optimize the ProgMgrInfoForm.designer.cs

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

@@ -1,9 +1,9 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>XXXXXX有限公司</str_tb_FBT>
+    <str_tb_ZBT>IncA Report</str_tb_ZBT>
+    <str_tb_FBT>XXX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>VDA19</str_tb_CKBZ>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -12,7 +12,7 @@
     <int_xzkl>0</int_xzkl>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>清洁度分析报告</str_tb_ymwb>
+    <str_tb_ymwb>OTS夹杂物分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
     <str_tb_yjwb>OTS Result</str_tb_yjwb>
@@ -36,21 +36,53 @@
     <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
+    <str_tb_ysfx_xsys>Al,Si,B,P,C,S,N,Cl,O,F,Te,Se,Pb,Sn,Hg,W,Mo,Cr,I,Br,Bi,As,Zr,Ti,Ni,Nd,Re,Mn,Ba,Ca,Cu,Ce,Ta,Nb,Sm,V,Co,Ac,La,Y,Cs,Mg,Be,Li,H</str_tb_ysfx_xsys>
     <list_str_tb_ysfx_xsys>
       <YS0>Al</YS0>
       <YS1>Si</YS1>
-      <YS2>C</YS2>
-      <YS3>S</YS3>
-      <YS4>N</YS4>
-      <YS5>O</YS5>
-      <YS6>Fe</YS6>
-      <YS7>Ti</YS7>
-      <YS8>Mn</YS8>
-      <YS9>Mg</YS9>
-      <YS10>Ca</YS10>
-      <YS11>Ce</YS11>
-      <YS12>La</YS12>
+      <YS2>B</YS2>
+      <YS3>P</YS3>
+      <YS4>C</YS4>
+      <YS5>S</YS5>
+      <YS6>N</YS6>
+      <YS7>Cl</YS7>
+      <YS8>O</YS8>
+      <YS9>F</YS9>
+      <YS10>Te</YS10>
+      <YS11>Se</YS11>
+      <YS12>Pb</YS12>
+      <YS13>Sn</YS13>
+      <YS14>Hg</YS14>
+      <YS15>W</YS15>
+      <YS16>Mo</YS16>
+      <YS17>Cr</YS17>
+      <YS18>I</YS18>
+      <YS19>Br</YS19>
+      <YS20>Bi</YS20>
+      <YS21>As</YS21>
+      <YS22>Zr</YS22>
+      <YS23>Ti</YS23>
+      <YS24>Ni</YS24>
+      <YS25>Nd</YS25>
+      <YS26>Re</YS26>
+      <YS27>Mn</YS27>
+      <YS28>Ba</YS28>
+      <YS29>Ca</YS29>
+      <YS30>Cu</YS30>
+      <YS31>Ce</YS31>
+      <YS32>Ta</YS32>
+      <YS33>Nb</YS33>
+      <YS34>Sm</YS34>
+      <YS35>V</YS35>
+      <YS36>Co</YS36>
+      <YS37>Ac</YS37>
+      <YS38>La</YS38>
+      <YS39>Y</YS39>
+      <YS40>Cs</YS40>
+      <YS41>Mg</YS41>
+      <YS42>Be</YS42>
+      <YS43>Li</YS43>
+      <YS44>H</YS44>
     </list_str_tb_ysfx_xsys>
     <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
     <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
@@ -62,17 +94,25 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al₂O₃</MB0>
       <MB1>CaO.SiO₂.Al₂O₃</MB1>
+      <MB2>MnO.S.Al₂O₃</MB2>
+      <MB3>CaO.TiN.Al₂O₃</MB3>
+      <MB4>CaO.CaS.Al₂O₃</MB4>
+      <MB5>MnS.CaS.Al₂O₃</MB5>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
       <MBIndex1>2</MBIndex1>
+      <MBIndex2>3</MBIndex2>
+      <MBIndex3>4</MBIndex3>
+      <MBIndex4>6</MBIndex4>
+      <MBIndex5>7</MBIndex5>
     </list_lbv_syxt_mblb_index>
   </M_SYXT>
   <M_KLLBXX>
@@ -97,30 +137,32 @@
     <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
     <index_cb_kllb_sort>2</index_cb_kllb_sort>
     <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Hardness</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>2</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>Area</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>0</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Hardness</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>2</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>Area</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>0</index_cb_kllb_chartSort_p2>
+    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
+    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
+    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
+    <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
+    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
+    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
+    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
     <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
       <YS0>C</YS0>
