修改颗粒列表中管理的位置

OTSExtremum/ExtremumApp.Designer.cs

@@ -567,15 +567,6 @@
         public System.Windows.Forms.RibbonButton rbRectangle;
         public System.Windows.Forms.RibbonButton rbCancel;
         public System.Windows.Forms.RibbonPanel rbChoiceTools;
-        private System.Windows.Forms.RibbonTab ribbonTab1;
-        private System.Windows.Forms.RibbonPanel ribbonPanel1;
-        private System.Windows.Forms.RibbonPanel ribbonPanel2;
-        public System.Windows.Forms.RibbonButton ribbonButton1;
-        private System.Windows.Forms.RibbonButton ribbonButton2;
-        private System.Windows.Forms.RibbonButton ribbonButton3;
-        private System.Windows.Forms.RibbonButton ribbonButton4;
-        private System.Windows.Forms.RibbonButton ribbonButton5;
-        private System.Windows.Forms.RibbonButton ribbonButton6;
         private System.Windows.Forms.RibbonTab rbtab1;
         private System.Windows.Forms.RibbonPanel rbpan1;
         private System.Windows.Forms.RibbonPanel rbpan2;

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

@@ -46,8 +46,6 @@
             this.Tbx_AreaMax = new System.Windows.Forms.TextBox();
             this.label5 = new System.Windows.Forms.Label();
             this.tBx_AreaMin = new System.Windows.Forms.TextBox();
-            this.cbB_order = new System.Windows.Forms.ComboBox();
-            this.label_order = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.cbB_PageSize = new System.Windows.Forms.ComboBox();
             this.label6 = new System.Windows.Forms.Label();
@@ -76,6 +74,7 @@
             this.ImportSTDDb = new System.Windows.Forms.ToolStripMenuItem();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.dgV_ParticlesDevidePage = new System.Windows.Forms.DataGridView();
+            this.btn_showconfig = new System.Windows.Forms.Button();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.contextMenuStrip1.SuspendLayout();
@@ -85,6 +84,7 @@
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.btn_showconfig);
             this.panel2.Controls.Add(this.tB_FieldId);
             this.panel2.Controls.Add(this.label7);
             this.panel2.Controls.Add(this.tB_ParticleId);
@@ -101,8 +101,6 @@
             this.panel2.Controls.Add(this.Tbx_AreaMax);
             this.panel2.Controls.Add(this.label5);
             this.panel2.Controls.Add(this.tBx_AreaMin);
-            this.panel2.Controls.Add(this.cbB_order);
-            this.panel2.Controls.Add(this.label_order);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel2.Location = new System.Drawing.Point(3, 3);
             this.panel2.Name = "panel2";
@@ -247,27 +245,6 @@
             this.tBx_AreaMin.TabIndex = 2;
             this.tBx_AreaMin.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // cbB_order
-            // 
-            this.cbB_order.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbB_order.FormattingEnabled = true;
-            this.cbB_order.Location = new System.Drawing.Point(1381, 12);
-            this.cbB_order.Name = "cbB_order";
-            this.cbB_order.Size = new System.Drawing.Size(108, 20);
-            this.cbB_order.TabIndex = 1;
-            this.cbB_order.Visible = false;
-            this.cbB_order.SelectedIndexChanged += new System.EventHandler(this.cbB_order_SelectedIndexChanged);
-            // 
-            // label_order
-            // 
-            this.label_order.AutoSize = true;
-            this.label_order.Location = new System.Drawing.Point(1327, 15);
-            this.label_order.Name = "label_order";
-            this.label_order.Size = new System.Drawing.Size(59, 12);
-            this.label_order.TabIndex = 0;
-            this.label_order.Text = "排序方式:";
-            this.label_order.Visible = false;
-            // 
             // panel1
             // 
             this.panel1.Controls.Add(this.cbB_PageSize);
@@ -544,6 +521,17 @@
             this.dgV_ParticlesDevidePage.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.dgV_ParticlesDevidePage_SortCompare);
             this.dgV_ParticlesDevidePage.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dgV_ParticlesDevidePage_MouseDown);
             // 
+            // btn_showconfig
+            // 
+            this.btn_showconfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn_showconfig.Location = new System.Drawing.Point(1414, 8);
+            this.btn_showconfig.Name = "btn_showconfig";
+            this.btn_showconfig.Size = new System.Drawing.Size(75, 23);
+            this.btn_showconfig.TabIndex = 40;
+            this.btn_showconfig.Text = "显示配置";
+            this.btn_showconfig.UseVisualStyleBackColor = true;
+            this.btn_showconfig.Click += new System.EventHandler(this.btn_showconfig_Click);
+            // 
             // ParticlesGridDevidePage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -587,8 +575,6 @@
         private System.Windows.Forms.TextBox Tbx_AreaMax;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.TextBox tBx_AreaMin;
-        private System.Windows.Forms.ComboBox cbB_order;
-        private System.Windows.Forms.Label label_order;
         private System.Windows.Forms.ComboBox cbB_PageSize;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label lblPageCount;
@@ -611,5 +597,6 @@
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.TextBox tB_ParticleId;
         private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Button btn_showconfig;
     }
 }

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

@@ -23,12 +23,13 @@ using System.Windows.Forms;
 using NPOI.XSSF.UserModel;
 using NPOI.SS.UserModel.Charts;
 using NPOI.SS.Util;
+using OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage;
 
 namespace OTSIncAReportGrids
 {
     public partial class ParticlesGridDevidePage : UserControl
     {
-       
+        ParticlesGridDevidePageShowConfig m_particlesGridDevidePageShowConfig=null;
 
         //设置模拟数据表
         public DataTable m_dt = new DataTable();
@@ -2535,6 +2536,26 @@ namespace OTSIncAReportGrids
             }
             dataTable_Particle.AcceptChanges();
         }
+
+        private void btn_showconfig_Click(object sender, EventArgs e)
+        {
+            //if (m_particlesGridDevidePageShowConfig == null|| m_particlesGridDevidePageShowConfig.IsDisposed)
+            //{
+                m_particlesGridDevidePageShowConfig = new ParticlesGridDevidePageShowConfig(m_ReportApp.m_RptConfigFile.Systype);
+                m_particlesGridDevidePageShowConfig.ShowDialog();
+            //}
+            //else
+            //{
+            //    m_particlesGridDevidePageShowConfig.Activate();
+            //}
+            if (m_particlesGridDevidePageShowConfig.DialogResult == DialogResult.OK)
+            {
+                dgV_ParticlesDevidePage.Rows.Clear();
+                dgV_ParticlesDevidePage.Columns.Clear();
+                BindDataGridView();
+                SetDataGridViewStyle();
+            }
+        }
     }
 }
 

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

