Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -28,17 +28,13 @@
     <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>O,Al,Mg,Ca,Ti,Si,S,Mn,N</str_tb_ysfx_xsys>
+    <str_tb_ysfx_xsys>Al,Si,O,Ca,Mg</str_tb_ysfx_xsys>
     <list_str_tb_ysfx_xsys>
-      <YS0>O</YS0>
-      <YS1>Al</YS1>
-      <YS2>Mg</YS2>
+      <YS0>Al</YS0>
+      <YS1>Si</YS1>
+      <YS2>O</YS2>
       <YS3>Ca</YS3>
-      <YS4>Ti</YS4>
-      <YS5>Si</YS5>
-      <YS6>S</YS6>
-      <YS7>Mn</YS7>
-      <YS8>N</YS8>
+      <YS4>Mg</YS4>
     </list_str_tb_ysfx_xsys>
     <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
     <index_cb_yscf_xstx>0</index_cb_yscf_xstx>

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -859,9 +859,39 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 }
 
                 InclusionAreaRatio(ls_gv);
+                //把用户设置感兴趣的元素显示在前边
+                for (int i=0;i< m_otsreport_export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Count(); i++)
+                {
+                    if (i > 13)
+                        continue;
+                    for (int a=0;a< ls_elementname_dt.Rows[0].ItemArray.Count(); a++)
+                    {
+                        if (m_otsreport_export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys[i]== ls_elementname_dt.Rows[0][a].ToString())
+                        {
+                            string str_elementname = "";
+                            
+                            str_elementname = ls_elementname_dt.Rows[0][i].ToString();
+                            ls_elementname_dt.Rows[0][i] = ls_elementname_dt.Rows[0][a];
+                            ls_elementname_dt.Rows[0][a] = str_elementname;
+
+                            for (int j=0;j< ls_element_dt.Rows.Count;j++)
+                            {
+                                string str_element = "0";
+                                str_element = ls_element_dt.Rows[j][i].ToString();
+                                ls_element_dt.Rows[j][i] = ls_element_dt.Rows[j][a];
+                                ls_element_dt.Rows[j][a] = str_element;
+                            }
+                           
+                        }
+                        
+                    }
+                }
+
                 m_list_dt.Add(ls_elementname_dt);
                 m_list_dt.Add(ls_element_dt);
 
+                List<string> elementColumn= m_otsreport_export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys;
+
                 return true;
             }
             catch (Exception ee)

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -102,6 +102,8 @@
             this.panel3 = new System.Windows.Forms.Panel();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.label39 = new System.Windows.Forms.Label();
+            this.button4 = new System.Windows.Forms.Button();
+            this.tb_ysfx_xsys = new System.Windows.Forms.TextBox();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox5.SuspendLayout();
@@ -431,7 +433,7 @@
             this.groupBox5.Controls.Add(this.label20);
             this.groupBox5.Controls.Add(this.label22);
             this.groupBox5.Controls.Add(this.cb_yscf_xstx);
-            this.groupBox5.Location = new System.Drawing.Point(3, 701);
+            this.groupBox5.Location = new System.Drawing.Point(3, 738);
             this.groupBox5.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Padding = new System.Windows.Forms.Padding(2);
@@ -483,13 +485,15 @@
             // 
             // groupBox6
             // 
+            this.groupBox6.Controls.Add(this.tb_ysfx_xsys);
+            this.groupBox6.Controls.Add(this.button4);
             this.groupBox6.Controls.Add(this.ck_ysfx_xsmk);
             this.groupBox6.Controls.Add(this.label25);
             this.groupBox6.Location = new System.Drawing.Point(3, 614);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox6.Size = new System.Drawing.Size(268, 72);
+            this.groupBox6.Size = new System.Drawing.Size(268, 101);
             this.groupBox6.TabIndex = 4;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "元素分析表";
@@ -525,11 +529,11 @@
             this.groupBox7.Controls.Add(this.label38);
             this.groupBox7.Controls.Add(this.label33);
             this.groupBox7.Controls.Add(this.label42);
-            this.groupBox7.Location = new System.Drawing.Point(3, 827);
+            this.groupBox7.Location = new System.Drawing.Point(3, 868);
             this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox7.Size = new System.Drawing.Size(263, 498);
