Просмотр исходного кода

Temporary fix for the bug where image columns are lost

cxs 2 месяцев назад
Родитель
Сommit
f701d98733

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
-  <Member RegName="DefaultComputedColName" strValue="ParticleCoordinate,Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation,XRayDataCount" />
+  <Member RegName="DefaultComputedColName" strValue="ParticleImage,FieldId,ParticleId,FieldPos,ParticleCoordinate,Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation,XRayDataCount" />
   <Member RegName="ElementsColName" strValue="C,N,O,Na,Si,Br,Al,S,Ca,Ni,Fe,P,Mg,Cr,Cl,K,Ti" />
   <Member RegName="PartSizeFile" name="ljInclusionLevel" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />

+ 14 - 9
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePageShowConfig.Designer.cs

@@ -93,6 +93,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             this.groupBox2.Controls.Add(this.cb_PERP);
             this.groupBox2.Controls.Add(this.cb_MEAN);
             this.groupBox2.Controls.Add(this.cb_INSCR);
+            this.groupBox2.Enabled = false;
             this.groupBox2.Location = new System.Drawing.Point(11, 10);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.groupBox2.Name = "groupBox2";
@@ -105,7 +106,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_fieldPos
             // 
             this.cB_fieldPos.AutoSize = true;
-            this.cB_fieldPos.Location = new System.Drawing.Point(248, 173);
+            this.cB_fieldPos.Location = new System.Drawing.Point(97, 172);
             this.cB_fieldPos.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_fieldPos.Name = "cB_fieldPos";
             this.cB_fieldPos.Size = new System.Drawing.Size(72, 16);
@@ -116,8 +117,10 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_particleImage
             // 
             this.cB_particleImage.AutoSize = true;
+            this.cB_particleImage.Checked = true;
+            this.cB_particleImage.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cB_particleImage.Enabled = false;
-            this.cB_particleImage.Location = new System.Drawing.Point(97, 172);
+            this.cB_particleImage.Location = new System.Drawing.Point(97, 226);
             this.cB_particleImage.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_particleImage.Name = "cB_particleImage";
             this.cB_particleImage.Size = new System.Drawing.Size(84, 16);
@@ -128,28 +131,30 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_particleid
             // 
             this.cB_particleid.AutoSize = true;
+            this.cB_particleid.Checked = true;
+            this.cB_particleid.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cB_particleid.Enabled = false;
-            this.cB_particleid.Location = new System.Drawing.Point(248, 226);
+            this.cB_particleid.Location = new System.Drawing.Point(377, 197);
             this.cB_particleid.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_particleid.Name = "cB_particleid";
             this.cB_particleid.Size = new System.Drawing.Size(60, 16);
             this.cB_particleid.TabIndex = 134;
             this.cB_particleid.Text = "颗粒id";
             this.cB_particleid.UseVisualStyleBackColor = true;
-            this.cB_particleid.Visible = false;
             // 
             // cB_fieldid
             // 
             this.cB_fieldid.AutoSize = true;
+            this.cB_fieldid.Checked = true;
+            this.cB_fieldid.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cB_fieldid.Enabled = false;
-            this.cB_fieldid.Location = new System.Drawing.Point(97, 226);
+            this.cB_fieldid.Location = new System.Drawing.Point(248, 197);
             this.cB_fieldid.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_fieldid.Name = "cB_fieldid";
             this.cB_fieldid.Size = new System.Drawing.Size(60, 16);
             this.cB_fieldid.TabIndex = 133;
             this.cB_fieldid.Text = "帧图id";
             this.cB_fieldid.UseVisualStyleBackColor = true;
-            this.cB_fieldid.Visible = false;
             // 
             // btn_auto
             // 
@@ -220,7 +225,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_Electrical_conductivity
             // 
             this.cB_Electrical_conductivity.AutoSize = true;
-            this.cB_Electrical_conductivity.Location = new System.Drawing.Point(377, 172);
+            this.cB_Electrical_conductivity.Location = new System.Drawing.Point(248, 172);
             this.cB_Electrical_conductivity.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cB_Electrical_conductivity.Name = "cB_Electrical_conductivity";
             this.cB_Electrical_conductivity.Size = new System.Drawing.Size(60, 16);
@@ -241,7 +246,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_Density
             // 
             this.cB_Density.AutoSize = true;
-            this.cB_Density.Location = new System.Drawing.Point(248, 199);
+            this.cB_Density.Location = new System.Drawing.Point(97, 197);
             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);
@@ -260,7 +265,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_Hardness
             // 
             this.cB_Hardness.AutoSize = true;
-            this.cB_Hardness.Location = new System.Drawing.Point(97, 199);
+            this.cB_Hardness.Location = new System.Drawing.Point(377, 172);
             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);