@@ -0,0 +1,388 @@
+
+namespace OTSIncAReportApp._1_UI.Control_Grids.ParticlesGridDevidePage
+{
+    partial class ParticlesGridDevidePageShowConfig
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.cb_ParticleCoordinate = new System.Windows.Forms.CheckBox();
+            this.btn_xsys = new System.Windows.Forms.Button();
+            this.cB_Electrical_conductivity = new System.Windows.Forms.CheckBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.cB_Density = new System.Windows.Forms.CheckBox();
+            this.tb_xsys = new System.Windows.Forms.TextBox();
+            this.cB_Hardness = new System.Windows.Forms.CheckBox();
+            this.cb_Area = new System.Windows.Forms.CheckBox();
+            this.cb_ELONG = new System.Windows.Forms.CheckBox();
+            this.cb_MaxDiameter = new System.Windows.Forms.CheckBox();
+            this.cb_PERI = new System.Windows.Forms.CheckBox();
+            this.cb_MinDiameter = new System.Windows.Forms.CheckBox();
+            this.cb_EquivalentCircleDiameter = new System.Windows.Forms.CheckBox();
+            this.cb_DiameterRatio = new System.Windows.Forms.CheckBox();
+            this.cb_ASPECT_ELONG = new System.Windows.Forms.CheckBox();
+            this.cb_FerretDiameter = new System.Windows.Forms.CheckBox();
+            this.cb_Orientation = new System.Windows.Forms.CheckBox();
+            this.cb_PERP = new System.Windows.Forms.CheckBox();
+            this.cb_MEAN = new System.Windows.Forms.CheckBox();
+            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.groupBox2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.label1);
+            this.groupBox2.Controls.Add(this.cb_ParticleCoordinate);
+            this.groupBox2.Controls.Add(this.btn_xsys);
+            this.groupBox2.Controls.Add(this.cB_Electrical_conductivity);
+            this.groupBox2.Controls.Add(this.label2);
+            this.groupBox2.Controls.Add(this.cB_Density);
+            this.groupBox2.Controls.Add(this.tb_xsys);
+            this.groupBox2.Controls.Add(this.cB_Hardness);
+            this.groupBox2.Controls.Add(this.cb_Area);
+            this.groupBox2.Controls.Add(this.cb_ELONG);
+            this.groupBox2.Controls.Add(this.cb_MaxDiameter);
+            this.groupBox2.Controls.Add(this.cb_PERI);
+            this.groupBox2.Controls.Add(this.cb_MinDiameter);
+            this.groupBox2.Controls.Add(this.cb_EquivalentCircleDiameter);
+            this.groupBox2.Controls.Add(this.cb_DiameterRatio);
+            this.groupBox2.Controls.Add(this.cb_ASPECT_ELONG);
+            this.groupBox2.Controls.Add(this.cb_FerretDiameter);
+            this.groupBox2.Controls.Add(this.cb_Orientation);
+            this.groupBox2.Controls.Add(this.cb_PERP);
+            this.groupBox2.Controls.Add(this.cb_MEAN);
+            this.groupBox2.Controls.Add(this.cb_INSCR);
+            this.groupBox2.Location = new System.Drawing.Point(11, 10);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.groupBox2.Size = new System.Drawing.Size(514, 189);
+            this.groupBox2.TabIndex = 130;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "显示信息设置";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(14, 15);
+            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.TabIndex = 109;
+            this.label1.Text = "显示元素";
+            // 
+            // cb_ParticleCoordinate
+            // 
+            this.cb_ParticleCoordinate.AutoSize = true;
+            this.cb_ParticleCoordinate.Location = new System.Drawing.Point(254, 135);
+            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 = 129;
+            this.cb_ParticleCoordinate.Text = "颗粒坐标";
+            this.cb_ParticleCoordinate.UseVisualStyleBackColor = true;
+            // 
+            // btn_xsys
+            // 
+            this.btn_xsys.Location = new System.Drawing.Point(469, 11);
+            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);
+            this.btn_xsys.TabIndex = 112;
+            this.btn_xsys.Text = "...";
+            this.btn_xsys.UseVisualStyleBackColor = true;
+            this.btn_xsys.Click += new System.EventHandler(this.btn_xsys_Click);
+            // 
+            // cB_Electrical_conductivity
+            // 
+            this.cB_Electrical_conductivity.AutoSize = true;
+            this.cB_Electrical_conductivity.Location = new System.Drawing.Point(128, 160);
+            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);
+            this.cB_Electrical_conductivity.TabIndex = 128;
+            this.cB_Electrical_conductivity.Text = "导电性";
+            this.cB_Electrical_conductivity.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(14, 37);
+            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.TabIndex = 110;
+            this.label2.Text = "显示类型";
+            // 
+            // cB_Density
+            // 
+            this.cB_Density.AutoSize = true;
+            this.cB_Density.Location = new System.Drawing.Point(370, 135);
+            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);
+            this.cB_Density.TabIndex = 127;
+            this.cB_Density.Text = "密度";
+            this.cB_Density.UseVisualStyleBackColor = true;
+            // 
+            // tb_xsys
+            // 
+            this.tb_xsys.Location = new System.Drawing.Point(128, 12);
+            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);
+            this.tb_xsys.TabIndex = 111;
+            // 
+            // cB_Hardness
+            // 
+            this.cB_Hardness.AutoSize = true;
+            this.cB_Hardness.Location = new System.Drawing.Point(254, 160);
+            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);
+            this.cB_Hardness.TabIndex = 126;
+            this.cB_Hardness.Text = "硬度";
+            this.cB_Hardness.UseVisualStyleBackColor = true;
+            // 
+            // cb_Area
+            // 
+            this.cb_Area.AutoSize = true;
+            this.cb_Area.Location = new System.Drawing.Point(128, 39);
+            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);
+            this.cb_Area.TabIndex = 113;
+            this.cb_Area.Text = "面积um²";
+            this.cb_Area.UseVisualStyleBackColor = true;
+            // 
+            // cb_ELONG
+            // 
+            this.cb_ELONG.AutoSize = true;
+            this.cb_ELONG.Location = new System.Drawing.Point(370, 63);
+            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);
+            this.cb_ELONG.TabIndex = 125;
+            this.cb_ELONG.Text = "展开长度um";
+            this.cb_ELONG.UseVisualStyleBackColor = true;
+            // 
+            // cb_MaxDiameter
+            // 
+            this.cb_MaxDiameter.AutoSize = true;
+            this.cb_MaxDiameter.Location = new System.Drawing.Point(128, 87);
+            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);
+            this.cb_MaxDiameter.TabIndex = 114;
+            this.cb_MaxDiameter.Text = "最长直径um";
+            this.cb_MaxDiameter.UseVisualStyleBackColor = true;
+            // 
+            // cb_PERI
+            // 
+            this.cb_PERI.AutoSize = true;
+            this.cb_PERI.Location = new System.Drawing.Point(254, 87);
+            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);
+            this.cb_PERI.TabIndex = 123;
+            this.cb_PERI.Text = "周长um";
+            this.cb_PERI.UseVisualStyleBackColor = true;
+            // 
+            // cb_MinDiameter
+            // 
+            this.cb_MinDiameter.AutoSize = true;
+            this.cb_MinDiameter.Location = new System.Drawing.Point(254, 39);
+            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);
+            this.cb_MinDiameter.TabIndex = 115;
+            this.cb_MinDiameter.Text = "最短直径um";
+            this.cb_MinDiameter.UseVisualStyleBackColor = true;
+            // 
+            // cb_EquivalentCircleDiameter
+            // 
+            this.cb_EquivalentCircleDiameter.AutoSize = true;
+            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(128, 112);
+            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);
+            this.cb_EquivalentCircleDiameter.TabIndex = 122;
+            this.cb_EquivalentCircleDiameter.Text = "等效圆直径um";
+            this.cb_EquivalentCircleDiameter.UseVisualStyleBackColor = true;
+            // 
+            // cb_DiameterRatio
+            // 
+            this.cb_DiameterRatio.AutoSize = true;
+            this.cb_DiameterRatio.Location = new System.Drawing.Point(128, 63);
+            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);
+            this.cb_DiameterRatio.TabIndex = 116;
+            this.cb_DiameterRatio.Text = "长短直径比";
+            this.cb_DiameterRatio.UseVisualStyleBackColor = true;
+            // 
+            // cb_ASPECT_ELONG
+            // 
+            this.cb_ASPECT_ELONG.AutoSize = true;
+            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(370, 112);
+            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);
+            this.cb_ASPECT_ELONG.TabIndex = 121;
+            this.cb_ASPECT_ELONG.Text = "展开长宽比";
+            this.cb_ASPECT_ELONG.UseVisualStyleBackColor = true;
+            // 
+            // cb_FerretDiameter
+            // 
+            this.cb_FerretDiameter.AutoSize = true;
+            this.cb_FerretDiameter.Location = new System.Drawing.Point(254, 63);
+            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);
+            this.cb_FerretDiameter.TabIndex = 117;
+            this.cb_FerretDiameter.Text = "费雷特直径um";
+            this.cb_FerretDiameter.UseVisualStyleBackColor = true;
+            // 
+            // cb_Orientation
+            // 
+            this.cb_Orientation.AutoSize = true;
+            this.cb_Orientation.Location = new System.Drawing.Point(254, 111);
+            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);
+            this.cb_Orientation.TabIndex = 120;
+            this.cb_Orientation.Text = "朝向角度°";
+            this.cb_Orientation.UseVisualStyleBackColor = true;
+            // 
+            // cb_PERP
+            // 
+            this.cb_PERP.AutoSize = true;
+            this.cb_PERP.Location = new System.Drawing.Point(370, 39);
+            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);
+            this.cb_PERP.TabIndex = 124;
+            this.cb_PERP.Text = "正交直径um";
+            this.cb_PERP.UseVisualStyleBackColor = true;
+            // 
+            // cb_MEAN
+            // 
+            this.cb_MEAN.AutoSize = true;
+            this.cb_MEAN.Location = new System.Drawing.Point(128, 135);
+            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);
+            this.cb_MEAN.TabIndex = 119;
+            this.cb_MEAN.Text = "内接圆平均直径";
+            this.cb_MEAN.UseVisualStyleBackColor = true;
+            // 
+            // cb_INSCR
+            // 
+            this.cb_INSCR.AutoSize = true;
+            this.cb_INSCR.Location = new System.Drawing.Point(370, 87);
+            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);
+            this.cb_INSCR.TabIndex = 118;
+            this.cb_INSCR.Text = "内接圆直径um";
+            this.cb_INSCR.UseVisualStyleBackColor = true;
+            // 
+            // btn_ybcsqx
+            // 
+            this.btn_ybcsqx.Location = new System.Drawing.Point(457, 201);
+            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(67, 23);
+            this.btn_ybcsqx.TabIndex = 131;
+            this.btn_ybcsqx.Text = "取  消";
+            this.btn_ybcsqx.UseVisualStyleBackColor = true;
+            this.btn_ybcsqx.Click += new System.EventHandler(this.btn_ybcsqx_Click);
+            // 
+            // btn_ybcsbc
+            // 
+            this.btn_ybcsbc.Location = new System.Drawing.Point(386, 201);
+            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(67, 23);
+            this.btn_ybcsbc.TabIndex = 132;
+            this.btn_ybcsbc.Text = "确   定";
+            this.btn_ybcsbc.UseVisualStyleBackColor = true;
+            this.btn_ybcsbc.Click += new System.EventHandler(this.btn_ybcsbc_Click);
+            // 
+            // ParticlesGridDevidePageShowConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(536, 225);
+            this.Controls.Add(this.btn_ybcsqx);
+            this.Controls.Add(this.btn_ybcsbc);
+            this.Controls.Add(this.groupBox2);
+            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(552, 264);
+            this.MinimumSize = new System.Drawing.Size(552, 264);
+            this.Name = "ParticlesGridDevidePageShowConfig";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "ParticlesGridDevidePageShowConfig";
+            this.Load += new System.EventHandler(this.ParticlesGridDevidePageShowConfig_Load);
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.CheckBox cb_ParticleCoordinate;
+        private System.Windows.Forms.Button btn_xsys;
+        private System.Windows.Forms.CheckBox cB_Electrical_conductivity;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.CheckBox cB_Density;
+        private System.Windows.Forms.TextBox tb_xsys;
+        private System.Windows.Forms.CheckBox cB_Hardness;
+        private System.Windows.Forms.CheckBox cb_Area;
+        private System.Windows.Forms.CheckBox cb_ELONG;
+        private System.Windows.Forms.CheckBox cb_MaxDiameter;
+        private System.Windows.Forms.CheckBox cb_PERI;
+        private System.Windows.Forms.CheckBox cb_MinDiameter;
+        private System.Windows.Forms.CheckBox cb_EquivalentCircleDiameter;
+        private System.Windows.Forms.CheckBox cb_DiameterRatio;
+        private System.Windows.Forms.CheckBox cb_ASPECT_ELONG;
+        private System.Windows.Forms.CheckBox cb_FerretDiameter;
+        private System.Windows.Forms.CheckBox cb_Orientation;
+        private System.Windows.Forms.CheckBox cb_PERP;
+        private System.Windows.Forms.CheckBox cb_MEAN;
+        private System.Windows.Forms.CheckBox cb_INSCR;
+        private System.Windows.Forms.Button btn_ybcsqx;
+        private System.Windows.Forms.Button btn_ybcsbc;
+    }
+}

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

