Parcourir la source

optimize the pausing function again

gsp il y a 3 ans
Parent
commit
dc461e1f42

+ 2 - 1
OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -729,7 +729,8 @@ namespace OTSModelSharp
                  
                     if (IsSampleOver(pScanParam))
                     {
-                        pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
+                        pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.SUCCESSED);
+                        pStatus.ComputeTime(OTS_MSR_TIME_TYPE.COMPLT);
                         break;
                     }
 

+ 2 - 2
OTSIncAMeasureApp/1-OTSMeasure/CMeasureThreadWrapper.cs

@@ -243,13 +243,13 @@ namespace OTSMeasureApp
                     }
                     else if (MSTMsg.STMSampleStu.iMsrSampleStatu == OTSDataType.OTS_MSR_SAMPLE_STATUS.FAILED)
                     {
-                        StopMeasure(MSTMsg);
+                        //StopMeasure(MSTMsg);
                         log.Error("(OTSGetMreRetThread) MSTMsg.STMSampleStu.iMeasureSampleStatus = RET_MEASURE_SAMPLE_STATUS.FAILED Failed");
 
                     }
                     else if (MSTMsg.STMSampleStu.iMsrSampleStatu == OTSDataType.OTS_MSR_SAMPLE_STATUS.SUCCESSED)
                     {
-                        StopMeasure(MSTMsg);
+                        //StopMeasure(MSTMsg);
                     }
                     else if(MSTMsg.STMSampleStu.iMsrSampleStatu == OTSDataType.OTS_MSR_SAMPLE_STATUS.PAUSED)
                     {