Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -251,6 +251,7 @@ namespace OTSMeasureApp
                                 {
                                     Color ColorStr = OTSSamplespaceGraphicsPanelFun.GetColorValue(ColorType.FieldColor);
                                     ChangeMeasureFieldColor(visualsam, f.GetOTSPosition(), ColorStr);
+                                   
                                 }
                                
                             }

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -962,6 +962,7 @@ namespace OTSMeasureApp
             }
             else if (m_MsrThreadWrapper.m_measure.GetMsrThreadStatus() .GetStatus()== OTS_MSR_THREAD_STATUS.PAUSED)
             {
+                m_MsrThreadWrapper.SetMeasureThreadStatus(otsdataconst.OTS_MSR_THREAD_STATUS.STOPPED);
                 foreach (KeyValuePair<string, CSmplMeasure> smpl in m_MsrThreadWrapper.m_measure.mapSmplMsr)
                 {
                     if (smpl.Value.GetSample().GetMsrStatus().GetStatus() == OTS_MSR_SAMPLE_STATUS.PAUSED)