fix bugs in stage operating system.

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="FEI" ImageInputSources="BSE" />
-  <Member RegName="EDSName" Value="FEI" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="BSE" />
+  <Member RegName="EDSName" Value="OffLine" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

OTSIncAMeasureApp/0-OTSModel/OTSDataType/CDomain.cs

@@ -96,7 +96,7 @@ namespace OTSDataType
         public void SetPolygonPoint(List<Point> a_PolygonPoint) 
         { 
             m_PolygonPoint = a_PolygonPoint; 
-            //myDomainClr = new CDomainClr((int)m_nShape, m_rectangle); 
+         
         }
         public List<Point> GetPolygonPoint() { return m_PolygonPoint; }
 

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -445,8 +445,6 @@ namespace OTSDataType
            
             m_listFieldData.Add(newfld);
 
-
-            //int iFieldCount = pFieldMgr.GetTotalFields();
             var mySemdata = GetSEMDataMsr();
 
             mySemdata.SetTotalFields(m_listFieldData.Count);

OTSIncAMeasureApp/2-OTSMeasureParamManage/MeasureParam.cd

@@ -27,7 +27,7 @@
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>CAihQAAFJBFCk0Ao4QEGLADBGJDQgEARyIoEBgikglI=</HashCode>
+      <HashCode>CAihQCAFJBFSk0Ao4QEGLADBEJDAAEARyIoEBiikglI=</HashCode>
       <FileName>2-OTSMeasureParamManage\COTSMeasureParam.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -39,7 +39,7 @@
     </ShowAsCollectionAssociation>
   </Class>
   <Class Name="OTSModelSharp.COTSDefaultParam" Collapsed="true">
-    <Position X="3.5" Y="2.25" Width="2.5" />
+    <Position X="2.25" Y="2.25" Width="2.5" />
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
@@ -58,7 +58,7 @@
   <Class Name="OTSDataType.COTSSample" Collapsed="true">
     <Position X="8.75" Y="6.5" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>UCEIgsIiY0kCoCAQiUmCAikAECCEZxABiIAPYEIgXJk=</HashCode>
+      <HashCode>cCEIgsIiY0kCoCAQiUmCAikAECCEZxABiIAPYEIgXJk=</HashCode>
       <FileName>0-OTSModel\OTSDataType\COTSSample.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -67,12 +67,12 @@
     </ShowAsAssociation>
   </Class>
   <Class Name="OTSModelSharp.COTSMsrPrjResultData" Collapsed="true">
-    <Position X="13.5" Y="3.25" Width="2.25" />
+    <Position X="14" Y="5" Width="2.25" />
     <AssociationLine Name="m_listSamples" Type="OTSDataType.COTSSample" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="13.5" Y="3.625" />
-        <Point X="13.125" Y="3.625" />
-        <Point X="13.125" Y="6.638" />
+        <Point X="14" Y="5.375" />
+        <Point X="13.625" Y="5.375" />
+        <Point X="13.625" Y="6.638" />
         <Point X="11.25" Y="6.638" />
       </Path>
     </AssociationLine>
@@ -88,20 +88,18 @@
     </ShowAsCollectionAssociation>
   </Class>
   <Class Name="OTSMeasureApp.OTSIncAMeasureAppForm" Collapsed="true">
-    <Position X="2.5" Y="7.5" Width="2.75" />
+    <Position X="3.25" Y="7.5" Width="2.75" />
     <AssociationLine Name="m_ProjData" Type="OTSModelSharp.COTSMsrPrjResultData" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="5.25" Y="7.833" />
-        <Point X="6.76" Y="7.833" Type="JumpStart" />
-        <Point X="6.927" Y="7.833" Type="JumpEnd" />
-        <Point X="10.042" Y="7.833" Type="JumpStart" />
-        <Point X="10.208" Y="7.833" Type="JumpEnd" />
-        <Point X="15.5" Y="7.833" />
-        <Point X="15.5" Y="3.798" />
+        <Point X="6" Y="7.833" />
+        <Point X="9.76" Y="7.833" Type="JumpStart" />
+        <Point X="9.927" Y="7.833" Type="JumpEnd" />
+        <Point X="16" Y="7.833" />
+        <Point X="16" Y="5.548" />
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>cIGadXIZ6PENrQ5bYEOxLzq7DEARCnwbVGsEIl+D4vk=</HashCode>
+      <HashCode>cIGadXIZ6PENvQ5bYEOxLzq7DEARCnwbFGsEIleD4vk=</HashCode>
       <FileName>OTSIncAMeasureAppForm.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -113,7 +111,7 @@
   <Class Name="OTSMeasureApp.CMeasureThreadWrapper" Collapsed="true">
     <Position X="0.5" Y="6" Width="3.25" />
     <TypeIdentifier>
