去除“是否元素归一化”项在程序管理

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -46,7 +46,6 @@ namespace OTSDataType
 
         private bool m_nUsingXray;
         private bool m_UseFilter;
-        bool m_ZeroElementProcess;
 
         private int m_XrayLimit;
         //private double m_xrayStep;
@@ -86,7 +85,6 @@ 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;
         }
@@ -109,8 +107,7 @@ namespace OTSDataType
                 //m_nFastXrayTime == a_oSource.m_nFastXrayTime &&
            
                 m_nUsingXray == a_oSource.m_nUsingXray &&
-                m_UseFilter == a_oSource.m_UseFilter&&
-                m_ZeroElementProcess == a_oSource.m_ZeroElementProcess;
+                m_UseFilter == a_oSource.m_UseFilter;
         }
 
 
@@ -163,12 +160,6 @@ 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();
@@ -229,7 +220,6 @@ namespace OTSDataType
                 xnUseFilter.AssignValue(m_UseFilter);
 
                 xXrayLimit.AssignValue(m_XrayLimit);
-                xZeroElementProcess.AssignValue(m_ZeroElementProcess);
                 //xXrayStep.AssignValue(m_xrayStep);
 
                 slo.Serialize(true, classDoc, rootNode);
@@ -253,7 +243,6 @@ 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,6 @@ namespace OTSMeasureApp
 
             IDC_FILTER.Checked = m_cotsxrayprm.GetUseFilter();
 
-            IDC_Zeroelementprocess.Checked = m_cotsxrayprm.GetZeroelementprocess();
         }
 
         /// <summary>
@@ -849,7 +848,6 @@ namespace OTSMeasureApp
 
             m_cotsxrayprm.SetUseFilter(IDC_FILTER.Checked);
 
-            m_cotsxrayprm.SetZeroelementprocess(IDC_Zeroelementprocess.Checked);
 
 
             //m_cotsxrayprm.SetShowScanMode(IDC_XRAY_MODE_SWITCH.Checked);

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -105,9 +105,6 @@
             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();
@@ -996,9 +993,6 @@
             // 
             // 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);
@@ -1027,37 +1021,10 @@
             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;
-            this.IDC_FILTER.Location = new System.Drawing.Point(276, 189);
+            this.IDC_FILTER.Location = new System.Drawing.Point(278, 186);
             this.IDC_FILTER.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_FILTER.Name = "IDC_FILTER";
             this.IDC_FILTER.Size = new System.Drawing.Size(15, 14);
@@ -1066,7 +1033,7 @@
             // 
             // IDC_EDIT_XrayLimit
             // 
-            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(138, 125);
+            this.IDC_EDIT_XrayLimit.Location = new System.Drawing.Point(141, 149);
             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";
@@ -1076,7 +1043,7 @@
             // label52
             // 
             this.label52.AutoSize = true;
-            this.label52.Location = new System.Drawing.Point(7, 188);
+            this.label52.Location = new System.Drawing.Point(9, 185);
             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);
@@ -1086,7 +1053,7 @@
             // label47
             // 
             this.label47.AutoSize = true;
-            this.label47.Location = new System.Drawing.Point(6, 128);
+            this.label47.Location = new System.Drawing.Point(9, 152);
             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);
@@ -1178,7 +1145,7 @@
             // 
             // IDC_TEXTBOX_ANALYXRAYSPEED_TIME
             // 
-            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Location = new System.Drawing.Point(141, 71);
+            this.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Location = new System.Drawing.Point(141, 81);
             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);
@@ -1198,7 +1165,7 @@
             // label32
             // 
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(6, 74);
+            this.label32.Location = new System.Drawing.Point(6, 84);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(83, 12);
             this.label32.TabIndex = 770;
@@ -1207,7 +1174,7 @@
             // label39
             // 
             this.label39.AutoSize = true;
-            this.label39.Location = new System.Drawing.Point(273, 74);
+            this.label39.Location = new System.Drawing.Point(273, 84);
             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);
@@ -1218,7 +1185,7 @@
             // 
             this.IDC_COMBO_XRAYSCANMODE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.IDC_COMBO_XRAYSCANMODE.FormattingEnabled = true;
-            this.IDC_COMBO_XRAYSCANMODE.Location = new System.Drawing.Point(142, 40);
+            this.IDC_COMBO_XRAYSCANMODE.Location = new System.Drawing.Point(142, 50);
             this.IDC_COMBO_XRAYSCANMODE.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_COMBO_XRAYSCANMODE.Name = "IDC_COMBO_XRAYSCANMODE";
             this.IDC_COMBO_XRAYSCANMODE.Size = new System.Drawing.Size(150, 20);
@@ -1227,7 +1194,7 @@
             // 
             // IDC_EDIT_ANALYXRAYAIMVALUE
             // 
-            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(139, 101);
+            this.IDC_EDIT_ANALYXRAYAIMVALUE.Location = new System.Drawing.Point(139, 112);
             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";
@@ -1238,7 +1205,7 @@
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(9, 104);
+            this.label33.Location = new System.Drawing.Point(9, 115);
             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);
@@ -1248,7 +1215,7 @@
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(7, 42);
+            this.label31.Location = new System.Drawing.Point(7, 52);
             this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(83, 12);
@@ -1476,8 +1443,5 @@
         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;
     }
 }