restore the big small particle measure mode

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1036,7 +1036,7 @@
 	  <Control name="label11" text="取图方式" />
 	  <Control name="label10" text="终止颗粒数" />
 	  <Control name="label9" text="终止帧图数" />
-	  <Control name="label8" text="终止时间(秒)" />
+	
 	  <Control name="label7" text="测量终止方式" />
 	  <Control name="groupBox4" text="常规测量参数" />
 	  <Control name="label42" text="精炼工艺" />
@@ -1068,7 +1068,7 @@
 	  <Control name="label47" text="数量限值" />
 	  <Control name="label49" text="腐蚀膨胀系数" />
 	  <Control name="label31" text="扫描方式(大颗粒）" /> 
-	  <Control name="label37" text="分析阈值" />
+	  <Control name="label8" text="分析阈值(ECD/um)" />
 	  <Control name="label52" text="是否启用颗粒过滤（Bruker）" />
 	  <Control name="groupBox7" text="模式选择" />
 	  <Control name="lbModelSel" text="模式选择" />

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -21,7 +21,7 @@ namespace OTSDataType
         const int DEFAULE_XRAY_ANALY_MID_TIME = 1000;
         const double DEFAULE_XRAY_QUANTIFY_MINSIZE = 50;
 
-        const double DEFAULE_XRAY_QUANTIFY_MINSIZE = 50;
+       
 
         const int DEFAULE_FASTXRAYTIME = 100;
         const int Default_Xray_Limit = 50;
@@ -37,7 +37,7 @@ namespace OTSDataType
 
         private bool m_nUsingXray;
         private bool m_UseFilter;
-        private double m_nQutantifyMinSize;
+       
         private int m_nFastXrayTime;
         private int m_XrayLimit;
 
@@ -110,7 +110,7 @@ namespace OTSDataType
         public int GetAnalyExpCount() { return m_nAnalyLowestCount; }
         public void SetAnalyExpCount(int a_nVal) { m_nAnalyLowestCount = a_nVal; }
         public double GetFeatureModeMinSize() { return m_nQutantifyMinSize; }
-        public void SetQuantifyMinSize(double a_nQuantifyMinSize)
+        public void SetFeatureModeMinSize(double a_nQuantifyMinSize)
         {
             m_nQutantifyMinSize = a_nQuantifyMinSize;
         }
@@ -124,11 +124,7 @@ namespace OTSDataType
         public void SetMidAnalyAQTime(int a_nMidAnalyAQTime) { m_nMidAnalyAQTime = a_nMidAnalyAQTime; }
 
 