@@ -0,0 +1,522 @@
+using OTSCommon.Model;
+using OTSPeriodicTable;
+using System;
+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
+    {
+        OTS_SysType_ID systype = OTS_SysType_ID.IncA;
+        public ParticlesGridDevidePageShowConfig(OTS_SysType_ID a_systype)
+        {
+            InitializeComponent();
+            systype = a_systype;
+        }
+        private void ParticlesGridDevidePageShowConfig_Load(object sender, EventArgs e)
+        {
+            InitMyComponent();
+        }
+        private void btn_xsys_Click(object sender, EventArgs e)
+        {
+            //打开编辑元素列表窗体
+            OTSPeriodicTable.OTSPeriodicTableForm_Small opts = new OTSPeriodicTable.OTSPeriodicTableForm_Small();
+
+            //获取需要显示的元素列表,并转换成元素周期表窗体可接受的格式，传入----------------------
+            string str_xsys = tb_xsys.Text.Trim();
+            List<string> list_str = new List<string>();
+            string[] strs = str_xsys.Split(',');
+            for (int i = 0; i < strs.Length; i++)
+            {
+                list_str.Add(strs[i]);
+            }
+
+            //清除元素周期表中所有的记录
+            opts.m_List_Periodic.Clear();
+
+            //将该分类下的元素添加到元素周期表窗体的List_periodic中
+            for (int i = 0; i < strs.Length; i++)
+            {
+                string str_ysm = strs[i];
+                Periodic ls_periodic = new Periodic();
+                ls_periodic = CListPeriodic.GetPeriodicByEleName(str_ysm);
+                opts.m_List_Periodic.Add(ls_periodic);
+            }
+            //----------------------------------------------------------------------------------------
+            opts.StartPosition = FormStartPosition.CenterScreen;
+            opts.ShowDialog();
+
+            List<string> PeriodicFH = new List<string>();
+            for (int j = 0; j < opts.m_List_Periodic.Count; j++)
+            {
+                PeriodicFH.Add(opts.m_List_Periodic[j].Symbol);
+            }
+
+            PeriodicFH.Sort(delegate (string a, string b) { return ReturnsAtomicNumberByElementName(a).CompareTo(ReturnsAtomicNumberByElementName(b)); });//排序 从小到大原子序数
+
+            list_str = list_str.FindAll(delegate (string a) { return PeriodicFH.Contains(a); });
+            PeriodicFH = PeriodicFH.FindAll(delegate (string a) { return !list_str.Contains(a); });
+
+            //先清空元素
+            str_xsys = "";
+
+            //然后再将选择的元素，组合起来，返回显示到该窗体上
+            for (int i = 0; i < list_str.Count; i++)
+            {
+                if (str_xsys == "")
+                {
+                    str_xsys = list_str[i];
+                }
+                else
+                {
+                    str_xsys = str_xsys + "," + list_str[i];
+                }
+            }
+            for (int i = 0; i < PeriodicFH.Count; i++)
+            {
+                if (str_xsys == "")
+                {
+                    str_xsys = PeriodicFH[i];
+                }
+                else
+                {
+                    str_xsys = str_xsys + "," + PeriodicFH[i];
+                }
+
+            }
+
+            //再对选择的元素进行显示
+            tb_xsys.Text = str_xsys;
+        }
+
+        private void btn_ybcsbc_Click(object sender, EventArgs e)
+        {
+            //保存显示计算项
+            string[] AttributeName_DefaultComputedColName = new string[] { "RegName", "strValue" };
+            string[] Value_DefaultComputedColName = new string[] { "DefaultComputedColName", GetShowColumnsListStr() };
+            bool ret = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.UpdateByAttribute(Application.StartupPath + RptConfigFile.m_ReportMgrParamFile, AttributeName_DefaultComputedColName, Value_DefaultComputedColName);
+
+            //保存显示元素信息
+            string[] AttributeName_ElementsColName = new string[] { "RegName", "strValue" };
+            string[] Value_ElementsColName = new string[] { "ElementsColName", tb_xsys.Text.Trim() };
+            ret = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.UpdateByAttribute(Application.StartupPath + RptConfigFile.m_ReportMgrParamFile, AttributeName_ElementsColName, Value_ElementsColName);
+            this.DialogResult = DialogResult.OK;
+            this.Close();
+        }
+        private void btn_ybcsqx_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+        /// <summary>
+        /// 获取从各checkbox中组合完成的字段
+        /// </summary>
+        private string GetShowColumnsListStr()
+        {
+            string str_ret = "";
+
+            //帧图坐标
+            if (cb_ParticleCoordinate.Checked == true)
+            {
+                str_ret = str_ret + "ParticleCoordinate" + ",";
+            }
+
+            //面积
+            if (cb_Area.Checked == true)
+            {
+                str_ret = str_ret + "Area" + ",";
+            }
+
+            //等效圆直径
+            if (cb_EquivalentCircleDiameter.Checked == true)
+            {
+                str_ret = str_ret + "EquivalentCircleDiameter" + ",";
+            }
+
+            //最长直径
+            if (cb_MaxDiameter.Checked == true)
+            {
+                str_ret = str_ret + "MaxDiameter" + ",";
+            }
+
+            //最短直径
+            if (cb_MinDiameter.Checked == true)
+            {
+                str_ret = str_ret + "MinDiameter" + ",";
+            }
+
+            //长短直径比
+            if (cb_DiameterRatio.Checked == true)
+            {
+                str_ret = str_ret + "DiameterRatio" + ",";
+            }
+
+            //费雷特直径
+            if (cb_FerretDiameter.Checked == true)
+            {
+                str_ret = str_ret + "FerretDiameter" + ",";
+            }
+
+
+            //正交直径
+            if (cb_PERP.Checked == true)
+            {
+                str_ret = str_ret + "PERP" + ",";
+            }
+
+            //周长
+            if (cb_PERI.Checked == true)
+            {
+                str_ret = str_ret + "PERI" + ",";
+            }
+
+            //内接圆直径
+            if (cb_INSCR.Checked == true)
+            {
+                str_ret = str_ret + "INSCR" + ",";
+            }
+
+            //内接圆平均直径
+            if (cb_MEAN.Checked == true)
+            {
+                str_ret = str_ret + "MEAN" + ",";
+            }
+
+            //展开长度
+            if (cb_ELONG.Checked == true)
+            {
+                str_ret = str_ret + "ELONG" + ",";
+            }
+
+            //展开长度比
+            if (cb_ASPECT_ELONG.Checked == true)
+            {
+                str_ret = str_ret + "ASPECT_ELONG" + ",";
+            }
+
+            //朝向角度
+            if (cb_Orientation.Checked == true)
+            {
+                str_ret = str_ret + "Orientation" + ",";
+            }
+
+            //导电性
+            if (cB_Electrical_conductivity.Checked == true)
+            {
+                str_ret = str_ret + "Electrical_conductivity" + ",";
+            }
+            //密度
+            if (cB_Density.Checked == true)
+            {
+                str_ret = str_ret + "Density" + ",";
+            }
+            //硬度
+            if (cB_Hardness.Checked == true)
+            {
+                str_ret = str_ret + "Hardness" + ",";
+            }
+
+            if (str_ret.Length > 0)
+            {
+                str_ret = str_ret.Substring(0, str_ret.Length - 1);
+            }
+            return str_ret;
+        }
+
+        int ReturnsAtomicNumberByElementName(string ElementName)
+        {
+            switch (ElementName)
+            {
+                case "H": return 1;
+                case "He": return 2;
+                case "Li": return 3;
+                case "Be": return 4;
+                case "B": return 5;
+                case "C": return 6;
+                case "N": return 7;
+                case "O": return 8;
+                case "F": return 9;
+                case "Ne": return 10;
+                case "Na": return 11;
+                case "Mg": return 12;
+                case "Al": return 13;
+                case "Si": return 14;
+                case "P": return 15;
+                case "S": return 16;
+                case "Cl": return 17;
+                case "Ar": return 18;
+                case "K": return 19;
+                case "Ca": return 20;
+                case "Sc": return 21;
+                case "Ti": return 22;
+                case "V": return 23;
+                case "Cr": return 24;
+                case "Mn": return 25;
+                case "Fe": return 26;
+                case "Co": return 27;
+                case "Ni": return 28;
+                case "Cu": return 29;
+                case "Zn": return 30;
+                case "Ga": return 31;
+                case "Ge": return 32;
+                case "As": return 33;
+                case "Se": return 34;
+                case "Br": return 35;
+                case "Kr": return 36;
+                case "Rb": return 37;
+                case "Sr": return 38;
+                case "Y": return 39;
+                case "Zr": return 40;
+                case "Nb": return 41;
+                case "Mo": return 42;
+                case "Tc": return 43;
+                case "Ru": return 44;
+                case "Rh": return 45;
+                case "Pd": return 46;
+                case "Ag": return 47;
+                case "Cd": return 48;
+                case "In": return 49;
+                case "Sn": return 50;
+                case "Sb": return 51;
+                case "Te": return 52;
+                case "I": return 53;
+                case "Xe": return 54;
+                case "Cs": return 55;
+                case "Ba": return 56;
+                case "La": return 57;
+                case "Ce": return 58;
+                case "Pr": return 59;
+                case "Nd": return 60;
+                case "Pm": return 61;
+                case "Sm": return 62;
+                case "Eu": return 63;
+                case "Gd": return 64;
+                case "Tb": return 65;
+                case "Dy": return 66;
+                case "Ho": return 67;
+                case "Er": return 68;
+                case "Tm": return 69;
+                case "Yb": return 70;
+                case "Lu": return 71;
+                case "Hf": return 72;
+                case "Ta": return 73;
+                case "W": return 74;
+                case "Re": return 75;
+                case "Os": return 76;
+                case "Ir": return 77;
+                case "Pt": return 78;
+                case "Au": return 79;
+                case "Hq": return 80;
+                case "TI": return 81;
+                case "Pb": return 82;
+                case "Bi": return 83;
+                case "Po": return 84;
+                case "At": return 85;
+                case "Rn": return 86;
+                case "Fr": return 87;
+                case "Ra": return 88;
+                case "Ac": return 89;
+                case "Th": return 90;
+                case "Pa": return 91;
+                case "U": return 92;
+                case "Np": return 93;
+                case "Pu": return 94;
+                case "Am": return 95;
+                case "Cm": return 96;
+                case "Bk": return 97;
+                case "Cf": return 98;
+                case "Es": return 99;
+                case "Fm": return 100;
+                case "Mc": return 101;
+                case "No": return 102;
+                case "Lr": return 103;
+                case "Rf": return 104;
+                case "Db": return 105;
+                case "Sg": return 106;
+                case "Bh": return 107;
+                case "Hs": return 108;
+                case "Mt": return 109;
+                case "Ds": return 110;
+                case "Rg": return 111;
+                case "Unb": return 112;
+                default: return 1000;
+            }
+        }
+
+        public void InitMyComponent()
+        {
+            string str_DefaultComputedColName = "", str_ElementsColName = "";
+            DataSet ds = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.GetXmlData(Application.StartupPath + RptConfigFile.m_ReportMgrParamFile, "XMLData");
+            DataTable dt = ds.Tables["Member"];
+            string str_scale = "";
+            foreach (DataRow element in dt.Rows)
+            {
+                string RegName = element["RegName"].ToString();
+
+                if (RegName == "DefaultComputedColName")
+                {
+                    str_DefaultComputedColName = element["strValue"].ToString();
+                }
+
+                if (RegName == "ElementsColName")
+                {
+                    str_ElementsColName = element["strValue"].ToString();
+                }
+                if (RegName == "Scale")
+                {
+                    str_scale = element["strValue"].ToString();
+                }
+            }
+
+            //显示元素
+            tb_xsys.Text = str_ElementsColName;
+
+            //设置计算显示列
+            SetShowColumnsListStr(str_DefaultComputedColName);
+        }
+
+        private void SetShowColumnsListStr(string in_str)
+        {
+            cb_Area.Checked = false;
+            cb_EquivalentCircleDiameter.Checked = false;
+            cb_MaxDiameter.Checked = false;
+            cb_MinDiameter.Checked = false;
+            cb_DiameterRatio.Checked = false;
+            cb_FerretDiameter.Checked = false;
+            cb_PERP.Checked = false;
+            cb_PERI.Checked = false;
+            cb_INSCR.Checked = false;
+            cb_MEAN.Checked = false;
+            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;
+
+
+            //面积
+            if (in_str.IndexOf("Area") > -1)
+            {
+                cb_Area.Checked = true;
+            }
+
+            //等效圆直径
+            if (in_str.IndexOf("EquivalentCircleDiameter") > -1)
+            {
+                cb_EquivalentCircleDiameter.Checked = true;
+            }
+
+            //最长直径
+            if (in_str.IndexOf("MaxDiameter") > -1)
+            {
+                cb_MaxDiameter.Checked = true;
+            }
+
+            //最短直径
+            if (in_str.IndexOf("MinDiameter") > -1)
+            {
+                cb_MinDiameter.Checked = true;
+            }
+
+            //长短直径比
+            if (in_str.IndexOf("DiameterRatio") > -1)
+            {
+                cb_DiameterRatio.Checked = true;
+            }
+
+            //费雷特直径
+            if (in_str.IndexOf("FerretDiameter") > -1)
+            {
+                cb_FerretDiameter.Checked = true;
+            }
+
+            //正交直径
+            if (in_str.IndexOf("PERP") > -1)
+            {
+                cb_PERP.Checked = true;
+            }
+
+            //周长
+            if (in_str.IndexOf("PERI") > -1)
+            {
+                cb_PERI.Checked = true;
+            }
+
+            //内接圆直径
+            if (in_str.IndexOf("INSCR") > -1)
+            {
+                cb_INSCR.Checked = true;
+            }
+
+            //内接圆平均直径
+            if (in_str.IndexOf("MEAN") > -1)
+            {
+                cb_MEAN.Checked = true;
+            }
+
+            //展开长度
+            if (in_str.IndexOf("ELONG") > -1)
+            {
+                cb_ELONG.Checked = true;
+            }
+
+            //展开长度比
+            if (in_str.IndexOf("ASPECT_ELONG") > -1)
+            {
+                cb_ASPECT_ELONG.Checked = true;
+            }
+
+            //朝向角度
+            if (in_str.IndexOf("Orientation") > -1)
+            {
+                cb_Orientation.Checked = true;
+            }
+
+            //帧图坐标
+            if (in_str.IndexOf("ParticleCoordinate") > -1)
+            {
+                cb_ParticleCoordinate.Checked = true;
+            }
+
+
+            if (systype == OTSCommon.Model.OTS_SysType_ID.CleannessA)
+            {
+                cB_Hardness.Enabled = true;
+                cB_Density.Enabled = true;
+                cB_Electrical_conductivity.Enabled = true;
+                //硬度
+                if (in_str.IndexOf("Hardness") > -1)
+                {
+                    cB_Hardness.Checked = true;
+                }
+
+                //密度
+                if (in_str.IndexOf("Density") > -1)
+                {
+                    cB_Density.Checked = true;
+                }
+
+                //导电性
+                if (in_str.IndexOf("Electrical_conductivity") > -1)
+                {
+                    cB_Electrical_conductivity.Checked = true;
+                }
+            }
+            else
+            {
+                cB_Hardness.Enabled = false;
+                cB_Density.Enabled = false;
+                cB_Electrical_conductivity.Enabled = false;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

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

@@ -60,27 +60,6 @@ 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();
-            this.cb_ELONG = new System.Windows.Forms.CheckBox();
-            this.cb_PERI = new System.Windows.Forms.CheckBox();
-            this.cb_EquivalentCircleDiameter = new System.Windows.Forms.CheckBox();
-            this.cb_ASPECT_ELONG = new System.Windows.Forms.CheckBox();
-            this.cb_Orientation = new System.Windows.Forms.CheckBox();
-            this.cb_MEAN = new System.Windows.Forms.CheckBox();
-            this.cb_INSCR = new System.Windows.Forms.CheckBox();
-            this.cb_PERP = new System.Windows.Forms.CheckBox();
-            this.cb_FerretDiameter = new System.Windows.Forms.CheckBox();
-            this.cb_DiameterRatio = new System.Windows.Forms.CheckBox();
-            this.cb_MinDiameter = new System.Windows.Forms.CheckBox();
-            this.cb_MaxDiameter = new System.Windows.Forms.CheckBox();
-            this.cb_Area = new System.Windows.Forms.CheckBox();
-            this.tb_xsys = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.btn_xsys = new System.Windows.Forms.Button();
             this.groupBox3.SuspendLayout();
             this.groupBox6.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -262,7 +241,7 @@ namespace OTSIncAReprotCharts
             // 
             // btn_ybcsqx
             // 
-            this.btn_ybcsqx.Location = new System.Drawing.Point(445, 337);
+            this.btn_ybcsqx.Location = new System.Drawing.Point(444, 185);
             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(67, 23);
@@ -273,7 +252,7 @@ namespace OTSIncAReprotCharts
             // 
             // btn_ybcsbc
             // 
-            this.btn_ybcsbc.Location = new System.Drawing.Point(363, 337);
+            this.btn_ybcsbc.Location = new System.Drawing.Point(373, 185);
             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(67, 23);
@@ -355,269 +334,22 @@ namespace OTSIncAReprotCharts
             // 
             // groupBox2
             // 
-            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);
-            this.groupBox2.Controls.Add(this.cb_ELONG);
-            this.groupBox2.Controls.Add(this.cb_PERI);
-            this.groupBox2.Controls.Add(this.cb_EquivalentCircleDiameter);
-            this.groupBox2.Controls.Add(this.cb_ASPECT_ELONG);
-            this.groupBox2.Controls.Add(this.cb_Orientation);
-            this.groupBox2.Controls.Add(this.cb_MEAN);
-            this.groupBox2.Controls.Add(this.cb_INSCR);
-            this.groupBox2.Controls.Add(this.cb_PERP);
-            this.groupBox2.Controls.Add(this.cb_FerretDiameter);
-            this.groupBox2.Controls.Add(this.cb_DiameterRatio);
-            this.groupBox2.Controls.Add(this.cb_MinDiameter);
-            this.groupBox2.Controls.Add(this.cb_MaxDiameter);
-            this.groupBox2.Controls.Add(this.cb_Area);
-            this.groupBox2.Controls.Add(this.tb_xsys);
-            this.groupBox2.Controls.Add(this.label1);
-            this.groupBox2.Controls.Add(this.label2);
-            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(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(2, 1, 2, 1);
-            this.groupBox2.Size = new System.Drawing.Size(503, 208);
+            this.groupBox2.Size = new System.Drawing.Size(503, 49);
             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(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(60, 16);
-            this.cB_Electrical_conductivity.TabIndex = 106;
-            this.cB_Electrical_conductivity.Text = "导电性";
-            this.cB_Electrical_conductivity.UseVisualStyleBackColor = true;
-            // 
-            // cB_Density
-            // 
-            this.cB_Density.AutoSize = true;
-            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(48, 16);
-            this.cB_Density.TabIndex = 105;
-            this.cB_Density.Text = "密度";
-            this.cB_Density.UseVisualStyleBackColor = true;
-            // 
-            // cB_Hardness
-            // 
-            this.cB_Hardness.AutoSize = true;
-            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(48, 16);
-            this.cB_Hardness.TabIndex = 104;
-            this.cB_Hardness.Text = "硬度";
-            this.cB_Hardness.UseVisualStyleBackColor = true;
-            // 
-            // cb_ELONG
-            // 
-            this.cb_ELONG.AutoSize = true;
-            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(84, 16);
-            this.cb_ELONG.TabIndex = 103;
-            this.cb_ELONG.Text = "展开长度um";
-            this.cb_ELONG.UseVisualStyleBackColor = true;
-            // 
-            // cb_PERI
-            // 
-            this.cb_PERI.AutoSize = true;
-            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(60, 16);
-            this.cb_PERI.TabIndex = 101;
-            this.cb_PERI.Text = "周长um";
-            this.cb_PERI.UseVisualStyleBackColor = true;
-            // 
-            // cb_EquivalentCircleDiameter
-            // 
-            this.cb_EquivalentCircleDiameter.AutoSize = true;
-            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(96, 16);
-            this.cb_EquivalentCircleDiameter.TabIndex = 100;
-            this.cb_EquivalentCircleDiameter.Text = "等效圆直径um";
-            this.cb_EquivalentCircleDiameter.UseVisualStyleBackColor = true;
-            // 
-            // cb_ASPECT_ELONG
-            // 
-            this.cb_ASPECT_ELONG.AutoSize = true;
-            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(84, 16);
-            this.cb_ASPECT_ELONG.TabIndex = 99;
-            this.cb_ASPECT_ELONG.Text = "展开长宽比";
-            this.cb_ASPECT_ELONG.UseVisualStyleBackColor = true;
-            // 
-            // cb_Orientation
-            // 
-            this.cb_Orientation.AutoSize = true;
-            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(84, 16);
-            this.cb_Orientation.TabIndex = 98;
-            this.cb_Orientation.Text = "朝向角度°";
-            this.cb_Orientation.UseVisualStyleBackColor = true;
-            // 
-            // cb_MEAN
-            // 
-            this.cb_MEAN.AutoSize = true;
-            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(108, 16);
-            this.cb_MEAN.TabIndex = 97;
-            this.cb_MEAN.Text = "内接圆平均直径";
-            this.cb_MEAN.UseVisualStyleBackColor = true;
-            // 
-            // cb_INSCR
-            // 
-            this.cb_INSCR.AutoSize = true;
-            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(96, 16);
-            this.cb_INSCR.TabIndex = 96;
-            this.cb_INSCR.Text = "内接圆直径um";
-            this.cb_INSCR.UseVisualStyleBackColor = true;
-            // 
-            // cb_PERP
-            // 
-            this.cb_PERP.AutoSize = true;
-            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(84, 16);
-            this.cb_PERP.TabIndex = 102;
-            this.cb_PERP.Text = "正交直径um";
-            this.cb_PERP.UseVisualStyleBackColor = true;
-            // 
-            // cb_FerretDiameter
-            // 
-            this.cb_FerretDiameter.AutoSize = true;
-            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(96, 16);
-            this.cb_FerretDiameter.TabIndex = 95;
-            this.cb_FerretDiameter.Text = "费雷特直径um";
-            this.cb_FerretDiameter.UseVisualStyleBackColor = true;
-            // 
-            // cb_DiameterRatio
-            // 
-            this.cb_DiameterRatio.AutoSize = true;
-            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(84, 16);
-            this.cb_DiameterRatio.TabIndex = 94;
-            this.cb_DiameterRatio.Text = "长短直径比";
-            this.cb_DiameterRatio.UseVisualStyleBackColor = true;
-            // 
-            // cb_MinDiameter
-            // 
-            this.cb_MinDiameter.AutoSize = true;
-            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(84, 16);
-            this.cb_MinDiameter.TabIndex = 93;
-            this.cb_MinDiameter.Text = "最短直径um";
-            this.cb_MinDiameter.UseVisualStyleBackColor = true;
-            // 
-            // cb_MaxDiameter
-            // 
-            this.cb_MaxDiameter.AutoSize = true;
-            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(84, 16);
-            this.cb_MaxDiameter.TabIndex = 92;
-            this.cb_MaxDiameter.Text = "最长直径um";
-            this.cb_MaxDiameter.UseVisualStyleBackColor = true;
-            // 
-            // cb_Area
-            // 
-            this.cb_Area.AutoSize = true;
-            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(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(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(336, 21);
-            this.tb_xsys.TabIndex = 89;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            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(53, 12);
-            this.label1.TabIndex = 87;
-            this.label1.Text = "显示元素";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            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(53, 12);
-            this.label2.TabIndex = 88;
-            this.label2.Text = "显示类型";
-            // 
-            // btn_xsys
-            // 
-            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(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);
-            // 
             // frmReportSysConfig
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(526, 365);
+            this.ClientSize = new System.Drawing.Size(526, 225);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox3);
@@ -672,26 +404,5 @@ namespace OTSIncAReprotCharts
         public System.Windows.Forms.TextBox tb_PartiSizeFileFolder;
         private System.Windows.Forms.GroupBox groupBox2;
         private Button btn_PartSize;
-        private CheckBox cb_ELONG;
-        private CheckBox cb_PERI;
-        private CheckBox cb_EquivalentCircleDiameter;
-        private CheckBox cb_ASPECT_ELONG;
-        private CheckBox cb_Orientation;
-        private CheckBox cb_MEAN;
-        private CheckBox cb_INSCR;
-        private CheckBox cb_PERP;
-        private CheckBox cb_FerretDiameter;
-        private CheckBox cb_DiameterRatio;
-        private CheckBox cb_MinDiameter;
-        private CheckBox cb_MaxDiameter;
-        private CheckBox cb_Area;
-        private TextBox tb_xsys;
-        private Label label1;
-        private Label label2;
-        private Button btn_xsys;
-        private CheckBox cB_Electrical_conductivity;
-        private CheckBox cB_Density;
-        private CheckBox cB_Hardness;
-        private CheckBox cb_ParticleCoordinate;
     }
 }

OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.cs

@@ -1,15 +1,10 @@
 using OTSCommon.Model;
 using OTSIncAReportApp;
-using OTSIncAReportApp.Controls;
 using OTSIncAReportApp.OTSDataMgrFunction;
 using OTSIncAReportApp.OTSMgrInfo;
 using OTSIncAReportApp.SysMgrTools;
-using OTSPeriodicTable;
-using OTSRptPeriodicTable;
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Windows.Forms;
 
 namespace OTSIncAReprotCharts
@@ -52,44 +47,6 @@ namespace OTSIncAReprotCharts
             #endregion
         }
 
-
-        /// <summary>
-        /// 加载下拉框控件数据
-        /// </summary>
-        private void BindCombobox()
-        {
-            //加载默认显示列名下拉框
-            foreach (OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum enum_one in Enum.GetValues(typeof(OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum)))
-            {
-                string str_text = string.Empty;
-                string str_value = string.Empty;
-                if (enum_one == OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum.Area)
-                {
-                    str_text = "面积";
-                }
-                if (enum_one == OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum.EquivalentCircleDiameter)
-                {
-                    str_text = "等效圆直径";
-                }
-                if (enum_one == OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum.MaxDiameter)
-                {
-                    str_text = "最长直径";
-                }
-                if (enum_one == OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum.MinDiameter)
-                {
-                    str_text = "最短直径";
-                }
-                if (enum_one == OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum.DiameterRatio)
-                {
-                    str_text = "长短直径比";
-                }
-                if (enum_one == OTSIncAReportApp.OTSSampleReportInfo.ComputedColNameEnum.FerretDiameter)
-                {
-                    str_text = "费雷特直径";
-                }
-            }
-        }
-
         private void ReportMgrInfoForm_Load(object sender, EventArgs e)
         {
             //初始化数据
@@ -117,8 +74,6 @@ namespace OTSIncAReprotCharts
             tb_sjtmbwj.ReadOnly = true;
             tb_PartiSizeFileFolder.ReadOnly = true;
 
-
-            string str_DefaultComputedColName = "", str_ElementsColName = "";
             DataSet ds = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.GetXmlData(Application.StartupPath + RptConfigFile.m_ReportMgrParamFile, "XMLData");
             DataTable dt = ds.Tables["Member"];
             string str_scale="";
@@ -126,31 +81,13 @@ namespace OTSIncAReprotCharts
             {
                 string RegName = element["RegName"].ToString();
 
-                if (RegName == "DefaultComputedColName")
-                {
-                    str_DefaultComputedColName = element["strValue"].ToString();
-                }
-
-                if (RegName == "ElementsColName")
-                {
-                    str_ElementsColName = element["strValue"].ToString();
-                }
                 if (RegName == "Scale")
                 {
                     str_scale = element["strValue"].ToString();
                 }
             }
-
-            
-
             //比例因子
             tb_blyz.Text = str_scale;
-
-            //显示元素
-            tb_xsys.Text = str_ElementsColName;
-
-            //设置计算显示列
-            SetShowColumnsListStr(str_DefaultComputedColName);
         }
 
 
@@ -277,524 +214,17 @@ namespace OTSIncAReprotCharts
         //保存报告文件
         private void btn_ybcsbc_Click(object sender, EventArgs e)
         {
-          
-         
-
             //参数设置保存功能粒级文件
             strParSizeFile = tb_PartiSizeFileFolder.Text;
 
             String strTritempFile = tb_sjtmb.Text;
             string strTritemp = tb_sjtmbwj.Text;
          
-
-
-            //保存显示计算项
-            string[] AttributeName_DefaultComputedColName = new string[] { "RegName", "strValue" };
-            string[] Value_DefaultComputedColName = new string[] { "DefaultComputedColName", GetShowColumnsListStr() };
-            bool ret = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.UpdateByAttribute(Application.StartupPath + RptConfigFile.m_ReportMgrParamFile, AttributeName_DefaultComputedColName, Value_DefaultComputedColName);
-
-            //保存显示元素信息
-            string[] AttributeName_ElementsColName = new string[] { "RegName", "strValue" };
-            string[] Value_ElementsColName = new string[] { "ElementsColName", tb_xsys.Text.Trim()};
-            ret = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.UpdateByAttribute(Application.StartupPath + RptConfigFile.m_ReportMgrParamFile, AttributeName_ElementsColName, Value_ElementsColName);
-
             //比例因子
             OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.EditXmlInfo(Application.StartupPath + RptConfigFile.m_ReportMgrParamFile, "Scale", "strValue", tb_blyz.Text.ToString());
 
-
-            //因为设置了颗粒列表的显示列，颗粒列表则需要重新加载,设置为null,后面可以重新加载
-            m_ReportApp.im_ParticlesGridDevidePage = null;
-
             this.Close();
         }
         #endregion
-
-        #region 规则标准库部份
-        private void button2_Click_1(object sender, EventArgs e)
-        {
-            //标准库规则编辑器
-            string exefile = "OTSPartA_STDEditor_d.exe";
-            if (File.Exists(exefile))
-            {
-                System.Diagnostics.Process process = new System.Diagnostics.Process();
-                // params 为 string 类型的参数，多个参数以空格分隔，如果某个参数为空，可以传入””
-                System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo(exefile, "");
-                process.StartInfo = startInfo;
-                process.Start();
-            }
-        }
-
-        #endregion
-
-        private void btn_xsys_Click(object sender, EventArgs e)
-        {
-            //打开编辑元素列表窗体
-            OTSPeriodicTable.OTSPeriodicTableForm_Small opts = new OTSPeriodicTable.OTSPeriodicTableForm_Small();
-
-            //获取需要显示的元素列表,并转换成元素周期表窗体可接受的格式，传入----------------------
-            string str_xsys = tb_xsys.Text.Trim();
-            List<string> list_str = new List<string>();
-            string[] strs = str_xsys.Split(',');
-            for (int i = 0; i < strs.Length; i++)
-            {
-                list_str.Add(strs[i]);
-            }
-
-            //清除元素周期表中所有的记录
-            opts.m_List_Periodic.Clear();
-
-            //将该分类下的元素添加到元素周期表窗体的List_periodic中
-            for (int i = 0; i < strs.Length; i++)
-            {
-                string str_ysm = strs[i];
-                Periodic ls_periodic = new Periodic();
-                ls_periodic = CListPeriodic.GetPeriodicByEleName( str_ysm);
-                opts.m_List_Periodic.Add(ls_periodic);
-            }
-            //----------------------------------------------------------------------------------------
-            opts.StartPosition = FormStartPosition.CenterScreen;
-            opts.ShowDialog();
-
-            List<string> PeriodicFH = new List<string>();
-            for (int j = 0; j < opts.m_List_Periodic.Count; j++)
-            {
-                PeriodicFH.Add(opts.m_List_Periodic[j].Symbol);
-            }
-
-            PeriodicFH.Sort(delegate (string a, string b) { return ReturnsAtomicNumberByElementName(a).CompareTo(ReturnsAtomicNumberByElementName(b)); });//排序 从小到大原子序数
-
-            list_str = list_str.FindAll(delegate (string a) { return PeriodicFH.Contains(a); });
-            PeriodicFH = PeriodicFH.FindAll(delegate (string a) { return !list_str.Contains(a); });
-
-            //先清空元素
-            str_xsys = "";
-
-            //然后再将选择的元素，组合起来，返回显示到该窗体上
-            for (int i = 0; i < list_str.Count; i++)
-            {
-                if (str_xsys == "")
-                {
-                    str_xsys = list_str[i];
-                }
-                else
-                {
-                    str_xsys = str_xsys + "," + list_str[i];
-                }
-            }
-            for (int i = 0; i < PeriodicFH.Count; i++)
-            {
-                if (str_xsys == "")
-                {
-                    str_xsys = PeriodicFH[i];
-                }
-                else
-                {
-                    str_xsys = str_xsys + "," + PeriodicFH[i];
-                }
-
-            }
-
-            //再对选择的元素进行显示
-            tb_xsys.Text = str_xsys;
-        }
-
-
-        /// <summary>
-        /// 将配置文件中的字段，拆分设置到各checkbox中
-        /// </summary>
-        private void SetShowColumnsListStr(string in_str)
-        {
-            cb_Area.Checked = false;
-            cb_EquivalentCircleDiameter.Checked = false;
-            cb_MaxDiameter.Checked = false;
-            cb_MinDiameter.Checked = false;
-            cb_DiameterRatio.Checked = false;
-            cb_FerretDiameter.Checked = false;
-            cb_PERP.Checked = false;
-            cb_PERI.Checked = false;
-            cb_INSCR.Checked = false;
-            cb_MEAN.Checked = false;
-            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;
-
-
-            //面积
-            if (in_str.IndexOf("Area") > -1)
-            {
-                cb_Area.Checked = true;
-            }
-
-            //等效圆直径
-            if (in_str.IndexOf("EquivalentCircleDiameter") > -1)
-            {
-                cb_EquivalentCircleDiameter.Checked = true;
-            }
-
-            //最长直径
-            if (in_str.IndexOf("MaxDiameter") > -1)
-            {
-                cb_MaxDiameter.Checked = true;
-            }
-
-            //最短直径
-            if (in_str.IndexOf("MinDiameter") > -1)
-            {
-                cb_MinDiameter.Checked = true;
-            }
-
-            //长短直径比
-            if (in_str.IndexOf("DiameterRatio") > -1)
-            {
-                cb_DiameterRatio.Checked = true;
-            }
-
-            //费雷特直径
-            if (in_str.IndexOf("FerretDiameter") > -1)
-            {
-                cb_FerretDiameter.Checked = true;
-            }
-
-            //正交直径
-            if (in_str.IndexOf("PERP") > -1)
-            {
-                cb_PERP.Checked = true;
-            }
-
-            //周长
-            if (in_str.IndexOf("PERI") > -1)
-            {
-                cb_PERI.Checked = true;
-            }
-
-            //内接圆直径
-            if (in_str.IndexOf("INSCR") > -1)
-            {
-                cb_INSCR.Checked = true;
-            }
-
-            //内接圆平均直径
-            if (in_str.IndexOf("MEAN") > -1)
-            {
-                cb_MEAN.Checked = true;
-            }
-
-            //展开长度
-            if (in_str.IndexOf("ELONG") > -1)
-            {
-                cb_ELONG.Checked = true;
-            }
-
-            //展开长度比
-            if (in_str.IndexOf("ASPECT_ELONG") > -1)
-            {
-                cb_ASPECT_ELONG.Checked = true;
-            }
-
-            //朝向角度
-            if (in_str.IndexOf("Orientation") > -1)
-            {
-                cb_Orientation.Checked = true;
-            }
-
-            //帧图坐标
-            if (in_str.IndexOf("ParticleCoordinate") > -1)
-            {
-                cb_ParticleCoordinate.Checked = true;
-            }
-
-            List<ResultFile> resfileList = m_ReportApp.m_rstDataMgr.ResultFilesList;
-            if (resfileList.Count > 0)
-            {
-                ResultFile resfile = resfileList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()];
-                var systype = m_ReportApp.m_RptConfigFile.Systype;
-                if (systype==OTSCommon.Model.OTS_SysType_ID.CleannessA)
-                {
-                    cB_Hardness.Enabled = true;
-                    cB_Density.Enabled = true;
-                    cB_Electrical_conductivity.Enabled = true;
-                    //硬度
-                    if (in_str.IndexOf("Hardness") > -1)
-                    {
-                        cB_Hardness.Checked = true;
-                    }
-
-                    //密度
-                    if (in_str.IndexOf("Density") > -1)
-                    {
-                        cB_Density.Checked = true;
-                    }
-
-                    //导电性
-                    if (in_str.IndexOf("Electrical_conductivity") > -1)
-                    {
-                        cB_Electrical_conductivity.Checked = true;
-                    }
-                }
-                else
-                {
-                    cB_Hardness.Enabled = false;
-                    cB_Density.Enabled = false;
-                    cB_Electrical_conductivity.Enabled = false;
-                }
-            }
-            else
-            {
-                cB_Hardness.Enabled = false;
-                cB_Density.Enabled = false;
-                cB_Electrical_conductivity.Enabled = false;
-            }
-
-           
-
-        }
-
-        /// <summary>
-        /// 获取从各checkbox中组合完成的字段
-        /// </summary>
-        private string GetShowColumnsListStr()
-        {
-            string str_ret = "";
-
-            //帧图坐标
-            if (cb_ParticleCoordinate.Checked == true)
-            {
-                str_ret = str_ret + "ParticleCoordinate" + ",";
-            }
-
-            //面积
-            if (cb_Area.Checked == true)
-            {
-                str_ret = str_ret + "Area" + ",";
-            }
-
-            //等效圆直径
-            if (cb_EquivalentCircleDiameter.Checked == true)
-            {
-                str_ret = str_ret + "EquivalentCircleDiameter" + ",";
-            }
-
-            //最长直径
-            if (cb_MaxDiameter.Checked == true)
-            {
-                str_ret = str_ret + "MaxDiameter" + ",";
-            }
-
-            //最短直径
-            if (cb_MinDiameter.Checked == true)
-            {
-                str_ret = str_ret + "MinDiameter" + ",";
-            }
-
-            //长短直径比
-            if (cb_DiameterRatio.Checked == true)
-            {
-                str_ret = str_ret + "DiameterRatio" + ",";
-            }
-
-            //费雷特直径
-            if (cb_FerretDiameter.Checked == true)
-            {
-                str_ret = str_ret + "FerretDiameter" + ",";
-            }
-
-
-            //正交直径
-            if (cb_PERP.Checked == true)
-            {
-                str_ret = str_ret + "PERP" + ",";
-            }
-
-            //周长
-            if (cb_PERI.Checked == true)
-            {
-                str_ret = str_ret + "PERI" + ",";
-            }
-
-            //内接圆直径
-            if (cb_INSCR.Checked == true)
-            {
-                str_ret = str_ret + "INSCR" + ",";
-            }
-
-            //内接圆平均直径
-            if (cb_MEAN.Checked == true)
-            {
-                str_ret = str_ret + "MEAN" + ",";
-            }
-
-            //展开长度
-            if (cb_ELONG.Checked == true)
-            {
-                str_ret = str_ret + "ELONG" + ",";
-            }
-
-            //展开长度比
-            if (cb_ASPECT_ELONG.Checked == true)
-            {
-                str_ret = str_ret + "ASPECT_ELONG" + ",";
-            }
-
-            //朝向角度
-            if (cb_Orientation.Checked == true)
-            {
-                str_ret = str_ret + "Orientation" + ",";
-            }
-
-            //导电性
-            if (cB_Electrical_conductivity.Checked == true)
-            {
-                str_ret = str_ret + "Electrical_conductivity" + ",";
-            }
-            //密度
-            if (cB_Density.Checked == true)
-            {
-                str_ret = str_ret + "Density" + ",";
-            }
-            //硬度
-            if (cB_Hardness.Checked == true)
-            {
-                str_ret = str_ret + "Hardness" + ",";
-            }
-
-            if (str_ret.Length > 0)
-            {
-                str_ret = str_ret.Substring(0, str_ret.Length - 1);
-            }
-            return str_ret;
-        }
-
-
-        /// <summary>
-        /// 返回原子序数
-        /// </summary>
-        /// <param name="ElementName"></param>
-        /// <returns></returns>
-        int ReturnsAtomicNumberByElementName(string ElementName)
-        {
-            switch (ElementName)
-            {
-                case "H": return 1;
-                case "He": return 2;
-                case "Li": return 3;
-                case "Be": return 4;
-                case "B": return 5;
-                case "C": return 6;
-                case "N": return 7;
-                case "O": return 8;
-                case "F": return 9;
-                case "Ne": return 10;
-                case "Na": return 11;
-                case "Mg": return 12;
-                case "Al": return 13;
-                case "Si": return 14;
-                case "P": return 15;
-                case "S": return 16;
-                case "Cl": return 17;
-                case "Ar": return 18;
-                case "K": return 19;
-                case "Ca": return 20;
-                case "Sc": return 21;
-                case "Ti": return 22;
-                case "V": return 23;
-                case "Cr": return 24;
-                case "Mn": return 25;
-                case "Fe": return 26;
-                case "Co": return 27;
-                case "Ni": return 28;
-                case "Cu": return 29;
-                case "Zn": return 30;
-                case "Ga": return 31;
-                case "Ge": return 32;
-                case "As": return 33;
-                case "Se": return 34;
-                case "Br": return 35;
-                case "Kr": return 36;
-                case "Rb": return 37;
-                case "Sr": return 38;
-                case "Y": return 39;
-                case "Zr": return 40;
-                case "Nb": return 41;
-                case "Mo": return 42;
-                case "Tc": return 43;
-                case "Ru": return 44;
-                case "Rh": return 45;
-                case "Pd": return 46;
-                case "Ag": return 47;
-                case "Cd": return 48;
-                case "In": return 49;
-                case "Sn": return 50;
-                case "Sb": return 51;
-                case "Te": return 52;
-                case "I": return 53;
-                case "Xe": return 54;
-                case "Cs": return 55;
-                case "Ba": return 56;
-                case "La": return 57;
-                case "Ce": return 58;
-                case "Pr": return 59;
-                case "Nd": return 60;
-                case "Pm": return 61;
-                case "Sm": return 62;
-                case "Eu": return 63;
-                case "Gd": return 64;
-                case "Tb": return 65;
-                case "Dy": return 66;
-                case "Ho": return 67;
-                case "Er": return 68;
-                case "Tm": return 69;
-                case "Yb": return 70;
-                case "Lu": return 71;
-                case "Hf": return 72;
-                case "Ta": return 73;
-                case "W": return 74;
-                case "Re": return 75;
-                case "Os": return 76;
-                case "Ir": return 77;
-                case "Pt": return 78;
-                case "Au": return 79;
-                case "Hq": return 80;
-                case "TI": return 81;
-                case "Pb": return 82;
-                case "Bi": return 83;
-                case "Po": return 84;
-                case "At": return 85;
-                case "Rn": return 86;
-                case "Fr": return 87;
-                case "Ra": return 88;
-                case "Ac": return 89;
-                case "Th": return 90;
-                case "Pa": return 91;
-                case "U": return 92;
-                case "Np": return 93;
-                case "Pu": return 94;
-                case "Am": return 95;
-                case "Cm": return 96;
-                case "Bk": return 97;
-                case "Cf": return 98;
-                case "Es": return 99;
-                case "Fm": return 100;
-                case "Mc": return 101;
-                case "No": return 102;
-                case "Lr": return 103;
-                case "Rf": return 104;
-                case "Db": return 105;
-                case "Sg": return 106;
-                case "Bh": return 107;
-                case "Hs": return 108;
-                case "Mt": return 109;
-                case "Ds": return 110;
-                case "Rg": return 111;
-                case "Unb": return 112;
-                default: return 1000;
-            }
-        }
-
-
-
     }
 }

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -434,6 +434,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePageShowConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePageShowConfig.Designer.cs">
+      <DependentUpon>ParticlesGridDevidePageShowConfig.cs</DependentUpon>
+    </Compile>
     <Compile Include="1-UI\Control_Grids\SpectrumExportConfirmation.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -496,10 +502,10 @@
     <Compile Include="1-UI\Controls\myColorComboBox.Designer.cs">
       <DependentUpon>myColorComboBox.cs</DependentUpon>
     </Compile>