+      <YS1>Fe</YS1>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>C</str_kllb_qcys>
-    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
+    <str_kllb_qcys>C,Fe</str_kllb_qcys>
+    <str_kllb_DeleteClass>SiC,FeO</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
-      <YS0>misc</YS0>
+      <YS0>SiC</YS0>
+      <YS1>FeO</YS1>
     </list_str_kllb_DeleteClass>
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
-    <Path>C:\Others\Opton\cleanness\OTS\Bin\x64\Debug\Config\ConfigTemplate\BatteryCleannessA\ReportTemplateConfig.xml</Path>
+    <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
   </M_address>
   <M_JZWZB>
     <b_ck_surface>False</b_ck_surface>

Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="6">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
@@ -54,77 +54,5 @@
         <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apero">
-      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,130000,120000" shape="1:RECTANGLE" />
-      <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
-      <Collection RegName="Holes">
-        <Member HoleName="9" rectDomian="0,0,10000,0" shape="0" />
-        <Member HoleName="2" rectDomian="0,25000,10000,0" shape="0" />
-        <Member HoleName="3" rectDomian="-15000,25000,10000,0" shape="0" />
-        <Member HoleName="1" rectDomian="15000,25500,10000,0" shape="0" />
-        <Member HoleName="4" rectDomian="22000,13000,10000,0" shape="0" />
-        <Member HoleName="5" rectDomian="7000,13000,10000,0" shape="0" />
-        <Member HoleName="6" rectDomian="-7500,13000,10000,0" shape="0" />
-        <Member HoleName="7" rectDomian="-22500,13000,10000,0" shape="0" />
-        <Member HoleName="8" rectDomian="14000,0,10000,0" shape="0" />
-        <Member HoleName="10" rectDomian="-15000,0,10000,0" shape="0" />
-        <Member HoleName="11" rectDomian="-30000,0,10000,0" shape="0" />
-        <Member HoleName="12" rectDomian="22000,-12500,10000,0" shape="0" />
-        <Member HoleName="13" rectDomian="7000,-12500,10000,0" shape="0" />
-        <Member HoleName="14" rectDomian="-7500,-12500,10000,0" shape="0" />
-        <Member HoleName="15" rectDomian="-22500,-12500,10000,0" shape="0" />
-        <Member HoleName="16" rectDomian="14500,-24500,10000,0" shape="0" />
-        <Member HoleName="17" rectDomian="-500,-24500,10000,0" shape="0" />
-        <Member HoleName="18" rectDomian="-14500,-24500,10000,0" shape="0" />
-      </Collection>
-    </Member>
-    <Member strName="Apero12">
-      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,130000,120000" shape="1:RECTANGLE" />
-      <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
-      <Collection RegName="Holes">
-        <Member HoleName="9" rectDomian="0,0,12000,0" shape="0" />
-        <Member HoleName="2" rectDomian="0,25000,12000,0" shape="0" />
-        <Member HoleName="3" rectDomian="-15000,25000,12000,0" shape="0" />
-        <Member HoleName="1" rectDomian="15000,25500,12000,0" shape="0" />
-        <Member HoleName="4" rectDomian="22000,13000,12000,0" shape="0" />
-        <Member HoleName="5" rectDomian="7000,13000,12000,0" shape="0" />
-        <Member HoleName="6" rectDomian="-7500,13000,12000,0" shape="0" />
-        <Member HoleName="7" rectDomian="-22500,13000,12000,0" shape="0" />
-        <Member HoleName="8" rectDomian="14000,0,12000,0" shape="0" />
-        <Member HoleName="10" rectDomian="-15000,0,12000,0" shape="0" />
-        <Member HoleName="11" rectDomian="-30000,0,12000,0" shape="0" />
-        <Member HoleName="12" rectDomian="22000,-12500,12000,0" shape="0" />
-        <Member HoleName="13" rectDomian="7000,-12500,12000,0" shape="0" />
-        <Member HoleName="14" rectDomian="-7500,-12500,12000,0" shape="0" />
-        <Member HoleName="15" rectDomian="-22500,-12500,12000,0" shape="0" />
-        <Member HoleName="16" rectDomian="14500,-24500,12000,0" shape="0" />
-        <Member HoleName="17" rectDomian="-500,-24500,12000,0" shape="0" />
-        <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
-      </Collection>
-    </Member>
-    <Member strName="Apero12_90">
-      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,90000,90000" shape="1:RECTANGLE" />
-      <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
-      <Collection RegName="Holes">
-        <Member HoleName="9" rectDomian="0,0,12000,0" shape="0" />
-        <Member HoleName="2" rectDomian="0,25000,12000,0" shape="0" />
-        <Member HoleName="3" rectDomian="-15000,25000,12000,0" shape="0" />
-        <Member HoleName="1" rectDomian="15000,25500,12000,0" shape="0" />
-        <Member HoleName="4" rectDomian="22000,13000,12000,0" shape="0" />
-        <Member HoleName="5" rectDomian="7000,13000,12000,0" shape="0" />
-        <Member HoleName="6" rectDomian="-7500,13000,12000,0" shape="0" />
-        <Member HoleName="7" rectDomian="-22500,13000,12000,0" shape="0" />
-        <Member HoleName="8" rectDomian="14000,0,12000,0" shape="0" />
-        <Member HoleName="10" rectDomian="-15000,0,12000,0" shape="0" />
-        <Member HoleName="11" rectDomian="-30000,0,12000,0" shape="0" />
-        <Member HoleName="12" rectDomian="22000,-12500,12000,0" shape="0" />
-        <Member HoleName="13" rectDomian="7000,-12500,12000,0" shape="0" />
-        <Member HoleName="14" rectDomian="-7500,-12500,12000,0" shape="0" />
-        <Member HoleName="15" rectDomian="-22500,-12500,12000,0" shape="0" />
-        <Member HoleName="16" rectDomian="14500,-24500,12000,0" shape="0" />
-        <Member HoleName="17" rectDomian="-500,-24500,12000,0" shape="0" />
-        <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
-      </Collection>
-    </Member>
   </Collection>
 </XMLData>

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

