修改调整ProgMgrInfoForm界面布局的报错

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

@@ -1062,8 +1062,6 @@
 	  <Control name="label13" text="Dimension" />
 	  <Control name="label12" text="Accuracy" />
 	  <Control name="label11" text="Drawing" />
-	  <Control name="label10" text="Particles" />
-	  <Control name="label9" text="Number of terminated frames" />
 	  <Control name="label8" text="Termination time (seconds)" />
 	  <Control name="label7" text="Termination mode" />
 	  <Control name="groupBox4" text="ConventionalMeasurementParameters" />
@@ -1071,7 +1069,6 @@
 	  <Control name="label19" text="UserLib" />
 	  <Control name="label18" text="SysLib" />
 	  <Control name="label40" text="μm" />
-	  <Control name="label16" text="Measurement" />
 	  <Control name="label15" text="Switch" />
 	  <Control name="label14" text="Name" />
 	  <Control name="groupBox5" text="ImageProcessingParameters" />

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

@@ -1051,16 +1051,12 @@
 	  <Control name="label13" text="扫描图尺寸" />
 	  <Control name="label12" text="扫描图精度" />
 	  <Control name="label11" text="取图方式" />
-	  <Control name="label10" text="终止颗粒数" />
-	  <Control name="label9" text="终止帧图数" />
-	
 	  <Control name="label7" text="测量终止方式" />
 	  <Control name="groupBox4" text="常规测量参数" />
 	  <Control name="label42" text="精炼工艺" />
 	  <Control name="label19" text="用户分析库编辑" />
 	  <Control name="label18" text="系统分析库文件夹" />
 	  <Control name="label40" text="μm" />
-	  <Control name="label16" text="测量参数文件夹" />
 	  <Control name="label15" text="执行开关" />
 	  <Control name="label14" text="样品名" />
 	  <Control name="groupBox5" text="图像处理参数" />
@@ -1081,7 +1077,7 @@
 	  <Control name="label29" text="搜索X-ray精度" />
 	  <Control name="label32" text="大颗粒X-ray时间" />
 	  <Control name="label45" text="小颗粒Xray时间" />
-	  <Control name="label33" text="分析X-ray计数期望值" />
+	  <Control name="label33" text="X-ray计数期望值" />
 	  <Control name="label47" text="数量限值" />
 	  <Control name="label49" text="腐蚀膨胀系数" />
 	  <Control name="label31" text="扫描方式(大颗粒）" /> 

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -495,13 +495,6 @@ namespace OTSMeasureApp
             IDC_MEAS_SWITCH.Checked = m_cgenparam.GetMeasurementSwitch();
             //是否使用系统库开关
             IDC_SYS_LIB.Checked = m_cgenparam.GetSysSTD();
-            //测量参数文件夹
-            IDC_EDIT_MEASUREPARAMPATH.Text = m_cgenparam.GetMsrParamFileFolderName().ToString();
-
-            //颗粒分析标准库文件夹
-            IDC_EDIT_ANALYSESTDLIBPATH.Text = m_cgenparam.GetPartSTDLibFolderName().ToString();
-          
-
            
             //精炼工艺选项
             foreach (ComboBoxItem cbi in IDC_COMBO_TECHNOLOGY.Items)
@@ -736,14 +729,6 @@ namespace OTSMeasureApp
             //是否使用系统库
             m_cgenparam.SetSysSTD(IDC_SYS_LIB.Checked);
 
-            //测量参数文件夹
-            m_cgenparam.SetMsrParamFileFolderName(IDC_EDIT_MEASUREPARAMPATH.Text);
-
-
-            //颗粒分析标准库文件夹
-            m_cgenparam.SetPartSTDLibFolderName(IDC_EDIT_ANALYSESTDLIBPATH.Text);
-
-
             //获取精炼工艺索引
             ComboBoxItem cbiTECH = new ComboBoxItem();
             cbiTECH = (ComboBoxItem)IDC_COMBO_TECHNOLOGY.SelectedItem;