-        public double GetFeatureModeMinSize() { return m_nQutantifyMinSize; }
-        public void SetQuantifyMinSize(double a_nQuantifyMinSize)
-        {
-            m_nQutantifyMinSize = a_nQuantifyMinSize;
-        }
+       
         public int GetSmallPartXrayTime() { return m_nSmallPartXrayTime; }
         public void SetSmallPartXrayTime(int a_nFastXrayTime)
         {

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CMeasureThreadWrapper.cs

@@ -417,10 +417,7 @@ namespace OTSMeasureApp
         {
             m_MeasureApp.SetPauseMeasureRibbonStatus();
 
-            //GetMsrRetData(ref SMsrData.STMThreadStu.SMsrCompleteData);
-
-            //m_OTSMeasureResult.UpdateMeasureState_samplespace_propertyGrid(SMsrData);
-            //m_OTSMeasureResult.me
+          
         }
 
       

OTSIncAMeasureApp/1-OTSMeasure/Measure/ParamData/OTSGeneralParam.cs

@@ -11,7 +11,7 @@ namespace OTSModelSharp
    public class COTSGeneralParam : ISlo
     {
         //--------------------definition-------------
-        //int m_StdLibTypeIndex;
+     
         double m_dDefaultArea;
         int m_nPropertyDisplayMode;
         bool m_bMeasSwitch;
@@ -110,14 +110,6 @@ namespace OTSModelSharp
         }
 
 
-        //public int GetPartStdLibTypeIndex()
-        //{
-        //    return m_StdLibTypeIndex;
-        //}
-        //public void SetPartStdLibTypeIndex(int a_index)
-        //{
-        //    m_StdLibTypeIndex = a_index;
-        //}
 
         public int PropertyDisplayMode()
         {
@@ -204,7 +196,7 @@ namespace OTSModelSharp
 
         public int GetSteelTechnology() { return m_steelTechnologyl; }
         public void SetSteelTechnology(int a_steelTechnology) { m_steelTechnologyl = a_steelTechnology; }
-        public string GetSelectSTDName() { return m_sSTDSelect; }
+        public string GetSTDSelect() { return m_sSTDSelect; }
         public void SetSTDSelect(string a_sSTDSelect) { m_sSTDSelect = a_sSTDSelect; }
         //--------------------protected--------------
         // initialization
@@ -214,7 +206,7 @@ namespace OTSModelSharp
             m_bMeasSwitch = true;
             m_strMeasParamFileFolderName = ("");
             m_strPartSTDLibFolderName = ("");
-            //m_StdLibTypeIndex = 0;
+           
             m_DefaultmembraneType = otsdataconst.MEMBRANE_TYPE.Abrasive;
             m_nDefaultShape = (otsdataconst.DOMAIN_SHAPE)(-1);
             m_dDefaultArea = 0;
@@ -242,7 +234,7 @@ namespace OTSModelSharp
             m_bMeasSwitch = a_oSource.m_bMeasSwitch;
             m_strMeasParamFileFolderName = a_oSource.m_strMeasParamFileFolderName;
             m_strPartSTDLibFolderName = a_oSource.m_strPartSTDLibFolderName;
-            //m_StdLibTypeIndex = a_oSource.m_StdLibTypeIndex;
+           
             m_DefaultmembraneType = a_oSource.m_DefaultmembraneType;
             m_nDefaultShape = a_oSource.m_nDefaultShape;
             m_dDefaultArea = a_oSource.m_dDefaultArea;
@@ -266,7 +258,7 @@ namespace OTSModelSharp
             xString xstrMeasParamFileFolderName = new xString();
             xString xstrPartSTDLibFolderName = new xString();
             xString xstrSTDSelect = new xString();
-            //xInt xnStdLibTypeIndex = new xInt();
+            xInt xnStdLibTypeIndex = new xInt();
             xInt xnSteelTechnology = new xInt();
             xInt xnDefaultShape = new xInt();
             xBool xbUseSysSTD = new xBool();
@@ -277,7 +269,7 @@ namespace OTSModelSharp
             slo.Register("MeasSwitch", xbMeasSwitch);
             slo.Register("MeasParamFileFolderName", xstrMeasParamFileFolderName);
             slo.Register("PartSTDLibFolderName", xstrPartSTDLibFolderName);
-            //slo.Register("StdLibTypeIndex", xnStdLibTypeIndex);
+           
             slo.Register("StdLibFileName", xstrSTDSelect);
             slo.Register("SteelTechnology", xnSteelTechnology);
             slo.Register("DefaultShape", xnDefaultShape);
@@ -292,7 +284,7 @@ namespace OTSModelSharp
                 xstrMeasParamFileFolderName.AssignValue(m_strMeasParamFileFolderName);
                 xstrPartSTDLibFolderName.AssignValue(m_strPartSTDLibFolderName);
                 xstrSTDSelect.AssignValue(m_sSTDSelect);
-                //xnStdLibTypeIndex.AssignValue(m_StdLibTypeIndex);
+              
                 xnSteelTechnology.AssignValue(m_steelTechnologyl);
                 xnDefaultShape.AssignValue((int)m_nDefaultShape);
                 xbUseSysSTD.AssignValue(m_bSysSTD);
@@ -310,7 +302,7 @@ namespace OTSModelSharp
                 m_strMeasParamFileFolderName = xstrMeasParamFileFolderName.value();
                 m_strPartSTDLibFolderName = xstrPartSTDLibFolderName.value();
                 m_sSTDSelect = xstrSTDSelect.value();
-                //m_StdLibTypeIndex = xnStdLibTypeIndex.value();
+              
                 m_steelTechnologyl = xnSteelTechnology.value();
                 m_nDefaultShape = (otsdataconst.DOMAIN_SHAPE)xnDefaultShape.value();
                 m_bSysSTD =Convert.ToBoolean(xbUseSysSTD.toString());

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -361,7 +361,7 @@ namespace OTSMeasureApp
             poMsrParams.SetImageScanParam(GetDefaultParam().GetImageScanParam ());
             poMsrParams.SetImageProcessParam(GetDefaultParam().GetImageProcParam()); 
             poMsrParams.SetXRayParam(GetDefaultParam().GetXRayParam());
-            String sSTDName = m_pParam.GetSelectSTDName();
+            String sSTDName = m_pParam.GetSTDSelect();
             poMsrParams.SetSTDName(sSTDName);
             poMsrParams.SetSteelTechnology((STEEL_TECHNOLOGY)m_pParam.GetSteelTechnology());
             poMsrParams.SetSpecialGrayRangeParam(SpecialRanges);

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSSampleVisualPropertyInfo.cs

@@ -533,7 +533,7 @@ namespace OTSMeasureApp
                         {
                             return false;
                         }
-                        m_poMsrParams.GetXRayParam().SetQuantifyMinSize((double)objVal);
+                        m_poMsrParams.GetXRayParam().SetFeatureModeMinSize((double)objVal);
                     }
                     break;
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -258,18 +258,18 @@ namespace OTSMeasureApp
             this.IDC_COMBO_XRAYSCANMODE.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_XRAYSCANMODE_SelectedIndexChanged);
        
             //分析X-Ray精度
