|
@@ -318,9 +318,7 @@ namespace OTSModelSharp
|
|
|
case OTS_SysType_ID.CleannessA:
|
|
|
pSmplMeasure = new CSmplMeasureCleanliness(m_strWorkingFolder, pSample);
|
|
|
break;
|
|
|
- //case OTS_SysType_ID.MiningA:
|
|
|
- // pSmplMeasure = new CSmplMeasureMining(m_strWorkingFolder, pSample);
|
|
|
- // break;
|
|
|
+
|
|
|
default:
|
|
|
pSmplMeasure = new CSmplMeasureInclution(m_strWorkingFolder, pSample);
|
|
|
break;
|
|
@@ -423,52 +421,7 @@ namespace OTSModelSharp
|
|
|
ThreadOver();
|
|
|
}
|
|
|
|
|
|
- //public bool DoReMeasure(List<Particle> particles, int imgscanspeed_index, int xrayscanmode_index, int scantime_count)
|
|
|
- //{
|
|
|
- // // got through measure list
|
|
|
- // foreach (var pSample in m_listMeasurableSamples)
|
|
|
- // {
|
|
|
- // // check and break if stop button is clicked
|
|
|
- // if (m_ThreadStatus.GetStatus() == OTS_MSR_THREAD_STATUS.STOPPED)
|
|
|
- // {
|
|
|
- // // stop button clicked
|
|
|
- // loger.Info("DoMeasure: stop button is clicked.");
|
|
|
- // // record end time
|
|
|
- // m_ThreadStatus.ComputeTime(OTS_THREAD_TIME_TYPE.STOPPED);
|
|
|
- // ThreadOver();
|
|
|
- // return false;
|
|
|
- // }
|
|
|
-
|
|
|
- // CSmplMeasure pSmplMeasure;
|
|
|
- // // create a sample measure object for the sample
|
|
|
- // switch (m_pProjData.m_nPackId)
|
|
|
- // {
|
|
|
- // case OTS_SysType_ID.IncA:
|
|
|
- // pSmplMeasure = new CSmplMeasureInclution(m_strWorkingFolder, pSample);
|
|
|
- // break;
|
|
|
- // case OTS_SysType_ID.CleannessA:
|
|
|
- // pSmplMeasure = new CSmplMeasureCleanliness(m_strWorkingFolder, pSample);
|
|
|
- // break;
|
|
|
- // default:
|
|
|
- // pSmplMeasure = new CSmplMeasureInclution(m_strWorkingFolder, pSample);
|
|
|
- // break;
|
|
|
-
|
|
|
- // }
|
|
|
-
|
|
|
- // // set measure thread
|
|
|
- // pSmplMeasure.SetMsrThread(this);
|
|
|
- // pSmplMeasure.DoMeasureForOneSample();
|
|
|
- // }
|
|
|
-
|
|
|
- // // measurement completed
|
|
|
- // m_ThreadStatus.SetStatus(OTS_MSR_THREAD_STATUS.COMPLETED);
|
|
|
- // // record end time
|
|
|
- // m_ThreadStatus.ComputeTime(OTS_THREAD_TIME_TYPE.STOPPED);
|
|
|
-
|
|
|
- // ThreadOver();
|
|
|
-
|
|
|
- // return true;
|
|
|
- //}
|
|
|
+
|
|
|
|
|
|
// hole preview
|
|
|
public void DoHolePreview()
|