refactor a function

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -1139,24 +1139,6 @@ namespace OTSMeasureApp
 
  
 
-        /// <summary>
-        /// 通过样品孔信息 返回默认测量区域大小
-        /// </summary>
-        /// <param name="cHoleClr"></param>
-        /// <returns></returns>
-        public RectangleF CalculateMsrArea(string cHoleName)
-        {
-            CHole cHoleClr = null;
-            foreach (CHole item in GetResultData().GetStageHolder().GetHoleList())
-            {
-                if (item.GetName() == cHoleName)
-                {
-                    cHoleClr = item;
-                }
-            }
-            CDomain CDomain = GetResultData().CalculateMsrArea(cHoleClr);
-            return CDomain.GetRectDomain();
-        }
 
         /// <summary>
         /// 获取已完成测量的结果文件路径
@@ -1214,24 +1196,7 @@ namespace OTSMeasureApp
         }
 
 
-        /// <summary>
-        /// 获取工作样品的测量状态
-        /// </summary>
-        /// <param name="workingSampleName"></param>
-        /// <returns></returns>
-        public bool GetWorkSampleMeasureStatus()
-        {
-            bool reuslt = false;
-            COTSSample COTSSample = GetResultData().GetWorkingSample();
-            if (COTSSample == null) return false;
-            int sampleStatus = COTSSample.GetMsrStatus().GetCompletedFields();
-            if (sampleStatus > 0)
-            {
-                reuslt = true;
-            }
-            return reuslt;
-
-        }
+        
       
     }
 

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -1583,11 +1583,14 @@ namespace OTSMeasureApp
                         {
                             var item = sam.GetMeasureGDIObject();
 
-                            var selWSampleMeasureStatus = m_MeasureAppForm.m_ProjParam.GetWorkSampleMeasureStatus();
-                            if (selWSampleMeasureStatus)
+                            //var selWSampleMeasureStatus = m_MeasureAppForm.m_ProjParam.GetWorkSampleMeasureStatus();
+                            COTSSample COTSSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
+                            int completeflds = COTSSample.GetMsrStatus().GetCompletedFields();
+                            if (completeflds > 0)
                             {
                                 return;
                             }
+                            
 
                             if (item.Myshape == ShapeType.POLYGON)
                             {
@@ -2226,8 +2229,11 @@ namespace OTSMeasureApp
                 var measureItem = sam.GetMeasureGDIObject();
                 if (measureItem.IsDragging || measureItem.IsAltering)//while pressing ctrl key then it must be altering something(position or size)
                 {
-                    var selWSampleMeasureStatus = m_MeasureAppForm.m_ProjParam.GetWorkSampleMeasureStatus();
-                    if (!selWSampleMeasureStatus)
+                    //var selWSampleMeasureStatus = m_MeasureAppForm.m_ProjParam.GetWorkSampleMeasureStatus();
+                    COTSSample COTSSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
+                    int completeflds = COTSSample.GetMsrStatus().GetCompletedFields();
+                   
+                    if (completeflds==0)
                     {
 
                         var para = m_visualStage.GetSampleMeasurePara(measureItem);
@@ -3113,8 +3119,9 @@ namespace OTSMeasureApp
         #region 驱动到SEM当前位置
         protected void SetMeasureToSEMLocation()
         {
-            bool selWSampleMeasureStatus = m_MeasureAppForm.m_ProjParam.GetWorkSampleMeasureStatus();
-            if (selWSampleMeasureStatus)
+            COTSSample COTSSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
+            int completeflds = COTSSample.GetMsrStatus().GetCompletedFields();
+            if (completeflds > 0)
             {
                 return;
             }