-            IDC_COMBO_ANALYXRAYSPEED.Items.Clear();
-            foreach (otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)))
-            {
-                ComboBoxItem cbi = new ComboBoxItem();
-                cbi.Text = GetXRayAnalySpeedIdString(enum_one);
-                cbi.Value = (int)enum_one;
-                IDC_COMBO_ANALYXRAYSPEED.Items.Add(cbi);
-            }
-            this.IDC_COMBO_ANALYXRAYSPEED.SelectedIndexChanged -= new System.EventHandler(this.IDC_COMBO_ANALYXRAYSPEED_SelectedIndexChanged);
-            if (IDC_COMBO_ANALYXRAYSPEED.Items.Count > 0)
-                IDC_COMBO_ANALYXRAYSPEED.SelectedIndex = 0;
-            this.IDC_COMBO_ANALYXRAYSPEED.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_ANALYXRAYSPEED_SelectedIndexChanged);
+            //IDC_COMBO_ANALYXRAYSPEED.Items.Clear();
+            //foreach (otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)))
+            //{
+            //    ComboBoxItem cbi = new ComboBoxItem();
+            //    cbi.Text = GetXRayAnalySpeedIdString(enum_one);
+            //    cbi.Value = (int)enum_one;
+            //    IDC_COMBO_ANALYXRAYSPEED.Items.Add(cbi);
+            //}
+            //this.IDC_COMBO_ANALYXRAYSPEED.SelectedIndexChanged -= new System.EventHandler(this.IDC_COMBO_ANALYXRAYSPEED_SelectedIndexChanged);
+            //if (IDC_COMBO_ANALYXRAYSPEED.Items.Count > 0)
+            //    IDC_COMBO_ANALYXRAYSPEED.SelectedIndex = 0;
+            //this.IDC_COMBO_ANALYXRAYSPEED.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_ANALYXRAYSPEED_SelectedIndexChanged);
 
             //精炼工艺下拉框选项
             IDC_COMBO_TECHNOLOGY.Items.Clear();
@@ -501,15 +501,7 @@ namespace OTSMeasureApp
             IDC_EDIT_ANALYSESTDLIBPATH.Text = m_cgenparam.GetPartSTDLibFolderName().ToString();
           
 
