rename some variables.

OTSIncAMeasureApp/0-OTSModel/Measure/GetBSEPic/Measurethread.cd

@@ -50,9 +50,6 @@
       <HashCode>AAAAAIAEAAAAAABAQBAAAIAQgACgAAgQAAABAAAABAA=</HashCode>
       <FileName>0-OTSModel\ServiceCenter\SemController.cs</FileName>
     </TypeIdentifier>
-    <ShowAsAssociation>
-      <Field Name="hw" />
-    </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="OTSModelSharp.CSmplMeasure" Collapsed="true">
@@ -90,7 +87,6 @@
     </TypeIdentifier>
     <ShowAsAssociation>
       <Field Name="m_ImagePro" />
-      <Field Name="m_pBSEImg" />
     </ShowAsAssociation>
   </Class>
   <Class Name="OTSModelSharp.CSmplMeasureInclution" Collapsed="true">
@@ -113,9 +109,6 @@
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAIAAiAAAEAAA=</HashCode>
       <FileName>0-OTSModel\ServiceCenter\ScanController.cs</FileName>
     </TypeIdentifier>
-    <ShowAsAssociation>
-      <Field Name="scan" />
-    </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="OTSModelSharp.ServiceInterface.EDSController" Collapsed="true">
@@ -124,9 +117,6 @@
       <HashCode>ACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAACAAAAA=</HashCode>
       <FileName>0-OTSModel\ServiceCenter\EDSController.cs</FileName>
     </TypeIdentifier>
-    <ShowAsAssociation>
-      <Field Name="eds" />
-    </ShowAsAssociation>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="OTSMeasureApp.CMeasureThreadWrapper" Collapsed="true">
@@ -146,8 +136,8 @@
       <FileName>OTSIncAMeasureAppForm.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
-      <Field Name="m_MsrThreadWrapper" />
       <Field Name="m_SamplepaceWindow" />
+      <Field Name="m_MsrThreadWrapper" />
     </ShowAsAssociation>
   </Class>
   <Class Name="OTSMeasureApp.OTSSamplespaceWindow" Collapsed="true">
@@ -160,21 +150,6 @@
       <Field Name="m_MeasureAppForm" />
     </ShowAsAssociation>
   </Class>
-  <Class Name="NSOTSController.COTSControlFunExport" Collapsed="true">
-    <Position X="0.5" Y="4" Width="2" />
-    <TypeIdentifier />
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="OTSCOMMONCLR.CBSEImgClr" Collapsed="true">
-    <Position X="10.75" Y="8" Width="1.5" />
-    <TypeIdentifier />
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="OTSCOMMONCLR.COTSParticleClr" Collapsed="true">
-    <Position X="10.75" Y="6.75" Width="1.5" />
-    <TypeIdentifier />
-    <Lollipop Position="0.2" />
-  </Class>
   <Interface Name="OTSModelSharp.ImageProcess.IImageProcess" Collapsed="true">
     <Position X="10.75" Y="5.5" Width="1.5" />
     <TypeIdentifier>

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -883,12 +883,12 @@ namespace OTSDataType
                 CPropItem poPropItem;
                 bool bShow = true;
                 //分组编号