@@ -376,15 +376,7 @@ namespace OTSMeasureApp
             }
         }
         #region privte part
-        //private void StartMeasure(ST_MSTMsg MSTMsg)
-        //{
-        //    m_MeasureApp.SetStartMeasureRibbonStatus();
-
-        //    GetMsrRetData(ref MSTMsg.STMThreadStu.SMsrCompleteData);
-
-        //    m_OTSMeasureResult.UpdateMeasureState_samplespace_propertyGrid(MSTMsg);
-
-        //}
+   
 
 
         private void ShowCurrentFieldPointMessage(Point currPoint)

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -124,7 +124,6 @@
             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_QuantifyMinSize1 = new System.Windows.Forms.TextBox();
             this.label37 = new System.Windows.Forms.Label();
             this.btnok = new System.Windows.Forms.Button();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
@@ -1030,7 +1029,7 @@
             // label45
             // 
             this.label45.AutoSize = true;
-            this.label45.Location = new System.Drawing.Point(9, 116);
+            this.label45.Location = new System.Drawing.Point(9, 119);
             this.label45.Name = "label45";
             this.label45.Size = new System.Drawing.Size(89, 12);
             this.label45.TabIndex = 840;
@@ -1046,18 +1045,18 @@
             this.label46.TabIndex = 839;
             this.label46.Text = "ms";
             // 
-            // textBox1
+            // IDC_EDIT_QuantifyMinSize
             // 
             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.Name = "IDC_EDIT_QuantifyMinSize";
             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(11, 69);
+            this.label8.Location = new System.Drawing.Point(11, 74);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(53, 12);
             this.label8.TabIndex = 837;
@@ -1076,7 +1075,7 @@
             // IDC_FILTER
             // 
             this.IDC_FILTER.AutoSize = true;
-            this.IDC_FILTER.Location = new System.Drawing.Point(259, 192);
+            this.IDC_FILTER.Location = new System.Drawing.Point(259, 186);
             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);
@@ -1085,7 +1084,7 @@
             // 
             // IDC_EDIT_XrayLimit
             // 
-            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(138, 162);
+            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(138, 160);
             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";
@@ -1105,7 +1104,7 @@
             // label47
             // 
             this.label47.AutoSize = true;
-            this.label47.Location = new System.Drawing.Point(9, 165);
+            this.label47.Location = new System.Drawing.Point(9, 162);
             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);
@@ -1125,7 +1124,7 @@
             // label44
             // 
             this.label44.AutoSize = true;
-            this.label44.Location = new System.Drawing.Point(15, 21);
+            this.label44.Location = new System.Drawing.Point(15, 24);
             this.label44.Name = "label44";
             this.label44.Size = new System.Drawing.Size(83, 12);
             this.label44.TabIndex = 825;
@@ -1143,7 +1142,7 @@
             // label32
             // 
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(11, 92);
+            this.label32.Location = new System.Drawing.Point(11, 97);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(83, 12);
             this.label32.TabIndex = 770;
@@ -1172,7 +1171,7 @@
             // 
             // IDC_EDIT_ANALYXRAYAIMVALUE
             // 
-            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(138, 138);
+            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(138, 135);
             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";
@@ -1193,21 +1192,13 @@
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(15, 47);
+            this.label31.Location = new System.Drawing.Point(15, 51);
             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);
             this.label31.TabIndex = 750;
             this.label31.Text = "X-ray扫描方式";
             // 
-            // IDC_EDIT_QuantifyMinSize
-            // 
-            //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
             // 
             this.label37.Location = new System.Drawing.Point(0, 0);