-      <HashCode>FAgIAwAhIYIAAACQBAAEKI0hQBAAAAEACQBgYAQACgA=</HashCode>
+      <HashCode>FAgIAgAgIYIAAACQBAAEKo0gQBAAAAUAAQBgYAQACgA=</HashCode>
       <FileName>1-OTSMeasure\CMeasureThreadWrapper.cs</FileName>
     </TypeIdentifier>
   </Class>

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -90,7 +90,7 @@ namespace OTSMeasureApp
             var m_SolutionWindows = m_MeasureAppForm.m_SolutionWindows;
             //设置样品属性参数成功
             OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
-            var m_DataMgr = m_MeasureAppForm.m_ProjParam;
+            var m_measurePara = m_MeasureAppForm.m_ProjParam;
             //当前正在测量
             if (PropertyMeasureThreadRunFlag)//measureThread is running
             {
@@ -100,7 +100,7 @@ namespace OTSMeasureApp
                 }
 
             }
-            string sWSampleName = m_DataMgr.GetWorkSampleName();
+            string sWSampleName = m_measurePara.GetWorkSampleName();
             if ("" == sWSampleName)
             {
                 return;
@@ -110,10 +110,10 @@ namespace OTSMeasureApp
             //更新 STD_FILE_NAME FILE_LIST
              if (OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME == SampleId)
             {
-                if (m_DataMgr.SetSTDFileName((int)ObjVal))
+                if (m_measurePara.SetSTDFileName((int)ObjVal))
                 {
                     //重新获取原来工作样品值重新设置
-                    if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                    if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
                     {
                         //系统工作文件出错，设置样品属性失败
                         return;
@@ -131,10 +131,10 @@ namespace OTSMeasureApp
                     string str = (string)ObjVal;
                     str = str.Trim();
                     ObjVal = str;
-                    if (!m_DataMgr.CheckSampleNameIsValid((string)ObjVal))
+                    if (!m_measurePara.CheckSampleNameIsValid((string)ObjVal))
                     {
                         //重新获取原来工作样品值重新设置
-                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
                         {
                             return;
                         }
@@ -145,11 +145,11 @@ namespace OTSMeasureApp
 
                 }
                 //更新COMBBOX值
-                if (!m_DataMgr.SetSampleParamVal(SampleId, ValType, ObjVal))    // Prop值变化，修改样品值成功
+                if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal))    // Prop值变化，修改样品值成功
                 {
                     string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
                     //重新获取原来工作样品值重新设置
-                    if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                    if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
                     {
                         return;
                     }
@@ -159,11 +159,11 @@ namespace OTSMeasureApp
                 }
                 if(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE==SampleId)
                 {
-                    if (!m_DataMgr.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, StopModeDialog.FieldMode))    // Prop值变化，修改样品值成功
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, StopModeDialog.FieldMode))    // Prop值变化，修改样品值成功
                     {
                         string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
                         //重新获取原来工作样品值重新设置
-                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
                         {
                             return;
                         }
@@ -171,11 +171,11 @@ namespace OTSMeasureApp
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
-                    if (!m_DataMgr.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, StopModeDialog.TimeMode))    // Prop值变化，修改样品值成功
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, StopModeDialog.TimeMode))    // Prop值变化，修改样品值成功
                     {
                         string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
                         //重新获取原来工作样品值重新设置
-                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
                         {
                             return;
                         }
@@ -183,11 +183,11 @@ namespace OTSMeasureApp
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
-                    if (!m_DataMgr.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE, OTS_ITEM_TYPES.INT, StopModeDialog.ParticleMode))    // Prop值变化，修改样品值成功
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE, OTS_ITEM_TYPES.INT, StopModeDialog.ParticleMode))    // Prop值变化，修改样品值成功
                     {
                         string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
                         //重新获取原来工作样品值重新设置
-                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
                         {
                             return;
                         }
@@ -195,11 +195,11 @@ namespace OTSMeasureApp
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
-                    if (!m_DataMgr.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_AREA, OTS_ITEM_TYPES.INT, StopModeDialog.AreaMode))    // Prop值变化，修改样品值成功
+                    if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_AREA, OTS_ITEM_TYPES.INT, StopModeDialog.AreaMode))    // Prop值变化，修改样品值成功
                     {
                         string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
                         //重新获取原来工作样品值重新设置
-                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
                         {
                             return;
                         }
@@ -211,7 +211,7 @@ namespace OTSMeasureApp
             }
             //更新GROUPID和ITEMID的变化
             OTS_SAMPLE_PROP_GRID_ITEMS ItemID = (OTS_SAMPLE_PROP_GRID_ITEMS)SampleId;
