add specify elements function while do quantification

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
+  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Oxford" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -755,11 +755,11 @@
             this.groupBox5.Controls.Add(this.label26);
             this.groupBox5.Controls.Add(this.label23);
             this.groupBox5.Controls.Add(this.label20);
-            this.groupBox5.Location = new System.Drawing.Point(333, 477);
+            this.groupBox5.Location = new System.Drawing.Point(327, 153);
             this.groupBox5.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox5.Size = new System.Drawing.Size(313, 217);
+            this.groupBox5.Size = new System.Drawing.Size(313, 228);
             this.groupBox5.TabIndex = 540;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "图像处理参数";
@@ -1054,7 +1054,7 @@
             this.groupBox6.Controls.Add(this.label39);
             this.groupBox6.Controls.Add(this.IDC_COMBO_XRAYSCANMODE);
             this.groupBox6.Controls.Add(this.label31);
-            this.groupBox6.Location = new System.Drawing.Point(333, 154);
+            this.groupBox6.Location = new System.Drawing.Point(327, 388);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Size = new System.Drawing.Size(313, 306);

OTSIncAMeasureApp/OTSPeriodicTable/OTSPeriodicTableForm_Small.Designer.cs

@@ -1,4 +1,7 @@
-namespace OTSPeriodicTable
+using System;
+using System.Windows.Forms;
+
+namespace OTSPeriodicTable
 {
     partial class OTSPeriodicTableForm_Small
     {
@@ -28,29 +31,33 @@
         /// </summary>
         private void InitializeComponent()
         {
-            //this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+            thePeriodicTable_Small1 = new Controls.ThePeriodicTable_Small();
+            // 
+            // thePeriodicTable_Small1
+            // 
+            this.thePeriodicTable_Small1.Location = new System.Drawing.Point(2, 2);
+            this.thePeriodicTable_Small1.Name = "thePeriodicTable_Small1";
+            this.thePeriodicTable_Small1.Size = new System.Drawing.Size(925, 550);
+            //this.thePeriodicTable_Small1.TabIndex = 0;
+            this.thePeriodicTable_Small1.Visible = true;
+            //this.SuspendLayout();
+
             this.linkLabel2 = new System.Windows.Forms.LinkLabel();
             this.linkLabel3 = new System.Windows.Forms.LinkLabel();
-            this.thePeriodicTable_Small1 = new OTSPeriodicTable.Controls.ThePeriodicTable_Small();
+            this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+            this.linkLabel4 = new System.Windows.Forms.LinkLabel();
+            this.linkLabel5 = new System.Windows.Forms.LinkLabel();
+            this.linkLabel6 = new System.Windows.Forms.LinkLabel();
+            this.linkLabel7 = new System.Windows.Forms.LinkLabel();
             this.SuspendLayout();
-            //// 
-            //// linkLabel1
-            //// 
-            //this.linkLabel1.AutoSize = true;
-            //this.linkLabel1.Location = new System.Drawing.Point(11, 524);
-            //this.linkLabel1.Name = "linkLabel1";
-            //this.linkLabel1.Size = new System.Drawing.Size(170, 18);
-            //this.linkLabel1.TabIndex = 1;
-            //this.linkLabel1.TabStop = true;
-            //this.linkLabel1.Text = "Display Completely";
-            //this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
             // 
             // linkLabel2
             // 
             this.linkLabel2.AutoSize = true;
-            this.linkLabel2.Location = new System.Drawing.Point(11, 496);
+            this.linkLabel2.Location = new System.Drawing.Point(7, 337);
+            this.linkLabel2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.linkLabel2.Name = "linkLabel2";
-            this.linkLabel2.Size = new System.Drawing.Size(170, 18);
+            this.linkLabel2.Size = new System.Drawing.Size(113, 12);
             this.linkLabel2.TabIndex = 1;
             this.linkLabel2.TabStop = true;
             this.linkLabel2.Text = "All Element Enable";
@@ -59,34 +66,92 @@
             // linkLabel3
             // 
             this.linkLabel3.AutoSize = true;
-            this.linkLabel3.Location = new System.Drawing.Point(11, 469);
+            this.linkLabel3.Location = new System.Drawing.Point(7, 313);
+            this.linkLabel3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.linkLabel3.Name = "linkLabel3";
-            this.linkLabel3.Size = new System.Drawing.Size(134, 18);
+            this.linkLabel3.Size = new System.Drawing.Size(89, 12);
             this.linkLabel3.TabIndex = 1;
             this.linkLabel3.TabStop = true;
             this.linkLabel3.Text = "Common Element";
             this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked);
             // 
-            // thePeriodicTable_Small1
+            // linkLabel1
             // 
-            this.thePeriodicTable_Small1.Location = new System.Drawing.Point(2, 2);
-            this.thePeriodicTable_Small1.Name = "thePeriodicTable_Small1";
-            this.thePeriodicTable_Small1.Size = new System.Drawing.Size(925, 550);
-            this.thePeriodicTable_Small1.TabIndex = 0;
+            this.linkLabel1.AutoSize = true;
+            this.linkLabel1.Location = new System.Drawing.Point(7, 360);
+            this.linkLabel1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.linkLabel1.Name = "linkLabel1";
+            this.linkLabel1.Size = new System.Drawing.Size(119, 12);
+            this.linkLabel1.TabIndex = 1;
+            this.linkLabel1.TabStop = true;
+            this.linkLabel1.Text = "IncA Element Enable";
+            this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkInacA_LinkClicked);
+            // 
+            // linkLabel4
+            // 
+            this.linkLabel4.AutoSize = true;
+            this.linkLabel4.Location = new System.Drawing.Point(7, 385);
+            this.linkLabel4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.linkLabel4.Name = "linkLabel4";
+            this.linkLabel4.Size = new System.Drawing.Size(209, 12);
+            this.linkLabel4.TabIndex = 2;
+            this.linkLabel4.TabStop = true;
+            this.linkLabel4.Text = "Technical Cleanness Element Enable";
+            this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked);
+            // 
+            // linkLabel5
+            // 
+            this.linkLabel5.AutoSize = true;
+            this.linkLabel5.Location = new System.Drawing.Point(7, 410);
+            this.linkLabel5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.linkLabel5.Name = "linkLabel5";
+            this.linkLabel5.Size = new System.Drawing.Size(197, 12);
+            this.linkLabel5.TabIndex = 3;
+            this.linkLabel5.TabStop = true;
+            this.linkLabel5.Text = "Battery Cleanness Element Enable";
+            this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked);
+            // 
+            // linkLabel6
+            // 
+            this.linkLabel6.AutoSize = true;
+            this.linkLabel6.Location = new System.Drawing.Point(7, 434);
+            this.linkLabel6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.linkLabel6.Name = "linkLabel6";
+            this.linkLabel6.Size = new System.Drawing.Size(125, 12);
+            this.linkLabel6.TabIndex = 4;
+            this.linkLabel6.TabStop = true;
+            this.linkLabel6.Text = "Steel Element Enable";
+            this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked);
+            // 
+            // linkLabel7
+            // 
+            this.linkLabel7.AutoSize = true;
+            this.linkLabel7.Location = new System.Drawing.Point(7, 455);
+            this.linkLabel7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.linkLabel7.Name = "linkLabel7";
+            this.linkLabel7.Size = new System.Drawing.Size(149, 12);
+            this.linkLabel7.TabIndex = 5;
+            this.linkLabel7.TabStop = true;
+            this.linkLabel7.Text = "Aliuminum Element Enable";
+            this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked);
             // 
             // OTSPeriodicTableForm_Small
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(932, 555);
+            this.ClientSize = new System.Drawing.Size(622, 476);
+            
+            this.Controls.Add(this.linkLabel7);
+            this.Controls.Add(this.linkLabel6);
+            this.Controls.Add(this.linkLabel5);
+            this.Controls.Add(this.linkLabel4);
             this.Controls.Add(this.linkLabel3);
