Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP

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

@@ -91,6 +91,7 @@
 			<member itemKey="20036" itemName="" itemText="QuantifyThreshold（EqualCircle/um）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
 			<member itemKey="20037" itemName="" itemText="FastX-ray（Ms）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
 			<member itemKey="20038" itemName="" itemText="Collect X-ray" description="Whether to collect X-ray during the detection process"/>
+			<member itemKey="20039" itemName="" itemText="XrayLimit"/>
 			<member itemKey="20185" itemName="" itemText="Spot Scan"/>
 			<member itemKey="20186" itemName="" itemText="Plane Scan"/>
 			<member itemKey="20200" itemName="" itemText="Yes" description=""/>

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

@@ -92,6 +92,7 @@
 			<member itemKey="20036" itemName="" itemText="分析阈值（等效圆直径/微米）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
 			<member itemKey="20037" itemName="" itemText="小颗粒x-ray时间（毫秒）" description="进行X-ray quantify 分析的最小颗粒尺寸"/>
 			<member itemKey="20038" itemName="" itemText="是否采集X-ray" description="检测过程中是否对颗粒进行X-ray采集"/>
+			<member itemKey="20039" itemName="" itemText="数量限值"/>
 			<member itemKey="20185" itemName="" itemText="点扫描" description=""/>
             <member itemKey="20186" itemName="" itemText="面扫描" description=""/>
 			<member itemKey="20200" itemName="" itemText="是" description=""/>
@@ -102,7 +103,7 @@
 			<member itemKey="20102" itemName="" itemText="输入分析x-ray时间。"/>
 			<member itemKey="20103" itemName="" itemText="选择分析x-ray扫描方式。"/>
 			<member itemKey="20104" itemName="" itemText="输入分析x-ray计数率期望值。"/>
-			<member itemKey="20105" itemName="" itemText="spare"/>
+			<member itemKey="20105" itemName="" itemText=""/>
 			<member itemKey="20106" itemName="" itemText="spare"/>
 			<member itemKey="20107" itemName="" itemText="spare"/>
 			<member itemKey="20108" itemName="" itemText="spare"/>

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -595,6 +595,11 @@ namespace OTSDataType
                         a_nValue = m_poMsrParams.GetXRayParam().GetFastXrayTime();
                     }
                     break;
+                case OTS_SAMPLE_PROP_GRID_ITEMS.XrayLimit:
+                    {
+                        a_nValue = m_poMsrParams.GetXRayParam().GetXrayLimit();
+                    }
+                    break;
                 default:
                     {
                         // something wrong, return false
@@ -802,6 +807,15 @@ namespace OTSDataType
                         m_poMsrParams.GetXRayParam().SetFastXrayTime(a_nValue);
                     }
                     break;
+                case OTS_SAMPLE_PROP_GRID_ITEMS.XrayLimit:
+                    {
+                        if (0 >= a_nValue)
+                        {
+                            return false;
+                        }
+                        m_poMsrParams.GetXRayParam().SetXrayLimit(a_nValue);
+                    }
+                    break;
                 // read only properties, treat same as default
                 case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_FIELDS:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.COMPLETED_FIELDS:
@@ -1122,7 +1136,13 @@ namespace OTSDataType
                                 nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_COUNTS;
                                 poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
                                 a_listPropItems.Add(poPropItem);
-                           
+
+                            // XrayLimit 
+                            poPropItem = new CPropItem();
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.XrayLimit;
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                            a_listPropItems.Add(poPropItem);
+
                         }
                         break;
                     case OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.SEM:
@@ -1583,6 +1603,11 @@ namespace OTSDataType
                             poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
                             a_listPropItems.Add(poPropItem);
 
+                            // XrayLimit 
+                            poPropItem = new CPropItem();
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.XrayLimit;
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                            a_listPropItems.Add(poPropItem);
                         }
                         break;
                     case OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.SEM:

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -669,6 +669,8 @@ namespace OTSMeasureApp
             IDC_EDIT_QuantifyMinSize.Text = m_cotsxrayprm.GetFeatureModeMinSize().ToString();
 
             IDC_EDIT_SmallPartAQTime.Text = m_cotsxrayprm.GetFastXrayTime().ToString();
+
+            IDC_EDIT_XrayLimit.Text = m_cotsxrayprm.GetXrayLimit().ToString();
             //IDC_XRAY_MODE_SWITCH.Checked = m_cotsxrayprm.GetShowScanMode();
             //IDC_XRAY_TIME_SWITCH.Checked = m_cotsxrayprm.GetShowSpeed();
             //IDC_XRAY_COUNT_SWITCH.Checked = m_cotsxrayprm.GetShowExpCount();
@@ -843,6 +845,8 @@ namespace OTSMeasureApp
             m_cotsxrayprm.SetQuantifyMinSize(Convert.ToDouble(IDC_EDIT_QuantifyMinSize.Text));
 
             m_cotsxrayprm.SetFastXrayTime(Convert.ToInt32(IDC_EDIT_SmallPartAQTime.Text));
+
+            m_cotsxrayprm.SetXrayLimit(Convert.ToInt32(IDC_EDIT_XrayLimit.Text));
             //m_cotsxrayprm.SetShowScanMode(IDC_XRAY_MODE_SWITCH.Checked);
             //m_cotsxrayprm.SetShowSpeed(IDC_XRAY_TIME_SWITCH.Checked);
             //m_cotsxrayprm.SetShowExpCount(IDC_XRAY_COUNT_SWITCH.Checked);
@@ -1285,9 +1289,11 @@ namespace OTSMeasureApp
             string pat = @"^-?[0-9]\d*$";//只能限定正负整数,包含0
             string scope = @"^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$";
             string PositiveDecimals = @"^(([1-9]\d*)(\.\d+)?)$|^0\.\d*[1-9]$";  //正浮点数
+            string positiveInteger = @"^?[0-9]\d*$";//只能限定正整数,包含0
             Regex rg = new Regex(pat);
             Regex rgScope = new Regex(scope);
             Regex rgPositiveDecimals = new Regex(PositiveDecimals);
+            Regex rgpositiveInteger = new Regex(positiveInteger);
             //是否是正确的数值格式类型判断
             //100倍时屏幕尺寸
             if (false == rg.Match(IDC_EDIT_SCREENWIDTH.Text.Trim()).Success)
@@ -1601,6 +1607,15 @@ namespace OTSMeasureApp
                 MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 return false;
             }
+            //最小放大倍数
+            if (false == rgpositiveInteger.Match(IDC_EDIT_XrayLimit.Text.Trim()).Success)
+            {
+                IDC_EDIT_XrayLimit.Focus();
+                IDC_EDIT_XrayLimit.SelectAll();
+                string message = table["message64"].ToString();
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return false;
+            }
             return true;
         }
 

OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -48,7 +48,8 @@ namespace OTSModelSharp.ResourceManage
         XRAY_QUANTIFY_MINSIZE = 36,
         XRAY_FASTTIME = 37,
         USING_XRAY = 38,
-        XRAY_MAX = 38,
+        XrayLimit=39,
+        XRAY_MAX = 39,
         SEM_DATA_MIN = 40,
         MAGNIFICATION = 40,
         PIXEL_SIZE = 41,