-            //选择颗粒分析标准库
-            foreach (ComboBoxItem cbi in IDC_COMBO_TECHNOLOGY.Items)
-            {
-                if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cgenparam.GetPartStdLibTypeIndex())
-                    {
-                        IDC_COMBO_TECHNOLOGY.SelectedItem = cbi;
-                    }
-            }
+           
             //精炼工艺选项
             foreach (ComboBoxItem cbi in IDC_COMBO_TECHNOLOGY.Items)
             {
@@ -801,8 +793,7 @@ namespace OTSMeasureApp
         public void SaveXRayParam()
         {
 
-            //搜索X-ray精度
-            ComboBoxItem enum_searchxrayspeed = (ComboBoxItem)IDC_COMBO_SEARCHXRAYSPEED.SelectedItem;
+          
  
             //X-ray扫描方式
             ComboBoxItem enum_xrayscanmode = (ComboBoxItem)IDC_COMBO_XRAYSCANMODE.SelectedItem;
@@ -818,7 +809,7 @@ namespace OTSMeasureApp
             //分析X-ray计数期望值
             m_cotsxrayprm.SetAnalyExpCount(Convert.ToInt32(IDC_EDIT_ANALYXRAYAIMVALUE.Text));
 
-            m_cotsxrayprm.SetQuantifyMinSize(Convert.ToDouble(IDC_EDIT_QuantifyMinSize.Text));
+            m_cotsxrayprm.SetFeatureModeMinSize(Convert.ToDouble(IDC_EDIT_QuantifyMinSize.Text));
 
             m_cotsxrayprm.SetSmallPartXrayTime(Convert.ToInt32(IDC_EDIT_SmallPartAQTime.Text));
 
@@ -1235,14 +1226,14 @@ namespace OTSMeasureApp
                 IDC_COMBO_XRAYSCANMODE.SelectAll();
                 return false;
             }
-            if ("" == IDC_COMBO_ANALYXRAYSPEED.Text)
-            {
-                string message = table["message21"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                IDC_COMBO_ANALYXRAYSPEED.Focus();
-                IDC_COMBO_ANALYXRAYSPEED.SelectAll();
-                return false;
-            }
+            //if ("" == IDC_COMBO_ANALYXRAYSPEED.Text)
+            //{
+            //    string message = table["message21"].ToString();
+            //    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            //    IDC_COMBO_ANALYXRAYSPEED.Focus();
+            //    IDC_COMBO_ANALYXRAYSPEED.SelectAll();
+            //    return false;
+            //}
             if ("" == IDC_EDIT_ANALYXRAYAIMVALUE.Text)
             {
                 string message = table["message22"].ToString();

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -108,7 +108,7 @@
             this.IDC_EDIT_SmallPartAQTime = new System.Windows.Forms.TextBox();
             this.label45 = new System.Windows.Forms.Label();
             this.label46 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.IDC_EDIT_QuantifyMinSize = new System.Windows.Forms.TextBox();
             this.label8 = new System.Windows.Forms.Label();
             this.label40 = new System.Windows.Forms.Label();
             this.IDC_FILTER = new System.Windows.Forms.CheckBox();
@@ -117,28 +117,21 @@
             this.label47 = new System.Windows.Forms.Label();
             this.IDC_USINGXRAY_LIB = new System.Windows.Forms.CheckBox();
             this.label44 = new System.Windows.Forms.Label();
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME = new System.Windows.Forms.TextBox();
-            this.label38 = new System.Windows.Forms.Label();
-            this.label30 = new System.Windows.Forms.Label();
-            this.label29 = new System.Windows.Forms.Label();
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT = new System.Windows.Forms.TextBox();
-            this.IDC_COMBO_SEARCHXRAYSPEED = new System.Windows.Forms.ComboBox();
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME = new System.Windows.Forms.TextBox();
-            this.IDC_COMBO_ANALYXRAYSPEED = new System.Windows.Forms.ComboBox();
             this.label32 = new System.Windows.Forms.Label();
             this.label39 = new System.Windows.Forms.Label();
             this.IDC_COMBO_XRAYSCANMODE = new System.Windows.Forms.ComboBox();
             this.IDC_EDIT_ANALYXRAYAIMVALUE = new System.Windows.Forms.TextBox();
             this.label33 = new System.Windows.Forms.Label();
             this.label31 = new System.Windows.Forms.Label();
-            this.IDC_EDIT_QuantifyMinSize = new System.Windows.Forms.TextBox();
+            //this.IDC_EDIT_QuantifyMinSize1 = new System.Windows.Forms.TextBox();
             this.label37 = new System.Windows.Forms.Label();
             this.btnok = new System.Windows.Forms.Button();
-            this.btncancel = new System.Windows.Forms.Button();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
             this.lbModelSel = new System.Windows.Forms.Label();
             this.IDC_COMBO_Model = new System.Windows.Forms.ComboBox();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
+            this.btncancel = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -154,7 +147,7 @@
             this.groupBox1.Controls.Add(this.IDC_COMBO_STAGE);
             this.groupBox1.Controls.Add(this.label41);
             this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox1.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox1.Location = new System.Drawing.Point(6, 63);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
@@ -573,7 +566,7 @@
             // 
             // tBMeasArea
             // 
-            this.tBMeasArea.Location = new System.Drawing.Point(147, 218);
+            this.tBMeasArea.Location = new System.Drawing.Point(114, 217);
             this.tBMeasArea.Margin = new System.Windows.Forms.Padding(2);
             this.tBMeasArea.Name = "tBMeasArea";
             this.tBMeasArea.Size = new System.Drawing.Size(145, 21);
@@ -584,7 +577,7 @@
             // 
             this.cBMeasShape.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cBMeasShape.FormattingEnabled = true;
-            this.cBMeasShape.Location = new System.Drawing.Point(148, 186);
+            this.cBMeasShape.Location = new System.Drawing.Point(115, 186);
             this.cBMeasShape.Margin = new System.Windows.Forms.Padding(2);
             this.cBMeasShape.Name = "cBMeasShape";
             this.cBMeasShape.Size = new System.Drawing.Size(142, 20);
@@ -615,10 +608,10 @@
             // 
             this.IDC_COMBO_TECHNOLOGY.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.IDC_COMBO_TECHNOLOGY.FormattingEnabled = true;
-            this.IDC_COMBO_TECHNOLOGY.Location = new System.Drawing.Point(118, 250);
+            this.IDC_COMBO_TECHNOLOGY.Location = new System.Drawing.Point(115, 244);
             this.IDC_COMBO_TECHNOLOGY.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_COMBO_TECHNOLOGY.Name = "IDC_COMBO_TECHNOLOGY";
-            this.IDC_COMBO_TECHNOLOGY.Size = new System.Drawing.Size(171, 20);
+            this.IDC_COMBO_TECHNOLOGY.Size = new System.Drawing.Size(175, 20);
             this.IDC_COMBO_TECHNOLOGY.TabIndex = 532;
             this.IDC_COMBO_TECHNOLOGY.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_TECHNOLOGY_SelectedIndexChanged);
             // 
@@ -1002,7 +995,7 @@
             this.groupBox6.Controls.Add(this.IDC_EDIT_SmallPartAQTime);
             this.groupBox6.Controls.Add(this.label45);
             this.groupBox6.Controls.Add(this.label46);
-            this.groupBox6.Controls.Add(this.textBox1);
+            this.groupBox6.Controls.Add(this.IDC_EDIT_QuantifyMinSize);
             this.groupBox6.Controls.Add(this.label8);
             this.groupBox6.Controls.Add(this.label40);
             this.groupBox6.Controls.Add(this.IDC_FILTER);
@@ -1011,14 +1004,7 @@
             this.groupBox6.Controls.Add(this.label47);
             this.groupBox6.Controls.Add(this.IDC_USINGXRAY_LIB);
             this.groupBox6.Controls.Add(this.label44);
-            this.groupBox6.Controls.Add(this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME);
-            this.groupBox6.Controls.Add(this.label38);
-            this.groupBox6.Controls.Add(this.label30);
-            this.groupBox6.Controls.Add(this.label29);
-            this.groupBox6.Controls.Add(this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT);
-            this.groupBox6.Controls.Add(this.IDC_COMBO_SEARCHXRAYSPEED);
             this.groupBox6.Controls.Add(this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME);
-            this.groupBox6.Controls.Add(this.IDC_COMBO_ANALYXRAYSPEED);
             this.groupBox6.Controls.Add(this.label32);
             this.groupBox6.Controls.Add(this.label39);
             this.groupBox6.Controls.Add(this.IDC_COMBO_XRAYSCANMODE);
@@ -1028,14 +1014,14 @@
             this.groupBox6.Location = new System.Drawing.Point(6, 132);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(306, 211);
+            this.groupBox6.Size = new System.Drawing.Size(301, 207);
             this.groupBox6.TabIndex = 700;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "X-ray参数";
             // 
             // IDC_EDIT_SmallPartAQTime
             // 
-            this.IDC_EDIT_SmallPartAQTime.Location = new System.Drawing.Point(143, 113);
+            this.IDC_EDIT_SmallPartAQTime.Location = new System.Drawing.Point(138, 113);
             this.IDC_EDIT_SmallPartAQTime.MaxLength = 10;
             this.IDC_EDIT_SmallPartAQTime.Name = "IDC_EDIT_SmallPartAQTime";
             this.IDC_EDIT_SmallPartAQTime.Size = new System.Drawing.Size(117, 21);
@@ -1044,7 +1030,7 @@
             // label45
             // 
             this.label45.AutoSize = true;
-            this.label45.Location = new System.Drawing.Point(8, 116);
+            this.label45.Location = new System.Drawing.Point(9, 116);
             this.label45.Name = "label45";
             this.label45.Size = new System.Drawing.Size(89, 12);
             this.label45.TabIndex = 840;
@@ -1053,7 +1039,7 @@
             // label46
             // 
             this.label46.AutoSize = true;
-            this.label46.Location = new System.Drawing.Point(275, 116);
+            this.label46.Location = new System.Drawing.Point(269, 116);
             this.label46.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label46.Name = "label46";
             this.label46.Size = new System.Drawing.Size(17, 12);
@@ -1062,16 +1048,16 @@
             // 
             // textBox1
             // 
-            this.textBox1.Location = new System.Drawing.Point(143, 63);
-            this.textBox1.MaxLength = 10;
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(117, 21);
-            this.textBox1.TabIndex = 838;
+            this.IDC_EDIT_QuantifyMinSize.Location = new System.Drawing.Point(138, 69);
+            this.IDC_EDIT_QuantifyMinSize.MaxLength = 10;
+            this.IDC_EDIT_QuantifyMinSize.Name = "textBox1";
+            this.IDC_EDIT_QuantifyMinSize.Size = new System.Drawing.Size(117, 21);
+            this.IDC_EDIT_QuantifyMinSize.TabIndex = 838;
             // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(8, 66);
+            this.label8.Location = new System.Drawing.Point(11, 69);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(53, 12);
             this.label8.TabIndex = 837;
@@ -1080,7 +1066,7 @@
             // label40
             // 
             this.label40.AutoSize = true;
-            this.label40.Location = new System.Drawing.Point(274, 66);
+            this.label40.Location = new System.Drawing.Point(269, 69);
             this.label40.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label40.Name = "label40";
             this.label40.Size = new System.Drawing.Size(17, 12);
@@ -1090,7 +1076,7 @@
             // IDC_FILTER
             // 
             this.IDC_FILTER.AutoSize = true;
-            this.IDC_FILTER.Location = new System.Drawing.Point(278, 186);
+            this.IDC_FILTER.Location = new System.Drawing.Point(259, 192);
             this.IDC_FILTER.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_FILTER.Name = "IDC_FILTER";
             this.IDC_FILTER.Size = new System.Drawing.Size(15, 14);
@@ -1099,11 +1085,11 @@
             // 
             // IDC_EDIT_XrayLimit
             // 
-            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(141, 149);
+            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(138, 162);
             this.IDC_EDIT_XrayLimit.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_EDIT_XrayLimit.MaxLength = 10;
             this.IDC_EDIT_XrayLimit.Name = "IDC_EDIT_XrayLimit";
-            this.IDC_EDIT_XrayLimit.Size = new System.Drawing.Size(150, 21);
+            this.IDC_EDIT_XrayLimit.Size = new System.Drawing.Size(116, 21);
             this.IDC_EDIT_XrayLimit.TabIndex = 834;
             // 
             // label52
@@ -1119,7 +1105,7 @@
             // label47
             // 
             this.label47.AutoSize = true;
-            this.label47.Location = new System.Drawing.Point(9, 152);
+            this.label47.Location = new System.Drawing.Point(9, 165);
             this.label47.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label47.Name = "label47";
             this.label47.Size = new System.Drawing.Size(53, 12);
@@ -1129,7 +1115,7 @@
             // IDC_USINGXRAY_LIB
             // 
             this.IDC_USINGXRAY_LIB.AutoSize = true;
-            this.IDC_USINGXRAY_LIB.Location = new System.Drawing.Point(278, 18);
+            this.IDC_USINGXRAY_LIB.Location = new System.Drawing.Point(138, 21);
             this.IDC_USINGXRAY_LIB.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_USINGXRAY_LIB.Name = "IDC_USINGXRAY_LIB";
             this.IDC_USINGXRAY_LIB.Size = new System.Drawing.Size(15, 14);
@@ -1139,99 +1125,25 @@
             // label44
             // 
             this.label44.AutoSize = true;
-            this.label44.Location = new System.Drawing.Point(8, 24);
+            this.label44.Location = new System.Drawing.Point(15, 21);
             this.label44.Name = "label44";
             this.label44.Size = new System.Drawing.Size(83, 12);
             this.label44.TabIndex = 825;
             this.label44.Text = "是否使用X-ray";
             // 
-            // IDC_TEXTBOX_SEARCHXRAYSPEED_TIME
-            // 
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Location = new System.Drawing.Point(218, 226);
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.MaxLength = 10;
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Name = "IDC_TEXTBOX_SEARCHXRAYSPEED_TIME";
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Size = new System.Drawing.Size(50, 21);
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.TabIndex = 805;
-            this.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Visible = false;
-            // 
-            // label38
-            // 
-            this.label38.AutoSize = true;
-            this.label38.Location = new System.Drawing.Point(269, 223);
-            this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(17, 12);
-            this.label38.TabIndex = 803;
-            this.label38.Text = "ms";
-            this.label38.Visible = false;
-            // 
-            // label30
-            // 
-            this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(0, 230);
-            this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label30.Name = "label30";
-            this.label30.Size = new System.Drawing.Size(107, 12);
-            this.label30.TabIndex = 806;
-            this.label30.Text = "搜索X-ray最低计数";
-            this.label30.Visible = false;
-            // 
-            // label29
-            // 
-            this.label29.AutoSize = true;
-            this.label29.Location = new System.Drawing.Point(26, 227);
-            this.label29.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(83, 12);
-            this.label29.TabIndex = 801;
-            this.label29.Text = "搜索X-ray精度";
-            this.label29.Visible = false;
-            // 
-            // IDC_EDIT_SEARCHXRAYCOUNTLIMIT
-            // 
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Location = new System.Drawing.Point(111, 226);
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT.MaxLength = 10;
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Name = "IDC_EDIT_SEARCHXRAYCOUNTLIMIT";
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Size = new System.Drawing.Size(155, 21);
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT.TabIndex = 807;
-            this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Visible = false;
-            // 
-            // IDC_COMBO_SEARCHXRAYSPEED
-            // 
-            this.IDC_COMBO_SEARCHXRAYSPEED.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.IDC_COMBO_SEARCHXRAYSPEED.FormattingEnabled = true;
-            this.IDC_COMBO_SEARCHXRAYSPEED.Location = new System.Drawing.Point(112, 227);
-            this.IDC_COMBO_SEARCHXRAYSPEED.Margin = new System.Windows.Forms.Padding(2);
-            this.IDC_COMBO_SEARCHXRAYSPEED.Name = "IDC_COMBO_SEARCHXRAYSPEED";
-            this.IDC_COMBO_SEARCHXRAYSPEED.Size = new System.Drawing.Size(72, 20);
-            this.IDC_COMBO_SEARCHXRAYSPEED.TabIndex = 802;
-            this.IDC_COMBO_SEARCHXRAYSPEED.Visible = false;
-            // 
             // IDC_TEXTBOX_ANALYXRAYSPEED_TIME
             // 
-            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Location = new System.Drawing.Point(141, 81);
+            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Location = new System.Drawing.Point(138, 92);
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.MaxLength = 10;
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Name = "IDC_TEXTBOX_ANALYXRAYSPEED_TIME";
-            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Size = new System.Drawing.Size(117, 21);
+            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Size = new System.Drawing.Size(116, 21);
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.TabIndex = 782;
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.TextChanged += new System.EventHandler(this.IDC_EDIT_SEARCHXRAYCOUNTLIMIT_TextChanged);
             // 
-            // IDC_COMBO_ANALYXRAYSPEED
-            // 
-            this.IDC_COMBO_ANALYXRAYSPEED.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.IDC_COMBO_ANALYXRAYSPEED.FormattingEnabled = true;
-            this.IDC_COMBO_ANALYXRAYSPEED.Location = new System.Drawing.Point(36, 252);
-            this.IDC_COMBO_ANALYXRAYSPEED.Name = "IDC_COMBO_ANALYXRAYSPEED";
-            this.IDC_COMBO_ANALYXRAYSPEED.Size = new System.Drawing.Size(72, 20);
-            this.IDC_COMBO_ANALYXRAYSPEED.TabIndex = 780;
-            this.IDC_COMBO_ANALYXRAYSPEED.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_ANALYXRAYSPEED_SelectedIndexChanged);
-            // 
             // label32
             // 
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(6, 84);
+            this.label32.Location = new System.Drawing.Point(11, 92);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(83, 12);
             this.label32.TabIndex = 770;
@@ -1240,7 +1152,7 @@
             // label39
             // 
             this.label39.AutoSize = true;
-            this.label39.Location = new System.Drawing.Point(273, 84);
+            this.label39.Location = new System.Drawing.Point(269, 92);
             this.label39.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label39.Name = "label39";
             this.label39.Size = new System.Drawing.Size(17, 12);
@@ -1251,27 +1163,27 @@
             // 
             this.IDC_COMBO_XRAYSCANMODE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.IDC_COMBO_XRAYSCANMODE.FormattingEnabled = true;
-            this.IDC_COMBO_XRAYSCANMODE.Location = new System.Drawing.Point(142, 50);
+            this.IDC_COMBO_XRAYSCANMODE.Location = new System.Drawing.Point(139, 44);
             this.IDC_COMBO_XRAYSCANMODE.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_COMBO_XRAYSCANMODE.Name = "IDC_COMBO_XRAYSCANMODE";
-            this.IDC_COMBO_XRAYSCANMODE.Size = new System.Drawing.Size(150, 20);
+            this.IDC_COMBO_XRAYSCANMODE.Size = new System.Drawing.Size(115, 20);
             this.IDC_COMBO_XRAYSCANMODE.TabIndex = 760;
             this.IDC_COMBO_XRAYSCANMODE.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_XRAYSCANMODE_SelectedIndexChanged);
             // 
             // IDC_EDIT_ANALYXRAYAIMVALUE
             // 