+            this.groupBox7.Size = new System.Drawing.Size(263, 471);
             this.groupBox7.TabIndex = 7;
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "三元相图";
@@ -539,7 +543,7 @@
             this.lbv_syxt_mblb.CheckBoxes = true;
             this.lbv_syxt_mblb.FullRowSelect = true;
             this.lbv_syxt_mblb.HideSelection = false;
-            this.lbv_syxt_mblb.Location = new System.Drawing.Point(6, 232);
+            this.lbv_syxt_mblb.Location = new System.Drawing.Point(8, 199);
             this.lbv_syxt_mblb.Margin = new System.Windows.Forms.Padding(2);
             this.lbv_syxt_mblb.Name = "lbv_syxt_mblb";
             this.lbv_syxt_mblb.Size = new System.Drawing.Size(249, 258);
@@ -582,7 +586,7 @@
             // 
             this.cb_syxt_mhxssl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_syxt_mhxssl.FormattingEnabled = true;
-            this.cb_syxt_mhxssl.Location = new System.Drawing.Point(14, 150);
+            this.cb_syxt_mhxssl.Location = new System.Drawing.Point(14, 129);
             this.cb_syxt_mhxssl.Margin = new System.Windows.Forms.Padding(2);
             this.cb_syxt_mhxssl.Name = "cb_syxt_mhxssl";
             this.cb_syxt_mhxssl.Size = new System.Drawing.Size(214, 20);
@@ -602,7 +606,7 @@
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(14, 211);
+            this.label33.Location = new System.Drawing.Point(16, 178);
             this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(101, 12);
@@ -612,7 +616,7 @@
             // label42
             // 
             this.label42.AutoSize = true;
-            this.label42.Location = new System.Drawing.Point(12, 136);
+            this.label42.Location = new System.Drawing.Point(12, 115);
             this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label42.Name = "label42";
             this.label42.Size = new System.Drawing.Size(77, 12);
@@ -629,11 +633,11 @@
             this.groupBox8.Controls.Add(this.label31);
             this.groupBox8.Controls.Add(this.label30);
             this.groupBox8.Controls.Add(this.label34);
-            this.groupBox8.Location = new System.Drawing.Point(3, 1340);
+            this.groupBox8.Location = new System.Drawing.Point(3, 1356);
             this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox8.Size = new System.Drawing.Size(263, 159);
+            this.groupBox8.Size = new System.Drawing.Size(263, 140);
             this.groupBox8.TabIndex = 6;
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "颗粒列表";
@@ -641,7 +645,7 @@
             // ck_kllb_npxx
             // 
             this.ck_kllb_npxx.AutoSize = true;
-            this.ck_kllb_npxx.Location = new System.Drawing.Point(224, 118);
+            this.ck_kllb_npxx.Location = new System.Drawing.Point(224, 102);
             this.ck_kllb_npxx.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_npxx.Name = "ck_kllb_npxx";
             this.ck_kllb_npxx.Size = new System.Drawing.Size(15, 14);
@@ -652,7 +656,7 @@
             // ck_kllb_fdtx
             // 
             this.ck_kllb_fdtx.AutoSize = true;
-            this.ck_kllb_fdtx.Location = new System.Drawing.Point(224, 90);
+            this.ck_kllb_fdtx.Location = new System.Drawing.Point(224, 74);
             this.ck_kllb_fdtx.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_fdtx.Name = "ck_kllb_fdtx";
             this.ck_kllb_fdtx.Size = new System.Drawing.Size(15, 14);
@@ -663,7 +667,7 @@
             // ck_kllb_ystx
             // 
             this.ck_kllb_ystx.AutoSize = true;
-            this.ck_kllb_ystx.Location = new System.Drawing.Point(224, 64);
+            this.ck_kllb_ystx.Location = new System.Drawing.Point(224, 48);
             this.ck_kllb_ystx.Margin = new System.Windows.Forms.Padding(2);
             this.ck_kllb_ystx.Name = "ck_kllb_ystx";
             this.ck_kllb_ystx.Size = new System.Drawing.Size(15, 14);
@@ -685,7 +689,7 @@
             // label32
             // 
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(16, 118);
+            this.label32.Location = new System.Drawing.Point(16, 102);
             this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(53, 12);
@@ -695,7 +699,7 @@
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(14, 92);
+            this.label31.Location = new System.Drawing.Point(14, 76);
             this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(53, 12);
