Browse Source

修改扫描图尺寸与程序管理相对应

CXS 3 years ago
parent
commit
7a73de227d

+ 6 - 4
OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -69,11 +69,11 @@ namespace OTSDataType
         public const int RESOLUTION_ID_FIRST_TIE = 0;
         //const CSize RESOLUTION_VALUE[RESOLUTION_ID_MAX] = { CSize(1024, 704), CSize(2048, 1408), CSize(3072, 2048),
         //CSize(1024,884), CSize(2048, 1768), CSize(1024, 640),CSize(1024,768) };
-        //const CString RESOLUTION_STRINGS[RESOLUTION_ID_MAX] = { _T("1024 X 704"), _T("2048 X 1408"), _T("3072 X 2048"),
+        //const CString RESOLUTION_STRINGS[RESOLUTION_ID_MAX] = { _T("1024 X 704"), _T("2048 X 1408"), _T("3072 X 2048"),256192
         //_T("1024 X 884"), _T("2048 X 1768"), _T("1024 X 640") ,_T("1024 X 768")};
-        public static readonly Size[] RESOLUTION_VALUE = { new Size(1024, 704), new Size(2048, 1408), new Size(3072, 2048), new Size(512, 384), new Size(1024, 768), new Size(2048, 1536), new Size(4096, 3072) };
+        public static readonly Size[] RESOLUTION_VALUE = { new Size(512, 384), new Size(1024, 704), new Size(1024, 768), new Size(2048, 1408), new Size(2048, 1536), new Size(3072, 2048),new Size(4096, 3072) };
 
-        public static readonly string[] RESOLUTION_STRINGS = { "1024 X 704", "2048 X 1408", "3072 X 2048", "512 X 384", "1024 X 768", "2048 X 1536", "4096 X 3072" };
+        public static readonly string[] RESOLUTION_STRINGS = { "512 X 384", "1024 X 704", "1024 X 768", "2048 X 1408",  "2048 X 1536", "3072 X 2048",  "4096 X 3072" };
 
         // image parameter
         public const int STOP_PARAM_PARTICLE_MIN = 0;
@@ -256,7 +256,9 @@ namespace OTSDataType
             TIE3 = 2,
             TIE4 = 3,
             TIE5 = 4,
-            MAX = 4
+            TIE6 = 5,
+            TIE7=6,
+            MAX = 6
         }
 
 

+ 2 - 0
OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -106,6 +106,8 @@ namespace OTSMeasureApp
         TIE3 = 2,
         TIE4 = 3,
         TIE5 = 4,
+        TIE6=5,
+        TIE7=6
         //MAX = 4
     }
 

+ 6 - 6
XMLData/ResourceForCpp/ResourceForCpp-EN.xml

@@ -480,13 +480,13 @@
         <member itemKey="12275" itemName="" itemText="space"/>
         <member itemKey="12276" itemName="" itemText="space"/>
         <member itemKey="12277" itemName="" itemText="space"/>
-        <member itemKey="12278" itemName="" itemText="256x192"/>
-        <member itemKey="12279" itemName="" itemText="512x384"/>
+        <member itemKey="12278" itemName="" itemText="512x384"/>
+        <member itemKey="12279" itemName="" itemText="1024x704"/>
         <member itemKey="12280" itemName="" itemText="1024x768"/>
-        <member itemKey="12281" itemName="" itemText="2046x1536"/>
-        <member itemKey="12282" itemName="" itemText="4096x3072"/>
-        <member itemKey="12283" itemName="" itemText="space"/>
-        <member itemKey="12284" itemName="" itemText="space"/>
+        <member itemKey="12281" itemName="" itemText="2048x1408"/>
+        <member itemKey="12282" itemName="" itemText="2048x1536"/>
+        <member itemKey="12283" itemName="" itemText="3072x2048"/>
+        <member itemKey="12284" itemName="" itemText="4096x3072"/>
         <member itemKey="12285" itemName="" itemText="space"/>
         <member itemKey="12286" itemName="" itemText="space"/>
         <member itemKey="12287" itemName="" itemText="space"/>

+ 6 - 6
XMLData/ResourceForCpp/ResourceForCpp-ZH.xml

@@ -515,13 +515,13 @@
         <member itemKey="12275" itemName="" itemText="空"/>
         <member itemKey="12276" itemName="" itemText="空"/>
         <member itemKey="12277" itemName="" itemText="空"/>
-        <member itemKey="12278" itemName="" itemText="256x192"/>
-        <member itemKey="12279" itemName="" itemText="512x384"/>
+        <member itemKey="12278" itemName="" itemText="512x384"/>
+        <member itemKey="12279" itemName="" itemText="1024x704"/>
         <member itemKey="12280" itemName="" itemText="1024x768"/>
-        <member itemKey="12281" itemName="" itemText="2046x1536"/>
-        <member itemKey="12282" itemName="" itemText="4096x3072"/>
-        <member itemKey="12283" itemName="" itemText=""/>
-        <member itemKey="12284" itemName="" itemText=""/>
+        <member itemKey="12281" itemName="" itemText="2048x1408"/>
+        <member itemKey="12282" itemName="" itemText="2048x1536"/>
+        <member itemKey="12283" itemName="" itemText="3072x2048"/>
+        <member itemKey="12284" itemName="" itemText="4096x3072"/>
         <member itemKey="12285" itemName="" itemText="空"/>
         <member itemKey="12286" itemName="" itemText="空"/>
         <member itemKey="12287" itemName="" itemText="空"/>