添加“是否元素归一化”项在程序管理

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -46,6 +46,7 @@ namespace OTSDataType
 
         private bool m_nUsingXray;
         private bool m_UseFilter;
+        bool m_ZeroElementProcess;
 
         private int m_XrayLimit;
         //private double m_xrayStep;
@@ -85,6 +86,7 @@ namespace OTSDataType
 
             m_nUsingXray = a_oSource.m_nUsingXray;
             m_UseFilter = a_oSource.m_UseFilter;
+            m_ZeroElementProcess = a_oSource.m_ZeroElementProcess;
             m_XrayLimit = a_oSource.m_XrayLimit;
             //m_xrayStep = a_oSource.m_xrayStep;
         }
@@ -107,7 +109,8 @@ namespace OTSDataType
                 //m_nFastXrayTime == a_oSource.m_nFastXrayTime &&
            
                 m_nUsingXray == a_oSource.m_nUsingXray &&
-                m_UseFilter == a_oSource.m_UseFilter;
+                m_UseFilter == a_oSource.m_UseFilter&&
+                m_ZeroElementProcess == a_oSource.m_ZeroElementProcess;
         }
 
 
@@ -160,6 +163,12 @@ namespace OTSDataType
             m_UseFilter = a_UseFilter;
         }
 
+        public bool GetZeroelementprocess() { return m_ZeroElementProcess; }
+        public void SetZeroelementprocess(bool a_Zeroelementprocess)
+        {
+            m_ZeroElementProcess = a_Zeroelementprocess;
+        }
+
         public override void Serialize(bool isStoring, XmlDocument classDoc, XmlNode rootNode)
         {
             xString xnScanMode = new xString();
@@ -178,8 +187,8 @@ namespace OTSDataType
 
             xInt xXrayLimit = new xInt();
             //xDouble xXrayStep = new xDouble();
+            xBool xZeroElementProcess = new xBool();
 
-    
             Slo slo = new Slo();
 
             slo.Register("ScanMode", xnScanMode);
@@ -200,7 +209,7 @@ namespace OTSDataType
 
             //slo.Register("XrayStep", xXrayStep);
 
-
+            slo.Register("ZeroElementProcess", xZeroElementProcess);
 
 
             if (isStoring)
@@ -220,7 +229,7 @@ namespace OTSDataType
                 xnUseFilter.AssignValue(m_UseFilter);
 
                 xXrayLimit.AssignValue(m_XrayLimit);
-
+                xZeroElementProcess.AssignValue(m_ZeroElementProcess);
                 //xXrayStep.AssignValue(m_xrayStep);
 
                 slo.Serialize(true, classDoc, rootNode);
@@ -244,7 +253,7 @@ namespace OTSDataType
                 m_UseFilter = xnUseFilter.value();
 
                 m_XrayLimit = xXrayLimit.value();
-
+                m_ZeroElementProcess = xZeroElementProcess.value();
                 //m_xrayStep = xXrayStep.value();
             }
         }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -664,7 +664,7 @@ namespace OTSMeasureApp
 
             IDC_FILTER.Checked = m_cotsxrayprm.GetUseFilter();
 
-
+            IDC_Zeroelementprocess.Checked = m_cotsxrayprm.GetZeroelementprocess();
         }
 
         /// <summary>
@@ -849,6 +849,8 @@ namespace OTSMeasureApp
 
             m_cotsxrayprm.SetUseFilter(IDC_FILTER.Checked);
 
+            m_cotsxrayprm.SetZeroelementprocess(IDC_Zeroelementprocess.Checked);
+
 
             //m_cotsxrayprm.SetShowScanMode(IDC_XRAY_MODE_SWITCH.Checked);
             //m_cotsxrayprm.SetShowSpeed(IDC_XRAY_TIME_SWITCH.Checked);

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -105,6 +105,9 @@
             this.label23 = new System.Windows.Forms.Label();
             this.label20 = new System.Windows.Forms.Label();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.IDC_Zeroelementprocess = new System.Windows.Forms.CheckBox();
+            this.label91 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
             this.IDC_FILTER = new System.Windows.Forms.CheckBox();
             this.IDC_EDIT_XrayLimit = new System.Windows.Forms.TextBox();
             this.label52 = new System.Windows.Forms.Label();
@@ -148,7 +151,7 @@
             this.groupBox1.Controls.Add(this.IDC_COMBO_STAGE);
             this.groupBox1.Controls.Add(this.label41);
             this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox1.Location = new System.Drawing.Point(6, 63);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
@@ -993,6 +996,9 @@
             // 
             // groupBox6
             // 
