|
@@ -1,16 +1,14 @@
|
|
|
using System;
|
|
|
using System.Collections.Generic;
|
|
|
-using System.Data.SQLite;
|
|
|
+
|
|
|
using System.Drawing;
|
|
|
using System.Linq;
|
|
|
-using System.Text;
|
|
|
+
|
|
|
using System.Threading;
|
|
|
-using System.Threading.Tasks;
|
|
|
+
|
|
|
using OTSCLRINTERFACE;
|
|
|
using OTSDataType;
|
|
|
-using OTSMeasureApp._0_OTSModel.Measure._5_OTSMining;
|
|
|
-using OTSModelSharp.Measure;
|
|
|
-using OTSModelSharp.Measure.OTSCleanliness;
|
|
|
+
|
|
|
using OTSModelSharp.ServiceCenter;
|
|
|
|
|
|
using static OTSDataType.otsdataconst;
|
|
@@ -101,8 +99,11 @@ namespace OTSModelSharp
|
|
|
|
|
|
|
|
|
ClassifyFieldParticles(curFldData);
|
|
|
-
|
|
|
- MergeSubParticleByTheXrayClassification(curFldData, m_Sample.CalculatePixelSize());
|
|
|
+ if (xrayStep > 0)//while doing matrix xray gethering,merge all the segments in this field by the classify id.
|
|
|
+ {
|
|
|
+ MergeSubParticleByTheXrayClassification(curFldData, m_Sample.CalculatePixelSize());
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
//curFldData.CalParticleImageProp(curFldData.GetListAnalysisParticles(), 0);//recalculate the image property of the new merged particles.
|
|
|
|