adjust the window display of the OTSReport_Template_CleannessA.Designer.cs

Bin/x64/Debug/Config/ReportTemplate/CleannessA_Template/ReportTemplateConfig.xml

@@ -12,7 +12,7 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>ReportIdentification.bmp</LOGName>
-    <StandardLibraryName>NoSTDDB.db</StandardLibraryName>
+    <StandardLibraryName>OTSCleanlinessSTD2</StandardLibraryName>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -34,7 +34,7 @@
     <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
-    <str_cb_klcc_ljb>j4.psf</str_cb_klcc_ljb>
+    <str_cb_klcc_ljb>lj.psf</str_cb_klcc_ljb>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -649,7 +649,7 @@ namespace OTSMeasureApp
 
             IDC_EDIT_XrayLimit.Text = m_cotsxrayprm.GetXrayLimit().ToString();
 
-            //IDC_FILTER.Checked = m_cotsxrayprm.GetUseFilter();
+          
 
 
         }
@@ -787,8 +787,6 @@ namespace OTSMeasureApp
             //去背景方式
             ComboBoxItem enum_AUTOBGREMOVETYP = (ComboBoxItem)IDC_COMBO_AUTOBGREMOVETYP.SelectedItem;
             m_cotsimgprocprm.SetAutoBGRemoveType((otsdataconst.OTS_AUTOBGREMOVE_TYPE)enum_AUTOBGREMOVETYP.Value);
-            //腐蚀膨胀系数
-            //m_cotsimgprocprm.SetErrodDilateParam(Convert.ToInt32(IDC_COMBO_CorrosionExpansionCoefficient.Text));
             //重叠像素
             m_cotsimgprocprm.SetOverlapParam(Convert.ToInt32(IDC_EDIT_Overlap.Text));
             if (IDC_EDIT_OTHERSELECTION.Text != "NoFilter")
@@ -829,9 +827,6 @@ namespace OTSMeasureApp
 
             m_cotsxrayprm.SetXrayLimit(Convert.ToInt32(IDC_EDIT_XrayLimit.Text));
 
-            //m_cotsxrayprm.SetUseFilter(IDC_FILTER.Checked);
-
-
         }
 
         /// <summary>

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.Designer.cs

@@ -52,21 +52,12 @@
             this.checkBox2 = new System.Windows.Forms.CheckBox();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.ck_klcc_xsmk = new System.Windows.Forms.CheckBox();
-            this.cb_klcc_ljb = new System.Windows.Forms.ComboBox();
-            this.cb_klcc_jsfs = new System.Windows.Forms.ComboBox();
-            this.label15 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
             this.tb_ysfx_xsys = new System.Windows.Forms.TextBox();
             this.button4 = new System.Windows.Forms.Button();
             this.ck_ysfx_xsmk = new System.Windows.Forms.CheckBox();
             this.numericMin = new System.Windows.Forms.NumericUpDown();
             this.label112121 = new System.Windows.Forms.Label();
             this.ck_kllb_fjzt = new System.Windows.Forms.CheckBox();
-            this.groupBox_zt = new System.Windows.Forms.GroupBox();
-            this.ParticleList_5 = new System.Windows.Forms.Label();
-            this.cb_FrameChart_p2 = new System.Windows.Forms.ComboBox();
-            this.ParticleList_4 = new System.Windows.Forms.Label();
-            this.cb_FrameChart_p1 = new System.Windows.Forms.ComboBox();
             this.groupBox_px = new System.Windows.Forms.GroupBox();
             this.comboBox_p3 = new System.Windows.Forms.ComboBox();
             this.ParticleList_3 = new System.Windows.Forms.Label();
@@ -82,20 +73,16 @@
             this.tb_RemoveElements = new System.Windows.Forms.TextBox();
             this.button6 = new System.Windows.Forms.Button();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
