change the holepreview photo logic to the zshape sequence logic.

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -903,6 +903,7 @@
 	  <Control name="另存选择颗粒ToolStripMenuItem" text="SaveAs" />
 	  <Control name="ToolStripMenuItem_movesempoint" text="Move SEM to the Particle Horizon Position" />
 	  <Control name="toolStripMenuItem_copyimage" text="Duplicate image" />
+	  <Control name="toolStripMenuItem_DeleteParticles" text="DeleteParticles"/>
 	  <Control name="str1" text="Start loading distribution map information" />
 	  <Control name="str2" text="Loading completed" />
 	  <Control name="str3" text="SEM location:" />
@@ -1336,13 +1337,14 @@
     <Name>OTSMeasureStatusWindow</Name>
     <Controls>
       <Control name="SampleParaLock" text="GetBSEDiagram" />
-	  <Control name="ViewStripMenuItem" text="Set the visual gray range of BSE image" />
+	  <Control name="VisualAdjustingMenu" text="Set the visual gray range of BSE image" />
 	  <Control name="toolStripMenuItem1" text="Set the grayscale range of special particles for visualization" />
 	  <Control name="ChangeDiffImageShow" text="SwitchToBSE" />
 	  <Control name="ToolStripMenuItem" text="De-backgroundImage " />
+	  <Control name="ToolStripMenuItem2" text="De-backgroundcolorImage " />
 	  <Control name="grayToolStripMenuItem" text="DisplayB-GrayCurve" />
 	  <Control name="AbandonGrayStripMenuItem" text="DisplayBackground-freeGray-scaleCurve" />
-	  <Control name="MenuItemLineScam" text="LineScanningCurve" />
+	  <Control name="MenuItemLineScan" text="LineScanningCurve" />
 	  <Control name="PointScanElementMenuItem" text="PointScanElement" />
 	  <Control name="ExportScanInfoMenuItem" text="ExportScanInfo" />
 	  <Control name="message1" text="SwitchBSEDiagram" />
@@ -1407,6 +1409,16 @@
 	  <Control name="ShootBSEPicture2" text="MeasureMode" />
     </Controls>
  </Form>
+ <Form>
+    <Name>RingGdiDataInput</Name>
+    <Controls>
+      <Control name="RingGdiDataInput" text="RingConfiguration" />
+	  <Control name="label1" text="Enter the outer diameter(micron) :" />
+	  <Control name="label2" text="Enter the ring width (micron) :" />
+	  <Control name="button1" text="OK" />
+	  <Control name="button2" text="Cancel" />
+    </Controls>
+ </Form>
  <Form>
     <Name>SampleGrid</Name>
     <Controls>

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -886,6 +886,7 @@
           <Control name="ToolStripMenuItem_delete" text="排除这些颗粒" />
 	  <Control name="另存选择颗粒ToolStripMenuItem" text="另存为" />
 	  <Control name="ToolStripMenuItem_movesempoin MenuItem" text="导出原图拼接分类图"/>
+	  <Control name="toolStripMenuItem_DeleteParticles" text="删除颗粒"/>
 	  <Control name="str1" text="开始加载分布图信息" />
 	  <Control name="str2" text="已完成加载" />
 	  <Control name="str3" text="SEM位置:" />
@@ -1278,13 +1279,14 @@
     <Name>OTSMeasureStatusWindow</Name>
     <Controls>
       <Control name="SampleParaLock" text="获取BSE图" />
-	  <Control name="ViewStripMenuItem" text="设置BSE图可视化灰度范围" />
+	  <Control name="VisualAdjustingMenu" text="设置BSE图可视化灰度范围" />
 	  <Control name="toolStripMenuItem1" text="可视化设置特殊颗粒灰度范围" />
 	  <Control name="ChangeDiffImageShow" text="切换至BSE图" />
 	  <Control name="ToolStripMenuItem" text="BSE去背景图" />
+	  <Control name="ToolStripMenuItem2" text="BSE去背景彩色图" />
 	  <Control name="grayToolStripMenuItem" text="显示BSE灰度曲线图" />
 	  <Control name="AbandonGrayStripMenuItem" text="显示BSE去背景灰度曲线图" />
-	  <Control name="MenuItemLineScam" text="线扫描曲线" />
+	  <Control name="MenuItemLineScan" text="线扫描曲线" />
 	  <Control name="PointScanElementMenuItem" text="单点采集" />
 	  <Control name="ExportScanInfoMenuItem" text="导出采集信息" />
 	  <Control name="message1" text="切换显示至BSE图" />
