Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

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

@@ -1,8 +1,8 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>夹杂物报告</str_tb_ZBT>
-    <str_tb_FBT>xxx有限公司</str_tb_FBT>
-    <str_tb_YPBH>0001</str_tb_YPBH>
+    <str_tb_FBT>北京首钢吉泰安新材料有限公司</str_tb_FBT>
+    <str_tb_YPBH>20804164 4.0  2</str_tb_YPBH>
     <str_tb_CKBZ>
     </str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>

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="3">
+<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,7 +54,7 @@
         <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apero90mm">
+    <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">
@@ -78,29 +78,5 @@
         <Member HoleName="18" rectDomian="-14500,-24500,12000,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>
   </Collection>
 </XMLData>

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

@@ -189,7 +189,40 @@
 	  
     </Controls>
  </Form>
- 
+ <Form> 
+	<Name>ParticlesGridDevidePageShowConfig</Name>
+	<Controls>
+	<Control name="groupBox2" text="Display Settings"/>
+	<Control name="label1" text="Element:"/>
+	<Control name="label2" text="Display"/>
+	<Control name="btn_xsys" text="Select"/>
+	<Control name="btn_auto" text="Auto"/>
+	<Control name="btn_ybcsbc" text="Ok"/>
+	<Control name="btn_ybcsqx" text="Cancel"/>
+	
+	
+	
+	<Control name="cb_Area" text="Area um²"/>
+	<Control name="cb_EquivalentCircleDiameter" text="Dequalcircle"/>
+	<Control name="cb_MaxDiameter" text="Dmax"/>
+	<Control name="cb_MinDiameter" text="Dmin"/>
+	<Control name="cb_DiameterRatio" text="Aspect"/>
+	<Control name="cb_FerretDiameter" text="Dferet"/>
+	<Control name="cb_PERP" text="Dperp"/>
+	<Control name="cb_PERI" text="Perimeter um"/>
+	<Control name="cb_INSCR" text="Inscribed circle"/>
+	<Control name="cb_MEAN" text="Dmean"/>
+	<Control name="cb_ELONG" text="Expansion"/>
+	<Control name="cb_ASPECT_ELONG" text="Expanded"/>
+	<Control name="cb_Orientation" text="0rientation"/>
+	<Control name="cb_ParticleCoordinate" text="Particle Pos"/>
+	<Control name="cB_XRayDataCount" text="XRay Count"/>
+	
+	<Control name="cB_Density" text="Density" />
+	  <Control name="cB_Electrical_conductivity" text="Conductivity" />
+	  <Control name="cB_Hardness" text="Hardness" />
+	</Controls>
+ </Form>
   <Form>
 	<Name>Category</Name>
 	<Controls>
@@ -342,9 +375,9 @@
 	  <Control name="cb_ASPECT_ELONG" text="Expanded aspect ratio" />
 	  <Control name="cb_Orientation" text="Orientation angle" />
 	  <Control name="cb_FiledCoordinate" text="FiledCoordinate" />
-	  <Control name="cB_Density" text="Density" />
-	  <Control name="cB_Electrical_conductivity" text="Electrical_conductivity" />
-	  <Control name="cB_Hardness" text="Hardness" />
+	  
+	  
+	  
     </Controls>
  </Form>
  <Form>
@@ -1567,6 +1600,14 @@
       <Control name="str34" text="Hardness" />
 	  <Control name="str35" text="Density" />
 	  <Control name="str36" text="Electrical_conductivity" />
+	  
+	  <Control name="btn_showconfig" text="configuration"/>
+	  
+	  <Control name="EXCELToolStripMenuItem" text="Export to Excel"/>
+	  <Control name="ToolStripMenuItemDelete_Particle" text="Delete particles"/>
+	  <Control name="cB_Electrical_conductivity" text="Electric conductivity"/>
+	  <Control name="cB_Hardness" text="Hardness"/>
+	  <Control name="cB_Density" text="Density"/>
 	</Controls>
  </Form>
   <Form>

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePageShowConfig.Designer.cs

