添加分辨率1024x684

Bin/x64/Debug/Resources/XMLData/ResourceForCpp/ResourceForCpp-EN.xml

@@ -481,13 +481,13 @@
         <member itemKey="12276" itemName="" itemText="space"/>
         <member itemKey="12277" itemName="" itemText="space"/>
         <member itemKey="12278" itemName="" itemText="512x384"/>
-        <member itemKey="12279" itemName="" itemText="1024x704"/>
-        <member itemKey="12280" itemName="" itemText="1024x768"/>
-        <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="12279" itemName="" itemText="1024x684"/>
+        <member itemKey="12280" itemName="" itemText="1024x704"/>
+        <member itemKey="12281" itemName="" itemText="1024x768"/>
+        <member itemKey="12282" itemName="" itemText="2048x1408"/>
+        <member itemKey="12283" itemName="" itemText="2048x1536"/>
+        <member itemKey="12284" itemName="" itemText="3072x2048"/>
+        <member itemKey="12285" itemName="" itemText="4096x3072"/>
         <member itemKey="12286" itemName="" itemText="space"/>
         <member itemKey="12287" itemName="" itemText="space"/>
         <member itemKey="12288" itemName="" itemText="Spot Scan"/>

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

@@ -516,13 +516,13 @@
         <member itemKey="12276" itemName="" itemText="空"/>
         <member itemKey="12277" itemName="" itemText="空"/>
         <member itemKey="12278" itemName="" itemText="512x384"/>
-        <member itemKey="12279" itemName="" itemText="1024x704"/>
-        <member itemKey="12280" itemName="" itemText="1024x768"/>
-        <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="12279" itemName="" itemText="1024x684"/>
+        <member itemKey="12280" itemName="" itemText="1024x704"/>
+        <member itemKey="12281" itemName="" itemText="1024x768"/>
+        <member itemKey="12282" itemName="" itemText="2048x1408"/>
+        <member itemKey="12283" itemName="" itemText="2048x1536"/>
+        <member itemKey="12284" itemName="" itemText="3072x2048"/>
+        <member itemKey="12285" itemName="" itemText="4096x3072"/>
         <member itemKey="12286" itemName="" itemText="空"/>
         <member itemKey="12287" itemName="" itemText="空"/>
         <member itemKey="12288" itemName="" itemText="点扫描"/>

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSImageScanParam.cs

@@ -40,7 +40,7 @@ namespace OTSDataType
          const OTS_THREE_TIES_OPTIONS DEFAULE_SCAN_SPEED = OTS_THREE_TIES_OPTIONS.meddium;
 
         // image size
