添加 CorrosionExpansionCoefficient 界面

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

@@ -1083,6 +1083,8 @@
 	  <Control name="message62" text="The entered measurement area area cannot be empty!" />
 	  <Control name="message63" text="Please enter the correct numerical format!" />
 	  <Control name="message64" text="Please enter the correct numerical format!" />
+	  <Control name="message65" text="The entered corrosion expansion coefficient cannot be empty!" />
+	  <Control name="message66" text="Please enter a positive odd number or 0!" />
     </Controls>
  </Form>
  <Form>

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

@@ -1081,6 +1081,8 @@
 	  <Control name="message62" text="输入的测量区域面积不可以为空!" />
 	  <Control name="message63" text="请输入正确的数值范围!" />
 	  <Control name="message64" text="请输入正确的数值范围!" />
+	  <Control name="message65" text="输入的腐蚀膨胀系数不可以为空!" />
+	  <Control name="message66" text="请输入正奇数或0!" />
     </Controls>
  </Form>
  <Form>

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

@@ -31,7 +31,7 @@
 			<member itemKey="20012" itemName="" itemText="ParticalNum"/>
 			<member itemKey="20013" itemName="" itemText="FieldNum"/>
 			<member itemKey="20014" itemName="" itemText="MeasureTime(s)"/>
-			<member itemKey="20015" itemName="" itemText="MeasureStopArea(um2)"/>
+			<member itemKey="20015" itemName="" itemText="MeasureStopArea(mm2)"/>
 			<member itemKey="20016" itemName="" itemText="ScanResolution"/>
 			<member itemKey="20017" itemName="" itemText="MeasureImageResolution"/>
 			<member itemKey="20160" itemName="" itemText="Center"/>

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

@@ -31,7 +31,7 @@
 			<member itemKey="20012" itemName="" itemText="颗粒数" description="输入测量颗粒数。"/>
 			<member itemKey="20013" itemName="" itemText="帧图数" description="输入测量帧图数。"/>
 			<member itemKey="20014" itemName="" itemText="测量时间（秒）" description="输入测量时间。"/>
-			<member itemKey="20015" itemName="" itemText="测量结束面积（um2）" description="输入测量结束面积。"/>
+			<member itemKey="20015" itemName="" itemText="测量结束面积（mm2）" description="输入测量结束面积。"/>
 			<member itemKey="20016" itemName="" itemText="扫描精度" description="选择扫描精度。"/>
 			<member itemKey="20017" itemName="" itemText="测量图精度" description="选择扫描图精度（尺寸）。"/>
 			<member itemKey="20160" itemName="" itemText="中心" description=""/>

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSImageProcParam.cs

@@ -22,6 +22,7 @@ namespace OTSDataType
         private CIntRange m_oParticleGray = new CIntRange();
         private OTS_BGREMOVE_TYPE m_BGRemoveType;
         private OTS_AUTOBGREMOVE_TYPE m_autoBGRemoveType;
+        int m_CorrosionExpansionCoefficient;
 
         private CSpecialGrayRangeParam m_specialGreyRangeParam;
 
@@ -44,7 +45,7 @@ namespace OTSDataType
             m_oParticleGray = new CIntRange(DEFUALT_PARTICLE_GRAY_LEVEL_MIN, DEFUALT_PARTICLE_GRAY_LEVEL_MAX);
             m_BGRemoveType = OTS_BGREMOVE_TYPE.MANUAL;// OTS_BGREMOVE_TYPE.AUTO;
             m_autoBGRemoveType = OTS_AUTOBGREMOVE_TYPE.MIDDLE;
-           
+            m_CorrosionExpansionCoefficient = 3;
         }
         public CDoubleRange GetIncAreaRange() { return m_oIncArea; }
         public void SetIncAreaRange(CDoubleRange a_oVal) { m_oIncArea = a_oVal; }
@@ -63,8 +64,10 @@ namespace OTSDataType
 
         public void SetAutoBGRemoveType(OTS_AUTOBGREMOVE_TYPE a_oVal) { m_autoBGRemoveType = a_oVal; }
 