-    <Compile Include="1-UI\Control_Grids\ParticlesGridDevidePage.cs">
+    <Compile Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePage.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="1-UI\Control_Grids\ParticlesGridDevidePage.Designer.cs">
+    <Compile Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePage.Designer.cs">
       <DependentUpon>ParticlesGridDevidePage.cs</DependentUpon>
     </Compile>
     <Compile Include="1-UI\Control_ECharts\EChart_ParticlesComposition.cs">
@@ -756,7 +762,7 @@
     <Compile Include="1-UI\OTSMgrInfo\frmReportSysConfig.Designer.cs">
       <DependentUpon>frmReportSysConfig.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="1-UI\Control_Grids\ParticlesGridDevidePage.resx">
+    <EmbeddedResource Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePage.resx">
       <DependentUpon>ParticlesGridDevidePage.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="1-UI\Control_ECharts\EChart_ParticlesComposition.resx">
@@ -787,6 +793,9 @@
     <EmbeddedResource Include="1-UI\Control_Grids\ElementCompositionAvgGrid.resx">
       <DependentUpon>ElementCompositionAvgGrid.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePageShowConfig.resx">
+      <DependentUpon>ParticlesGridDevidePageShowConfig.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="1-UI\Control_Grids\ParticlesSizeGrid.resx">
       <DependentUpon>ParticlesSizeGrid.cs</DependentUpon>
     </EmbeddedResource>

