Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -654,10 +654,13 @@ namespace OTSIncAReportGrids
             keyValues.Add("TypeName", table["str6"].ToString());
             keyValues.Add("ParticleImage", table["str5"].ToString());
             keyValues.Add("FieldID", "FieldID");
-            keyValues.Add("SEMPosX", "SEMPosX");
-            keyValues.Add("SEMPosY", "SEMPosY");
             for (int i = 0; i < strs.Count(); i++)
             {
+                if (strs[i] == "FiledCoordinate")
+                {
+                    keyValues.Add("SEMPosX", "SEMPosX");
+                    keyValues.Add("SEMPosY", "SEMPosY");
+                }
                 if (strs[i] == "Area")
                 {
                     keyValues.Add("Area", table["str21"].ToString());

OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.Designer.cs

@@ -80,6 +80,7 @@ namespace OTSIncAReprotCharts
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.btn_xsys = new System.Windows.Forms.Button();
+            this.cb_FiledCoordinate = new System.Windows.Forms.CheckBox();
             this.groupBox3.SuspendLayout();
             this.groupBox6.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -135,7 +136,7 @@ namespace OTSIncAReprotCharts
             this.comboBox6.FormattingEnabled = true;
             this.comboBox6.Location = new System.Drawing.Point(88, 128);
             this.comboBox6.Name = "comboBox6";
-            this.comboBox6.Size = new System.Drawing.Size(227, 23);
+            this.comboBox6.Size = new System.Drawing.Size(227, 26);
             this.comboBox6.TabIndex = 1;
             // 
             // comboBox5
@@ -143,7 +144,7 @@ namespace OTSIncAReprotCharts
             this.comboBox5.FormattingEnabled = true;
             this.comboBox5.Location = new System.Drawing.Point(88, 174);
             this.comboBox5.Name = "comboBox5";
-            this.comboBox5.Size = new System.Drawing.Size(227, 23);
+            this.comboBox5.Size = new System.Drawing.Size(227, 26);
             this.comboBox5.TabIndex = 1;
             // 
             // comboBox4
@@ -151,14 +152,14 @@ namespace OTSIncAReprotCharts
             this.comboBox4.FormattingEnabled = true;
             this.comboBox4.Location = new System.Drawing.Point(88, 223);
             this.comboBox4.Name = "comboBox4";
-            this.comboBox4.Size = new System.Drawing.Size(227, 23);
+            this.comboBox4.Size = new System.Drawing.Size(227, 26);
             this.comboBox4.TabIndex = 1;
             // 
             // textBox9
             // 
             this.textBox9.Location = new System.Drawing.Point(88, 81);
             this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(227, 25);
+            this.textBox9.Size = new System.Drawing.Size(227, 28);
             this.textBox9.TabIndex = 1;
             // 
             // button18
@@ -202,21 +203,21 @@ namespace OTSIncAReprotCharts
             this.groupBox3.Controls.Add(this.btn_PartSize);
             this.groupBox3.Controls.Add(this.tb_PartiSizeFileFolder);
             this.groupBox3.Controls.Add(this.label4);
-            this.groupBox3.Location = new System.Drawing.Point(11, 10);
+            this.groupBox3.Location = new System.Drawing.Point(12, 12);
             this.groupBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox3.Size = new System.Drawing.Size(668, 54);
+            this.groupBox3.Size = new System.Drawing.Size(752, 65);
             this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "粒级设置";
             // 
             // btn_PartSize
             // 
-            this.btn_PartSize.Location = new System.Drawing.Point(617, 21);
+            this.btn_PartSize.Location = new System.Drawing.Point(694, 25);
             this.btn_PartSize.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_PartSize.Name = "btn_PartSize";
-            this.btn_PartSize.Size = new System.Drawing.Size(44, 24);
+            this.btn_PartSize.Size = new System.Drawing.Size(50, 29);
             this.btn_PartSize.TabIndex = 4;
             this.btn_PartSize.Text = "...";
             this.btn_PartSize.UseVisualStyleBackColor = true;
@@ -225,45 +226,45 @@ namespace OTSIncAReprotCharts
             // tb_PartiSizeFileFolder
             // 
             this.tb_PartiSizeFileFolder.Enabled = false;
-            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(167, 21);
+            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(188, 25);
             this.tb_PartiSizeFileFolder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_PartiSizeFileFolder.Name = "tb_PartiSizeFileFolder";
-            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(447, 25);
+            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(502, 28);
             this.tb_PartiSizeFileFolder.TabIndex = 3;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(13, 26);
+            this.label4.Location = new System.Drawing.Point(15, 31);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(52, 15);
+            this.label4.Size = new System.Drawing.Size(62, 18);
             this.label4.TabIndex = 2;
             this.label4.Text = "文件夹";
             // 
             // tb_sjtmbwj
             // 
             this.tb_sjtmbwj.Enabled = false;
-            this.tb_sjtmbwj.Location = new System.Drawing.Point(167, 46);
+            this.tb_sjtmbwj.Location = new System.Drawing.Point(188, 55);
             this.tb_sjtmbwj.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_sjtmbwj.Name = "tb_sjtmbwj";
-            this.tb_sjtmbwj.Size = new System.Drawing.Size(445, 25);
+            this.tb_sjtmbwj.Size = new System.Drawing.Size(500, 28);
             this.tb_sjtmbwj.TabIndex = 3;
             // 
             // tb_sjtmb
             // 
             this.tb_sjtmb.Enabled = false;
-            this.tb_sjtmb.Location = new System.Drawing.Point(167, 18);
+            this.tb_sjtmb.Location = new System.Drawing.Point(188, 22);
             this.tb_sjtmb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_sjtmb.Name = "tb_sjtmb";
-            this.tb_sjtmb.Size = new System.Drawing.Size(496, 25);
+            this.tb_sjtmb.Size = new System.Drawing.Size(558, 28);
             this.tb_sjtmb.TabIndex = 3;
             // 
             // btn_ybcsqx
             // 
-            this.btn_ybcsqx.Location = new System.Drawing.Point(593, 422);
+            this.btn_ybcsqx.Location = new System.Drawing.Point(667, 506);
             this.btn_ybcsqx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_ybcsqx.Name = "btn_ybcsqx";
-            this.btn_ybcsqx.Size = new System.Drawing.Size(89, 28);
+            this.btn_ybcsqx.Size = new System.Drawing.Size(100, 34);
             this.btn_ybcsqx.TabIndex = 76;
             this.btn_ybcsqx.Text = "取  消";
             this.btn_ybcsqx.UseVisualStyleBackColor = true;
@@ -271,10 +272,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_ybcsbc
             // 
-            this.btn_ybcsbc.Location = new System.Drawing.Point(484, 422);
+            this.btn_ybcsbc.Location = new System.Drawing.Point(544, 506);
             this.btn_ybcsbc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_ybcsbc.Name = "btn_ybcsbc";
-            this.btn_ybcsbc.Size = new System.Drawing.Size(89, 28);
+            this.btn_ybcsbc.Size = new System.Drawing.Size(100, 34);
             this.btn_ybcsbc.TabIndex = 77;
             this.btn_ybcsbc.Text = "确   定";
             this.btn_ybcsbc.UseVisualStyleBackColor = true;
@@ -282,10 +283,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_sjtmbwj
             // 
-            this.btn_sjtmbwj.Location = new System.Drawing.Point(617, 46);
+            this.btn_sjtmbwj.Location = new System.Drawing.Point(694, 55);
             this.btn_sjtmbwj.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_sjtmbwj.Name = "btn_sjtmbwj";
-            this.btn_sjtmbwj.Size = new System.Drawing.Size(44, 24);
+            this.btn_sjtmbwj.Size = new System.Drawing.Size(50, 29);
             this.btn_sjtmbwj.TabIndex = 4;
             this.btn_sjtmbwj.Text = "...";
             this.btn_sjtmbwj.UseVisualStyleBackColor = true;
@@ -294,18 +295,18 @@ namespace OTSIncAReprotCharts
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(13, 51);
+            this.label17.Location = new System.Drawing.Point(15, 61);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(37, 15);
+            this.label17.Size = new System.Drawing.Size(44, 18);
             this.label17.TabIndex = 2;
             this.label17.Text = "文件";
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(13, 24);
+            this.label5.Location = new System.Drawing.Point(15, 29);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(52, 15);
+            this.label5.Size = new System.Drawing.Size(62, 18);
             this.label5.TabIndex = 2;
             this.label5.Text = "文件夹";
             // 
@@ -316,30 +317,30 @@ namespace OTSIncAReprotCharts
             this.groupBox6.Controls.Add(this.tb_sjtmbwj);
             this.groupBox6.Controls.Add(this.btn_sjtmbwj);
             this.groupBox6.Controls.Add(this.label17);
-            this.groupBox6.Location = new System.Drawing.Point(11, 69);
+            this.groupBox6.Location = new System.Drawing.Point(12, 83);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox6.Size = new System.Drawing.Size(668, 81);
+            this.groupBox6.Size = new System.Drawing.Size(752, 97);
             this.groupBox6.TabIndex = 1;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "三元相图模板设置";
             // 
             // tb_blyz
             // 
-            this.tb_blyz.Location = new System.Drawing.Point(167, 18);
+            this.tb_blyz.Location = new System.Drawing.Point(188, 22);
             this.tb_blyz.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_blyz.Name = "tb_blyz";
-            this.tb_blyz.Size = new System.Drawing.Size(499, 25);
+            this.tb_blyz.Size = new System.Drawing.Size(561, 28);
             this.tb_blyz.TabIndex = 1;
             this.tb_blyz.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_blyz_KeyPress);
             // 
             // label22
             // 
             this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(13, 26);
+            this.label22.Location = new System.Drawing.Point(15, 31);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(67, 15);
+            this.label22.Size = new System.Drawing.Size(80, 18);
             this.label22.TabIndex = 0;
             this.label22.Text = "比例因子";
             // 
@@ -350,6 +351,7 @@ namespace OTSIncAReprotCharts
             // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.cb_FiledCoordinate);
             this.groupBox2.Controls.Add(this.cB_Electrical_conductivity);
             this.groupBox2.Controls.Add(this.cB_Density);
             this.groupBox2.Controls.Add(this.cB_Hardness);
@@ -372,11 +374,11 @@ namespace OTSIncAReprotCharts
             this.groupBox2.Controls.Add(this.btn_xsys);
             this.groupBox2.Controls.Add(this.tb_blyz);
             this.groupBox2.Controls.Add(this.label22);
-            this.groupBox2.Location = new System.Drawing.Point(11, 155);
+            this.groupBox2.Location = new System.Drawing.Point(12, 186);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox2.Size = new System.Drawing.Size(671, 260);
+            this.groupBox2.Size = new System.Drawing.Size(755, 312);
             this.groupBox2.TabIndex = 85;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
@@ -384,10 +386,10 @@ namespace OTSIncAReprotCharts
             // cB_Electrical_conductivity
             // 
             this.cB_Electrical_conductivity.AutoSize = true;
-            this.cB_Electrical_conductivity.Location = new System.Drawing.Point(166, 235);
+            this.cB_Electrical_conductivity.Location = new System.Drawing.Point(187, 282);
             this.cB_Electrical_conductivity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cB_Electrical_conductivity.Name = "cB_Electrical_conductivity";
-            this.cB_Electrical_conductivity.Size = new System.Drawing.Size(74, 19);
+            this.cB_Electrical_conductivity.Size = new System.Drawing.Size(88, 22);
             this.cB_Electrical_conductivity.TabIndex = 106;
             this.cB_Electrical_conductivity.Text = "导电性";
             this.cB_Electrical_conductivity.UseVisualStyleBackColor = true;
@@ -395,10 +397,10 @@ namespace OTSIncAReprotCharts
             // cB_Density
             // 
             this.cB_Density.AutoSize = true;
-            this.cB_Density.Location = new System.Drawing.Point(489, 204);
+            this.cB_Density.Location = new System.Drawing.Point(550, 245);
             this.cB_Density.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cB_Density.Name = "cB_Density";
-            this.cB_Density.Size = new System.Drawing.Size(59, 19);
+            this.cB_Density.Size = new System.Drawing.Size(70, 22);
             this.cB_Density.TabIndex = 105;
             this.cB_Density.Text = "密度";
             this.cB_Density.UseVisualStyleBackColor = true;
@@ -406,10 +408,10 @@ namespace OTSIncAReprotCharts
             // cB_Hardness
             // 
             this.cB_Hardness.AutoSize = true;
-            this.cB_Hardness.Location = new System.Drawing.Point(335, 204);
+            this.cB_Hardness.Location = new System.Drawing.Point(377, 282);
             this.cB_Hardness.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cB_Hardness.Name = "cB_Hardness";
-            this.cB_Hardness.Size = new System.Drawing.Size(59, 19);
+            this.cB_Hardness.Size = new System.Drawing.Size(70, 22);
             this.cB_Hardness.TabIndex = 104;
             this.cB_Hardness.Text = "硬度";
             this.cB_Hardness.UseVisualStyleBackColor = true;
@@ -417,10 +419,10 @@ namespace OTSIncAReprotCharts
             // cb_ELONG
             // 
             this.cb_ELONG.AutoSize = true;
-            this.cb_ELONG.Location = new System.Drawing.Point(489, 114);
+            this.cb_ELONG.Location = new System.Drawing.Point(550, 137);
             this.cb_ELONG.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_ELONG.Name = "cb_ELONG";
-            this.cb_ELONG.Size = new System.Drawing.Size(105, 19);
+            this.cb_ELONG.Size = new System.Drawing.Size(124, 22);
             this.cb_ELONG.TabIndex = 103;
             this.cb_ELONG.Text = "展开长度um";
             this.cb_ELONG.UseVisualStyleBackColor = true;
@@ -428,10 +430,10 @@ namespace OTSIncAReprotCharts
             // cb_PERI
             // 
             this.cb_PERI.AutoSize = true;
-            this.cb_PERI.Location = new System.Drawing.Point(335, 144);
+            this.cb_PERI.Location = new System.Drawing.Point(377, 173);
             this.cb_PERI.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_PERI.Name = "cb_PERI";
-            this.cb_PERI.Size = new System.Drawing.Size(75, 19);
+            this.cb_PERI.Size = new System.Drawing.Size(88, 22);
             this.cb_PERI.TabIndex = 101;
             this.cb_PERI.Text = "周长um";
             this.cb_PERI.UseVisualStyleBackColor = true;
@@ -439,10 +441,10 @@ namespace OTSIncAReprotCharts
             // cb_EquivalentCircleDiameter
             // 
             this.cb_EquivalentCircleDiameter.AutoSize = true;
-            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(166, 175);
+            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(187, 210);
             this.cb_EquivalentCircleDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_EquivalentCircleDiameter.Name = "cb_EquivalentCircleDiameter";
-            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(120, 19);
+            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(142, 22);
             this.cb_EquivalentCircleDiameter.TabIndex = 100;
             this.cb_EquivalentCircleDiameter.Text = "等效圆直径um";
             this.cb_EquivalentCircleDiameter.UseVisualStyleBackColor = true;
@@ -450,10 +452,10 @@ namespace OTSIncAReprotCharts
             // cb_ASPECT_ELONG
             // 
             this.cb_ASPECT_ELONG.AutoSize = true;
-            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(489, 175);
+            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(550, 210);
             this.cb_ASPECT_ELONG.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_ASPECT_ELONG.Name = "cb_ASPECT_ELONG";
-            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(104, 19);
+            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(124, 22);
             this.cb_ASPECT_ELONG.TabIndex = 99;
             this.cb_ASPECT_ELONG.Text = "展开长宽比";
             this.cb_ASPECT_ELONG.UseVisualStyleBackColor = true;
@@ -461,10 +463,10 @@ namespace OTSIncAReprotCharts
             // cb_Orientation
             // 
             this.cb_Orientation.AutoSize = true;
-            this.cb_Orientation.Location = new System.Drawing.Point(335, 173);
+            this.cb_Orientation.Location = new System.Drawing.Point(377, 208);
             this.cb_Orientation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_Orientation.Name = "cb_Orientation";
-            this.cb_Orientation.Size = new System.Drawing.Size(104, 19);
+            this.cb_Orientation.Size = new System.Drawing.Size(124, 22);
             this.cb_Orientation.TabIndex = 98;
             this.cb_Orientation.Text = "朝向角度°";
             this.cb_Orientation.UseVisualStyleBackColor = true;
@@ -472,10 +474,10 @@ namespace OTSIncAReprotCharts
             // cb_MEAN
             // 
             this.cb_MEAN.AutoSize = true;
-            this.cb_MEAN.Location = new System.Drawing.Point(166, 204);
+            this.cb_MEAN.Location = new System.Drawing.Point(187, 245);
             this.cb_MEAN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_MEAN.Name = "cb_MEAN";
-            this.cb_MEAN.Size = new System.Drawing.Size(134, 19);
+            this.cb_MEAN.Size = new System.Drawing.Size(160, 22);
             this.cb_MEAN.TabIndex = 97;
             this.cb_MEAN.Text = "内接圆平均直径";
             this.cb_MEAN.UseVisualStyleBackColor = true;
@@ -483,10 +485,10 @@ namespace OTSIncAReprotCharts
             // cb_INSCR
             // 
             this.cb_INSCR.AutoSize = true;
-            this.cb_INSCR.Location = new System.Drawing.Point(489, 144);
+            this.cb_INSCR.Location = new System.Drawing.Point(550, 173);
             this.cb_INSCR.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_INSCR.Name = "cb_INSCR";
-            this.cb_INSCR.Size = new System.Drawing.Size(120, 19);
+            this.cb_INSCR.Size = new System.Drawing.Size(142, 22);
             this.cb_INSCR.TabIndex = 96;
             this.cb_INSCR.Text = "内接圆直径um";
             this.cb_INSCR.UseVisualStyleBackColor = true;
@@ -494,10 +496,10 @@ namespace OTSIncAReprotCharts
             // cb_PERP
             // 
             this.cb_PERP.AutoSize = true;
-            this.cb_PERP.Location = new System.Drawing.Point(489, 84);
+            this.cb_PERP.Location = new System.Drawing.Point(550, 101);
             this.cb_PERP.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_PERP.Name = "cb_PERP";
-            this.cb_PERP.Size = new System.Drawing.Size(105, 19);
+            this.cb_PERP.Size = new System.Drawing.Size(124, 22);
             this.cb_PERP.TabIndex = 102;
             this.cb_PERP.Text = "正交直径um";
             this.cb_PERP.UseVisualStyleBackColor = true;
@@ -505,10 +507,10 @@ namespace OTSIncAReprotCharts
             // cb_FerretDiameter
             // 
             this.cb_FerretDiameter.AutoSize = true;
-            this.cb_FerretDiameter.Location = new System.Drawing.Point(335, 114);
+            this.cb_FerretDiameter.Location = new System.Drawing.Point(377, 137);
             this.cb_FerretDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_FerretDiameter.Name = "cb_FerretDiameter";
-            this.cb_FerretDiameter.Size = new System.Drawing.Size(120, 19);
+            this.cb_FerretDiameter.Size = new System.Drawing.Size(142, 22);
             this.cb_FerretDiameter.TabIndex = 95;
             this.cb_FerretDiameter.Text = "费雷特直径um";
             this.cb_FerretDiameter.UseVisualStyleBackColor = true;
@@ -516,10 +518,10 @@ namespace OTSIncAReprotCharts
             // cb_DiameterRatio
             // 
             this.cb_DiameterRatio.AutoSize = true;
-            this.cb_DiameterRatio.Location = new System.Drawing.Point(166, 113);
+            this.cb_DiameterRatio.Location = new System.Drawing.Point(187, 136);
             this.cb_DiameterRatio.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_DiameterRatio.Name = "cb_DiameterRatio";
-            this.cb_DiameterRatio.Size = new System.Drawing.Size(104, 19);
+            this.cb_DiameterRatio.Size = new System.Drawing.Size(124, 22);
             this.cb_DiameterRatio.TabIndex = 94;
             this.cb_DiameterRatio.Text = "长短直径比";
             this.cb_DiameterRatio.UseVisualStyleBackColor = true;
@@ -527,10 +529,10 @@ namespace OTSIncAReprotCharts
             // cb_MinDiameter
             // 
             this.cb_MinDiameter.AutoSize = true;
-            this.cb_MinDiameter.Location = new System.Drawing.Point(335, 84);
+            this.cb_MinDiameter.Location = new System.Drawing.Point(377, 101);
             this.cb_MinDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_MinDiameter.Name = "cb_MinDiameter";
-            this.cb_MinDiameter.Size = new System.Drawing.Size(105, 19);
+            this.cb_MinDiameter.Size = new System.Drawing.Size(124, 22);
             this.cb_MinDiameter.TabIndex = 93;
             this.cb_MinDiameter.Text = "最短直径um";
             this.cb_MinDiameter.UseVisualStyleBackColor = true;
@@ -538,10 +540,10 @@ namespace OTSIncAReprotCharts
             // cb_MaxDiameter
             // 
             this.cb_MaxDiameter.AutoSize = true;
-            this.cb_MaxDiameter.Location = new System.Drawing.Point(166, 144);
+            this.cb_MaxDiameter.Location = new System.Drawing.Point(187, 173);
             this.cb_MaxDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_MaxDiameter.Name = "cb_MaxDiameter";
-            this.cb_MaxDiameter.Size = new System.Drawing.Size(105, 19);
+            this.cb_MaxDiameter.Size = new System.Drawing.Size(124, 22);
             this.cb_MaxDiameter.TabIndex = 92;
             this.cb_MaxDiameter.Text = "最长直径um";
             this.cb_MaxDiameter.UseVisualStyleBackColor = true;
@@ -549,56 +551,67 @@ namespace OTSIncAReprotCharts
             // cb_Area
             // 
             this.cb_Area.AutoSize = true;
-            this.cb_Area.Location = new System.Drawing.Point(166, 84);
+            this.cb_Area.Location = new System.Drawing.Point(187, 101);
             this.cb_Area.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_Area.Name = "cb_Area";
-            this.cb_Area.Size = new System.Drawing.Size(83, 19);
+            this.cb_Area.Size = new System.Drawing.Size(97, 22);
             this.cb_Area.TabIndex = 91;
             this.cb_Area.Text = "面积um²";
             this.cb_Area.UseVisualStyleBackColor = true;
             // 
             // tb_xsys
             // 
-            this.tb_xsys.Location = new System.Drawing.Point(167, 50);
+            this.tb_xsys.Location = new System.Drawing.Point(188, 60);
             this.tb_xsys.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_xsys.Name = "tb_xsys";
-            this.tb_xsys.Size = new System.Drawing.Size(447, 25);
+            this.tb_xsys.Size = new System.Drawing.Size(502, 28);
             this.tb_xsys.TabIndex = 89;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(15, 54);
+            this.label1.Location = new System.Drawing.Point(17, 65);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(67, 15);
+            this.label1.Size = new System.Drawing.Size(80, 18);
             this.label1.TabIndex = 87;
             this.label1.Text = "显示元素";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(15, 82);
+            this.label2.Location = new System.Drawing.Point(17, 98);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(67, 15);
+            this.label2.Size = new System.Drawing.Size(80, 18);
             this.label2.TabIndex = 88;
             this.label2.Text = "显示类型";
             // 
             // btn_xsys
             // 
-            this.btn_xsys.Location = new System.Drawing.Point(621, 48);
+            this.btn_xsys.Location = new System.Drawing.Point(699, 58);
             this.btn_xsys.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_xsys.Name = "btn_xsys";
-            this.btn_xsys.Size = new System.Drawing.Size(44, 24);
+            this.btn_xsys.Size = new System.Drawing.Size(50, 29);
             this.btn_xsys.TabIndex = 90;
             this.btn_xsys.Text = "...";
             this.btn_xsys.UseVisualStyleBackColor = true;
             this.btn_xsys.Click += new System.EventHandler(this.btn_xsys_Click);
             // 
+            // cb_FiledCoordinate
+            // 
+            this.cb_FiledCoordinate.AutoSize = true;
+            this.cb_FiledCoordinate.Location = new System.Drawing.Point(377, 245);
+            this.cb_FiledCoordinate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cb_FiledCoordinate.Name = "cb_FiledCoordinate";
+            this.cb_FiledCoordinate.Size = new System.Drawing.Size(106, 22);
+            this.cb_FiledCoordinate.TabIndex = 108;
+            this.cb_FiledCoordinate.Text = "帧图坐标";
+            this.cb_FiledCoordinate.UseVisualStyleBackColor = true;
+            // 
             // frmReportSysConfig
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(701, 456);
+            this.ClientSize = new System.Drawing.Size(789, 547);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox3);
@@ -673,5 +686,6 @@ namespace OTSIncAReprotCharts
         private CheckBox cB_Electrical_conductivity;
         private CheckBox cB_Density;
         private CheckBox cB_Hardness;