-                int modelResource = ResourceID.GrpCommon;
+                int modelResource = ResourceID.GrpGeneral;
                 switch (a_nId)
                 {
                     case OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.GENERAL:
                         {
-                            modelResource = ResourceID.GrpCommon;
+                            modelResource = ResourceID.GrpGeneral;
                             // name
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME;
@@ -1325,7 +1325,7 @@ namespace OTSDataType
                 {
                     if (a_nId != OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.GENERAL)
                     {
-                        break;//if it's plainmode then only display the general parameter section.
+                        break;//if it's plain mode then only display the general parameter section.
                     }
 
                 }
@@ -1348,12 +1348,12 @@ namespace OTSDataType
                 CPropItem poPropItem;
                 bool bShow = true;
                 //分组编号
-                int modelResource = ResourceID.GrpCommon;
+                int modelResource = ResourceID.GrpGeneral;
                 switch (a_nId)
                 {
                     case OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.GENERAL:
                         {
-                            modelResource = ResourceID.GrpCommon;
+                            modelResource = ResourceID.GrpGeneral;
                             // name
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME;
@@ -1373,10 +1373,10 @@ namespace OTSDataType
                             a_listPropItems.Add(poPropItem);
 
                             // system STD
-                            poPropItem = new CPropItem();
-                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.SYS_STD_SWITCH;
-                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.BOOL, false, bShow);
-                            a_listPropItems.Add(poPropItem);
+                            //poPropItem = new CPropItem();
+                            //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.SYS_STD_SWITCH;
+                            //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.BOOL, false, bShow);
+                            //a_listPropItems.Add(poPropItem);
 
                      
 
@@ -1385,8 +1385,12 @@ namespace OTSDataType
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME;
                             poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.FILE_LIST, false, bShow);
                             a_listPropItems.Add(poPropItem);
+                            // Membrane type 
+                            //poPropItem = new CPropItem();
+                            //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.MEMBRANE_TYPE;
+                            //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.COMBO, false, true);
+                            //a_listPropItems.Add(poPropItem);
 
-                      
                         }
                         break;
 
@@ -1560,32 +1564,7 @@ namespace OTSDataType
 
 
 
-                            //// UsingXray
-                            //poPropItem = new CPropItem();
-                            //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.USING_XRAY;
-                            //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.BOOL, false, bShow);
-                            //a_listPropItems.Add(poPropItem);
-
-                            //// analysis 
-
-                            //poPropItem = new CPropItem();
-                            //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_RESOLUTION;
-                            //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                            //a_listPropItems.Add(poPropItem);
-
-                            //// scan mode 
-
-                            //poPropItem = new CPropItem();
-                            //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE;
-                            //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.COMBO, false, bShow);
-                            //a_listPropItems.Add(poPropItem);
-
-                            //// analysis counts 
-
-                            //poPropItem = new CPropItem();
-                            //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_COUNTS;
-                            //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                            //a_listPropItems.Add(poPropItem);
+                         
                             //using xray
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.USING_XRAY;
@@ -2443,7 +2422,7 @@ namespace OTSDataType
                     {
                         for (int i = (int)STEEL_TECHNOLOGY.MIN; i <= (int)STEEL_TECHNOLOGY.MAX; ++i)
                         {
-                            strItem = XmlResourceData.GetInstance().GetStringByKey(GrpCommon, IDS_STEEL_TECHNOLOGY + i);
+                            strItem = XmlResourceData.GetInstance().GetStringByKey(GrpGeneral, IDS_STEEL_TECHNOLOGY + i);
                             a_listComboStrings.Add(strItem);
                         }
                     }

OTSIncAMeasureApp/0-OTSModel/ResourceManage/ResourceData.cs

@@ -242,7 +242,7 @@ namespace OTSModelSharp.ResourceManage
 
             if (a_nSteelTech >= otsdataconst.STEEL_TECHNOLOGY.MIN && a_nSteelTech <= otsdataconst.STEEL_TECHNOLOGY.MAX)
             {
-                strId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpCommon, ResourceID.IDS_MEMBRANE_TYPE + (int)a_nSteelTech);
+                strId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpGeneral, ResourceID.IDS_MEMBRANE_TYPE + (int)a_nSteelTech);
             }
 
             return strId;
@@ -264,17 +264,17 @@ namespace OTSModelSharp.ResourceManage
         }
 
         //get model
-        public static string GetModelString(otsdataconst.RunMode a_nModel)
+        public static string GetRunModeString(otsdataconst.RunMode a_nMode)
         {
             
-            string strModel = "";
+            string strMode = "";
 
-            if (a_nModel >= otsdataconst.RunMode.ProfessionalMode && a_nModel <= otsdataconst.RunMode.PlainMode)
+            if (a_nMode >= otsdataconst.RunMode.ProfessionalMode && a_nMode <= otsdataconst.RunMode.PlainMode)
             {
-                strModel = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_MEASURE_StartModel + (int)a_nModel);
+                strMode = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_MEASURE_StartMode + (int)a_nMode);
             }
 
-            return strModel;
+            return strMode;
         }
 
         //get FrameEndMode

OTSIncAMeasureApp/0-OTSModel/ResourceManage/ResourceID.cs

@@ -8,7 +8,7 @@ namespace OTSModelSharp.ResourceManage
 {
     public class ResourceID
     {
-        public const int GrpCommon = 0;
+        public const int GrpGeneral = 0;
         public const int GrpImageScan = 1;
         public const int GrpImageProcess = 2;
         public const int GrpXray = 3;
@@ -202,7 +202,7 @@ namespace OTSModelSharp.ResourceManage
         public const int DlgStageRename_Cancel = 12470;
         public const int DlgStageRename_Title = 12471;
         public const int IDS_MEASURE_SHAPE = 12540;
-        public const int IDS_MEASURE_StartModel = 12542;
+        public const int IDS_MEASURE_StartMode = 12542;
         public const int IDS_MEASURE_FrameEndMode = 12544;
         public const int IDS_MEASURE_AUTOBGREMOVETYPE = 12546;
         public const int IDS_MEASURE_IMAGE_MODE = 12548;

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -320,7 +320,7 @@ namespace OTSMeasureApp
             foreach (otsdataconst.RunMode enum_one in Enum.GetValues(typeof(otsdataconst.RunMode)))
             {
                 OTSPeriodicTable.ComboBoxItem cbi = new OTSPeriodicTable.ComboBoxItem();
-                cbi.Text = GetModelString(enum_one);
+                cbi.Text = GetRunModeString(enum_one);
                 cbi.Value = (int)enum_one;
                 IDC_COMBO_Model.Items.Add(cbi);
             }