Bläddra i källkod

remove useless code.

gsp 2 år sedan
förälder
incheckning
35430a4aa2

+ 9 - 8
OTSIncAMeasureApp/0-OTSModel/Measure/5-OTSMining/SmplMeasureMining.cs

@@ -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.
 

+ 2 - 2
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -223,8 +223,8 @@ namespace OTSMeasureApp
                 PrepareIpcServer();
                 log.Info("Ipc server start success!");
                 //----------------------Test Code, Don't delete
-                var f = new BaseFunctionTest();
-                f.ShowDialog();
+                //var f = new BaseFunctionTest();
+                //f.ShowDialog();
                 //----------------------
             }
             catch (Exception ex)