remove useless variables in OTSGeneralParam.cs

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

@@ -21,7 +21,7 @@
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
     <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>1</index_cb_klcc_ljb>
+    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
     <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
@@ -29,8 +29,6 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
-    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
@@ -62,21 +60,17 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al₂O₃</MB0>
-      <MB1>CaO.S.Al₂O₃</MB1>
-      <MB2>CaO.SiO₂.Al₂O₃</MB2>
-      <MB3>MnO.S.Al₂O₃</MB3>
+      <MB1>CaO.SiO₂.Al₂O₃</MB1>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
-      <MBIndex1>1</MBIndex1>
-      <MBIndex2>2</MBIndex2>
-      <MBIndex3>3</MBIndex3>
+      <MBIndex1>2</MBIndex1>
     </list_lbv_syxt_mblb_index>
   </M_SYXT>
   <M_KLLBXX>
@@ -107,8 +101,8 @@
     <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
     <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
     <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>AveGray</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>3</index_cb_kllb_chartSort_p2>
+    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
+    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
     <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
@@ -121,7 +115,6 @@
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
     </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>60</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>

OTSIncAMeasureApp/0-OTSModel/OTSDataType/CSampleParam.cs

@@ -1,5 +1,4 @@
-//using OTSMeasureApp._0_OTSModel.Measure.ParamData;
-using OTSMeasureApp._0_OTSModel.OTSDataType;
+using OTSMeasureApp._0_OTSModel.OTSDataType;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OTSIncAMeasureApp/1-OTSMeasure/Measure/ParamData/OTSGeneralParam.cs

@@ -11,7 +11,7 @@ namespace OTSModelSharp
    public class COTSGeneralParam : ISlo
     {
         //--------------------definition-------------
-        int m_StdLibTypeIndex;
+        //int m_StdLibTypeIndex;
         double m_dDefaultArea;
         int m_nPropertyDisplayMode;
         bool m_bMeasSwitch;
@@ -71,7 +71,7 @@ namespace OTSModelSharp
               (m_bMeasSwitch == a_oSource.m_bMeasSwitch) &&
               (m_strMeasParamFileFolderName.ToLower().IndexOf(a_oSource.m_strMeasParamFileFolderName) == 0) &&
               (m_strPartSTDLibFolderName.ToLower().IndexOf(a_oSource.m_strPartSTDLibFolderName) == 0)) &&
-              (m_StdLibTypeIndex == a_oSource.m_StdLibTypeIndex) && (m_DefaultmembraneType == a_oSource.m_DefaultmembraneType) &&
+              (m_DefaultmembraneType == a_oSource.m_DefaultmembraneType) &&
               (m_nDefaultShape == a_oSource.m_nDefaultShape) &&
               (m_dDefaultArea == a_oSource.m_dDefaultArea) &&
               (m_nPropertyDisplayMode == a_oSource.m_nPropertyDisplayMode);
@@ -110,14 +110,14 @@ namespace OTSModelSharp
         }
 
 