+        public int GetCorrosionExpansionCoefficient() { return m_CorrosionExpansionCoefficient; }
+
+        public void SetCorrosionExpansionCoefficient(int a_oVal) { m_CorrosionExpansionCoefficient = a_oVal; }
 
-     
 
         public void Duplicate(COTSImageProcParam a_oSource)
         {
@@ -79,9 +82,10 @@ namespace OTSDataType
             m_oParticleGray.SetEnd(a_oSource.m_oParticleGray.GetEnd());
             m_BGRemoveType = a_oSource.m_BGRemoveType;
             m_autoBGRemoveType = a_oSource.m_autoBGRemoveType;
-          
+            m_CorrosionExpansionCoefficient = a_oSource.m_CorrosionExpansionCoefficient;
+
+
 
-          
         }
         public bool Equals(COTSImageProcParam a_oSource)
         {
@@ -89,7 +93,8 @@ namespace OTSDataType
             // return test result
             return m_oIncArea == a_oSource.m_oIncArea &&
                 m_oBGGray == a_oSource.m_oBGGray &&
-                m_oParticleGray == a_oSource.m_oParticleGray;
+                m_oParticleGray == a_oSource.m_oParticleGray &&
+                m_CorrosionExpansionCoefficient == a_oSource.m_CorrosionExpansionCoefficient;
 
         }
 
@@ -104,7 +109,9 @@ namespace OTSDataType
             slo.Register("BGGray", m_oBGGray);
            
             slo.Register("ParticleGray", m_oParticleGray);
-           
+
+            xInt xnCorrosionExpansionCoefficient = new xInt();
+            slo.Register("CorrosionExpansionCoefficient", xnCorrosionExpansionCoefficient);
 
             xString xnBGRemoveType = new xString();
             xString xnautoBGRemoveType = new xString();
@@ -117,6 +124,7 @@ namespace OTSDataType
 
                 xnBGRemoveType.AssignValue((int)m_BGRemoveType+":"+m_BGRemoveType.ToString());
                 xnautoBGRemoveType.AssignValue((int)m_autoBGRemoveType+":"+m_autoBGRemoveType.ToString());
+                xnCorrosionExpansionCoefficient.AssignValue(m_CorrosionExpansionCoefficient);
                 slo.Serialize(true, classDoc, rootNode);
             }
             else
@@ -125,7 +133,7 @@ namespace OTSDataType
                 //自动去背景设置
                 m_BGRemoveType = (OTS_BGREMOVE_TYPE)Convert.ToInt32( xnBGRemoveType.value().Split(':')[0]);
                 m_autoBGRemoveType = (OTS_AUTOBGREMOVE_TYPE)Convert.ToInt32( xnautoBGRemoveType.value().Split(':')[0]);
-
+                m_CorrosionExpansionCoefficient = Convert.ToInt32(xnCorrosionExpansionCoefficient.value());
             }
         }
     }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -250,6 +250,23 @@ namespace OTSMeasureApp
                 IDC_COMBO_AUTOBGREMOVETYP.SelectedIndex = 0;
             this.IDC_COMBO_AUTOBGREMOVETYP.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_AUTOBGREMOVETYPE_SelectedIndexChanged);
 
+            //腐蚀膨胀系数
+            IDC_COMBO_CorrosionExpansionCoefficient.Items.Clear();
+            ComboBoxItem ci = new ComboBoxItem();
+            ci.Text = "0";
+            ci.Value = 0;
+            IDC_COMBO_CorrosionExpansionCoefficient.Items.Add(ci);
+            for (int i=1;i<6;i++)
+            {
+                ComboBoxItem cbi = new ComboBoxItem();
+                cbi.Text = (i*2+1).ToString();
+                cbi.Value = i;
+                IDC_COMBO_CorrosionExpansionCoefficient.Items.Add(cbi);
+            }
+            //this.IDC_COMBO_CorrosionExpansionCoefficient.SelectedIndexChanged -= new System.EventHandler(this.IDC_COMBO_CorrosionExpansionCoefficient_SelectedIndexChanged);
+            //if (IDC_COMBO_CorrosionExpansionCoefficient.Items.Count > 0)
+            //    IDC_COMBO_CorrosionExpansionCoefficient.SelectedIndex = 0;
+            //this.IDC_COMBO_CorrosionExpansionCoefficient.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_CorrosionExpansionCoefficient_SelectedIndexChanged);
 
             //X-Ray扫描方式
             IDC_COMBO_XRAYSCANMODE.Items.Clear();