@@ -1350,6 +1352,16 @@
     </Controls>
  </Form>
  <Form>
+    <Name>RingGdiDataInput</Name>
+    <Controls>
+      <Control name="RingGdiDataInput" text="环形配置" />
+	  <Control name="label1" text="请输入环形外径（微米）：" />
+	  <Control name="label2" text="请输入环形宽度（微米）：" />
+	  <Control name="button1" text="确定" />
+	  <Control name="button2" text="取消" />
+    </Controls>
+ </Form>
+  <Form>
     <Name>SampleGrid</Name>
     <Controls>
       <Control name="m_reportname1" text="颗粒成分分类" />

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-ZH.xml

@@ -16,7 +16,7 @@
 			<member itemKey="20079" itemName="" itemText="spare"/>
 		</collection>
 		<collection RegName="ResGrp" grpKey="1" text="扫描参数" description="">
-			<member itemKey="20010" itemName="" itemText="取图方式" comboContent="中心,自上而下,自下而上" description="选择从测量区域中心开始取图，或自上而下、自下而上取图，或随机取图。"/>
+			<member itemKey="20010" itemName="" itemText="取图方式" comboContent="螺旋,蛇形,Z字形" description="选择从测量区域中心开始取图，或自上而下、自下而上取图，或随机取图。"/>
 			<member itemKey="20011" itemName="" itemText="终止方式" description="选择颗粒数、帧图数、测量时间，或覆盖测量区域。"/>
 			<member itemKey="20012" itemName="" itemText="颗粒数" description="输入测量颗粒数。"/>
 			<member itemKey="20013" itemName="" itemText="帧图数" description="输入测量帧图数。"/>
@@ -369,9 +369,9 @@
         <member itemKey="12258" itemName="" itemText="空"/>
         <member itemKey="12259" itemName="" itemText="空"/>
         <member itemKey="12260" itemName="" itemText="空"/>
-        <member itemKey="12261" itemName="" itemText="中心"/>
-        <member itemKey="12262" itemName="" itemText="自上而下"/>
-        <member itemKey="12263" itemName="" itemText="自下而上"/>
+        <member itemKey="12261" itemName="" itemText="螺旋"/>
+        <member itemKey="12262" itemName="" itemText="蛇形"/>
+        <member itemKey="12263" itemName="" itemText="Z字形"/>
         <member itemKey="12264" itemName="" itemText="随机"/>
         <member itemKey="12265" itemName="" itemText="通用方法"/>
         <member itemKey="12266" itemName="" itemText="钙处理"/>

OTSCPP/OTSClrInterface/ImageProClr/FieldMgrClr.cpp

@@ -107,38 +107,7 @@ namespace OTSCLRINTERFACE {
 		return NameClr;
 	}
 
