add the z shape photograph sequence

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="输入测量帧图数。"/>

OTSCPP/OTSData/otsdataconst.h

@@ -150,9 +150,9 @@ namespace OTSDATA
 	{
 		INVALID = -1,
 		MIN = 0,
-		FROM_CENTER = 0,
-		UP_TO_DOWN = 1,
-		DOWN_TO_UP = 2,
+		SpiralSequnce = 0,
+		SnakeSequnce = 1,
+		ZShapeSequnce = 2,
 		RANDOM = 3,
 		MAX = 3
 	} OTS_GET_IMAGE_MODE;

OTSCPP/OTSImagePro/FieldMgr.cpp

@@ -68,7 +68,7 @@ namespace OTSIMGPROC {
 			}
 
 		}
-		void getDownUpMeanderMatrics(std::vector <std::vector <int>>& arrays, int row, int col)
+		void getZShapeMatrics(std::vector <std::vector <int>>& arrays, int row, int col)
 		{
 			
 			arrays.resize(row, std::vector<int>(col));
@@ -78,14 +78,14 @@ namespace OTSIMGPROC {
 			{
 				for (int j = 0; j < col; j++)
 				{
-					if (i % 2 == 0)
-					{
-						arrays[i][j] = col * i + j+1;
-					}
+					/*if (i % 2 == 0)
+					{*/
+						arrays[i][j] = col *(row- i) + j+1;
+					/*}
 					else
 					{
 						arrays[i][j] = col * i+(col-  j);
-					}
+					}*/
 					
 				}
 			}
@@ -419,15 +419,16 @@ namespace OTSIMGPROC {
 				std::vector <std::vector <int>> sequenceMat; //construct an matrics map to the pointMatrics,but the content is the sequence number.
 				switch (nStartMode)
 				{
-				case OTS_GET_IMAGE_MODE::FROM_CENTER:
+				case OTS_GET_IMAGE_MODE::SpiralSequnce:
                     getSpiralMatrics(sequenceMat, nTotalRows,nTotalCols);
 					break;
-				case  OTS_GET_IMAGE_MODE::UP_TO_DOWN :
+				case  OTS_GET_IMAGE_MODE::SnakeSequnce :
 					getUpDownMeanderMatrics(sequenceMat, nTotalRows, nTotalCols);
 					break;
-				case OTS_GET_IMAGE_MODE::DOWN_TO_UP :
+				case OTS_GET_IMAGE_MODE::ZShapeSequnce :
+					getZShapeMatrics(sequenceMat, nTotalRows, nTotalCols);
 				case OTS_GET_IMAGE_MODE::RANDOM :
-					getDownUpMeanderMatrics(sequenceMat, nTotalRows, nTotalCols);
+					
 					break;
 				}	
 				

OTSCPP/OTSImagePro/OTSImageScanParam.h

@@ -14,7 +14,7 @@ namespace OTSIMGPROC
 	__declspec(dllexport) const int DEFUALT_PARAM_PARTICLE = 5000;
 
 	// image mode
-	__declspec(dllexport) const OTS_GET_IMAGE_MODE DEFAULT_IMAGEMODE = OTS_GET_IMAGE_MODE::FROM_CENTER;
+	__declspec(dllexport) const OTS_GET_IMAGE_MODE DEFAULT_IMAGEMODE = OTS_GET_IMAGE_MODE::SpiralSequnce;
 
 	// scan speed
 	__declspec(dllexport) const OTS_THREE_TIES_OPTIONS DEFAULE_SCAN_SPEED = OTS_THREE_TIES_OPTIONS::TIE2;

OTSInclusionsTraceability/App.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

OTSInclusionsTraceability/OTSInclusionsTraceability.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>OTSInclusionsTraceability</RootNamespace>
     <AssemblyName>OTSInclusionsTraceability</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>