@@ -705,7 +709,7 @@
             // label30
             // 
             this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(14, 66);
+            this.label30.Location = new System.Drawing.Point(14, 50);
             this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label30.Name = "label30";
             this.label30.Size = new System.Drawing.Size(53, 12);
@@ -888,7 +892,7 @@
             this.panel3.Controls.Add(this.groupBox1);
             this.panel3.Location = new System.Drawing.Point(714, 74);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(299, 636);
+            this.panel3.Size = new System.Drawing.Size(299, 654);
             this.panel3.TabIndex = 74;
             // 
             // groupBox9
@@ -923,11 +927,31 @@
             this.label39.TabIndex = 75;
             this.label39.Text = "模板设置";
             // 
+            // button4
+            // 
+            this.button4.Location = new System.Drawing.Point(213, 66);
+            this.button4.Margin = new System.Windows.Forms.Padding(2);
+            this.button4.Name = "button4";
+            this.button4.Size = new System.Drawing.Size(37, 19);
+            this.button4.TabIndex = 57;
+            this.button4.Text = "...";
+            this.button4.UseVisualStyleBackColor = true;
+            this.button4.Click += new System.EventHandler(this.button4_Click);
+            // 
+            // tb_ysfx_xsys
+            // 
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 66);
+            this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
+            this.tb_ysfx_xsys.ReadOnly = true;
+            this.tb_ysfx_xsys.Size = new System.Drawing.Size(173, 21);
+            this.tb_ysfx_xsys.TabIndex = 58;
+            // 
             // OTSReport_TemplateDesignerRM
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1037, 707);
+            this.ClientSize = new System.Drawing.Size(1037, 751);
             this.Controls.Add(this.button6);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.label39);
@@ -1047,5 +1071,7 @@
         private System.Windows.Forms.Panel panel3;
         private System.Windows.Forms.GroupBox groupBox9;
         private System.Windows.Forms.Label label39;
+        private System.Windows.Forms.TextBox tb_ysfx_xsys;
+        private System.Windows.Forms.Button button4;
     }
 }

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -196,7 +196,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         private void button4_Click(object sender, EventArgs e)
         {
             //元素分析表,显示元素
-            //SetPeriodicTableControl(tb_ysfx_xsys, m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys);
+            SetPeriodicTableControl(tb_ysfx_xsys, m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys);
         }
 
         private void button5_Click(object sender, EventArgs e)
@@ -584,7 +584,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs = cb_yxfx_jsfs.SelectedIndex;
             //m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_ysfx_klfw = cb_ysfx_klfw.Text;//颗粒范围
             //m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw = cb_ysfx_klfw.SelectedIndex;
-            //m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys = tb_ysfx_xsys.Text;//显示元素
+            m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys = tb_ysfx_xsys.Text;//显示元素
 
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk = ck_yscf_xsmk.Checked;
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_xstx = cb_yscf_xstx.Text;//显示图形
@@ -685,7 +685,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //cb_yxfx_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs;
             //cb_ysfx_klfw.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_ysfx_klfw;//颗粒范围
             //cb_ysfx_klfw.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_ysfx_klfw;
-            //tb_ysfx_xsys.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys;//显示元素
+            tb_ysfx_xsys.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_tb_ysfx_xsys;//显示元素
 
             ck_yscf_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk;
             //cb_yscf_xstx.Text = m_OTSReport_Export.m_mbszclass.M_YSFXJG.str_cb_yscf_xstx;//显示图形

OTSSysMgrApp/SemTestForms.cs

@@ -1303,5 +1303,20 @@ namespace OTSSysMgrApp
         {
 
         }
+
+        private void button_VoltageStatus_Click(object sender, EventArgs e)
+        {
+            //连接电镜 关闭电压
+            int a_HTValue = 0;
+            bool result = cfun.GetSemHTOnOff(ref a_HTValue);
+                MessageBox.Show("电压当前状态：" + Convert.ToBoolean(a_HTValue).ToString());
+        }
+
+        private void button_VoltageClose_Click(object sender, EventArgs e)
+        {
+            int a_HTValue = 0; 
+            bool result = cfun.SetSemHTOnOff(a_HTValue);
+                MessageBox.Show("关闭电压是否成功：" + Convert.ToBoolean(result).ToString());
+        }
     }
 }