shift+右键 显示导出带背景拼接图

国标导出清洁度隐藏
颗粒列表显示界面设置微调

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

@@ -1168,9 +1168,19 @@ namespace OTSIncAReportGraph.Controls
                 if (m_RptConfigFile.Systype == OTS_SysType_ID.CleannessA)
                 {
                     显示国标信息ToolStripMenuItem.Visible = false;
+                    国标图导出ToolStripMenuItem.Visible = false;
                 }
 
-
+                if(Control.ModifierKeys==Keys.Shift)
+                {
+                    toolStripMenuItem_backgroundcombin.Visible = true;
+                    toolStripMenuItem_backgroundcombinClass.Visible = true;
+                }
+                else
+                {
+                    toolStripMenuItem_backgroundcombin.Visible = false;
+                    toolStripMenuItem_backgroundcombinClass.Visible = false;
+                }
 
             }
 
@@ -2269,38 +2279,46 @@ namespace OTSIncAReportGraph.Controls
         private void toolStripMenuItem_combinClass_Click(object sender, EventArgs e)
         {
             SaveFileDialog sfd = new SaveFileDialog();
-            //|ALL Files(*.*)|*.*
-            //BMP Files(*.bmp)| *.bmp |
+
             sfd.Filter = "png Files(*.png)| *.png |BMP Files(*.bmp)| *.bmp |JPG Files(*.jpg)|*.jpg;*.jpeg";
             if (sfd.ShowDialog() == DialogResult.OK)
             {
+                this.Cursor = System.Windows.Forms.Cursors.WaitCursor;
                 OutPIC outpic = new OutPIC();
                 outpic.m_list_allDfield = m_list_allDfield;
                 outpic.resultFile = resultFile;
                 outpic.sfd = sfd;
-                outpic.type = (int)Outpic_enum.Render_Combin;
-                Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic2));
+                outpic.type = (int)Outpic_enum.Render_pic;
+                outpic.m_ReportApp = m_ReportApp;
+                Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic));
+
                 bThread.IsBackground = true;
+
                 bThread.Start();
+
             }
         }
 
         private void toolStripMenuItem_combin_Click(object sender, EventArgs e)
         {
             SaveFileDialog sfd = new SaveFileDialog();
-            //|ALL Files(*.*)|*.*
-            //BMP Files(*.bmp)| *.bmp |
+
             sfd.Filter = "png Files(*.png)| *.png |BMP Files(*.bmp)| *.bmp |JPG Files(*.jpg)|*.jpg;*.jpeg";
             if (sfd.ShowDialog() == DialogResult.OK)
             {
+                this.Cursor = System.Windows.Forms.Cursors.WaitCursor;
                 OutPIC outpic = new OutPIC();
                 outpic.m_list_allDfield = m_list_allDfield;
                 outpic.resultFile = resultFile;
                 outpic.sfd = sfd;
-                outpic.type = (int)Outpic_enum.Combin;
-                Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic2));
+                outpic.type = (int)Outpic_enum.pic;
+                outpic.m_ReportApp = m_ReportApp;
+                Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic));
+
                 bThread.IsBackground = true;
+
                 bThread.Start();
+
             }
         }
 

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

@@ -48,8 +48,8 @@
             this.aSTMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.显示所有帧ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.清除ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem_combin = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem_combinClass = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem_backgroundcombin = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem_backgroundcombinClass = new System.Windows.Forms.ToolStripMenuItem();
             this.国标图导出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.方法一ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.方法二ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -69,8 +69,8 @@
             this.ToolStripMenuItem_ParticleSplicing,
             this.toolStripMenuItem_copyimage,
             this.显示国标信息ToolStripMenuItem,
-            this.toolStripMenuItem_combin,
-            this.toolStripMenuItem_combinClass,
+            this.toolStripMenuItem_backgroundcombin,
+            this.toolStripMenuItem_backgroundcombinClass,
             this.国标图导出ToolStripMenuItem});
             this.CMenuStrip.Name = "contextMenuStrip1";
             this.CMenuStrip.Size = new System.Drawing.Size(185, 158);
@@ -107,7 +107,7 @@
             this.查询DS类颗粒ToolStripMenuItem,
             this.显示当前帧国标分类ToolStripMenuItem});
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(112, 22);
             this.toolStripMenuItem2.Text = "方法一";
             // 
             // toolStripMenuItem1
@@ -180,7 +180,7 @@
             this.toolStripMenuItem4,
             this.toolStripMenuItem10});
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(112, 22);
             this.toolStripMenuItem3.Text = "方法二";
             // 
             // toolStripMenuItem4
@@ -204,7 +204,7 @@
             this.aSTMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.显示所有帧ToolStripMenuItem});
             this.aSTMToolStripMenuItem.Name = "aSTMToolStripMenuItem";