-            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(139, 112);
+            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(138, 138);
             this.IDC_EDIT_ANALYXRAYAIMVALUE.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_EDIT_ANALYXRAYAIMVALUE.MaxLength = 10;
             this.IDC_EDIT_ANALYXRAYAIMVALUE.Name = "IDC_EDIT_ANALYXRAYAIMVALUE";
-            this.IDC_EDIT_ANALYXRAYAIMVALUE.Size = new System.Drawing.Size(150, 21);
+            this.IDC_EDIT_ANALYXRAYAIMVALUE.Size = new System.Drawing.Size(116, 21);
             this.IDC_EDIT_ANALYXRAYAIMVALUE.TabIndex = 800;
             this.IDC_EDIT_ANALYXRAYAIMVALUE.TextChanged += new System.EventHandler(this.IDC_EDIT_ANALYXRAYAIMVALUE_TextChanged);
             // 
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(9, 115);
+            this.label33.Location = new System.Drawing.Point(7, 141);
             this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(119, 12);
@@ -1281,7 +1193,7 @@
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(7, 52);
+            this.label31.Location = new System.Drawing.Point(15, 47);
             this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(83, 12);
@@ -1290,10 +1202,11 @@
             // 
             // IDC_EDIT_QuantifyMinSize
             // 
-            this.IDC_EDIT_QuantifyMinSize.Location = new System.Drawing.Point(0, 0);
-            this.IDC_EDIT_QuantifyMinSize.Name = "IDC_EDIT_QuantifyMinSize";
-            this.IDC_EDIT_QuantifyMinSize.Size = new System.Drawing.Size(100, 21);
-            this.IDC_EDIT_QuantifyMinSize.TabIndex = 0;
+            //this.IDC_EDIT_QuantifyMinSize1.Location = new System.Drawing.Point(100, 100);
+            //this.IDC_EDIT_QuantifyMinSize1.Name = "IDC_EDIT_QuantifyMinSize";
+            //this.IDC_EDIT_QuantifyMinSize1.Size = new System.Drawing.Size(100, 21);
+            //this.IDC_EDIT_QuantifyMinSize1.TabIndex = 0;
+            //this.IDC_EDIT_QuantifyMinSize1.Text = "iuyyuyyyyyyyyyyyyy";
             // 
             // label37
             // 