@@ -30,6 +30,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
         private void InitializeComponent()
         {
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.btn_auto = new System.Windows.Forms.Button();
             this.cB_XRayDataCount = new System.Windows.Forms.CheckBox();
             this.label_help = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
@@ -55,7 +56,6 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             this.cb_INSCR = new System.Windows.Forms.CheckBox();
             this.btn_ybcsqx = new System.Windows.Forms.Button();
             this.btn_ybcsbc = new System.Windows.Forms.Button();
-            this.btn_auto = new System.Windows.Forms.Button();
             this.groupBox2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -94,10 +94,22 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
             // 
+            // btn_auto
+            // 
+            this.btn_auto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn_auto.Location = new System.Drawing.Point(472, 19);
+            this.btn_auto.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.btn_auto.Name = "btn_auto";
+            this.btn_auto.Size = new System.Drawing.Size(38, 21);
+            this.btn_auto.TabIndex = 132;
+            this.btn_auto.Text = "自动";
+            this.btn_auto.UseVisualStyleBackColor = true;
+            this.btn_auto.Click += new System.EventHandler(this.btn_auto_Click);
+            // 
             // cB_XRayDataCount
             // 
             this.cB_XRayDataCount.AutoSize = true;
-            this.cB_XRayDataCount.Location = new System.Drawing.Point(339, 146);
+            this.cB_XRayDataCount.Location = new System.Drawing.Point(372, 146);
             this.cB_XRayDataCount.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_XRayDataCount.Name = "cB_XRayDataCount";
             this.cB_XRayDataCount.Size = new System.Drawing.Size(72, 16);
@@ -128,7 +140,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_ParticleCoordinate
             // 
             this.cb_ParticleCoordinate.AutoSize = true;
-            this.cb_ParticleCoordinate.Location = new System.Drawing.Point(223, 146);
+            this.cb_ParticleCoordinate.Location = new System.Drawing.Point(225, 146);
             this.cb_ParticleCoordinate.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_ParticleCoordinate.Name = "cb_ParticleCoordinate";
             this.cb_ParticleCoordinate.Size = new System.Drawing.Size(72, 16);
@@ -172,7 +184,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_Density
             // 
             this.cB_Density.AutoSize = true;
-            this.cB_Density.Location = new System.Drawing.Point(339, 169);
+            this.cB_Density.Location = new System.Drawing.Point(372, 169);
             this.cB_Density.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_Density.Name = "cB_Density";
             this.cB_Density.Size = new System.Drawing.Size(48, 16);
@@ -191,7 +203,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_Hardness
             // 
             this.cB_Hardness.AutoSize = true;
-            this.cB_Hardness.Location = new System.Drawing.Point(223, 169);
+            this.cB_Hardness.Location = new System.Drawing.Point(225, 169);
             this.cB_Hardness.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_Hardness.Name = "cB_Hardness";
             this.cB_Hardness.Size = new System.Drawing.Size(48, 16);
@@ -213,7 +225,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_ELONG
             // 
             this.cb_ELONG.AutoSize = true;
-            this.cb_ELONG.Location = new System.Drawing.Point(339, 74);
+            this.cb_ELONG.Location = new System.Drawing.Point(372, 74);
             this.cb_ELONG.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_ELONG.Name = "cb_ELONG";
             this.cb_ELONG.Size = new System.Drawing.Size(84, 16);
@@ -235,7 +247,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_PERI
             // 
             this.cb_PERI.AutoSize = true;
-            this.cb_PERI.Location = new System.Drawing.Point(223, 98);
+            this.cb_PERI.Location = new System.Drawing.Point(225, 98);
             this.cb_PERI.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_PERI.Name = "cb_PERI";
             this.cb_PERI.Size = new System.Drawing.Size(60, 16);
@@ -246,7 +258,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_MinDiameter
             // 
             this.cb_MinDiameter.AutoSize = true;
-            this.cb_MinDiameter.Location = new System.Drawing.Point(223, 50);
+            this.cb_MinDiameter.Location = new System.Drawing.Point(225, 50);
             this.cb_MinDiameter.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_MinDiameter.Name = "cb_MinDiameter";
             this.cb_MinDiameter.Size = new System.Drawing.Size(84, 16);
@@ -279,7 +291,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_ASPECT_ELONG
             // 
             this.cb_ASPECT_ELONG.AutoSize = true;
-            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(339, 123);
+            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(372, 123);
             this.cb_ASPECT_ELONG.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_ASPECT_ELONG.Name = "cb_ASPECT_ELONG";
             this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(84, 16);
@@ -290,7 +302,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_FerretDiameter
             // 
             this.cb_FerretDiameter.AutoSize = true;
-            this.cb_FerretDiameter.Location = new System.Drawing.Point(223, 74);
+            this.cb_FerretDiameter.Location = new System.Drawing.Point(225, 74);
             this.cb_FerretDiameter.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_FerretDiameter.Name = "cb_FerretDiameter";
             this.cb_FerretDiameter.Size = new System.Drawing.Size(96, 16);
@@ -301,7 +313,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_Orientation
             // 
             this.cb_Orientation.AutoSize = true;
-            this.cb_Orientation.Location = new System.Drawing.Point(223, 122);
+            this.cb_Orientation.Location = new System.Drawing.Point(225, 122);
             this.cb_Orientation.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_Orientation.Name = "cb_Orientation";
             this.cb_Orientation.Size = new System.Drawing.Size(84, 16);
@@ -312,7 +324,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_PERP
             // 
             this.cb_PERP.AutoSize = true;
-            this.cb_PERP.Location = new System.Drawing.Point(339, 50);
+            this.cb_PERP.Location = new System.Drawing.Point(372, 50);
             this.cb_PERP.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_PERP.Name = "cb_PERP";
             this.cb_PERP.Size = new System.Drawing.Size(84, 16);
@@ -334,7 +346,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_INSCR
             // 
             this.cb_INSCR.AutoSize = true;
-            this.cb_INSCR.Location = new System.Drawing.Point(339, 98);
+            this.cb_INSCR.Location = new System.Drawing.Point(372, 98);
             this.cb_INSCR.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_INSCR.Name = "cb_INSCR";
             this.cb_INSCR.Size = new System.Drawing.Size(96, 16);
@@ -364,18 +376,6 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             this.btn_ybcsbc.UseVisualStyleBackColor = true;
             this.btn_ybcsbc.Click += new System.EventHandler(this.btn_ybcsbc_Click);
             // 
-            // btn_auto
-            // 
-            this.btn_auto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btn_auto.Location = new System.Drawing.Point(472, 19);
-            this.btn_auto.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.btn_auto.Name = "btn_auto";
-            this.btn_auto.Size = new System.Drawing.Size(38, 21);
-            this.btn_auto.TabIndex = 132;
-            this.btn_auto.Text = "自动";
-            this.btn_auto.UseVisualStyleBackColor = true;
-            this.btn_auto.Click += new System.EventHandler(this.btn_auto_Click);
-            // 
             // ParticlesGridDevidePageShowConfig
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);