-            this.aSTMToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.aSTMToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
             this.aSTMToolStripMenuItem.Tag = "";
             this.aSTMToolStripMenuItem.Text = "ASTM";
             // 
@@ -219,25 +219,25 @@
             // 清除ToolStripMenuItem
             // 
             this.清除ToolStripMenuItem.Name = "清除ToolStripMenuItem";
-            this.清除ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.清除ToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
             this.清除ToolStripMenuItem.Text = "清除";
             this.清除ToolStripMenuItem.Click += new System.EventHandler(this.清除ToolStripMenuItem_Click);
             // 
-            // toolStripMenuItem_combin
+            // toolStripMenuItem_backgroundcombin
             // 
-            this.toolStripMenuItem_combin.Name = "toolStripMenuItem_combin";
-            this.toolStripMenuItem_combin.Size = new System.Drawing.Size(184, 22);
-            this.toolStripMenuItem_combin.Text = "导出原图融合图";
-            this.toolStripMenuItem_combin.Visible = false;
-            this.toolStripMenuItem_combin.Click += new System.EventHandler(this.toolStripMenuItem_combin_Click);
+            this.toolStripMenuItem_backgroundcombin.Name = "toolStripMenuItem_backgroundcombin";
+            this.toolStripMenuItem_backgroundcombin.Size = new System.Drawing.Size(184, 22);
+            this.toolStripMenuItem_backgroundcombin.Text = "导出原图融合图";
+            this.toolStripMenuItem_backgroundcombin.Visible = false;
+            this.toolStripMenuItem_backgroundcombin.Click += new System.EventHandler(this.toolStripMenuItem_combin_Click);
             // 
-            // toolStripMenuItem_combinClass
+            // toolStripMenuItem_backgroundcombinClass
             // 
-            this.toolStripMenuItem_combinClass.Name = "toolStripMenuItem_combinClass";
-            this.toolStripMenuItem_combinClass.Size = new System.Drawing.Size(184, 22);
-            this.toolStripMenuItem_combinClass.Text = "导出原图融合分类图";
-            this.toolStripMenuItem_combinClass.Visible = false;
-            this.toolStripMenuItem_combinClass.Click += new System.EventHandler(this.toolStripMenuItem_combinClass_Click);
+            this.toolStripMenuItem_backgroundcombinClass.Name = "toolStripMenuItem_backgroundcombinClass";
+            this.toolStripMenuItem_backgroundcombinClass.Size = new System.Drawing.Size(184, 22);
+            this.toolStripMenuItem_backgroundcombinClass.Text = "导出原图融合分类图";
+            this.toolStripMenuItem_backgroundcombinClass.Visible = false;
+            this.toolStripMenuItem_backgroundcombinClass.Click += new System.EventHandler(this.toolStripMenuItem_combinClass_Click);
             // 
             // 国标图导出ToolStripMenuItem
             // 
@@ -335,8 +335,8 @@
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_DeleteParticles;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_Segmentation;
         protected System.Windows.Forms.ContextMenuStrip CMenuStrip;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_combinClass;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_combin;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_backgroundcombinClass;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_backgroundcombin;
         private System.Windows.Forms.ToolStripMenuItem 显示当前帧国标分类ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem aToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem bToolStripMenuItem;

OTSIncAReportApp/1-UI/Control_Graph/Controls/OutPIC.cs

@@ -293,7 +293,7 @@ namespace OTSIncAReportApp._3_ServiceCenter
            
 
             //导出原图（渲染图）在下方增加每种颜色的标注和面积占比
-            if (type == (int)Outpic_enum.Render_pic && type == (int)Outpic_enum.GBOne)
+            if (type == (int)Outpic_enum.Render_pic || type == (int)Outpic_enum.GBOne)
             {
                 DataTable particleData = ParticleDataIntegration(ParticleData, ParticleClassData);
                 int NumberOfRows = getPICstringLong(particleData, list_pano);

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.label_help = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.cb_ParticleCoordinate = new System.Windows.Forms.CheckBox();
             this.btn_xsys = new System.Windows.Forms.Button();
@@ -53,7 +54,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.label_help = new System.Windows.Forms.Label();
             this.groupBox2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -90,20 +90,30 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
             // 
+            // label_help
+            // 
+            this.label_help.AutoSize = true;
+            this.label_help.Location = new System.Drawing.Point(502, 1);
+            this.label_help.Name = "label_help";
+            this.label_help.Size = new System.Drawing.Size(17, 12);
+            this.label_help.TabIndex = 130;
+            this.label_help.Text = "？";
+            this.label_help.MouseHover += new System.EventHandler(this.label_help_MouseHover);
+            // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(14, 15);
+            this.label1.Location = new System.Drawing.Point(14, 22);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.Size = new System.Drawing.Size(65, 12);
             this.label1.TabIndex = 109;
-            this.label1.Text = "显示元素";
+            this.label1.Text = "显示元素：";
             // 
             // cb_ParticleCoordinate
             // 
             this.cb_ParticleCoordinate.AutoSize = true;
-            this.cb_ParticleCoordinate.Location = new System.Drawing.Point(254, 135);
+            this.cb_ParticleCoordinate.Location = new System.Drawing.Point(254, 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);
@@ -113,7 +123,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // 
             // btn_xsys
             // 
-            this.btn_xsys.Location = new System.Drawing.Point(469, 11);
+            this.btn_xsys.Location = new System.Drawing.Point(469, 18);
             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(33, 19);
@@ -125,7 +135,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(128, 160);
+            this.cB_Electrical_conductivity.Location = new System.Drawing.Point(128, 169);
             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);