-            m_DataMgr.UpdateGroupValAndItemVal(ItemID);
+            m_measurePara.UpdateGroupValAndItemVal(ItemID);
 
             //修改Treeview 工作样品名字
             if (OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME == SampleId)
@@ -223,7 +223,7 @@ namespace OTSMeasureApp
 
         HERE:
 
-            if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+            if (!m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo))
             {
                 //系统工作文件出错，设置样品属性失败
                 return;
@@ -233,12 +233,12 @@ namespace OTSMeasureApp
                 if (OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH == SampleId)
                 {
                     //修改TREEVIEW对应的样品的CHECKBOX值
-                    m_SolutionWindows.Rev_MeasureApp_CheckboxStatuChange_Event(m_DataMgr.GetWorkSampleName(), SMInfo.TSampleParam.bSwitch);
+                    m_SolutionWindows.Rev_MeasureApp_CheckboxStatuChange_Event(m_measurePara.GetWorkSampleName(), SMInfo.TSampleParam.bSwitch);
                     // 设置 开始 ,停止 和检查参数 按钮状态
                    m_MeasureAppForm. m_RibbonFun.SetMeasureRibbonButnStatu();
                 }
                 //设置SampleWindow新的工作样品
-                sWSampleName = m_DataMgr.GetWorkSampleName();
+                sWSampleName = m_measurePara.GetWorkSampleName();
                 if (!("" == sWSampleName))
                 {
                    m_MeasureAppForm. m_SamplepaceWindow.ChangeWorkSampleName(sWSampleName);

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -233,6 +233,7 @@ namespace OTSMeasureApp
 
                     //添加样品
                     m_MeasureAppForm.AddNewSampleMeasure(m_SampleHoleSelectName);
+                    ReadSEMDataFromSEM();
                     break;
                 case "DeleteStage":
                     //删除样品
@@ -255,7 +256,7 @@ namespace OTSMeasureApp
                     m_MeasureAppForm.m_RunType = MSR_THREAD_RunSTATUS.RUNMEASURE;
                     //设定SEM数据
                     CMeasureThreadWrapper.DoRunType = MSR_THREAD_RunSTATUS.RUNMEASURE;
-                   
+                    ReadSEMDataFromSEM();
                     PrepareMeasureField(GetWorkingVisualSample());
                   
                     break;
@@ -1083,7 +1084,7 @@ namespace OTSMeasureApp
                         
                             m_MeasureAppForm.SwitchWSample(m_SampleSelectName);
 
-                            //--------------------read sem data draw measrue field and save these data to sample
+                            //-------------------- draw measrue field and save these data to sample
                             m_MeasureAppForm.m_RunType = MSR_THREAD_RunSTATUS.RUNMEASURE;
                             CMeasureThreadWrapper.DoRunType = MSR_THREAD_RunSTATUS.RUNMEASURE;
                             PrepareMeasureField(sam);
@@ -2491,7 +2492,7 @@ namespace OTSMeasureApp
 
 
         #region 获取帧图信息
-        public void GetSEMData()
+        public void ReadSEMDataFromSEM()
         {
           
            
@@ -2630,7 +2631,7 @@ namespace OTSMeasureApp
             try
             {
 
-                GetSEMData();
+              
 
                 List<CRectangleGDIObject> visualfieldRects = null;