@@ -586,6 +603,8 @@ namespace OTSMeasureApp
             IDC_EDIT_PARTMIN.Text = m_cotsimgprocprm.GetParticleGray().GetStart().ToString();
             //颗粒灰度范围 最大
             IDC_EDIT_PARTMAX.Text = m_cotsimgprocprm.GetParticleGray().GetEnd().ToString();
+            //腐蚀膨胀系数
+            IDC_COMBO_CorrosionExpansionCoefficient.Text=m_cotsimgprocprm.GetCorrosionExpansionCoefficient().ToString();
 
             //去背景方式
             foreach (ComboBoxItem cbi in IDC_COMBO_BGREMOVETYPE.Items)
@@ -805,8 +824,8 @@ namespace OTSMeasureApp
             //去背景方式
             ComboBoxItem enum_AUTOBGREMOVETYP = (ComboBoxItem)IDC_COMBO_AUTOBGREMOVETYP.SelectedItem;
             m_cotsimgprocprm.SetAutoBGRemoveType((otsdataconst.OTS_AUTOBGREMOVE_TYPE)enum_AUTOBGREMOVETYP.Value);
-
-          
+            //腐蚀膨胀系数
+            m_cotsimgprocprm.SetCorrosionExpansionCoefficient(Convert.ToInt32(IDC_COMBO_CorrosionExpansionCoefficient.Text));
         }
 
         /// <summary>
@@ -1268,17 +1287,38 @@ namespace OTSMeasureApp
                 tBMeasArea.SelectAll();
                 return false;
             }
+            if ("" == IDC_COMBO_CorrosionExpansionCoefficient.Text)
+            {
+                string message = table["message62"].ToString();
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                IDC_COMBO_CorrosionExpansionCoefficient.Focus();
+                IDC_COMBO_CorrosionExpansionCoefficient.SelectAll();
+                return false;
+            }
 
             //string pat = @"^(-|\+)?\d{1,8}$";//只能输入1到3位的正负整数
             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
+            string positiveOddNumber = @"[^1,3,5,7,9]";//只能限定正奇数
             Regex rg = new Regex(pat);
             Regex rgScope = new Regex(scope);
             Regex rgPositiveDecimals = new Regex(PositiveDecimals);
             Regex rgpositiveInteger = new Regex(positiveInteger);
+            Regex rgpositiveOddNumber = new Regex(positiveOddNumber);
             //是否是正确的数值格式类型判断
+            if(IDC_COMBO_CorrosionExpansionCoefficient.Text!="0")
+            {
+                if (rgpositiveOddNumber.Match(IDC_COMBO_CorrosionExpansionCoefficient.Text.Trim()).Success)
+                {
+                    IDC_COMBO_CorrosionExpansionCoefficient.Focus();
+                    IDC_COMBO_CorrosionExpansionCoefficient.SelectAll();
+                    string message = table["message66"].ToString();
+                    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    return false;
+                }
+            }
             //100倍时屏幕尺寸
             if (false == rg.Match(IDC_EDIT_SCREENWIDTH.Text.Trim()).Success)
             {
@@ -2031,6 +2071,11 @@ namespace OTSMeasureApp
                 IDC_EDIT_STOP_INCA_AREA.Text = StopModeDialog.AreaMode.ToString();
             }
         }