@@ -1313,17 +1226,6 @@
             this.btnok.UseVisualStyleBackColor = true;
             this.btnok.Click += new System.EventHandler(this.btnok_Click);
             // 
-            // btncancel
-            // 
-            this.btncancel.Location = new System.Drawing.Point(561, 606);
-            this.btncancel.Margin = new System.Windows.Forms.Padding(2);
-            this.btncancel.Name = "btncancel";
-            this.btncancel.Size = new System.Drawing.Size(66, 22);
-            this.btncancel.TabIndex = 820;
-            this.btncancel.Text = "取  消";
-            this.btncancel.UseVisualStyleBackColor = true;
-            this.btncancel.Click += new System.EventHandler(this.btncancel_Click);
-            // 
             // folderBrowserDialog1
             // 
             this.folderBrowserDialog1.ShowNewFolderButton = false;
@@ -1360,15 +1262,26 @@
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "模式选择";
             // 
+            // btncancel
+            // 
+            this.btncancel.Location = new System.Drawing.Point(568, 606);
+            this.btncancel.Margin = new System.Windows.Forms.Padding(2);
+            this.btncancel.Name = "btncancel";
+            this.btncancel.Size = new System.Drawing.Size(66, 22);
+            this.btncancel.TabIndex = 820;
+            this.btncancel.Text = "取  消";
+            this.btncancel.UseVisualStyleBackColor = true;
+            this.btncancel.Click += new System.EventHandler(this.btncancel_Click);
+            // 
             // ProgMgrInfoForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(645, 640);
