Browse Source

补充颗粒坐标显示

cxs 2 years ago
parent
commit
39e30dd469

+ 23 - 24
OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.Designer.cs

@@ -58,9 +58,9 @@
             // 
             this.pbBSEImage.BackColor = System.Drawing.Color.Transparent;
             this.pbBSEImage.Location = new System.Drawing.Point(0, 0);
-            this.pbBSEImage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pbBSEImage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.pbBSEImage.Name = "pbBSEImage";
-            this.pbBSEImage.Size = new System.Drawing.Size(1041, 566);
+            this.pbBSEImage.Size = new System.Drawing.Size(781, 453);
             this.pbBSEImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pbBSEImage.TabIndex = 0;
             this.pbBSEImage.TabStop = false;
@@ -86,88 +86,88 @@
             this.PointScanElementMenuItem,
             this.ExportScanInfoMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(285, 256);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(243, 236);
             this.contextMenuStrip1.Opened += new System.EventHandler(this.contextMenuStrip1_Opened);
             // 
             // SampleParaLock
             // 
             this.SampleParaLock.Name = "SampleParaLock";
-            this.SampleParaLock.Size = new System.Drawing.Size(284, 24);
+            this.SampleParaLock.Size = new System.Drawing.Size(242, 22);
             this.SampleParaLock.Text = "获取BSE图";
             this.SampleParaLock.Click += new System.EventHandler(this.AcquireBSEImage_Click);
             // 
             // ViewStripMenuItem
             // 
             this.ViewStripMenuItem.Name = "ViewStripMenuItem";