-	// field centre points list
-	/*bool CFieldMgrClr::GetFieldRectByIndex(int a_nIndex, System::Drawing::Rectangle^% a_rctField)
-	{
-	
-		ASSERT(a_rctField);
-		if (!a_rctField)
-		{
-			LogErrorTrace(__FILE__, __LINE__, _T("GetFieldRectByIndex:invalid rectangle pointer."));
-			return false;
-		}
-
-		CRect oRect;
-		CFieldMgrPtr pFieldMgr = GetCFiledMgrPtr();
-
-		ASSERT(pFieldMgr);
-		if (!pFieldMgr)
-		{
-			LogErrorTrace(__FILE__, __LINE__, _T("GetFieldRectByIndex: invalid pointer."));
-			return false;
-		}
-
-		bool bRet = pFieldMgr->GetFieldRectByIndex(a_nIndex, oRect);
-
-		a_rctField->X = oRect.left;
-		a_rctField->Y = oRect.top;
-		a_rctField->Width = oRect.Width();
-		a_rctField->Height = oRect.Height();
-
 	
-		return bRet;
-
-	}*/
 
 	int CFieldMgrClr::GetTotalFields()
 	{

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSImageScanParam.cs

@@ -37,7 +37,7 @@ namespace OTSDataType
         const int DEFUALT_PARAM_AREA = 100;
 
         // image mode
-        const OTS_GET_IMAGE_MODE DEFAULT_IMAGEMODE = OTS_GET_IMAGE_MODE.FROM_CENTER;
+        const OTS_GET_IMAGE_MODE DEFAULT_IMAGEMODE = OTS_GET_IMAGE_MODE.Spiral;
 
         // scan speed
          const OTS_IMAGE_SCANSPEED_OPTIONS DEFAULE_SCAN_SPEED = OTS_IMAGE_SCANSPEED_OPTIONS.meddium;

OTSIncAMeasureApp/0-OTSModel/OTSDataType/DataPublic.cs

@@ -44,7 +44,7 @@ namespace OTSModelSharp
 		// stop part num
 		public const int PARTICL_NUM = 50000;
 		// get image mode
-		public const otsdataconst.OTS_GET_IMAGE_MODE FETCH_IMAGE_MODE = otsdataconst.OTS_GET_IMAGE_MODE.FROM_CENTER;
+		public const otsdataconst.OTS_GET_IMAGE_MODE FETCH_IMAGE_MODE = otsdataconst.OTS_GET_IMAGE_MODE.Spiral;
 		// scan speed
 		public const otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS SCAN_SPEED = otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
 		// image size

OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -210,9 +210,9 @@ namespace OTSDataType
 
         public enum OTS_GET_IMAGE_MODE
         {
-            FROM_CENTER = 0,
-            UP_TO_DOWN = 1,
-            DOWN_TO_UP = 2
+            Spiral = 0,
+           Snake = 1,
+            Zshape = 2
             //RANDOM = 3
         }
 

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CMeasure.cs

@@ -436,7 +436,7 @@ namespace OTSModelSharp
             // Set image scan param
             COTSImgScanPrm poImageScanParam = new COTSImgScanPrm();
             poImageScanParam.SetStopMode(((int)OTS_MEASURE_STOP_MODE.CoverMode).ToString());
-            poImageScanParam.SetStartImageMode(OTS_GET_IMAGE_MODE.FROM_CENTER);
+            poImageScanParam.SetStartImageMode(OTS_GET_IMAGE_MODE.Zshape);
             poImageScanParam.SetScanImageSpeed(OTS_IMAGE_SCANSPEED_OPTIONS.low);
        
 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSSampleVisualPropertyInfo.cs

@@ -584,7 +584,7 @@ namespace OTSMeasureApp
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE:
                     {
-                        if (OTS_GET_IMAGE_MODE.FROM_CENTER > (OTS_GET_IMAGE_MODE)(int)objVal || (OTS_GET_IMAGE_MODE)(int)objVal > OTS_GET_IMAGE_MODE.DOWN_TO_UP)
+                        if (OTS_GET_IMAGE_MODE.Spiral > (OTS_GET_IMAGE_MODE)(int)objVal || (OTS_GET_IMAGE_MODE)(int)objVal > OTS_GET_IMAGE_MODE.Zshape)
                         {
                             return false;
                         }

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/CFieldPositionHelper.cs

@@ -58,7 +58,7 @@ namespace OTSModelSharp
 
             var scanfieldsize = m_poSEMDataMsr.GetScanFieldSize();
 
-            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poImageScanParam.GetImageResulotion();
+            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = a_poImageScanParam.GetImageResulotion();
             long nResulotionId = RESOLUTION_ID_FIRST_TIE + (long)nImageSizeId;
 
             fieldmgrclr = new CFieldMgrClr(scanfieldsize, RESOLUTION_VALUE[nResulotionId]);
@@ -67,7 +67,7 @@ namespace OTSModelSharp
 
 
 
-            fieldmgrclr.Init(domainclr.GetClrDomainObj(), (int)m_poImageScanParam.GetFieldStartMode());
+            fieldmgrclr.Init(domainclr.GetClrDomainObj(), (int)a_poImageScanParam.GetFieldStartMode());
             fieldmgrclr.SetOverlap(overlap);
 
             List<System.Drawing.Point> fieldpoints = new List<System.Drawing.Point>();

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -2608,7 +2608,8 @@ namespace OTSMeasureApp
             if (runType == MSR_RUN_TYPE.RUNSampleHoleImage)
             {
                 InitHoleImgPosData(sample,out listCenterPoint, out rectSize);
-            }else if(runType==MSR_RUN_TYPE.RUNMEASURE)
+            }
+            else if(runType==MSR_RUN_TYPE.RUNMEASURE)
             {
                 sample.InitFieldPosData( out listCenterPoint, out rectSize);
             }