+            this.groupBox6.Controls.Add(this.IDC_Zeroelementprocess);
+            this.groupBox6.Controls.Add(this.label91);
+            this.groupBox6.Controls.Add(this.label8);
             this.groupBox6.Controls.Add(this.IDC_FILTER);
             this.groupBox6.Controls.Add(this.IDC_EDIT_XrayLimit);
             this.groupBox6.Controls.Add(this.label52);
@@ -1021,6 +1027,33 @@
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "X-ray参数";
             // 
+            // IDC_Zeroelementprocess
+            // 
+            this.IDC_Zeroelementprocess.AutoSize = true;
+            this.IDC_Zeroelementprocess.Location = new System.Drawing.Point(275, 158);
+            this.IDC_Zeroelementprocess.Margin = new System.Windows.Forms.Padding(2);
+            this.IDC_Zeroelementprocess.Name = "IDC_Zeroelementprocess";
+            this.IDC_Zeroelementprocess.Size = new System.Drawing.Size(15, 14);
+            this.IDC_Zeroelementprocess.TabIndex = 838;
+            this.IDC_Zeroelementprocess.UseVisualStyleBackColor = true;
+            // 
+            // label91
+            // 
+            this.label91.AutoSize = true;
+            this.label91.Location = new System.Drawing.Point(7, 158);
+            this.label91.Name = "label91";
+            this.label91.Size = new System.Drawing.Size(89, 12);
+            this.label91.TabIndex = 837;
+            this.label91.Text = "是否元素归一化";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(7, 158);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(0, 12);
+            this.label8.TabIndex = 836;
+            // 
             // IDC_FILTER
             // 
             this.IDC_FILTER.AutoSize = true;
@@ -1033,7 +1066,7 @@
             // 
             // IDC_EDIT_XrayLimit
             // 
-            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(141, 162);
+            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(138, 125);
             this.IDC_EDIT_XrayLimit.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_EDIT_XrayLimit.MaxLength = 10;
             this.IDC_EDIT_XrayLimit.Name = "IDC_EDIT_XrayLimit";
@@ -1043,7 +1076,7 @@
             // label52
             // 
             this.label52.AutoSize = true;
-            this.label52.Location = new System.Drawing.Point(9, 189);
+            this.label52.Location = new System.Drawing.Point(7, 188);
             this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label52.Name = "label52";
             this.label52.Size = new System.Drawing.Size(77, 12);
@@ -1053,7 +1086,7 @@
             // label47
             // 
             this.label47.AutoSize = true;
-            this.label47.Location = new System.Drawing.Point(9, 165);
+            this.label47.Location = new System.Drawing.Point(6, 128);
             this.label47.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label47.Name = "label47";
             this.label47.Size = new System.Drawing.Size(53, 12);
@@ -1145,7 +1178,7 @@
             // 
             // IDC_TEXTBOX_ANALYXRAYSPEED_TIME
             // 
-            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Location = new System.Drawing.Point(142, 87);
+            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Location = new System.Drawing.Point(141, 71);
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.MaxLength = 10;
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Name = "IDC_TEXTBOX_ANALYXRAYSPEED_TIME";
             this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Size = new System.Drawing.Size(117, 21);
@@ -1165,7 +1198,7 @@
             // label32
             // 
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(7, 90);
+            this.label32.Location = new System.Drawing.Point(6, 74);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(83, 12);
             this.label32.TabIndex = 770;
@@ -1174,7 +1207,7 @@
             // label39
             // 
             this.label39.AutoSize = true;
-            this.label39.Location = new System.Drawing.Point(274, 90);
+            this.label39.Location = new System.Drawing.Point(273, 74);
             this.label39.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label39.Name = "label39";
             this.label39.Size = new System.Drawing.Size(17, 12);
@@ -1194,7 +1227,7 @@
             // 
             // IDC_EDIT_ANALYXRAYAIMVALUE
             // 
-            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(142, 138);
+            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(139, 101);
             this.IDC_EDIT_ANALYXRAYAIMVALUE.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_EDIT_ANALYXRAYAIMVALUE.MaxLength = 10;
             this.IDC_EDIT_ANALYXRAYAIMVALUE.Name = "IDC_EDIT_ANALYXRAYAIMVALUE";
@@ -1205,7 +1238,7 @@
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(6, 140);
+            this.label33.Location = new System.Drawing.Point(9, 104);
             this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(119, 12);
@@ -1443,5 +1476,8 @@
         public System.Windows.Forms.TextBox IDC_EDIT_Overlap;
         private System.Windows.Forms.Label label52;
         public System.Windows.Forms.CheckBox IDC_FILTER;
+        public System.Windows.Forms.CheckBox IDC_Zeroelementprocess;
+        private System.Windows.Forms.Label label91;
+        private System.Windows.Forms.Label label8;
     }
 }