+            this.Controls.Add(this.linkLabel1);
             this.Controls.Add(this.linkLabel2);
-            //this.Controls.Add(this.linkLabel1);
             this.Controls.Add(this.thePeriodicTable_Small1);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(954, 611);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(954, 611);
             this.Name = "OTSPeriodicTableForm_Small";
             this.ShowIcon = false;
             this.Text = "元素周期表";
@@ -97,11 +162,21 @@
 
         }
 
+        private void linkInacA_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            SetSelectedPeriodicEnable(m_IncA_elementliststr);
+        }
+
         #endregion
 
         private Controls.ThePeriodicTable_Small thePeriodicTable_Small1;
         //private System.Windows.Forms.LinkLabel linkLabel1;
         private System.Windows.Forms.LinkLabel linkLabel2;
         private System.Windows.Forms.LinkLabel linkLabel3;
+        private System.Windows.Forms.LinkLabel linkLabel1;
+        private System.Windows.Forms.LinkLabel linkLabel4;
+        private System.Windows.Forms.LinkLabel linkLabel5;
+        private System.Windows.Forms.LinkLabel linkLabel6;
+        private System.Windows.Forms.LinkLabel linkLabel7;
     }
 }

OTSIncAMeasureApp/OTSPeriodicTable/OTSPeriodicTableForm_Small.cs

