Merge branch 'Release3.3' of http://36.129.169.60:30080/gogsadmin/OTS into Release3.3

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -454,6 +454,10 @@ namespace OTSMeasureApp
                 newGDI.SetZoomNumber(m_visualStage.GetZoomNum());
                 newGDI.SetDisplayRefPoint(m_visualStage.GetDisplayRefPoint());
                 newGDI.IsWorkSample = true;
+
+
+                newGDI.HoleNo = sam.GetMeasureGDIObject().HoleNo;
+
                 sam.SetMeasureGDIObject(newGDI);
                 m_DrawPolygonFinishGDIObject = null;
                 m_DrawMeasureGDIObject = null;
@@ -502,9 +506,6 @@ namespace OTSMeasureApp
         
         
         
-        
-        
-        
         
         
         
@@ -537,6 +538,11 @@ namespace OTSMeasureApp
                 newGDI.SetZoomNumber(m_visualStage.GetZoomNum());
                 newGDI.SetDisplayRefPoint(m_visualStage.GetDisplayRefPoint());
                 newGDI.IsWorkSample = true;
+
+                newGDI.HoleNo = sam.GetMeasureGDIObject().HoleNo;
+
+
+
                 sam.SetMeasureGDIObject(newGDI);
                 m_DrawPolygonFinishGDIObject = null;
                 m_DrawMeasureGDIObject = null;
@@ -544,8 +550,6 @@ namespace OTSMeasureApp
 
                 SetWorkSampleMeasureArea(para);
                 
-
-                
                 if (frmInput.IsInclinedPlaneFocus) {
                     m_MeasureAppForm.m_ProjParam.GetWorkSample().GetMsrParams().SlopParam = frmInput.GetCSlopFocusParam();
                 }
@@ -554,15 +558,14 @@ namespace OTSMeasureApp
                 PrepareVisualMeasureField(GetWorkingVisualSample());
             }
         }
+
         public void SetWorkSampleMeasureArea(SampleMeasurePara SMeasurePara)
         {
-
             COTSSample WSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
             if (null == WSample)
             {
                 return;
             }
-
             CDomain Domain = new CDomain();
             Domain.SetShape((otsdataconst.DOMAIN_SHAPE)SMeasurePara.iShape);
             Domain.SetRectDomain(SMeasurePara.MeasureRect);
@@ -580,6 +583,11 @@ namespace OTSMeasureApp
             return;
         }
 
+
+
+
+
+
         public CVisualSampleArea GetWorkingVisualSample()
         {