-            this.ViewStripMenuItem.Size = new System.Drawing.Size(284, 24);
+            this.ViewStripMenuItem.Size = new System.Drawing.Size(242, 22);
             this.ViewStripMenuItem.Text = "可视化设置BSE图背景灰度范围";
             this.ViewStripMenuItem.Click += new System.EventHandler(this.ViewStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(284, 24);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(242, 22);
             this.toolStripMenuItem1.Text = "可视化设置特殊颗粒灰度范围";
             this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
             // 
             // grayToolStripMenuItem
             // 
             this.grayToolStripMenuItem.Name = "grayToolStripMenuItem";
-            this.grayToolStripMenuItem.Size = new System.Drawing.Size(284, 24);
+            this.grayToolStripMenuItem.Size = new System.Drawing.Size(242, 22);
             this.grayToolStripMenuItem.Text = "显示BSE灰度曲线图";
             this.grayToolStripMenuItem.Click += new System.EventHandler(this.ShowGrayLevelImage_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(281, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(239, 6);
             // 
             // ChangeDiffImageShow
             // 
             this.ChangeDiffImageShow.Name = "ChangeDiffImageShow";
-            this.ChangeDiffImageShow.Size = new System.Drawing.Size(284, 24);
+            this.ChangeDiffImageShow.Size = new System.Drawing.Size(242, 22);
             this.ChangeDiffImageShow.Text = "切换至BSE图";
             this.ChangeDiffImageShow.Click += new System.EventHandler(this.ChangeDiffImageShow_Click);
             // 
             // ToolStripMenuItem
             // 
             this.ToolStripMenuItem.Name = "ToolStripMenuItem";
-            this.ToolStripMenuItem.Size = new System.Drawing.Size(284, 24);
+            this.ToolStripMenuItem.Size = new System.Drawing.Size(242, 22);
             this.ToolStripMenuItem.Text = "BSE去背景图";
             this.ToolStripMenuItem.Click += new System.EventHandler(this.ShowRemoveBGImage_Click);
             // 
             // AbandonGrayStripMenuItem
             // 
             this.AbandonGrayStripMenuItem.Name = "AbandonGrayStripMenuItem";
-            this.AbandonGrayStripMenuItem.Size = new System.Drawing.Size(284, 24);
+            this.AbandonGrayStripMenuItem.Size = new System.Drawing.Size(242, 22);
             this.AbandonGrayStripMenuItem.Text = "显示BSE去背景灰度曲线图";
             this.AbandonGrayStripMenuItem.Click += new System.EventHandler(this.ShowAbandonGrayLevelImage_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(281, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(239, 6);
             // 
             // MenuItemLineScam
             // 
             this.MenuItemLineScam.CheckOnClick = true;
             this.MenuItemLineScam.Enabled = false;
             this.MenuItemLineScam.Name = "MenuItemLineScam";
-            this.MenuItemLineScam.Size = new System.Drawing.Size(284, 24);
+            this.MenuItemLineScam.Size = new System.Drawing.Size(242, 22);
             this.MenuItemLineScam.Text = "线扫描曲线";
             this.MenuItemLineScam.Click += new System.EventHandler(this.ShowGrayLevelLine_Click);
             // 
             // PointScanElementMenuItem
             // 
             this.PointScanElementMenuItem.Name = "PointScanElementMenuItem";
-            this.PointScanElementMenuItem.Size = new System.Drawing.Size(284, 24);
+            this.PointScanElementMenuItem.Size = new System.Drawing.Size(242, 22);
             this.PointScanElementMenuItem.Text = "X-Ray采集";
             this.PointScanElementMenuItem.Click += new System.EventHandler(this.PointScanElementMenuItem_Click);
             // 
             // ExportScanInfoMenuItem
             // 
             this.ExportScanInfoMenuItem.Name = "ExportScanInfoMenuItem";
-            this.ExportScanInfoMenuItem.Size = new System.Drawing.Size(284, 24);
+            this.ExportScanInfoMenuItem.Size = new System.Drawing.Size(242, 22);
             this.ExportScanInfoMenuItem.Text = "输出X-Ray信息";
             this.ExportScanInfoMenuItem.Click += new System.EventHandler(this.ExportScanInfoMenuItem_Click);
             // 
@@ -186,14 +186,14 @@
             legend1.Name = "Legend1";
             this.myChart.Legends.Add(legend1);
             this.myChart.Location = new System.Drawing.Point(0, 0);
-            this.myChart.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.myChart.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.myChart.Name = "myChart";
             series1.ChartArea = "ChartArea1";
             series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
             series1.Legend = "Legend1";
             series1.Name = "Series1";
             this.myChart.Series.Add(series1);
-            this.myChart.Size = new System.Drawing.Size(1041, 566);
+            this.myChart.Size = new System.Drawing.Size(781, 453);
             this.myChart.TabIndex = 5;
             this.myChart.Text = "chart1";
             this.myChart.TextAntiAliasingQuality = System.Windows.Forms.DataVisualization.Charting.TextAntiAliasingQuality.Normal;
@@ -205,26 +205,25 @@
             // panelXray
             // 
             this.panelXray.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelXray.Location = new System.Drawing.Point(0, 316);
-            this.panelXray.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panelXray.Location = new System.Drawing.Point(0, 253);
+            this.panelXray.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.panelXray.Name = "panelXray";
-            this.panelXray.Size = new System.Drawing.Size(1041, 250);
+            this.panelXray.Size = new System.Drawing.Size(781, 200);
             this.panelXray.TabIndex = 0;
             // 
             // OTSMeasureStatusWindow
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
-            this.ClientSize = new System.Drawing.Size(1041, 566);
+            this.ClientSize = new System.Drawing.Size(781, 453);
             this.CloseButton = false;
             this.CloseButtonVisible = false;
             this.Controls.Add(this.panelXray);
-            this.Controls.Add(this.myChart);
             this.Controls.Add(this.pbBSEImage);
+            this.Controls.Add(this.myChart);
             this.DockAreas = ((OTS.WinFormsUI.Docking.DockAreas)((OTS.WinFormsUI.Docking.DockAreas.DockTop | OTS.WinFormsUI.Docking.DockAreas.Document)));
             this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OTSMeasureStatusWindow";
             this.Text = "OTSMeasureStatus";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;

+ 1 - 1
OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1387,7 +1387,7 @@ namespace OTSIncAReportGraph.Controls
             str_IncAName = m_mouseOver_dparticle.TypeName;
 
             Particle particle = resultFile.List_OTSField.Find(x => x.FieldID == m_mouseOver_dparticle.FieldId).ParticleList.Find(x => x.ParticleId == m_mouseOver_dparticle.ParticleId);
-            control_XRayTable1.SetParticleInfo("Area:"+ Math.Round(particle.Area,2)+" "+"DELONG:"+ Math.Round(particle.DELONG,2)+" "+"DFERET:"+ Math.Round(particle.DFERET,2)+" "+"DINSCR:"+ Math.Round(particle.DINSCR,2)+" "+"DMAX:"+ Math.Round(particle.DMAX,2)+"\n"+"DMEAN:"+ Math.Round(particle.DMEAN,2)+" "+"DMIN:"+ Math.Round(particle.DMIN,2)+" "+"DPERP:"+ Math.Round(particle.DPERP,2)+" "+"ORIENTATION:"+ Math.Round(particle.ORIENTATION,2)+" "+"PERIMETER:"+ Math.Round(particle.PERIMETER,2));
+            control_XRayTable1.SetParticleInfo("Area:"+ Math.Round(particle.Area,2)+" "+"DELONG:"+ Math.Round(particle.DELONG,2)+" "+"DFERET:"+ Math.Round(particle.DFERET,2)+" "+"DINSCR:"+ Math.Round(particle.DINSCR,2)+" "+"DMAX:"+ Math.Round(particle.DMAX,2)+"\n"+"DMEAN:"+ Math.Round(particle.DMEAN,2)+" "+"DMIN:"+ Math.Round(particle.DMIN,2)+" "+"DPERP:"+ Math.Round(particle.DPERP,2)+" "+"ORIENTATION:"+ Math.Round(particle.ORIENTATION,2)+" "+"PERIMETER:"+ Math.Round(particle.PERIMETER,2) + "\n" +"PosX:"+particle.PosX+" "+"PosY:"+particle.PosY);
 
             //获取数据后,需要对xraytable设置
             control_XRayTable1.Visible = true;

+ 3 - 3
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -667,10 +667,10 @@ namespace OTSIncAReportGrids
             keyValues.Add("ParticleId", "ParticleId");
             for (int i = 0; i < strs.Count(); i++)
             {
-                if (strs[i] == "FiledCoordinate")
+                if (strs[i] == "ParticleCoordinate")
                 {
-                    keyValues.Add("SEMPosX", "SEMPosX");
-                    keyValues.Add("SEMPosY", "SEMPosY");
+                    keyValues.Add("PosX", "PosX");
+                    keyValues.Add("PosY", "PosY");
                 }
                 if (strs[i] == "Area")
                 {

+ 129 - 123
OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.Designer.cs

@@ -60,6 +60,7 @@ namespace OTSIncAReprotCharts
             this.label22 = new System.Windows.Forms.Label();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.cb_ParticleCoordinate = new System.Windows.Forms.CheckBox();
             this.cB_Electrical_conductivity = new System.Windows.Forms.CheckBox();
             this.cB_Density = new System.Windows.Forms.CheckBox();
             this.cB_Hardness = new System.Windows.Forms.CheckBox();
@@ -80,7 +81,6 @@ 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();
@@ -136,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, 26);
+            this.comboBox6.Size = new System.Drawing.Size(227, 20);
             this.comboBox6.TabIndex = 1;
             // 
             // comboBox5
@@ -144,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, 26);
+            this.comboBox5.Size = new System.Drawing.Size(227, 20);
             this.comboBox5.TabIndex = 1;
             // 
             // comboBox4
@@ -152,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, 26);
+            this.comboBox4.Size = new System.Drawing.Size(227, 20);
             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, 28);
+            this.textBox9.Size = new System.Drawing.Size(227, 21);
             this.textBox9.TabIndex = 1;
             // 
             // button18
@@ -203,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(12, 12);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox3.Location = new System.Drawing.Point(8, 8);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox3.Size = new System.Drawing.Size(752, 65);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.groupBox3.Size = new System.Drawing.Size(501, 43);
             this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "粒级设置";
             // 
             // btn_PartSize
             // 
-            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.Location = new System.Drawing.Point(463, 17);
+            this.btn_PartSize.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.btn_PartSize.Name = "btn_PartSize";
-            this.btn_PartSize.Size = new System.Drawing.Size(50, 29);
+            this.btn_PartSize.Size = new System.Drawing.Size(33, 19);
             this.btn_PartSize.TabIndex = 4;
             this.btn_PartSize.Text = "...";
             this.btn_PartSize.UseVisualStyleBackColor = true;
@@ -226,45 +226,46 @@ namespace OTSIncAReprotCharts
             // tb_PartiSizeFileFolder
             // 
             this.tb_PartiSizeFileFolder.Enabled = false;
-            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.Location = new System.Drawing.Point(125, 17);
+            this.tb_PartiSizeFileFolder.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tb_PartiSizeFileFolder.Name = "tb_PartiSizeFileFolder";
-            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(502, 28);
+            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(336, 21);
             this.tb_PartiSizeFileFolder.TabIndex = 3;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(15, 31);
+            this.label4.Location = new System.Drawing.Point(10, 21);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
+            this.label4.Size = new System.Drawing.Size(41, 12);
             this.label4.TabIndex = 2;
             this.label4.Text = "文件夹";
             // 
             // tb_sjtmbwj
             // 
             this.tb_sjtmbwj.Enabled = false;
-            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.Location = new System.Drawing.Point(125, 37);
+            this.tb_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tb_sjtmbwj.Name = "tb_sjtmbwj";
-            this.tb_sjtmbwj.Size = new System.Drawing.Size(500, 28);
+            this.tb_sjtmbwj.Size = new System.Drawing.Size(335, 21);
             this.tb_sjtmbwj.TabIndex = 3;
             // 
             // tb_sjtmb
             // 
             this.tb_sjtmb.Enabled = false;
-            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.Location = new System.Drawing.Point(125, 15);
+            this.tb_sjtmb.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tb_sjtmb.Name = "tb_sjtmb";
-            this.tb_sjtmb.Size = new System.Drawing.Size(558, 28);
+            this.tb_sjtmb.Size = new System.Drawing.Size(373, 21);
             this.tb_sjtmb.TabIndex = 3;
             // 
             // btn_ybcsqx
             // 
-            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.Location = new System.Drawing.Point(445, 337);
+            this.btn_ybcsqx.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.btn_ybcsqx.Name = "btn_ybcsqx";
-            this.btn_ybcsqx.Size = new System.Drawing.Size(100, 34);
+            this.btn_ybcsqx.Size = new System.Drawing.Size(67, 23);
             this.btn_ybcsqx.TabIndex = 76;
             this.btn_ybcsqx.Text = "取  消";
             this.btn_ybcsqx.UseVisualStyleBackColor = true;
@@ -272,10 +273,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_ybcsbc
             // 
-            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.Location = new System.Drawing.Point(363, 337);
+            this.btn_ybcsbc.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.btn_ybcsbc.Name = "btn_ybcsbc";
-            this.btn_ybcsbc.Size = new System.Drawing.Size(100, 34);
+            this.btn_ybcsbc.Size = new System.Drawing.Size(67, 23);
             this.btn_ybcsbc.TabIndex = 77;
             this.btn_ybcsbc.Text = "确   定";
             this.btn_ybcsbc.UseVisualStyleBackColor = true;
@@ -283,10 +284,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_sjtmbwj
             // 
-            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.Location = new System.Drawing.Point(463, 37);
+            this.btn_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.btn_sjtmbwj.Name = "btn_sjtmbwj";
-            this.btn_sjtmbwj.Size = new System.Drawing.Size(50, 29);
+            this.btn_sjtmbwj.Size = new System.Drawing.Size(33, 19);
             this.btn_sjtmbwj.TabIndex = 4;
             this.btn_sjtmbwj.Text = "...";
             this.btn_sjtmbwj.UseVisualStyleBackColor = true;
@@ -295,18 +296,20 @@ namespace OTSIncAReprotCharts
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(15, 61);
+            this.label17.Location = new System.Drawing.Point(10, 41);
+            this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(44, 18);
+            this.label17.Size = new System.Drawing.Size(29, 12);
             this.label17.TabIndex = 2;
             this.label17.Text = "文件";
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(15, 29);
+            this.label5.Location = new System.Drawing.Point(10, 19);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
+            this.label5.Size = new System.Drawing.Size(41, 12);
             this.label5.TabIndex = 2;
             this.label5.Text = "文件夹";
             // 
@@ -317,30 +320,31 @@ 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(12, 83);
-            this.groupBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox6.Location = new System.Drawing.Point(8, 55);
+            this.groupBox6.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox6.Size = new System.Drawing.Size(752, 97);
+            this.groupBox6.Padding = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.groupBox6.Size = new System.Drawing.Size(501, 65);
             this.groupBox6.TabIndex = 1;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "三元相图模板设置";
             // 
             // tb_blyz
             // 
-            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.Location = new System.Drawing.Point(125, 15);
+            this.tb_blyz.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tb_blyz.Name = "tb_blyz";
-            this.tb_blyz.Size = new System.Drawing.Size(561, 28);
+            this.tb_blyz.Size = new System.Drawing.Size(375, 21);
             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(15, 31);
+            this.label22.Location = new System.Drawing.Point(10, 21);
+            this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(80, 18);
+            this.label22.Size = new System.Drawing.Size(53, 12);
             this.label22.TabIndex = 0;
             this.label22.Text = "比例因子";
             // 
@@ -351,7 +355,7 @@ namespace OTSIncAReprotCharts
             // 
             // groupBox2
             // 
-            this.groupBox2.Controls.Add(this.cb_FiledCoordinate);
+            this.groupBox2.Controls.Add(this.cb_ParticleCoordinate);
             this.groupBox2.Controls.Add(this.cB_Electrical_conductivity);
             this.groupBox2.Controls.Add(this.cB_Density);
             this.groupBox2.Controls.Add(this.cB_Hardness);
@@ -374,22 +378,33 @@ 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(12, 186);
-            this.groupBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox2.Location = new System.Drawing.Point(8, 124);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox2.Size = new System.Drawing.Size(755, 312);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.groupBox2.Size = new System.Drawing.Size(503, 208);
             this.groupBox2.TabIndex = 85;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
             // 
+            // cb_ParticleCoordinate
+            // 
+            this.cb_ParticleCoordinate.AutoSize = true;
+            this.cb_ParticleCoordinate.Location = new System.Drawing.Point(251, 163);
+            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);
+            this.cb_ParticleCoordinate.TabIndex = 108;
+            this.cb_ParticleCoordinate.Text = "颗粒坐标";
+            this.cb_ParticleCoordinate.UseVisualStyleBackColor = true;
+            // 
             // cB_Electrical_conductivity
             // 
             this.cB_Electrical_conductivity.AutoSize = true;
-            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.Location = new System.Drawing.Point(125, 188);
+            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(88, 22);
+            this.cB_Electrical_conductivity.Size = new System.Drawing.Size(60, 16);
             this.cB_Electrical_conductivity.TabIndex = 106;
             this.cB_Electrical_conductivity.Text = "导电性";
             this.cB_Electrical_conductivity.UseVisualStyleBackColor = true;
@@ -397,10 +412,10 @@ namespace OTSIncAReprotCharts
             // cB_Density
             // 
             this.cB_Density.AutoSize = true;
-            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.Location = new System.Drawing.Point(367, 163);
+            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(70, 22);
+            this.cB_Density.Size = new System.Drawing.Size(48, 16);
             this.cB_Density.TabIndex = 105;
             this.cB_Density.Text = "密度";
             this.cB_Density.UseVisualStyleBackColor = true;
@@ -408,10 +423,10 @@ namespace OTSIncAReprotCharts
             // cB_Hardness
             // 
             this.cB_Hardness.AutoSize = true;
-            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.Location = new System.Drawing.Point(251, 188);
+            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(70, 22);
+            this.cB_Hardness.Size = new System.Drawing.Size(48, 16);
             this.cB_Hardness.TabIndex = 104;
             this.cB_Hardness.Text = "硬度";
             this.cB_Hardness.UseVisualStyleBackColor = true;
@@ -419,10 +434,10 @@ namespace OTSIncAReprotCharts
             // cb_ELONG
             // 
             this.cb_ELONG.AutoSize = true;
-            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.Location = new System.Drawing.Point(367, 91);
+            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(124, 22);
+            this.cb_ELONG.Size = new System.Drawing.Size(84, 16);
             this.cb_ELONG.TabIndex = 103;
             this.cb_ELONG.Text = "展开长度um";
             this.cb_ELONG.UseVisualStyleBackColor = true;
@@ -430,10 +445,10 @@ namespace OTSIncAReprotCharts
             // cb_PERI
             // 
             this.cb_PERI.AutoSize = true;
-            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.Location = new System.Drawing.Point(251, 115);
+            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(88, 22);
+            this.cb_PERI.Size = new System.Drawing.Size(60, 16);
             this.cb_PERI.TabIndex = 101;
             this.cb_PERI.Text = "周长um";
             this.cb_PERI.UseVisualStyleBackColor = true;
@@ -441,10 +456,10 @@ namespace OTSIncAReprotCharts
             // cb_EquivalentCircleDiameter
             // 
             this.cb_EquivalentCircleDiameter.AutoSize = true;
-            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.Location = new System.Drawing.Point(125, 140);
+            this.cb_EquivalentCircleDiameter.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_EquivalentCircleDiameter.Name = "cb_EquivalentCircleDiameter";
-            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(142, 22);
+            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(96, 16);
             this.cb_EquivalentCircleDiameter.TabIndex = 100;
             this.cb_EquivalentCircleDiameter.Text = "等效圆直径um";
             this.cb_EquivalentCircleDiameter.UseVisualStyleBackColor = true;
@@ -452,10 +467,10 @@ namespace OTSIncAReprotCharts
             // cb_ASPECT_ELONG
             // 
             this.cb_ASPECT_ELONG.AutoSize = true;
-            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.Location = new System.Drawing.Point(367, 140);
+            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(124, 22);
+            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(84, 16);
             this.cb_ASPECT_ELONG.TabIndex = 99;
             this.cb_ASPECT_ELONG.Text = "展开长宽比";
             this.cb_ASPECT_ELONG.UseVisualStyleBackColor = true;
@@ -463,10 +478,10 @@ namespace OTSIncAReprotCharts
             // cb_Orientation
             // 
             this.cb_Orientation.AutoSize = true;
-            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.Location = new System.Drawing.Point(251, 139);
+            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(124, 22);
+            this.cb_Orientation.Size = new System.Drawing.Size(84, 16);
             this.cb_Orientation.TabIndex = 98;
             this.cb_Orientation.Text = "朝向角度°";
             this.cb_Orientation.UseVisualStyleBackColor = true;
@@ -474,10 +489,10 @@ namespace OTSIncAReprotCharts
             // cb_MEAN
             // 
             this.cb_MEAN.AutoSize = true;
-            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.Location = new System.Drawing.Point(125, 163);
+            this.cb_MEAN.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_MEAN.Name = "cb_MEAN";
-            this.cb_MEAN.Size = new System.Drawing.Size(160, 22);
+            this.cb_MEAN.Size = new System.Drawing.Size(108, 16);
             this.cb_MEAN.TabIndex = 97;
             this.cb_MEAN.Text = "内接圆平均直径";
             this.cb_MEAN.UseVisualStyleBackColor = true;
@@ -485,10 +500,10 @@ namespace OTSIncAReprotCharts
             // cb_INSCR
             // 
             this.cb_INSCR.AutoSize = true;
-            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.Location = new System.Drawing.Point(367, 115);
+            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(142, 22);
+            this.cb_INSCR.Size = new System.Drawing.Size(96, 16);
             this.cb_INSCR.TabIndex = 96;
             this.cb_INSCR.Text = "内接圆直径um";
             this.cb_INSCR.UseVisualStyleBackColor = true;
@@ -496,10 +511,10 @@ namespace OTSIncAReprotCharts
             // cb_PERP
             // 
             this.cb_PERP.AutoSize = true;
-            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.Location = new System.Drawing.Point(367, 67);
+            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(124, 22);
+            this.cb_PERP.Size = new System.Drawing.Size(84, 16);
             this.cb_PERP.TabIndex = 102;
             this.cb_PERP.Text = "正交直径um";
             this.cb_PERP.UseVisualStyleBackColor = true;
@@ -507,10 +522,10 @@ namespace OTSIncAReprotCharts
             // cb_FerretDiameter
             // 
             this.cb_FerretDiameter.AutoSize = true;
-            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.Location = new System.Drawing.Point(251, 91);
+            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(142, 22);
+            this.cb_FerretDiameter.Size = new System.Drawing.Size(96, 16);
             this.cb_FerretDiameter.TabIndex = 95;
             this.cb_FerretDiameter.Text = "费雷特直径um";
             this.cb_FerretDiameter.UseVisualStyleBackColor = true;
@@ -518,10 +533,10 @@ namespace OTSIncAReprotCharts
             // cb_DiameterRatio
             // 
             this.cb_DiameterRatio.AutoSize = true;
-            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.Location = new System.Drawing.Point(125, 91);
+            this.cb_DiameterRatio.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_DiameterRatio.Name = "cb_DiameterRatio";
-            this.cb_DiameterRatio.Size = new System.Drawing.Size(124, 22);
+            this.cb_DiameterRatio.Size = new System.Drawing.Size(84, 16);
             this.cb_DiameterRatio.TabIndex = 94;
             this.cb_DiameterRatio.Text = "长短直径比";
             this.cb_DiameterRatio.UseVisualStyleBackColor = true;
@@ -529,10 +544,10 @@ namespace OTSIncAReprotCharts
             // cb_MinDiameter
             // 
             this.cb_MinDiameter.AutoSize = true;
-            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.Location = new System.Drawing.Point(251, 67);
+            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(124, 22);
+            this.cb_MinDiameter.Size = new System.Drawing.Size(84, 16);
             this.cb_MinDiameter.TabIndex = 93;
             this.cb_MinDiameter.Text = "最短直径um";
             this.cb_MinDiameter.UseVisualStyleBackColor = true;
@@ -540,10 +555,10 @@ namespace OTSIncAReprotCharts
             // cb_MaxDiameter
             // 
             this.cb_MaxDiameter.AutoSize = true;
-            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.Location = new System.Drawing.Point(125, 115);
+            this.cb_MaxDiameter.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_MaxDiameter.Name = "cb_MaxDiameter";
-            this.cb_MaxDiameter.Size = new System.Drawing.Size(124, 22);
+            this.cb_MaxDiameter.Size = new System.Drawing.Size(84, 16);
             this.cb_MaxDiameter.TabIndex = 92;
             this.cb_MaxDiameter.Text = "最长直径um";
             this.cb_MaxDiameter.UseVisualStyleBackColor = true;
@@ -551,67 +566,58 @@ namespace OTSIncAReprotCharts
             // cb_Area
             // 
             this.cb_Area.AutoSize = true;
-            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.Location = new System.Drawing.Point(125, 67);
+            this.cb_Area.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.cb_Area.Name = "cb_Area";
-            this.cb_Area.Size = new System.Drawing.Size(97, 22);
+            this.cb_Area.Size = new System.Drawing.Size(66, 16);
             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(188, 60);
-            this.tb_xsys.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tb_xsys.Location = new System.Drawing.Point(125, 40);
+            this.tb_xsys.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tb_xsys.Name = "tb_xsys";
-            this.tb_xsys.Size = new System.Drawing.Size(502, 28);
+            this.tb_xsys.Size = new System.Drawing.Size(336, 21);
             this.tb_xsys.TabIndex = 89;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(17, 65);
+            this.label1.Location = new System.Drawing.Point(11, 43);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(80, 18);
+            this.label1.Size = new System.Drawing.Size(53, 12);
             this.label1.TabIndex = 87;
             this.label1.Text = "显示元素";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(17, 98);
+            this.label2.Location = new System.Drawing.Point(11, 65);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(80, 18);
+            this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 88;
             this.label2.Text = "显示类型";
             // 
             // btn_xsys
             // 
-            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.Location = new System.Drawing.Point(466, 39);
+            this.btn_xsys.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.btn_xsys.Name = "btn_xsys";
-            this.btn_xsys.Size = new System.Drawing.Size(50, 29);
+            this.btn_xsys.Size = new System.Drawing.Size(33, 19);
             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(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(789, 547);
+            this.ClientSize = new System.Drawing.Size(526, 365);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox3);
@@ -619,7 +625,7 @@ namespace OTSIncAReprotCharts
             this.Controls.Add(this.btn_ybcsbc);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "frmReportSysConfig";
@@ -686,6 +692,6 @@ namespace OTSIncAReprotCharts
         private CheckBox cB_Electrical_conductivity;
         private CheckBox cB_Density;
         private CheckBox cB_Hardness;
-        private CheckBox cb_FiledCoordinate;
+        private CheckBox cb_ParticleCoordinate;
     }
 }