OTSInclusionsTraceability/DataOperation.cs

@@ -34,7 +34,7 @@ namespace OTSInclusionsTraceability
         public DataTable GetParticlesByEquCircleDiameter(string condition1,string condition2)
         {
             string sqliteString = "select fieldid,particleid,AveGray,RectLeft,RectTop,RectWidth,RectHeight,Area,PosX,PosY,TypeId,SegmentNum,SEMPosX,SEMPosY,XrayId,DMAX,DMIN,DPERP,PERIMETER,ORIENTATION,DINSCR,DMEAN,DELONG,DFERET,TypeName,TypeColor,'' as Element from INcAData" +
-                " where xrayid > -1  and typeid !=9 and typeid !=-1 " + /*"and "+ */condition1 /*+" and "*/+condition2 ;
+                " where xrayid > -1 " + /*"and "+ */condition1 /*+" and "*/+condition2 ;
             DataTable DT = new DataTable();
             DT = dbHelper.ExecuteQuery(sqliteString);
             return DT;

OTSSysMgrApp/XMLOperationClass.cs

@@ -329,7 +329,7 @@ namespace OTSSysMgrApp
                 xe.SetAttribute(AttributeName, Value);
                 xmlDocument.Save(xmlpath);
             }
-            catch (Exception ex)
+            catch /*(Exception ex)*/
             {
                 //MessageBox.Show(ex.ToString());
                 return false;
@@ -348,7 +348,7 @@ namespace OTSSysMgrApp
                 XmlElement xe = (XmlElement)node;
                 Value=xe.GetAttribute(AttributeName);
             }
-            catch (Exception ex)
+            catch /*(Exception ex)*/
             {
                 //MessageBox.Show(ex.ToString());
                 return false;