+        private CheckBox cb_FiledCoordinate;
     }
 }

OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.cs

@@ -416,6 +416,7 @@ namespace OTSIncAReprotCharts
             cb_ELONG.Checked = false;
             cb_ASPECT_ELONG.Checked = false;
             cb_Orientation.Checked = false;
+            
             cB_Hardness.Checked = false;
             cB_Density.Checked = false;
             cB_Electrical_conductivity.Checked = false;
@@ -499,6 +500,12 @@ namespace OTSIncAReprotCharts
                 cb_Orientation.Checked = true;
             }
 
+            //帧图坐标
+            if (in_str.IndexOf("FiledCoordinate") > -1)
+            {
+                cb_FiledCoordinate.Checked = true;
+            }
+
             List<ResultFile> resfileList = m_ReportApp.m_rstDataMgr.ResultFilesList;
             if (resfileList.Count > 0)
             {
@@ -566,6 +573,12 @@ namespace OTSIncAReprotCharts
         {
             string str_ret = "";
 
+            //帧图坐标
+            if (cb_FiledCoordinate.Checked == true)
+            {
+                str_ret = str_ret + "FiledCoordinate" + ",";
+            }
+
             //面积
             if (cb_Area.Checked == true)
             {
@@ -644,6 +657,7 @@ namespace OTSIncAReprotCharts
             {
                 str_ret = str_ret + "Orientation" + ",";
             }
+
             //导电性
             if (cB_Electrical_conductivity.Checked == true)
             {