@@ -21,10 +21,21 @@ namespace OTSPeriodicTable
             "Co","Zr","Si","Cu","Sn","Se","W","Pb","Te","Mo",
             "Bi","As","V","Cs","S","Ti","Ba","P","Al","La",
             "N","Nb","Ce","O","Ta","Nd","H","Y","Cl","Ac","Hg","I","Br","F","Re","W"};
+        private string[] m_Battery_elementliststr = { "Na","Mg","Al","Si","K","Ca",
+            "Cr","Mn","Fe","Co","Ni","Cu","Zn","Ag","Au"};
+        private string[] m_TechnicalCleanness_c_elementliststr = {"C","O","F", "Na","Mg","Al","Si","P","S","Cl","K","Ca",
+          "Ti", "Cr","Mn","Fe","Ni","Cu","Zn","Cd","Sn","Ba","W","Pb"};
+        private string[] m_Steel_elementliststr = {"N", "Na","Mg","Al","Si","S","Cl","K","Ca",
+          "Ti", "Cr","Mn","Fe","Co","Ni","Nb","Mo"};
+        private string[] m_aliuminum_elementliststr = {"N", "Na","Mg","Al","Si","S","Cl","K","Ca",
+           "Ti", "Cr","Mn","Fe","Ni","Cu","Zn","Zr","Nb","Mo"};
+        private string[] m_IncA_elementliststr = {"S", "O","N","Mg","Al","Si","Ca",
+         "Ti", "V","Mn","Zr","Nb","Mo","Ce","La","Fe","C","Cr","P","Na","F"};
+
 
         #endregion
 
-            #region 构造函数及窗体加载
+        #region 构造函数及窗体加载
         public OTSPeriodicTableForm_Small()
         {
             m_List_Periodic = new List<Periodic>();//加载窗体时，重新初始化元素lis
@@ -110,7 +121,7 @@ namespace OTSPeriodicTable
         /// <summary>
         /// 将常用的界面UI periodic 设置成选择状态
         /// </summary>
-        private void SetCommonPeriodicEnable()
+        private void SetSelectedPeriodicEnable(string[] selectedelements)
         {
             foreach (Control uc in thePeriodicTable_Small1.Controls)
             {
@@ -127,7 +138,7 @@ namespace OTSPeriodicTable
                                 User_Element_Small ue = (User_Element_Small)uc3;
 
                                 //对常用元素进行判断
-                                if (m_common_elementliststr.Contains( ue.lb_fh.Text)== true)
+                                if (selectedelements.Contains( ue.lb_fh.Text)== true)
                                 {
                                     //选择
                                     ue.i_click = 2;
@@ -267,7 +278,7 @@ namespace OTSPeriodicTable
         private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
             //选择常用元素
-            SetCommonPeriodicEnable();
+            SetSelectedPeriodicEnable(m_common_elementliststr);
         }
 
         private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -285,6 +296,24 @@ namespace OTSPeriodicTable
             }
         }
 
+        private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            SetSelectedPeriodicEnable(m_TechnicalCleanness_c_elementliststr);
+        }
+
+        private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            SetSelectedPeriodicEnable(m_Battery_elementliststr);
+        }
 
+        private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            SetSelectedPeriodicEnable(m_Steel_elementliststr);
+        }
+
+        private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            SetSelectedPeriodicEnable(m_aliuminum_elementliststr);
+        }
     }
 }

OTSIncAMeasureApp/OTSPeriodicTable/ThePeriodicTable_Small.cs

@@ -70,7 +70,7 @@ namespace OTSPeriodicTable.Controls
             Color HalogensColor = Color.Gainsboro;        //卤素             如元素(9) 
             Color NobleGasesColor = Color.Gainsboro;//惰性气体         如元素(2)
             Color RareEarthColor = Color.Gainsboro;          //罕见             如元素(57)
-            
+
 
             User_Element_Small ue = new User_Element_Small();
             ue.lb_xh.Text = "1";