|
@@ -25,7 +25,7 @@ namespace OTSModelSharp
|
|
|
|
|
|
|
|
|
public class CSmplMeasure
|
|
|
- {
|
|
|
+ {
|
|
|
protected static NLog.Logger log ;
|
|
|
protected bool bSaveThreadWorking;
|
|
|
protected System.Threading.Thread m_thread_ptr;
|
|
@@ -157,7 +157,7 @@ namespace OTSModelSharp
|
|
|
// get dwell time
|
|
|
OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
|
|
|
|
|
|
- // convert dwell time to bruker dwell time (8, 16, 32)
|
|
|
+ // convert dwell time to bruker dwell time
|
|
|
int nBrukerDwellTimeId;
|
|
|
switch (nDwellTime)
|
|
|
{
|
|
@@ -223,7 +223,7 @@ namespace OTSModelSharp
|
|
|
// get dwell time
|
|
|
OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
|
|
|
|
|
|
- // convert dwell time to bruker dwell time (6, 16, 32)
|
|
|
+ // convert dwell time to bruker dwell time
|
|
|
long nBrukerDwellTime = DWELLTIME_BRUKER_VALUES[2];// choose the third option, so the dwell time will be 4 . there's no need to change here. it shoud be a const.
|
|
|
|
|
|
|
|
@@ -980,6 +980,29 @@ namespace OTSModelSharp
|
|
|
|
|
|
}
|
|
|
|
|
|
+ }
|
|
|
+ if (selconditiondic.ContainsKey("ferret"))
|
|
|
+ {
|
|
|
+ log.Info("Select particles according to ferret");
|
|
|
+ var rng = selconditiondic["ferret"];
|
|
|
+ foreach (var p in curFldData.GetListAnalysisParticles())
|
|
|
+ {
|
|
|
+ double dferet = p.GetFeretDiameter();
|
|
|
+ if (dferet < rng.GetStart() || dferet >= rng.GetEnd())
|
|
|
+ {
|
|
|
+ if (!excludeparts.Contains(p))
|
|
|
+ {
|
|
|
+ excludeparts.Add(p);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ log.Info("ferret=" + dferet.ToString("F2"));
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
foreach (var p in curFldData.GetListAnalysisParticles())
|