Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -1085,8 +1085,8 @@ namespace OTSMeasureApp
                             m_MeasureAppForm.SwitchWSample(m_SampleSelectName);
 
                             //-------------------- draw measrue field and save these data to sample
-                            m_MeasureAppForm.SetRunType(MSR_RUN_TYPE.RUNMEASURE);
-                            //CMeasureThreadWrapper.SetDoRunType(MSR_THREAD_RunSTATUS.RUNMEASURE);
+                            //m_MeasureAppForm.SetRunType(MSR_RUN_TYPE.RUNMEASURE);
+                           
                             PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
                             //--------------------