@@ -136,17 +146,17 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(14, 37);
+            this.label2.Location = new System.Drawing.Point(14, 50);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.Size = new System.Drawing.Size(65, 12);
             this.label2.TabIndex = 110;
-            this.label2.Text = "显示类型";
+            this.label2.Text = "显示类型：";
             // 
             // cB_Density
             // 
             this.cB_Density.AutoSize = true;
-            this.cB_Density.Location = new System.Drawing.Point(370, 135);
+            this.cB_Density.Location = new System.Drawing.Point(370, 146);
             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);
@@ -156,7 +166,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // 
             // tb_xsys
             // 
-            this.tb_xsys.Location = new System.Drawing.Point(128, 12);
+            this.tb_xsys.Location = new System.Drawing.Point(128, 19);
             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(336, 21);
@@ -165,7 +175,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cB_Hardness
             // 
             this.cB_Hardness.AutoSize = true;
-            this.cB_Hardness.Location = new System.Drawing.Point(254, 160);
+            this.cB_Hardness.Location = new System.Drawing.Point(254, 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);
@@ -176,7 +186,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_Area
             // 
             this.cb_Area.AutoSize = true;
-            this.cb_Area.Location = new System.Drawing.Point(128, 39);
+            this.cb_Area.Location = new System.Drawing.Point(128, 50);
             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(66, 16);
@@ -187,7 +197,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_ELONG
             // 
             this.cb_ELONG.AutoSize = true;
-            this.cb_ELONG.Location = new System.Drawing.Point(370, 63);
+            this.cb_ELONG.Location = new System.Drawing.Point(370, 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);
@@ -198,7 +208,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_MaxDiameter
             // 
             this.cb_MaxDiameter.AutoSize = true;
-            this.cb_MaxDiameter.Location = new System.Drawing.Point(128, 87);
+            this.cb_MaxDiameter.Location = new System.Drawing.Point(128, 98);
             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(84, 16);
@@ -209,7 +219,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_PERI
             // 
             this.cb_PERI.AutoSize = true;
-            this.cb_PERI.Location = new System.Drawing.Point(254, 87);
+            this.cb_PERI.Location = new System.Drawing.Point(254, 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);
@@ -220,7 +230,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_MinDiameter
             // 
             this.cb_MinDiameter.AutoSize = true;
-            this.cb_MinDiameter.Location = new System.Drawing.Point(254, 39);
+            this.cb_MinDiameter.Location = new System.Drawing.Point(254, 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);
@@ -231,7 +241,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_EquivalentCircleDiameter
             // 
             this.cb_EquivalentCircleDiameter.AutoSize = true;
-            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(128, 112);
+            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(128, 123);
             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(96, 16);
@@ -242,7 +252,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_DiameterRatio
             // 
             this.cb_DiameterRatio.AutoSize = true;
-            this.cb_DiameterRatio.Location = new System.Drawing.Point(128, 63);
+            this.cb_DiameterRatio.Location = new System.Drawing.Point(128, 74);
             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(84, 16);
@@ -253,7 +263,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(370, 112);
+            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(370, 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);
@@ -264,7 +274,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_FerretDiameter
             // 
             this.cb_FerretDiameter.AutoSize = true;
-            this.cb_FerretDiameter.Location = new System.Drawing.Point(254, 63);
+            this.cb_FerretDiameter.Location = new System.Drawing.Point(254, 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);
@@ -275,7 +285,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_Orientation
             // 
             this.cb_Orientation.AutoSize = true;
-            this.cb_Orientation.Location = new System.Drawing.Point(254, 111);
+            this.cb_Orientation.Location = new System.Drawing.Point(254, 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);
@@ -286,7 +296,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_PERP
             // 
             this.cb_PERP.AutoSize = true;
-            this.cb_PERP.Location = new System.Drawing.Point(370, 39);
+            this.cb_PERP.Location = new System.Drawing.Point(370, 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);
@@ -297,7 +307,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_MEAN
             // 
             this.cb_MEAN.AutoSize = true;