@@ -940,16 +925,8 @@ namespace OTSMeasureApp
             //    }
             //}
 
-            //关于路径定位问题
-            this.folderBrowserDialog1.SelectedPath = IDC_EDIT_MEASUREPARAMPATH.Text;
+            
 
-            string strb = ".\\Config\\SysData\\";
-            string strc = ".\\Config\\ProData\\";
-            string m_STDPath = strb;
-            m_ParameterPath = strc;
-            this.folderBrowserDialog1.SelectedPath = m_ParameterPath;
-            IDC_EDIT_MEASUREPARAMPATH.Text = m_ParameterPath;
-            IDC_EDIT_ANALYSESTDLIBPATH.Text = m_STDPath;
 
             if(m_cotsprogmgrparamfile.GetSysTypeName() == "IncA")
             {
@@ -987,34 +964,6 @@ namespace OTSMeasureApp
 
         }
 
-        private void IDC_BUTTON_MEASPRAMPATHSET_Click(object sender, EventArgs e)
-        {
-
-
-            if (folderBrowserDialog1.ShowDialog() == DialogResult.OK)
-            {
-                IDC_EDIT_MEASUREPARAMPATH.Text = folderBrowserDialog1.SelectedPath;
-            }
-            else 
-            {
-                folderBrowserDialog1.SelectedPath = IDC_EDIT_MEASUREPARAMPATH.Text;
-            }
-
-
-        }
-
-        private void IDC_BUTTON_PARTSTDLIBPATHSET_Click(object sender, EventArgs e)
-        {
-
-            if (folderBrowserDialog1.ShowDialog() == DialogResult.OK)
-            {
-                IDC_EDIT_ANALYSESTDLIBPATH.Text = folderBrowserDialog1.SelectedPath;
-            }
-            else {
-                folderBrowserDialog1.SelectedPath = IDC_EDIT_ANALYSESTDLIBPATH.Text;
-            }
-
-        }
         /// <summary>
         /// 弹出样品台管理窗体
         /// </summary>

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -34,6 +34,9 @@
             this.label41 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label16 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
             this.IDC_EDIT_YEND = new System.Windows.Forms.TextBox();
             this.IDC_EDIT_YSTART = new System.Windows.Forms.TextBox();
             this.IDC_EDIT_MINMAG = new System.Windows.Forms.TextBox();
@@ -126,9 +129,6 @@
             this.IDC_COMBO_Model = new System.Windows.Forms.ComboBox();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
             this.btncancel = new System.Windows.Forms.Button();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.label16 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -226,6 +226,36 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "SEM样品台信息";
             // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(292, 146);
+            this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(17, 12);
+            this.label16.TabIndex = 839;
+            this.label16.Text = "mm";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(292, 82);
+            this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(17, 12);
+            this.label10.TabIndex = 838;
+            this.label10.Text = "mm";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(292, 24);
+            this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(17, 12);
+            this.label9.TabIndex = 837;
+            this.label9.Text = "um";
+            // 
             // IDC_EDIT_YEND
             // 
             this.IDC_EDIT_YEND.Location = new System.Drawing.Point(211, 141);
@@ -1232,36 +1262,6 @@
             this.btncancel.UseVisualStyleBackColor = true;
             this.btncancel.Click += new System.EventHandler(this.btncancel_Click);
             // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(292, 24);
-            this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(17, 12);
-            this.label9.TabIndex = 837;
-            this.label9.Text = "um";
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(292, 82);
-            this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(17, 12);
-            this.label10.TabIndex = 838;
-            this.label10.Text = "mm";
-            // 
-            // label16
-            // 
-            this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(292, 146);
-            this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(17, 12);
-            this.label16.TabIndex = 839;
-            this.label16.Text = "mm";
-            // 
             // ProgMgrInfoForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);