-        public int GetPartStdLibTypeIndex()
-        {
-            return m_StdLibTypeIndex;
-        }
-        public void SetPartStdLibTypeIndex(int a_index)
-        {
-            m_StdLibTypeIndex = a_index;
-        }
+        //public int GetPartStdLibTypeIndex()
+        //{
+        //    return m_StdLibTypeIndex;
+        //}
+        //public void SetPartStdLibTypeIndex(int a_index)
+        //{
+        //    m_StdLibTypeIndex = a_index;
+        //}
 
         public int PropertyDisplayMode()
         {
@@ -204,7 +204,7 @@ namespace OTSModelSharp
 
         public int GetSteelTechnology() { return m_steelTechnologyl; }
         public void SetSteelTechnology(int a_steelTechnology) { m_steelTechnologyl = a_steelTechnology; }
-        public string GetSTDSelect() { return m_sSTDSelect; }
+        public string GetSelectSTDName() { return m_sSTDSelect; }
         public void SetSTDSelect(string a_sSTDSelect) { m_sSTDSelect = a_sSTDSelect; }
         //--------------------protected--------------
         // initialization
@@ -214,7 +214,7 @@ namespace OTSModelSharp
             m_bMeasSwitch = true;
             m_strMeasParamFileFolderName = ("");
             m_strPartSTDLibFolderName = ("");
-            m_StdLibTypeIndex = 0;
+            //m_StdLibTypeIndex = 0;
             m_DefaultmembraneType = otsdataconst.MEMBRANE_TYPE.Abrasive;
             m_nDefaultShape = (otsdataconst.DOMAIN_SHAPE)(-1);
             m_dDefaultArea = 0;
@@ -242,7 +242,7 @@ namespace OTSModelSharp
             m_bMeasSwitch = a_oSource.m_bMeasSwitch;
             m_strMeasParamFileFolderName = a_oSource.m_strMeasParamFileFolderName;
             m_strPartSTDLibFolderName = a_oSource.m_strPartSTDLibFolderName;
-            m_StdLibTypeIndex = a_oSource.m_StdLibTypeIndex;
+            //m_StdLibTypeIndex = a_oSource.m_StdLibTypeIndex;
             m_DefaultmembraneType = a_oSource.m_DefaultmembraneType;
             m_nDefaultShape = a_oSource.m_nDefaultShape;
             m_dDefaultArea = a_oSource.m_dDefaultArea;
@@ -292,7 +292,7 @@ namespace OTSModelSharp
                 xstrMeasParamFileFolderName.AssignValue(m_strMeasParamFileFolderName);
                 xstrPartSTDLibFolderName.AssignValue(m_strPartSTDLibFolderName);
                 xstrSTDSelect.AssignValue(m_sSTDSelect);
-                xnStdLibTypeIndex.AssignValue(m_StdLibTypeIndex);
+                //xnStdLibTypeIndex.AssignValue(m_StdLibTypeIndex);
                 xnSteelTechnology.AssignValue(m_steelTechnologyl);
                 xnDefaultShape.AssignValue((int)m_nDefaultShape);
                 xbUseSysSTD.AssignValue(m_bSysSTD);
@@ -310,7 +310,7 @@ namespace OTSModelSharp
                 m_strMeasParamFileFolderName = xstrMeasParamFileFolderName.value();
                 m_strPartSTDLibFolderName = xstrPartSTDLibFolderName.value();
                 m_sSTDSelect = xstrSTDSelect.value();
-                m_StdLibTypeIndex = xnStdLibTypeIndex.value();
+                //m_StdLibTypeIndex = xnStdLibTypeIndex.value();
                 m_steelTechnologyl = xnSteelTechnology.value();
                 m_nDefaultShape = (otsdataconst.DOMAIN_SHAPE)xnDefaultShape.value();
                 m_bSysSTD =Convert.ToBoolean(xbUseSysSTD.toString());

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -361,7 +361,7 @@ namespace OTSMeasureApp
             poMsrParams.SetImageScanParam(GetDefaultParam().GetImageScanParam ());
             poMsrParams.SetImageProcessParam(GetDefaultParam().GetImageProcParam()); 
             poMsrParams.SetXRayParam(GetDefaultParam().GetXRayParam());
-            String sSTDName = m_pParam.GetSTDSelect();
+            String sSTDName = m_pParam.GetSelectSTDName();
             poMsrParams.SetSTDName(sSTDName);
             poMsrParams.SetSteelTechnology((STEEL_TECHNOLOGY)m_pParam.GetSteelTechnology());
             poMsrParams.SetSpecialGrayRangeParam(SpecialRanges);

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -514,15 +514,7 @@ namespace OTSMeasureApp
             IDC_EDIT_ANALYSESTDLIBPATH.Text = m_cgenparam.GetPartSTDLibFolderName().ToString();
           
 
-            //选择颗粒分析标准库
-            foreach (ComboBoxItem cbi in IDC_COMBO_TECHNOLOGY.Items)
-            {
-                if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cgenparam.GetPartStdLibTypeIndex())
-                    {
-                        IDC_COMBO_TECHNOLOGY.SelectedItem = cbi;
-                    }
-            }
+           
             //精炼工艺选项
             foreach (ComboBoxItem cbi in IDC_COMBO_TECHNOLOGY.Items)
             {
@@ -549,7 +541,7 @@ namespace OTSMeasureApp
             foreach (ComboBoxItem cbi in IDC_COMBO_STDSelect.Items)
             {
                 if (cbi.Text.ToString() != "")
-                    if (cbi.Text.ToString() == m_cgenparam.GetSTDSelect())
+                    if (cbi.Text.ToString() == m_cgenparam.GetSelectSTDName())
                     {
                         IDC_COMBO_STDSelect.SelectedItem = cbi;
                     }
@@ -591,9 +583,7 @@ namespace OTSMeasureApp
             IDC_EDIT_PARTMIN.Text = m_cotsimgprocprm.GetParticleGray().GetStart().ToString();
             //颗粒灰度范围 最大
             IDC_EDIT_PARTMAX.Text = m_cotsimgprocprm.GetParticleGray().GetEnd().ToString();
-            //腐蚀膨胀系数
-            //IDC_COMBO_CorrosionExpansionCoefficient.Text = m_cotsimgprocprm.GetErrodDilateParam().ToString();
-            //重叠尺寸
+        
             IDC_EDIT_Overlap.Text = m_cotsimgprocprm.GetOverlapParam().ToString();
 
             //去背景方式
@@ -632,9 +622,6 @@ namespace OTSMeasureApp
         {
            
 
-            //搜索X-ray精度对应的时间
-            //IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Text = m_cotsxrayprm.GetMidSearchAQTime().ToString();
-
            
             foreach (ComboBoxItem cbi in IDC_COMBO_XRAYSCANMODE.Items)
             {
@@ -656,10 +643,6 @@ namespace OTSMeasureApp
             //分析X-ray计数期望值
             IDC_EDIT_ANALYXRAYAIMVALUE.Text = m_cotsxrayprm.GetAnalyExpCount().ToString();
 
-            //IDC_EDIT_QuantifyMinSize.Text = m_cotsxrayprm.GetFeatureModeMinSize().ToString();
-
-            //IDC_EDIT_SmallPartAQTime.Text = m_cotsxrayprm.GetFastXrayTime().ToString();
-
             IDC_EDIT_XrayLimit.Text = m_cotsxrayprm.GetXrayLimit().ToString();
 
             IDC_FILTER.Checked = m_cotsxrayprm.GetUseFilter();
@@ -799,8 +782,7 @@ namespace OTSMeasureApp
             //去背景方式
             ComboBoxItem enum_AUTOBGREMOVETYP = (ComboBoxItem)IDC_COMBO_AUTOBGREMOVETYP.SelectedItem;
             m_cotsimgprocprm.SetAutoBGRemoveType((otsdataconst.OTS_AUTOBGREMOVE_TYPE)enum_AUTOBGREMOVETYP.Value);
-            //腐蚀膨胀系数
-            //m_cotsimgprocprm.SetErrodDilateParam(Convert.ToInt32(IDC_COMBO_CorrosionExpansionCoefficient.Text));
+
             //重叠像素
             m_cotsimgprocprm.SetOverlapParam(Convert.ToInt32(IDC_EDIT_Overlap.Text));
 
@@ -815,13 +797,6 @@ namespace OTSMeasureApp
 
             //搜索X-ray精度
             ComboBoxItem enum_searchxrayspeed = (ComboBoxItem)IDC_COMBO_SEARCHXRAYSPEED.SelectedItem;
-            //m_cotsxrayprm.SetSearchSpeed((otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(enum_searchxrayspeed.Value));
-
-            //搜索X - ray精度对应的时间
-            //m_cotsxrayprm.SetMidSearchAQTime(Convert.ToInt32(IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Text.Trim()));
-
-            //搜索X-ray最低计数
-            //m_cotsxrayprm.SetXRaySearchCount(Convert.ToInt32(IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Text));
 
             //X-ray扫描方式
             ComboBoxItem enum_xrayscanmode = (ComboBoxItem)IDC_COMBO_XRAYSCANMODE.SelectedItem;
@@ -830,29 +805,18 @@ namespace OTSMeasureApp
             //是否使用X-ray
             m_cotsxrayprm.SetUsingXray(IDC_USINGXRAY_LIB.Checked);
 
-            //分析X-ray精度
-            //ComboBoxItem enum_analyxrayspeed = (ComboBoxItem)IDC_COMBO_ANALYXRAYSPEED.SelectedItem;
-            //m_cotsxrayprm.SetAnalySpeed((otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(enum_analyxrayspeed.Value));
-
             //分析X-ray精度对应的时间
             m_cotsxrayprm.SetMidAnalyAQTime(Convert.ToInt32(IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Text.Trim()));
 
             //分析X-ray计数期望值
             m_cotsxrayprm.SetAnalyExpCount(Convert.ToInt32(IDC_EDIT_ANALYXRAYAIMVALUE.Text));
 
-            //m_cotsxrayprm.SetQuantifyMinSize(Convert.ToDouble(IDC_EDIT_QuantifyMinSize.Text));
-
-            //m_cotsxrayprm.SetFastXrayTime(Convert.ToInt32(IDC_EDIT_SmallPartAQTime.Text));
-
+   
             m_cotsxrayprm.SetXrayLimit(Convert.ToInt32(IDC_EDIT_XrayLimit.Text));
 
             m_cotsxrayprm.SetUseFilter(IDC_FILTER.Checked);
 
 
-
-            //m_cotsxrayprm.SetShowScanMode(IDC_XRAY_MODE_SWITCH.Checked);
-            //m_cotsxrayprm.SetShowSpeed(IDC_XRAY_TIME_SWITCH.Checked);
-            //m_cotsxrayprm.SetShowExpCount(IDC_XRAY_COUNT_SWITCH.Checked);
         }
 
         /// <summary>
@@ -1166,8 +1130,7 @@ namespace OTSMeasureApp
             {
                 string message = table["message7"].ToString();
                 MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                //IDC_EDIT_STOP_TIME.Focus();
-                //IDC_EDIT_STOP_TIME.SelectAll();
+       
                 return false;
             }
             if ("" == IDC_COMBO_FETCHIMGMODE.Text)
@@ -1304,19 +1267,8 @@ namespace OTSMeasureApp
             Regex rgScope = new Regex(scope);
             Regex rgPositiveDecimals = new Regex(PositiveDecimals);
             Regex rgpositiveInteger = new Regex(positiveInteger);
-            Regex rgpositiveOddNumber = new Regex(positiveOddNumber);
-            //是否是正确的数值格式类型判断
-            //if(IDC_COMBO_CorrosionExpansionCoefficient.Text!="0")
-            //{
-            //    if (rgpositiveOddNumber.Match(IDC_COMBO_CorrosionExpansionCoefficient.Text.Trim()).Success)
-            //    {
-            //        IDC_COMBO_CorrosionExpansionCoefficient.Focus();
-            //        IDC_COMBO_CorrosionExpansionCoefficient.SelectAll();
-            //        string message = table["message66"].ToString();
-            //        MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //        return false;
-            //    }
-            //}
+          
+  
             //100倍时屏幕尺寸
             if (false == rg.Match(IDC_EDIT_SCREENWIDTH.Text.Trim()).Success)
             {
@@ -1481,15 +1433,7 @@ namespace OTSMeasureApp
                 return false;
             }
 
-            //if (false == rgPositiveDecimals.Match(IDC_EDIT_QuantifyMinSize.Text.Trim()).Success)
-            //{
-            //    IDC_EDIT_QuantifyMinSize.Focus();
-            //    IDC_EDIT_QuantifyMinSize.SelectAll();
-            //    string message = table["message63"].ToString();
-            //    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //    return false;
-            //}
-          
+    
             
             pat = @"^[0-9]+(\.[0-9]{1,3})?$";  //只能输入，1到3位小数的正数
             rg = new Regex(pat);
@@ -1503,15 +1447,7 @@ namespace OTSMeasureApp
                 return false;
             }
 
-            ////最小放大倍数不得小于45倍
-            //if (Convert.ToInt32(IDC_EDIT_MINMAG.Text.Trim()) < 45)
-            //{
-            //    IDC_EDIT_MINMAG.Focus();
-            //    IDC_EDIT_MINMAG.SelectAll();
-            //    string message = "The minimum magnification cannot be less than 45 times";
-            //    MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //    return false;
-            //}
+     
 
             //再限制,x轴,y轴，的起止的，输入长度，因为现在已经有在mm和um之间的转换，所以这里要限制一下
             //x轴行程/mm 起