|
@@ -245,7 +245,7 @@ namespace OTSModelSharp
|
|
|
|
|
|
m_strWorkingFolder = a_strWorkingFolder + m_Sample.GetName() + "\\";
|
|
|
}
|
|
|
- bool CalculateUnMeasuredFieldsCenters(out List<System.Drawing.Point> a_listFieldCenter)
|
|
|
+ bool CalculateUnMeasuredFieldsCenters(out List<System.Drawing.Point> a_allpieldcenter,out List<System.Drawing.Point> a_listFieldCenter)
|
|
|
{
|
|
|
|
|
|
// sample measure parameters
|
|
@@ -265,12 +265,15 @@ namespace OTSModelSharp
|
|
|
{
|
|
|
log.Error("CalculateFieldsCenters: failed to init field centres list manager.");
|
|
|
a_listFieldCenter = new List<System.Drawing.Point>();
|
|
|
+ a_allpieldcenter = new List<Point>();
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
// get field centers list
|
|
|
a_listFieldCenter = pFieldMgr.GetUnmeasuredFieldCentrePoints();// GetFieldCentrePoints();
|
|
|
|
|
|
+ a_allpieldcenter = pFieldMgr.GetFieldCentrePoints();
|
|
|
+
|
|
|
// ok, return TRUE
|
|
|
return true;
|
|
|
|
|
@@ -508,28 +511,32 @@ namespace OTSModelSharp
|
|
|
|
|
|
|
|
|
m_pSampleRstFile.SetSEMStage(pStage);
|
|
|
+
|
|
|
+ // calculate field centers
|
|
|
+ List<System.Drawing.Point> umMeasuredlistFieldCenter;
|
|
|
+ List<System.Drawing.Point> alllistFieldCenter;
|
|
|
|
|
|
+ if (!CalculateUnMeasuredFieldsCenters(out alllistFieldCenter,out umMeasuredlistFieldCenter))
|
|
|
+ {// failed to calculate field centers
|
|
|
+ log.Error("DoMeasure: failed to calculate field centers.");
|
|
|
+ pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
|
|
|
+ // record end time
|
|
|
+ pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//-----save the static measure result file data into xml file and the dynamic data of every field will be saved into sqlite database
|
|
|
log.Info("Create result file!");
|
|
|
- if (!m_pSampleRstFile.CreateResultFiles())
|
|
|
+ if (!m_pSampleRstFile.CreateResultFiles(alllistFieldCenter))
|
|
|
{// failed to call measure result file Save method
|
|
|
log.Error("DoMeasure: failed to call measure result file Save method.");
|
|
|
pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
|
|
|
pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
//------
|
|
|
- // calculate field centers
|
|
|
- List<System.Drawing.Point> umMeasuredlistFieldCenter;
|
|
|
-
|
|
|
- if (!CalculateUnMeasuredFieldsCenters(out umMeasuredlistFieldCenter))
|
|
|
- {// failed to calculate field centers
|
|
|
- log.Error("DoMeasure: failed to calculate field centers.");
|
|
|
- pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
|
|
|
- // record end time
|
|
|
- pStatus.ComputeTime(OTS_MSR_TIME_TYPE.STOPPED);
|
|
|
- return;
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
int nNewFieldId = 0;
|
|
|
int numOfAllFields = pStatus.GetCompletedFields() + umMeasuredlistFieldCenter.Count;//
|
|
|
int completedFields = pStatus.GetCompletedFields();
|
|
@@ -691,7 +698,7 @@ namespace OTSModelSharp
|
|
|
|
|
|
|
|
|
SaveMergedParticles(mergedParticles);
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
pStatus.ComputeTime(OTS_MSR_TIME_TYPE.COMPLT);
|
|
@@ -773,8 +780,9 @@ namespace OTSModelSharp
|
|
|
|
|
|
// calculate field centers
|
|
|
List<System.Drawing.Point> listFieldCenter=new List<System.Drawing.Point>();
|
|
|
- // listFieldCenter.clear();
|
|
|
- if (!CalculateUnMeasuredFieldsCenters(out listFieldCenter))
|
|
|
+ List<System.Drawing.Point> alllistFieldCenter = new List<System.Drawing.Point>();
|
|
|
+ // listFieldCenter.clear();
|
|
|
+ if (!CalculateUnMeasuredFieldsCenters(out alllistFieldCenter,out listFieldCenter))
|
|
|
{// failed to calculate field centers
|
|
|
log.Error("DoHolePreview: failed to calculate field centers.");
|
|
|
pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.FAILED);
|