+            this.ClientSize = new System.Drawing.Size(648, 640);
             this.Controls.Add(this.groupBox7);
             this.Controls.Add(this.btncancel);
-            this.Controls.Add(this.btnok);
             this.Controls.Add(this.groupBox6);
+            this.Controls.Add(this.btnok);
             this.Controls.Add(this.groupBox5);
             this.Controls.Add(this.groupBox4);
             this.Controls.Add(this.groupBox3);
@@ -1411,7 +1324,6 @@
         private System.Windows.Forms.GroupBox groupBox5;
         private System.Windows.Forms.GroupBox groupBox6;
         private System.Windows.Forms.Button btnok;
-        private System.Windows.Forms.Button btncancel;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label5;
@@ -1463,7 +1375,6 @@
         public System.Windows.Forms.TextBox IDC_EDIT_BACKMAX;
         public System.Windows.Forms.TextBox IDC_EDIT_BACKMIN;
         public System.Windows.Forms.TextBox IDC_EDIT_PARTAREAMAX;
-        public System.Windows.Forms.ComboBox IDC_COMBO_ANALYXRAYSPEED;
         public System.Windows.Forms.ComboBox IDC_COMBO_XRAYSCANMODE;
         public System.Windows.Forms.TextBox IDC_EDIT_ANALYXRAYAIMVALUE;
         public System.Windows.Forms.TextBox IDC_EDIT_SCREENWIDTH;