-            this.cb_MEAN.Location = new System.Drawing.Point(128, 135);
+            this.cb_MEAN.Location = new System.Drawing.Point(128, 146);
             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(108, 16);
@@ -308,7 +318,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             // cb_INSCR
             // 
             this.cb_INSCR.AutoSize = true;
-            this.cb_INSCR.Location = new System.Drawing.Point(370, 87);
+            this.cb_INSCR.Location = new System.Drawing.Point(370, 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);
@@ -338,16 +348,6 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             this.btn_ybcsbc.UseVisualStyleBackColor = true;
             this.btn_ybcsbc.Click += new System.EventHandler(this.btn_ybcsbc_Click);
             // 
-            // label_help
-            // 
-            this.label_help.AutoSize = true;
-            this.label_help.Location = new System.Drawing.Point(72, 37);
-            this.label_help.Name = "label_help";
-            this.label_help.Size = new System.Drawing.Size(17, 12);
-            this.label_help.TabIndex = 130;
-            this.label_help.Text = "？";
-            this.label_help.MouseHover += new System.EventHandler(this.label_help_MouseHover);
-            // 
             // ParticlesGridDevidePageShowConfig
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -362,7 +362,7 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             this.Name = "ParticlesGridDevidePageShowConfig";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "ParticlesGridDevidePageShowConfig";
+            this.Text = "Interfacedisplayconfiguration";
             this.Load += new System.EventHandler(this.ParticlesGridDevidePageShowConfig_Load);
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();

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

@@ -1,19 +1,18 @@
 using OTSCommon.Model;
+using OTSIncAReportApp.SysMgrTools;
 using OTSPeriodicTable;
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
 {
     public partial class ParticlesGridDevidePageShowConfig : Form
     {
+        Hashtable languageTable;
+        Language lan;
         OTS_SysType_ID systype = OTS_SysType_ID.IncA;
         public ParticlesGridDevidePageShowConfig(OTS_SysType_ID a_systype)
         {
@@ -23,6 +22,10 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
         private void ParticlesGridDevidePageShowConfig_Load(object sender, EventArgs e)
         {
             InitMyComponent();
+            #region 国际化语言
+            lan = new Language(this);
+            languageTable = lan.GetNameTable(this.Name);
+            #endregion
         }
         private void btn_xsys_Click(object sender, EventArgs e)
         {
@@ -529,22 +532,26 @@ namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
             toolTip1.InitialDelay = 500;//事件触发多久后出现提示
             toolTip1.ReshowDelay = 500;//指针从一个控件移向另一个控件时，经过多久才会显示下一个提示框
             toolTip1.ShowAlways = true;//是否显示提示框
-            string str = "Dmax:颗粒最大卡规直径\n" +
-                          "Dmin: 颗粒最小卡规直径\n" +
-                          "Aspect:颗粒长宽比\n" +
-                          "Dperp:与Dmax垂直的对应直径\n" +
-                          "Dmean:平均内接圆直径\n" +
-                          "Area:面积\n" +
-                          "Dferet:费雷特直径\n" +
-                          "Width:宽度（直上直下那种）\n" +
-                          "Height:高度（直上直下那种）\n" +
-                          "Perimeter:周长\n" +
-                          "Dinscr:最大内接圆直径\n" +
-                          "Orientation:朝向角度\n" +
-                          "Delong:展开长度（以最小卡规直径为宽）\n" +
-                          "Aspectelong:展开后长宽比\n" +
-                          "Dequalcircle:等效圆直径\n" +
-                          "Vedio:BSE灰度平均值";
+            string str = "";
+            if (Language.ReadDefaultLanguage().ToString() == "ZH")
+            {
+                str = " 最长直径:颗粒最大卡规直径\n" +
+                       "最短直径: 颗粒最小卡规直径\n" +
+                       "长短直径比:颗粒长宽比\n" +
+                       "正交直径:与Dmax垂直的对应直径\n" +
+                       "内接圆平均直径:平均内接圆直径\n" +
+                       "内接圆直径:最大内接圆直径";
+            }
+            else
+            {
+                str = "Dmax:Maximum caliper diameter of particle\n" +
+                       "Dmin: Minimum caliper diameter of particle\n" +
+                       "Aspect:The aspect ratio of the particle\n" +
+                       "Dperp:Corresponding diameter perpendicular to Dmax\n" +
+                       "Dmean:Average diameter of the internal circle\n" +
+                       "Dinscr:Maximum diameter of the inner circle\n" +
+                       "Dequalcircle:Equivalent circular diameter";
+            }
             //  设置伴随的对象.
             toolTip1.SetToolTip(this.label_help, str);
         }