-            this.cb_ParticleRange = new System.Windows.Forms.ComboBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.button3 = new System.Windows.Forms.Button();
             this.textBox_zypxss = new System.Windows.Forms.TextBox();
-            this.label_zypxss = new System.Windows.Forms.Label();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.label2 = new System.Windows.Forms.Label();
             this.button7 = new System.Windows.Forms.Button();
+            this.label2 = new System.Windows.Forms.Label();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
-            this.label7 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
-            this.groupBox_zt.SuspendLayout();
             this.groupBox_px.SuspendLayout();
             this.groupBox9.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -105,7 +92,7 @@
             // 
             // tb_FBT
             // 
-            this.tb_FBT.Location = new System.Drawing.Point(5, 125);
+            this.tb_FBT.Location = new System.Drawing.Point(5, 93);
             this.tb_FBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_FBT.Name = "tb_FBT";
             this.tb_FBT.Size = new System.Drawing.Size(252, 21);
@@ -113,7 +100,7 @@
             // 
             // tb_ZBT
             // 
-            this.tb_ZBT.Location = new System.Drawing.Point(5, 56);
+            this.tb_ZBT.Location = new System.Drawing.Point(5, 47);
             this.tb_ZBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ZBT.Name = "tb_ZBT";
             this.tb_ZBT.Size = new System.Drawing.Size(252, 21);
@@ -122,7 +109,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(5, 95);
+            this.label5.Location = new System.Drawing.Point(3, 75);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(41, 12);
@@ -141,7 +128,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(460, 386);
+            this.button1.Location = new System.Drawing.Point(707, 596);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(70, 30);
@@ -164,7 +151,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(5, 164);
+            this.label1.Location = new System.Drawing.Point(5, 128);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(53, 12);
@@ -173,7 +160,7 @@
             // 
             // tb_YPBH
             // 
-            this.tb_YPBH.Location = new System.Drawing.Point(5, 194);
+            this.tb_YPBH.Location = new System.Drawing.Point(5, 148);
             this.tb_YPBH.Margin = new System.Windows.Forms.Padding(2);
             this.tb_YPBH.Name = "tb_YPBH";
             this.tb_YPBH.Size = new System.Drawing.Size(252, 21);
@@ -182,7 +169,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(5, 233);
+            this.label4.Location = new System.Drawing.Point(4, 194);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(53, 12);
@@ -191,7 +178,7 @@
             // 
             // tb_CKBZ
             // 
-            this.tb_CKBZ.Location = new System.Drawing.Point(5, 263);
+            this.tb_CKBZ.Location = new System.Drawing.Point(0, 217);
             this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(2);
             this.tb_CKBZ.Name = "tb_CKBZ";
             this.tb_CKBZ.Size = new System.Drawing.Size(252, 21);
@@ -264,7 +251,7 @@
             this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.tb_yjwb);
             this.groupBox1.Controls.Add(this.label10);
-            this.groupBox1.Location = new System.Drawing.Point(13, 341);
+            this.groupBox1.Location = new System.Drawing.Point(11, 282);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
@@ -315,24 +302,24 @@
             // checkBox2
             // 
             this.checkBox2.AutoSize = true;
-            this.checkBox2.Location = new System.Drawing.Point(314, 50);
+            this.checkBox2.Location = new System.Drawing.Point(22, 107);
             this.checkBox2.Margin = new System.Windows.Forms.Padding(2);
             this.checkBox2.Name = "checkBox2";
-            this.checkBox2.Size = new System.Drawing.Size(108, 16);
+            this.checkBox2.Size = new System.Drawing.Size(84, 16);
             this.checkBox2.TabIndex = 57;
-            this.checkBox2.Text = "显示小分类图表";
+            this.checkBox2.Text = "小分类图表";
             this.checkBox2.UseVisualStyleBackColor = true;
             this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
             // 
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(168, 50);
+            this.checkBox1.Location = new System.Drawing.Point(22, 78);
             this.checkBox1.Margin = new System.Windows.Forms.Padding(2);
             this.checkBox1.Name = "checkBox1";
