|
@@ -786,7 +786,7 @@ namespace OTSModelSharp
|
|
|
//start db save
|
|
|
StartSaveFileThread(ref curFld);
|
|
|
|
|
|
- SendFieldParticlesInfoToScreen(curFld, m_Sample.GetMsrStatus());
|
|
|
+ SendFieldParticlesInfoToGUI(curFld, m_Sample.GetMsrStatus());
|
|
|
}
|
|
|
while (bSaveThreadWorking)//wait untill all the field data has been saved.
|
|
|
{
|
|
@@ -949,7 +949,7 @@ namespace OTSModelSharp
|
|
|
var workmode = pXRayParam.GetScanMode();
|
|
|
if (workmode == OTS_X_RAY_SCAN_MODE.PointMode)
|
|
|
{
|
|
|
- // calculate search x-ray acquire time
|
|
|
+
|
|
|
uint nXRayAQTime;
|
|
|
List<COTSParticleClr> parts = new List<COTSParticleClr>();
|
|
|
|
|
@@ -962,7 +962,7 @@ namespace OTSModelSharp
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- curFldData.CreateXrayList(parts); //small particle using the fast xray strategy
|
|
|
+ curFldData.CreateXrayList(parts);
|
|
|
|
|
|
if (parts.Count > 0)
|
|
|
{
|
|
@@ -990,10 +990,7 @@ namespace OTSModelSharp
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- curFldData.CreateXrayList(allparts); // big particle using the full xray strategy.
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ curFldData.CreateXrayList(allparts);
|
|
|
|
|
|
if (allparts.Count > 0)
|
|
|
{
|
|
@@ -1349,7 +1346,7 @@ namespace OTSModelSharp
|
|
|
}
|
|
|
return;
|
|
|
}
|
|
|
- private void SendFieldParticlesInfoToScreen(COTSFieldData curFld,CMsrSampleStatus pStatus)
|
|
|
+ private void SendFieldParticlesInfoToGUI(COTSFieldData curFld,CMsrSampleStatus pStatus)
|
|
|
{
|
|
|
double measuredArea = 0; // this area should be the field area
|
|
|
var a_pBSEImg = curFld.GetBSEImage();
|