+
+        private void IDC_COMBO_CorrosionExpansionCoefficient_TextChanged(object sender, EventArgs e)
+        {
+            ThisSetIsModify();
+        }
     }
     public class ComboBoxItem
     {

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -95,6 +95,8 @@
             this.label14 = new System.Windows.Forms.Label();
             this.IDC_BUTTON_MEASPRAMPATHSET = new System.Windows.Forms.Button();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.IDC_COMBO_CorrosionExpansionCoefficient = new System.Windows.Forms.ComboBox();
+            this.label49 = new System.Windows.Forms.Label();
             this.button1 = new System.Windows.Forms.Button();
             this.IDC_COMBO_AUTOBGREMOVETYP = new System.Windows.Forms.ComboBox();
             this.label_Auto = new System.Windows.Forms.Label();
@@ -173,7 +175,7 @@
             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.Location = new System.Drawing.Point(425, 1);
+            this.groupBox1.Location = new System.Drawing.Point(8, 79);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -240,7 +242,7 @@
             this.groupBox2.Controls.Add(this.label4);
             this.groupBox2.Controls.Add(this.label3);
             this.groupBox2.Controls.Add(this.label2);
-            this.groupBox2.Location = new System.Drawing.Point(8, 78);
+            this.groupBox2.Location = new System.Drawing.Point(445, 11);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -414,7 +416,7 @@
             this.groupBox3.Controls.Add(this.label12);
             this.groupBox3.Controls.Add(this.label11);
             this.groupBox3.Controls.Add(this.label7);
-            this.groupBox3.Location = new System.Drawing.Point(8, 540);
+            this.groupBox3.Location = new System.Drawing.Point(445, 241);
             this.groupBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -512,7 +514,7 @@
             // 
             // IDC_EDIT_STOP_INCA_NUM
             // 
-            this.IDC_EDIT_STOP_INCA_NUM.Location = new System.Drawing.Point(955, 647);
+            this.IDC_EDIT_STOP_INCA_NUM.Location = new System.Drawing.Point(1013, 642);
             this.IDC_EDIT_STOP_INCA_NUM.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_EDIT_STOP_INCA_NUM.MaxLength = 10;
             this.IDC_EDIT_STOP_INCA_NUM.Name = "IDC_EDIT_STOP_INCA_NUM";
@@ -524,7 +526,7 @@
             // 
             // IDC_EDIT_STOP_FIELD_NUM
             // 
-            this.IDC_EDIT_STOP_FIELD_NUM.Location = new System.Drawing.Point(955, 617);
+            this.IDC_EDIT_STOP_FIELD_NUM.Location = new System.Drawing.Point(1013, 612);
             this.IDC_EDIT_STOP_FIELD_NUM.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_EDIT_STOP_FIELD_NUM.MaxLength = 10;
             this.IDC_EDIT_STOP_FIELD_NUM.Name = "IDC_EDIT_STOP_FIELD_NUM";
@@ -536,7 +538,7 @@
             // 
             // IDC_EDIT_STOP_TIME
             // 
-            this.IDC_EDIT_STOP_TIME.Location = new System.Drawing.Point(955, 589);
+            this.IDC_EDIT_STOP_TIME.Location = new System.Drawing.Point(1013, 584);
             this.IDC_EDIT_STOP_TIME.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_EDIT_STOP_TIME.MaxLength = 10;
             this.IDC_EDIT_STOP_TIME.Name = "IDC_EDIT_STOP_TIME";
@@ -549,7 +551,7 @@
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(841, 653);
+            this.label10.Location = new System.Drawing.Point(899, 648);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(97, 15);
             this.label10.TabIndex = 300;
@@ -559,7 +561,7 @@
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(841, 623);
+            this.label9.Location = new System.Drawing.Point(899, 618);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(82, 15);
             this.label9.TabIndex = 280;
@@ -569,7 +571,7 @@
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(841, 594);
+            this.label8.Location = new System.Drawing.Point(899, 589);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(98, 15);
             this.label8.TabIndex = 260;
@@ -579,7 +581,7 @@
             // IDC_IMAGE_SIZE_SWITCH
             // 
             this.IDC_IMAGE_SIZE_SWITCH.AutoSize = true;
-            this.IDC_IMAGE_SIZE_SWITCH.Location = new System.Drawing.Point(876, 206);
+            this.IDC_IMAGE_SIZE_SWITCH.Location = new System.Drawing.Point(934, 201);
             this.IDC_IMAGE_SIZE_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_IMAGE_SIZE_SWITCH.Name = "IDC_IMAGE_SIZE_SWITCH";
             this.IDC_IMAGE_SIZE_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -591,7 +593,7 @@
             // IDC_SCAN_SPEED_SWITCH
             // 
             this.IDC_SCAN_SPEED_SWITCH.AutoSize = true;
-            this.IDC_SCAN_SPEED_SWITCH.Location = new System.Drawing.Point(876, 179);
+            this.IDC_SCAN_SPEED_SWITCH.Location = new System.Drawing.Point(934, 174);
             this.IDC_SCAN_SPEED_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_SCAN_SPEED_SWITCH.Name = "IDC_SCAN_SPEED_SWITCH";
             this.IDC_SCAN_SPEED_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -603,7 +605,7 @@
             // IDC_FETCH_IMAGE_SWITCH
             // 
             this.IDC_FETCH_IMAGE_SWITCH.AutoSize = true;
-            this.IDC_FETCH_IMAGE_SWITCH.Location = new System.Drawing.Point(876, 151);
+            this.IDC_FETCH_IMAGE_SWITCH.Location = new System.Drawing.Point(934, 146);
             this.IDC_FETCH_IMAGE_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_FETCH_IMAGE_SWITCH.Name = "IDC_FETCH_IMAGE_SWITCH";
             this.IDC_FETCH_IMAGE_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -615,7 +617,7 @@
             // IDC_STOP_PARTICAL_SWITCH
             // 
             this.IDC_STOP_PARTICAL_SWITCH.AutoSize = true;
-            this.IDC_STOP_PARTICAL_SWITCH.Location = new System.Drawing.Point(876, 124);
+            this.IDC_STOP_PARTICAL_SWITCH.Location = new System.Drawing.Point(934, 119);
             this.IDC_STOP_PARTICAL_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_STOP_PARTICAL_SWITCH.Name = "IDC_STOP_PARTICAL_SWITCH";
             this.IDC_STOP_PARTICAL_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -627,7 +629,7 @@
             // IDC_STOP_FIELD_SWITCH
             // 
             this.IDC_STOP_FIELD_SWITCH.AutoSize = true;
-            this.IDC_STOP_FIELD_SWITCH.Location = new System.Drawing.Point(876, 94);
+            this.IDC_STOP_FIELD_SWITCH.Location = new System.Drawing.Point(934, 89);
             this.IDC_STOP_FIELD_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_STOP_FIELD_SWITCH.Name = "IDC_STOP_FIELD_SWITCH";
             this.IDC_STOP_FIELD_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -639,7 +641,7 @@
             // IDC_STOP_TIME_SWITCH
             // 
             this.IDC_STOP_TIME_SWITCH.AutoSize = true;
-            this.IDC_STOP_TIME_SWITCH.Location = new System.Drawing.Point(876, 65);
+            this.IDC_STOP_TIME_SWITCH.Location = new System.Drawing.Point(934, 60);
             this.IDC_STOP_TIME_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_STOP_TIME_SWITCH.Name = "IDC_STOP_TIME_SWITCH";
             this.IDC_STOP_TIME_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -651,7 +653,7 @@
             // IDC_STOP_MODE_SWITCH
             // 
             this.IDC_STOP_MODE_SWITCH.AutoSize = true;
-            this.IDC_STOP_MODE_SWITCH.Location = new System.Drawing.Point(876, 36);
+            this.IDC_STOP_MODE_SWITCH.Location = new System.Drawing.Point(934, 31);
             this.IDC_STOP_MODE_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_STOP_MODE_SWITCH.Name = "IDC_STOP_MODE_SWITCH";
             this.IDC_STOP_MODE_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -682,7 +684,7 @@
             this.groupBox4.Controls.Add(this.label15);
             this.groupBox4.Controls.Add(this.label14);
             this.groupBox4.Controls.Add(this.IDC_BUTTON_MEASPRAMPATHSET);
-            this.groupBox4.Location = new System.Drawing.Point(425, 348);
+            this.groupBox4.Location = new System.Drawing.Point(8, 433);
             this.groupBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -890,6 +892,8 @@
             // 
             // groupBox5
             // 
+            this.groupBox5.Controls.Add(this.IDC_COMBO_CorrosionExpansionCoefficient);
+            this.groupBox5.Controls.Add(this.label49);
             this.groupBox5.Controls.Add(this.button1);
             this.groupBox5.Controls.Add(this.IDC_COMBO_AUTOBGREMOVETYP);
             this.groupBox5.Controls.Add(this.label_Auto);
@@ -910,18 +914,36 @@
             this.groupBox5.Controls.Add(this.label26);
             this.groupBox5.Controls.Add(this.label23);
             this.groupBox5.Controls.Add(this.label20);
-            this.groupBox5.Location = new System.Drawing.Point(8, 293);
+            this.groupBox5.Location = new System.Drawing.Point(445, 456);
             this.groupBox5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox5.Size = new System.Drawing.Size(408, 232);
+            this.groupBox5.Size = new System.Drawing.Size(408, 282);
             this.groupBox5.TabIndex = 540;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "图像处理参数";
             // 
+            // IDC_COMBO_CorrosionExpansionCoefficient
+            // 
+            this.IDC_COMBO_CorrosionExpansionCoefficient.FormattingEnabled = true;
+            this.IDC_COMBO_CorrosionExpansionCoefficient.Location = new System.Drawing.Point(167, 191);
+            this.IDC_COMBO_CorrosionExpansionCoefficient.Name = "IDC_COMBO_CorrosionExpansionCoefficient";
+            this.IDC_COMBO_CorrosionExpansionCoefficient.Size = new System.Drawing.Size(121, 23);
+            this.IDC_COMBO_CorrosionExpansionCoefficient.TabIndex = 825;
+            this.IDC_COMBO_CorrosionExpansionCoefficient.TextChanged += new System.EventHandler(this.IDC_COMBO_CorrosionExpansionCoefficient_TextChanged);
+            // 
+            // label49
+            // 
+            this.label49.AutoSize = true;
+            this.label49.Location = new System.Drawing.Point(8, 195);
+            this.label49.Name = "label49";
+            this.label49.Size = new System.Drawing.Size(97, 15);
+            this.label49.TabIndex = 824;
+            this.label49.Text = "腐蚀膨胀系数";
+            // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(23, 199);
+            this.button1.Location = new System.Drawing.Point(19, 238);
             this.button1.Margin = new System.Windows.Forms.Padding(4);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(260, 28);
@@ -1112,7 +1134,7 @@
             // IDC_PART_GRAY_MIN_SWITCH
             // 
             this.IDC_PART_GRAY_MIN_SWITCH.AutoSize = true;
-            this.IDC_PART_GRAY_MIN_SWITCH.Location = new System.Drawing.Point(876, 398);
+            this.IDC_PART_GRAY_MIN_SWITCH.Location = new System.Drawing.Point(934, 393);
             this.IDC_PART_GRAY_MIN_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_PART_GRAY_MIN_SWITCH.Name = "IDC_PART_GRAY_MIN_SWITCH";
             this.IDC_PART_GRAY_MIN_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1124,7 +1146,7 @@
             // IDC_BACK_MIN_SWITCH
             // 
             this.IDC_BACK_MIN_SWITCH.AutoSize = true;
-            this.IDC_BACK_MIN_SWITCH.Location = new System.Drawing.Point(876, 364);
+            this.IDC_BACK_MIN_SWITCH.Location = new System.Drawing.Point(934, 359);
             this.IDC_BACK_MIN_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_BACK_MIN_SWITCH.Name = "IDC_BACK_MIN_SWITCH";
             this.IDC_BACK_MIN_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1136,7 +1158,7 @@
             // IDC_PART_MIN_SWITCH
             // 
             this.IDC_PART_MIN_SWITCH.AutoSize = true;
-            this.IDC_PART_MIN_SWITCH.Location = new System.Drawing.Point(876, 332);
+            this.IDC_PART_MIN_SWITCH.Location = new System.Drawing.Point(934, 327);
             this.IDC_PART_MIN_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_PART_MIN_SWITCH.Name = "IDC_PART_MIN_SWITCH";
             this.IDC_PART_MIN_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1148,7 +1170,7 @@
             // IDC_PART_GRAY_MAX_SWITCH
             // 
             this.IDC_PART_GRAY_MAX_SWITCH.AutoSize = true;
-            this.IDC_PART_GRAY_MAX_SWITCH.Location = new System.Drawing.Point(935, 395);
+            this.IDC_PART_GRAY_MAX_SWITCH.Location = new System.Drawing.Point(993, 390);
             this.IDC_PART_GRAY_MAX_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_PART_GRAY_MAX_SWITCH.Name = "IDC_PART_GRAY_MAX_SWITCH";
             this.IDC_PART_GRAY_MAX_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1160,7 +1182,7 @@
             // IDC_BACK_MAX_SWITCH
             // 
             this.IDC_BACK_MAX_SWITCH.AutoSize = true;
-            this.IDC_BACK_MAX_SWITCH.Location = new System.Drawing.Point(935, 361);
+            this.IDC_BACK_MAX_SWITCH.Location = new System.Drawing.Point(993, 356);
             this.IDC_BACK_MAX_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_BACK_MAX_SWITCH.Name = "IDC_BACK_MAX_SWITCH";
             this.IDC_BACK_MAX_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1172,7 +1194,7 @@
             // IDC_PART_MAX_SWITCH
             // 
             this.IDC_PART_MAX_SWITCH.AutoSize = true;
-            this.IDC_PART_MAX_SWITCH.Location = new System.Drawing.Point(935, 330);
+            this.IDC_PART_MAX_SWITCH.Location = new System.Drawing.Point(993, 325);
             this.IDC_PART_MAX_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_PART_MAX_SWITCH.Name = "IDC_PART_MAX_SWITCH";
             this.IDC_PART_MAX_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1207,7 +1229,7 @@
             this.groupBox6.Controls.Add(this.IDC_EDIT_ANALYXRAYAIMVALUE);
             this.groupBox6.Controls.Add(this.label33);
             this.groupBox6.Controls.Add(this.label31);
-            this.groupBox6.Location = new System.Drawing.Point(425, 94);
+            this.groupBox6.Location = new System.Drawing.Point(8, 168);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Padding = new System.Windows.Forms.Padding(4);
@@ -1453,7 +1475,7 @@
             // IDC_XRAY_COUNT_SWITCH
             // 
             this.IDC_XRAY_COUNT_SWITCH.AutoSize = true;
-            this.IDC_XRAY_COUNT_SWITCH.Location = new System.Drawing.Point(887, 518);
+            this.IDC_XRAY_COUNT_SWITCH.Location = new System.Drawing.Point(945, 513);
             this.IDC_XRAY_COUNT_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_XRAY_COUNT_SWITCH.Name = "IDC_XRAY_COUNT_SWITCH";
             this.IDC_XRAY_COUNT_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1465,7 +1487,7 @@
             // IDC_XRAY_TIME_SWITCH
             // 
             this.IDC_XRAY_TIME_SWITCH.AutoSize = true;
-            this.IDC_XRAY_TIME_SWITCH.Location = new System.Drawing.Point(887, 486);
+            this.IDC_XRAY_TIME_SWITCH.Location = new System.Drawing.Point(945, 481);
             this.IDC_XRAY_TIME_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_XRAY_TIME_SWITCH.Name = "IDC_XRAY_TIME_SWITCH";
             this.IDC_XRAY_TIME_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1477,7 +1499,7 @@
             // IDC_XRAY_MODE_SWITCH
             // 
             this.IDC_XRAY_MODE_SWITCH.AutoSize = true;
-            this.IDC_XRAY_MODE_SWITCH.Location = new System.Drawing.Point(887, 456);
+            this.IDC_XRAY_MODE_SWITCH.Location = new System.Drawing.Point(945, 451);
             this.IDC_XRAY_MODE_SWITCH.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_XRAY_MODE_SWITCH.Name = "IDC_XRAY_MODE_SWITCH";
             this.IDC_XRAY_MODE_SWITCH.Size = new System.Drawing.Size(18, 17);
@@ -1488,7 +1510,7 @@
             // 
             // btnok
             // 
-            this.btnok.Location = new System.Drawing.Point(613, 709);
+            this.btnok.Location = new System.Drawing.Point(637, 757);
             this.btnok.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnok.Name = "btnok";
             this.btnok.Size = new System.Drawing.Size(88, 28);
@@ -1499,7 +1521,7 @@
             // 
             // btncancel
             // 
-            this.btncancel.Location = new System.Drawing.Point(724, 709);
+            this.btncancel.Location = new System.Drawing.Point(748, 757);
             this.btncancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btncancel.Name = "btncancel";
             this.btncancel.Size = new System.Drawing.Size(88, 28);
@@ -1547,7 +1569,7 @@
             // 
             // IDC_EDIT_STOP_INCA_AREA
             // 
-            this.IDC_EDIT_STOP_INCA_AREA.Location = new System.Drawing.Point(955, 680);
+            this.IDC_EDIT_STOP_INCA_AREA.Location = new System.Drawing.Point(1013, 675);
             this.IDC_EDIT_STOP_INCA_AREA.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_EDIT_STOP_INCA_AREA.MaxLength = 10;
             this.IDC_EDIT_STOP_INCA_AREA.Name = "IDC_EDIT_STOP_INCA_AREA";
@@ -1559,7 +1581,7 @@
             // label48
             // 
             this.label48.AutoSize = true;
-            this.label48.Location = new System.Drawing.Point(842, 683);
+            this.label48.Location = new System.Drawing.Point(900, 678);
             this.label48.Name = "label48";
             this.label48.Size = new System.Drawing.Size(97, 15);
             this.label48.TabIndex = 823;
@@ -1570,7 +1592,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1047, 941);
+            this.ClientSize = new System.Drawing.Size(858, 796);
             this.Controls.Add(this.IDC_EDIT_STOP_INCA_AREA);
             this.Controls.Add(this.label48);
             this.Controls.Add(this.IDC_IMAGE_SIZE_SWITCH);
@@ -1591,9 +1613,9 @@
             this.Controls.Add(this.label9);
             this.Controls.Add(this.IDC_XRAY_TIME_SWITCH);
             this.Controls.Add(this.label8);
+            this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.IDC_STOP_MODE_SWITCH);
             this.Controls.Add(this.IDC_BACK_MIN_SWITCH);
-            this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.IDC_PART_MIN_SWITCH);
             this.Controls.Add(this.IDC_XRAY_MODE_SWITCH);
             this.Controls.Add(this.IDC_PART_GRAY_MAX_SWITCH);
@@ -1607,7 +1629,6 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(852, 790);
             this.MinimizeBox = false;
             this.MinimumSize = new System.Drawing.Size(852, 790);
             this.Name = "ProgMgrInfoForm";
@@ -1765,5 +1786,7 @@
         private System.Windows.Forms.Button btn_StopMode;
         public System.Windows.Forms.TextBox IDC_EDIT_STOP_INCA_AREA;
         private System.Windows.Forms.Label label48;
+        private System.Windows.Forms.ComboBox IDC_COMBO_CorrosionExpansionCoefficient;
+        private System.Windows.Forms.Label label49;
     }
 }