-            this.checkBox1.Size = new System.Drawing.Size(108, 16);
+            this.checkBox1.Size = new System.Drawing.Size(84, 16);
             this.checkBox1.TabIndex = 56;
-            this.checkBox1.Text = "显示大分类图表";
+            this.checkBox1.Text = "大分类图表";
             this.checkBox1.UseVisualStyleBackColor = true;
             this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
@@ -348,70 +335,30 @@
             this.ck_klcc_xsmk.UseVisualStyleBackColor = true;
             this.ck_klcc_xsmk.CheckedChanged += new System.EventHandler(this.ck_klcc_xsmk_CheckedChanged);
             // 
-            // cb_klcc_ljb
-            // 
-            this.cb_klcc_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_klcc_ljb.FormattingEnabled = true;
-            this.cb_klcc_ljb.Location = new System.Drawing.Point(157, 113);
-            this.cb_klcc_ljb.Margin = new System.Windows.Forms.Padding(2);
-            this.cb_klcc_ljb.Name = "cb_klcc_ljb";
-            this.cb_klcc_ljb.Size = new System.Drawing.Size(92, 20);
-            this.cb_klcc_ljb.TabIndex = 42;
-            // 
-            // cb_klcc_jsfs
-            // 
-            this.cb_klcc_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_klcc_jsfs.FormattingEnabled = true;
-            this.cb_klcc_jsfs.Location = new System.Drawing.Point(22, 113);
-            this.cb_klcc_jsfs.Margin = new System.Windows.Forms.Padding(2);
-            this.cb_klcc_jsfs.Name = "cb_klcc_jsfs";
-            this.cb_klcc_jsfs.Size = new System.Drawing.Size(92, 20);
-            this.cb_klcc_jsfs.TabIndex = 42;
-            // 
-            // label15
-            // 
-            this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(158, 92);
-            this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(65, 12);
-            this.label15.TabIndex = 41;
-            this.label15.Text = "粒级表信息";
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(20, 92);
-            this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(53, 12);
-            this.label14.TabIndex = 41;
-            this.label14.Text = "计算方式";
-            // 
             // tb_ysfx_xsys
             // 
-            this.tb_ysfx_xsys.Location = new System.Drawing.Point(22, 183);
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(187, 138);
             this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
             this.tb_ysfx_xsys.ReadOnly = true;
-            this.tb_ysfx_xsys.Size = new System.Drawing.Size(198, 21);
+            this.tb_ysfx_xsys.Size = new System.Drawing.Size(337, 21);
             this.tb_ysfx_xsys.TabIndex = 58;
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(148, 208);
+            this.button4.Location = new System.Drawing.Point(528, 138);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
             this.button4.TabIndex = 57;
-            this.button4.Text = "PeriodicTable";
+            this.button4.Text = "元素选择";
             this.button4.UseVisualStyleBackColor = true;
             this.button4.Click += new System.EventHandler(this.button4_Click);
             // 
             // ck_ysfx_xsmk
             // 
             this.ck_ysfx_xsmk.AutoSize = true;
-            this.ck_ysfx_xsmk.Location = new System.Drawing.Point(168, 23);
+            this.ck_ysfx_xsmk.Location = new System.Drawing.Point(22, 137);
             this.ck_ysfx_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_ysfx_xsmk.Name = "ck_ysfx_xsmk";
             this.ck_ysfx_xsmk.Size = new System.Drawing.Size(72, 16);
@@ -426,7 +373,7 @@
             0,
             0,
             0});