@@ -1471,12 +1382,6 @@
         private System.Windows.Forms.Label label36;
         public System.Windows.Forms.TextBox IDC_TEXTBOX_ANALYXRAYSPEED_TIME;
         private System.Windows.Forms.Label label39;
-        public System.Windows.Forms.TextBox IDC_TEXTBOX_SEARCHXRAYSPEED_TIME;
-        private System.Windows.Forms.Label label38;
-        private System.Windows.Forms.Label label30;
-        private System.Windows.Forms.Label label29;
-        public System.Windows.Forms.TextBox IDC_EDIT_SEARCHXRAYCOUNTLIMIT;
-        public System.Windows.Forms.ComboBox IDC_COMBO_SEARCHXRAYSPEED;
         private System.Windows.Forms.Label label41;
         public System.Windows.Forms.ComboBox IDC_COMBO_TECHNOLOGY;
         private System.Windows.Forms.Label label42;
@@ -1498,7 +1403,7 @@
         public System.Windows.Forms.ComboBox IDC_COMBO_Model;
         private System.Windows.Forms.GroupBox groupBox7;
         public System.Windows.Forms.CheckBox IDC_USINGXRAY_LIB;
-        public System.Windows.Forms.TextBox IDC_EDIT_QuantifyMinSize;
+        //public System.Windows.Forms.TextBox IDC_EDIT_QuantifyMinSize1;
         private System.Windows.Forms.Label label37;
         public System.Windows.Forms.TextBox IDC_EDIT_XrayLimit;
         private System.Windows.Forms.Label label47;
@@ -1512,8 +1417,9 @@
         public System.Windows.Forms.TextBox IDC_EDIT_SmallPartAQTime;
         private System.Windows.Forms.Label label45;
         private System.Windows.Forms.Label label46;
-        public System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Label label8;
+        public System.Windows.Forms.TextBox IDC_EDIT_QuantifyMinSize;
         private System.Windows.Forms.Label label40;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Button btncancel;
     }
 }