+ 5 - 5
OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.cs

@@ -416,7 +416,7 @@ namespace OTSIncAReprotCharts
             cb_ELONG.Checked = false;
             cb_ASPECT_ELONG.Checked = false;
             cb_Orientation.Checked = false;
-            
+            cb_ParticleCoordinate.Checked = false;
             cB_Hardness.Checked = false;
             cB_Density.Checked = false;
             cB_Electrical_conductivity.Checked = false;
@@ -501,9 +501,9 @@ namespace OTSIncAReprotCharts
             }
 
             //帧图坐标
-            if (in_str.IndexOf("FiledCoordinate") > -1)
+            if (in_str.IndexOf("ParticleCoordinate") > -1)
             {
-                cb_FiledCoordinate.Checked = true;
+                cb_ParticleCoordinate.Checked = true;
             }
 
             List<ResultFile> resfileList = m_ReportApp.m_rstDataMgr.ResultFilesList;
@@ -574,9 +574,9 @@ namespace OTSIncAReprotCharts
             string str_ret = "";
 
             //帧图坐标
-            if (cb_FiledCoordinate.Checked == true)
+            if (cb_ParticleCoordinate.Checked == true)
             {
-                str_ret = str_ret + "FiledCoordinate" + ",";
+                str_ret = str_ret + "ParticleCoordinate" + ",";
             }
 
             //面积

+ 0 - 1
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -744,7 +744,6 @@
     <EmbeddedResource Include="1-UI\OTSTemplateDesigner\OTSReport_TemplateDesignerRM.resx">
       <DependentUpon>OTSReport_TemplateDesignerRM.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="ReportTemplate\GBReport.resx">
       <DependentUpon>GBReport.cs</DependentUpon>
     </EmbeddedResource>