-            this.numericMin.Location = new System.Drawing.Point(460, 76);
+            this.numericMin.Location = new System.Drawing.Point(304, 49);
             this.numericMin.Maximum = new decimal(new int[] {
             99999,
             0,
@@ -444,7 +391,7 @@
             // label112121
             // 
             this.label112121.AutoSize = true;
-            this.label112121.Location = new System.Drawing.Point(308, 78);
+            this.label112121.Location = new System.Drawing.Point(299, 25);
             this.label112121.Name = "label112121";
             this.label112121.Size = new System.Drawing.Size(77, 12);
             this.label112121.TabIndex = 64;
@@ -453,7 +400,7 @@
             // ck_kllb_fjzt
             // 
             this.ck_kllb_fjzt.AutoSize = true;
-            this.ck_kllb_fjzt.Location = new System.Drawing.Point(460, 23);
+            this.ck_kllb_fjzt.Location = new System.Drawing.Point(22, 283);
             this.ck_kllb_fjzt.Name = "ck_kllb_fjzt";
             this.ck_kllb_fjzt.Size = new System.Drawing.Size(96, 16);
             this.ck_kllb_fjzt.TabIndex = 57;
@@ -461,70 +408,19 @@
             this.ck_kllb_fjzt.UseVisualStyleBackColor = true;
             this.ck_kllb_fjzt.CheckedChanged += new System.EventHandler(this.ck_kllb_fjzt_CheckedChanged);
             // 
-            // groupBox_zt
-            // 
-            this.groupBox_zt.Controls.Add(this.ParticleList_5);
-            this.groupBox_zt.Controls.Add(this.cb_FrameChart_p2);
-            this.groupBox_zt.Controls.Add(this.ParticleList_4);
-            this.groupBox_zt.Controls.Add(this.cb_FrameChart_p1);
-            this.groupBox_zt.Location = new System.Drawing.Point(297, 195);
-            this.groupBox_zt.Name = "groupBox_zt";
-            this.groupBox_zt.Size = new System.Drawing.Size(292, 79);
-            this.groupBox_zt.TabIndex = 55;
-            this.groupBox_zt.TabStop = false;
-            this.groupBox_zt.Text = "帧图显示排序设置";
-            // 
-            // ParticleList_5
-            // 
-            this.ParticleList_5.AutoSize = true;
-            this.ParticleList_5.Location = new System.Drawing.Point(102, 23);
-            this.ParticleList_5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ParticleList_5.Name = "ParticleList_5";
-            this.ParticleList_5.Size = new System.Drawing.Size(35, 12);
-            this.ParticleList_5.TabIndex = 57;
-            this.ParticleList_5.Text = "参数2";
-            // 
-            // cb_FrameChart_p2
-            // 
-            this.cb_FrameChart_p2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_FrameChart_p2.FormattingEnabled = true;
-            this.cb_FrameChart_p2.Location = new System.Drawing.Point(102, 48);
-            this.cb_FrameChart_p2.Margin = new System.Windows.Forms.Padding(2);
-            this.cb_FrameChart_p2.Name = "cb_FrameChart_p2";
-            this.cb_FrameChart_p2.Size = new System.Drawing.Size(80, 20);
-            this.cb_FrameChart_p2.TabIndex = 56;
-            // 
-            // ParticleList_4
-            // 
-            this.ParticleList_4.AutoSize = true;
-            this.ParticleList_4.Location = new System.Drawing.Point(13, 23);
-            this.ParticleList_4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ParticleList_4.Name = "ParticleList_4";
-            this.ParticleList_4.Size = new System.Drawing.Size(35, 12);
-            this.ParticleList_4.TabIndex = 55;
-            this.ParticleList_4.Text = "参数1";
-            // 
-            // cb_FrameChart_p1
-            // 
-            this.cb_FrameChart_p1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cb_FrameChart_p1.FormattingEnabled = true;
-            this.cb_FrameChart_p1.Location = new System.Drawing.Point(15, 48);
-            this.cb_FrameChart_p1.Margin = new System.Windows.Forms.Padding(2);
-            this.cb_FrameChart_p1.Name = "cb_FrameChart_p1";
-            this.cb_FrameChart_p1.Size = new System.Drawing.Size(80, 20);
-            this.cb_FrameChart_p1.TabIndex = 54;
-            // 
             // groupBox_px
             // 
             this.groupBox_px.Controls.Add(this.comboBox_p3);
+            this.groupBox_px.Controls.Add(this.label112121);
+            this.groupBox_px.Controls.Add(this.numericMin);
             this.groupBox_px.Controls.Add(this.ParticleList_3);
             this.groupBox_px.Controls.Add(this.comboBox_p2);
             this.groupBox_px.Controls.Add(this.ParticleList_2);
             this.groupBox_px.Controls.Add(this.ParticleList_1);
             this.groupBox_px.Controls.Add(this.comboBox_p1);
-            this.groupBox_px.Location = new System.Drawing.Point(297, 106);
+            this.groupBox_px.Location = new System.Drawing.Point(126, 179);
             this.groupBox_px.Name = "groupBox_px";
-            this.groupBox_px.Size = new System.Drawing.Size(292, 83);
+            this.groupBox_px.Size = new System.Drawing.Size(417, 83);
             this.groupBox_px.TabIndex = 54;
             this.groupBox_px.TabStop = false;
             this.groupBox_px.Text = "颗粒显示排序设置";
@@ -594,7 +490,7 @@
             // ck_kllb_xsmk
             // 
             this.ck_kllb_xsmk.AutoSize = true;
-            this.ck_kllb_xsmk.Location = new System.Drawing.Point(314, 23);
+            this.ck_kllb_xsmk.Location = new System.Drawing.Point(22, 204);
             this.ck_kllb_xsmk.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_xsmk.Name = "ck_kllb_xsmk";
             this.ck_kllb_xsmk.Size = new System.Drawing.Size(72, 16);
@@ -606,7 +502,7 @@
             // label_delete_Class
             // 
             this.label_delete_Class.AutoSize = true;
-            this.label_delete_Class.Location = new System.Drawing.Point(351, 26);
+            this.label_delete_Class.Location = new System.Drawing.Point(290, 26);
             this.label_delete_Class.Name = "label_delete_Class";
             this.label_delete_Class.Size = new System.Drawing.Size(101, 12);
             this.label_delete_Class.TabIndex = 63;
@@ -614,9 +510,9 @@
             // 
             // delete_Class
             // 
-            this.delete_Class.Location = new System.Drawing.Point(349, 49);
+            this.delete_Class.Location = new System.Drawing.Point(292, 49);
             this.delete_Class.Name = "delete_Class";
-            this.delete_Class.Size = new System.Drawing.Size(181, 21);
+            this.delete_Class.Size = new System.Drawing.Size(320, 21);
             this.delete_Class.TabIndex = 62;
             // 
             // label11111
@@ -630,17 +526,17 @@
             // 
             // button5
             // 
-            this.button5.Location = new System.Drawing.Point(210, 47);
+            this.button5.Location = new System.Drawing.Point(199, 47);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(76, 23);
             this.button5.TabIndex = 60;
-            this.button5.Text = "选取";
+            this.button5.Text = "元素选择";
             this.button5.UseVisualStyleBackColor = true;
             this.button5.Click += new System.EventHandler(this.button5_Click);
             // 
             // tb_RemoveElements
             // 
-            this.tb_RemoveElements.Location = new System.Drawing.Point(40, 49);
+            this.tb_RemoveElements.Location = new System.Drawing.Point(14, 49);
             this.tb_RemoveElements.Margin = new System.Windows.Forms.Padding(2);
             this.tb_RemoveElements.Name = "tb_RemoveElements";
             this.tb_RemoveElements.ReadOnly = true;
@@ -649,7 +545,7 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(386, 386);
+            this.button6.Location = new System.Drawing.Point(633, 596);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(70, 30);
@@ -672,19 +568,11 @@
             this.groupBox9.Controls.Add(this.label3);
             this.groupBox9.Location = new System.Drawing.Point(13, 12);
             this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Size = new System.Drawing.Size(263, 324);
+            this.groupBox9.Size = new System.Drawing.Size(263, 260);
             this.groupBox9.TabIndex = 1;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "首页设置信息";
             // 
-            // cb_ParticleRange
-            // 
-            this.cb_ParticleRange.FormattingEnabled = true;
-            this.cb_ParticleRange.Location = new System.Drawing.Point(6, 55);
-            this.cb_ParticleRange.Name = "cb_ParticleRange";
-            this.cb_ParticleRange.Size = new System.Drawing.Size(124, 20);
-            this.cb_ParticleRange.TabIndex = 76;
-            // 
             // groupBox2
             // 
             this.groupBox2.Controls.Add(this.tb_RemoveElements);
@@ -701,39 +589,25 @@
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(460, 55);
+            this.button3.Location = new System.Drawing.Point(6, 15);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(83, 22);
             this.button3.TabIndex = 68;
-            this.button3.Text = "排序选择";
+            this.button3.Text = "选择分类";
             this.button3.UseVisualStyleBackColor = true;
             this.button3.Click += new System.EventHandler(this.button3_Click);
             // 
             // textBox_zypxss
             // 
-            this.textBox_zypxss.Location = new System.Drawing.Point(146, 55);
+            this.textBox_zypxss.Location = new System.Drawing.Point(6, 43);
+            this.textBox_zypxss.Multiline = true;
             this.textBox_zypxss.Name = "textBox_zypxss";
-            this.textBox_zypxss.Size = new System.Drawing.Size(306, 21);
+            this.textBox_zypxss.Size = new System.Drawing.Size(606, 41);
             this.textBox_zypxss.TabIndex = 65;
             // 
-            // label_zypxss
-            // 
-            this.label_zypxss.AutoSize = true;
-            this.label_zypxss.Location = new System.Drawing.Point(144, 34);
-            this.label_zypxss.Name = "label_zypxss";
-            this.label_zypxss.Size = new System.Drawing.Size(53, 12);
-            this.label_zypxss.TabIndex = 64;
-            this.label_zypxss.Text = "排序显示";
-            // 
             // groupBox3
             // 
-            this.groupBox3.Controls.Add(this.button7);
-            this.groupBox3.Controls.Add(this.numericMin);
-            this.groupBox3.Controls.Add(this.groupBox_zt);
-            this.groupBox3.Controls.Add(this.label112121);
-            this.groupBox3.Controls.Add(this.button6);
             this.groupBox3.Controls.Add(this.groupBox_px);
-            this.groupBox3.Controls.Add(this.button1);
             this.groupBox3.Controls.Add(this.label2);
             this.groupBox3.Controls.Add(this.ck_klcc_xsddt);
             this.groupBox3.Controls.Add(this.tb_ysfx_xsys);
@@ -741,32 +615,19 @@
             this.groupBox3.Controls.Add(this.checkBox2);
             this.groupBox3.Controls.Add(this.ck_klcc_xsmk);
             this.groupBox3.Controls.Add(this.checkBox1);
-            this.groupBox3.Controls.Add(this.cb_klcc_ljb);
-            this.groupBox3.Controls.Add(this.label15);
             this.groupBox3.Controls.Add(this.ck_ysfx_xsmk);
-            this.groupBox3.Controls.Add(this.cb_klcc_jsfs);
             this.groupBox3.Controls.Add(this.ck_kllb_fjzt);
-            this.groupBox3.Controls.Add(this.label14);
             this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
             this.groupBox3.Location = new System.Drawing.Point(281, 206);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(618, 428);
+            this.groupBox3.Size = new System.Drawing.Size(618, 369);
             this.groupBox3.TabIndex = 78;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "颗粒筛选";
             // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(20, 164);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(77, 12);
-            this.label2.TabIndex = 68;
-            this.label2.Text = "元素选择设置";
-            // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(534, 386);
+            this.button7.Location = new System.Drawing.Point(781, 596);
             this.button7.Margin = new System.Windows.Forms.Padding(2);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(70, 30);
@@ -775,13 +636,19 @@
             this.button7.UseVisualStyleBackColor = true;
             this.button7.Click += new System.EventHandler(this.button7_Click);
             // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(99, 141);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(83, 12);
+            this.label2.TabIndex = 68;
+            this.label2.Text = "元素选择设置:";
+            // 
             // groupBox4
             // 
-            this.groupBox4.Controls.Add(this.label7);
             this.groupBox4.Controls.Add(this.button3);
             this.groupBox4.Controls.Add(this.textBox_zypxss);
-            this.groupBox4.Controls.Add(this.label_zypxss);
-            this.groupBox4.Controls.Add(this.cb_ParticleRange);
             this.groupBox4.Location = new System.Drawing.Point(281, 105);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Size = new System.Drawing.Size(618, 90);
@@ -790,22 +657,16 @@
             this.groupBox4.Text = "特定选择";
             this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter);
             // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(6, 35);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(53, 12);
-            this.label7.TabIndex = 77;
-            this.label7.Text = "颗粒选择";
-            // 
             // OTSReport_Template_CleannessA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(911, 646);
+            this.Controls.Add(this.button7);
+            this.Controls.Add(this.button6);
             this.Controls.Add(this.groupBox4);
             this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.button1);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox9);
             this.Controls.Add(this.groupBox1);
