fix a bug when setting the resolution in program manage form.

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

@@ -419,15 +419,15 @@
         <member itemKey="12275" itemName="" itemText="space"/>
         <member itemKey="12276" itemName="" itemText="space"/>
         <member itemKey="12277" itemName="" itemText="space"/>
-        <member itemKey="12278" itemName="" itemText="512x384"/>
-        <member itemKey="12279" itemName="" itemText="1024x684"/>
-        <member itemKey="12280" itemName="" itemText="1024x704"/>
-        <member itemKey="12281" itemName="" itemText="1024x768"/>
-        <member itemKey="12282" itemName="" itemText="1536x1024"/>
-        <member itemKey="12283" itemName="" itemText="2048x1408"/>
-        <member itemKey="12284" itemName="" itemText="2048x1536"/>
-        <member itemKey="12285" itemName="" itemText="3072x2048"/>
-        <member itemKey="12286" itemName="" itemText="4096x3072"/>
+        <member itemKey="12278" itemName="" itemText="space"/>
+        <member itemKey="12279" itemName="" itemText="space"/>
+        <member itemKey="12280" itemName="" itemText="space"/>
+        <member itemKey="12281" itemName="" itemText="space"/>
+        <member itemKey="12282" itemName="" itemText="space"/>
+        <member itemKey="12283" itemName="" itemText="space"/>
+        <member itemKey="12284" itemName="" itemText="space"/>
+        <member itemKey="12285" itemName="" itemText="space"/>
+        <member itemKey="12286" itemName="" itemText="space"/>
         <member itemKey="12287" itemName="" itemText="space"/>
         <member itemKey="12288" itemName="" itemText="SpotScan"/>
         <member itemKey="12289" itemName="" itemText="PlainScan"/>

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

@@ -387,15 +387,15 @@
         <member itemKey="12275" itemName="" itemText="空"/>
         <member itemKey="12276" itemName="" itemText="空"/>
         <member itemKey="12277" itemName="" itemText="空"/>
-        <member itemKey="12278" itemName="" itemText="512x384"/>
-        <member itemKey="12279" itemName="" itemText="1024x684"/>
-        <member itemKey="12280" itemName="" itemText="1024x704"/>
-        <member itemKey="12281" itemName="" itemText="1024x768"/>
-        <member itemKey="12282" itemName="" itemText="1536x1024"/>
-        <member itemKey="12283" itemName="" itemText="2048x1408"/>
-        <member itemKey="12284" itemName="" itemText="2048x1536"/>
-        <member itemKey="12285" itemName="" itemText="3072x2048"/>
-        <member itemKey="12286" itemName="" itemText="4096x3072"/>
+        <member itemKey="12278" itemName="" itemText="空"/>
+        <member itemKey="12279" itemName="" itemText="空"/>
+        <member itemKey="12280" itemName="" itemText="空"/>
+        <member itemKey="12281" itemName="" itemText="空"/>
+        <member itemKey="12282" itemName="" itemText="空"/>
+        <member itemKey="12283" itemName="" itemText="空"/>
+        <member itemKey="12284" itemName="" itemText="空"/>
+        <member itemKey="12285" itemName="" itemText="空"/>
+        <member itemKey="12286" itemName="" itemText="空"/>
         <member itemKey="12287" itemName="" itemText="空"/>
         <member itemKey="12288" itemName="" itemText="点扫描"/>
         <member itemKey="12289" itemName="" itemText="面扫描"/>

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -163,7 +163,7 @@ namespace OTSMeasureApp
             foreach (otsdataconst.OTS_GET_IMAGE_MODE enum_one in Enum.GetValues(typeof(otsdataconst.OTS_GET_IMAGE_MODE)))
             {
                 ComboBoxItem cbi = new ComboBoxItem();
-                cbi.Text = GetGetImageIdString(enum_one);
+                cbi.Text = GetImageModeString(enum_one);
                 cbi.Value = (int)enum_one;
                 IDC_COMBO_FETCHIMGMODE.Items.Add(cbi);
             }
@@ -189,7 +189,7 @@ namespace OTSMeasureApp
             foreach (otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS)))
             {
                 ComboBoxItem cbi = new ComboBoxItem();
-                cbi.Text = GetImageSizeIdString(enum_one);
+                cbi.Text = enum_one.ToString();
                 cbi.Value = (int)enum_one;
                 IDC_COMBO_IMGSIZE.Items.Add(cbi);
             }
@@ -583,11 +583,7 @@ namespace OTSMeasureApp
         /// </summary>
         public void LoadXRayParam()
         {
-           
-
-            //搜索X-ray精度对应的时间
-            //IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Text = m_cotsxrayprm.GetMidSearchAQTime().ToString();
-
+         
            
             foreach (ComboBoxItem cbi in IDC_COMBO_XRAYSCANMODE.Items)
             {

OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -156,20 +156,8 @@ namespace OTSModelSharp.ResourceManage
             return strScanSpeedId;
         }
 
-        // get image size id
-        public static string GetImageSizeIdString(otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS a_nImageSize)
-        {
-
-            string strImageSizeId = "";
-
-            
-                strImageSizeId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_SCANSIZE + (int)a_nImageSize);
-            
-            return strImageSizeId;
-        }
-
         // get image mode id
-        public static string GetGetImageIdString(otsdataconst.OTS_GET_IMAGE_MODE a_nGetImageMode)
+        public static string GetImageModeString(otsdataconst.OTS_GET_IMAGE_MODE a_nGetImageMode)
         {
             string strGetImageId = "";