-         const OTS_FIVE_TIES_OPTIONS DEFAULE_IMAGE_SIZE = OTS_FIVE_TIES_OPTIONS.TIE3;
+         const OTS_FIVE_TIES_OPTIONS DEFAULE_IMAGE_SIZE = OTS_FIVE_TIES_OPTIONS.TIE4;
         void Init()
         {
 

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -2284,7 +2284,7 @@ namespace OTSDataType
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_RESOLUTION:
                     {
-                        if (OTS_FIVE_TIES_OPTIONS.TIE1 > (OTS_FIVE_TIES_OPTIONS)a_nValue || (OTS_FIVE_TIES_OPTIONS)a_nValue > OTS_FIVE_TIES_OPTIONS.TIE7)
+                        if (OTS_FIVE_TIES_OPTIONS.TIE1 > (OTS_FIVE_TIES_OPTIONS)a_nValue || (OTS_FIVE_TIES_OPTIONS)a_nValue > OTS_FIVE_TIES_OPTIONS.TIE8)
                         {
                             return false;
                         }
@@ -2416,7 +2416,7 @@ namespace OTSDataType
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_RESOLUTION:
                     {
-                        for (int i = (int)OTS_FIVE_TIES_OPTIONS.TIE1; i <= (int)OTS_FIVE_TIES_OPTIONS.TIE7; ++i)
+                        for (int i = (int)OTS_FIVE_TIES_OPTIONS.TIE1; i <= (int)OTS_FIVE_TIES_OPTIONS.TIE8; ++i)
                         {
                             strItem = RESOLUTION_STRINGS[RESOLUTION_ID_FIRST_TIE + i];
                             a_listComboStrings.Add(strItem);

OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -65,9 +65,9 @@ namespace OTSDataType
         public const int RESOLUTION_ID_MAX = 6;
         public const int RESOLUTION_ID_DEFAULT = 4;
         public const int RESOLUTION_ID_FIRST_TIE = 0;
-        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 Size[] RESOLUTION_VALUE = { new Size(512, 384), new Size(1024, 684), 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 = { "512 X 384", "1024 X 704", "1024 X 768", "2048 X 1408",  "2048 X 1536", "3072 X 2048",  "4096 X 3072" };
+        public static readonly string[] RESOLUTION_STRINGS = { "512 X 384", "1024 X 684", "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;
@@ -232,7 +232,8 @@ namespace OTSDataType
             TIE4 = 3,
             TIE5 = 4,
             TIE6 = 5,
-            TIE7=6
+            TIE7=6,
+            TIE8 = 7
         }
 
 

OTSIncAMeasureApp/Properties/IDDescriptionResource.resx

@@ -177,7 +177,7 @@
   </data>
   <data name="ID1016" xml:space="preserve">
     <value>扫描图精度（速度）</value>
-    <comment>类型 int enum枚举值， 对应扫描图尺寸有5个选择：256x192、512x384、1024x768、2046x1536、4096x3072，256x200、512x400、1024x800、2046x1600、4096x3200，256x256、512x512、1024x1024、2046x2046、4096x4096</comment>
+    <comment>类型 int enum枚举值， 对应扫描图尺寸有8个选择：512x384、1024x684、1024x704、1024x768、2048x1408，2048x1536、3072x2048、4096x3072</comment>
   </data>
   <data name="ID1017" xml:space="preserve">
     <value />

OTSIncAMeasureApp/Properties/Resources.resx

@@ -435,7 +435,7 @@
   </data>
   <data name="ID1016" xml:space="preserve">
     <value>扫描精度（速度）</value>
-    <comment>类型 int enum枚举值， 对应扫描图尺寸有5个选择：256x192、512x384、1024x768、2046x1536、4096x3072，256x200、512x400、1024x800、2046x1600、4096x3200，256x256、512x512、1024x1024、2046x2046、4096x4096</comment>
+    <comment>类型 int enum枚举值， 对应扫描图尺寸有8个选择：512x384、1024x684、1024x704、1024x768、2048x1408，2048x1536、3072x2048、4096x3072</comment>
   </data>
   <data name="标尺32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\标尺32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -137,7 +137,7 @@ namespace OTSModelSharp.ResourceManage
 
             string strImageSizeId = "";
 
-            if (a_nImageSize >= otsdataconst.OTS_FIVE_TIES_OPTIONS.TIE1 && a_nImageSize <= otsdataconst.OTS_FIVE_TIES_OPTIONS.TIE7)
+            if (a_nImageSize >= otsdataconst.OTS_FIVE_TIES_OPTIONS.TIE1 && a_nImageSize <= otsdataconst.OTS_FIVE_TIES_OPTIONS.TIE8)
             {
                 strImageSizeId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_SCANSIZE + (int)a_nImageSize);
             }

OTSIncAReportApp/Control_Graph/OTSIncAReportGraphFuncation/OTSIncAReportFun.cs

@@ -369,10 +369,10 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
             }
             ///-----------because all the  fields 's height/width=0.75 so here we make an enforce. gsp add at 2019/10/31
             ///sometimes the gbfields are not conform to this for the cuting and merging operation.
-            if (ret_rect.Height / ret_rect.Width != 0.75f)
-            {
-                ret_rect = new Rectangle(ret_rect.X, ret_rect.Y, ret_rect.Width, (int)(ret_rect.Width * 0.75f));
-            }
+            //if (ret_rect.Height / ret_rect.Width != 0.75f)
+            //{
+            //    ret_rect = new Rectangle(ret_rect.X, ret_rect.Y, ret_rect.Width, (int)(ret_rect.Width * 0.75f));
+            //}
             return ret_rect;
         }
         #endregion