@@ -823,8 +684,6 @@
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).EndInit();
-            this.groupBox_zt.ResumeLayout(false);
-            this.groupBox_zt.PerformLayout();
             this.groupBox_px.ResumeLayout(false);
             this.groupBox_px.PerformLayout();
             this.groupBox9.ResumeLayout(false);
@@ -857,10 +716,6 @@
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
-        private System.Windows.Forms.ComboBox cb_klcc_ljb;
-        private System.Windows.Forms.ComboBox cb_klcc_jsfs;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.Label label14;
         private System.Windows.Forms.CheckBox ck_ysfx_xsmk;
         private System.Windows.Forms.CheckBox ck_kllb_xsmk;
         private System.Windows.Forms.CheckBox ck_ym;
@@ -869,18 +724,12 @@
         private System.Windows.Forms.TextBox tb_ysfx_xsys;
         private System.Windows.Forms.Button button4;
         private System.Windows.Forms.GroupBox groupBox_px;
-        private System.Windows.Forms.GroupBox groupBox_zt;
-        private System.Windows.Forms.Label ParticleList_5;
-        private System.Windows.Forms.ComboBox cb_FrameChart_p2;
-        private System.Windows.Forms.Label ParticleList_4;
-        private System.Windows.Forms.ComboBox cb_FrameChart_p1;
         private System.Windows.Forms.ComboBox comboBox_p3;
         private System.Windows.Forms.Label ParticleList_3;
         private System.Windows.Forms.ComboBox comboBox_p2;
         private System.Windows.Forms.Label ParticleList_2;
         private System.Windows.Forms.Label ParticleList_1;
         private System.Windows.Forms.ComboBox comboBox_p1;
-        private System.Windows.Forms.ComboBox cb_ParticleRange;
         private System.Windows.Forms.CheckBox ck_kllb_fjzt;
         private System.Windows.Forms.Button button5;
         private System.Windows.Forms.TextBox tb_RemoveElements;
@@ -897,12 +746,10 @@
         private System.Windows.Forms.Button button1217;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.TextBox textBox_zypxss;
-        private System.Windows.Forms.Label label_zypxss;
         private System.Windows.Forms.GroupBox groupBox3;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Button button3;
         private System.Windows.Forms.Button button7;
         private System.Windows.Forms.GroupBox groupBox4;
-        private System.Windows.Forms.Label label7;
     }
 }