Selaa lähdekoodia

optimize classification engine

gsp 2 vuotta sitten
vanhempi
commit
852ccf4bef

+ 15 - 13
OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -1450,6 +1450,7 @@ namespace OTSModelSharp
 
         public bool Reclassify()
         {
+            
             string strFilePath = FileHelper.GetFolderName(m_strPathName);
             if(strFilePath==null)
             {
@@ -1505,6 +1506,7 @@ namespace OTSModelSharp
 
 
                         var analysisparts = new List<COTSParticleClr>();
+                var m_classifyEngine = new CClassifyEngine();
                 foreach (var fld in spl.GetFieldsData())
                 {
                     foreach (var part in fld.GetListAnalysisParticles())
@@ -1514,13 +1516,13 @@ namespace OTSModelSharp
                             if (stdFileName != "NoSTDDB.db")
                             {
                               
-                                var  m_classifyEngine = new CClassifyEngine();
-                                IClassifyEngine engine = m_classifyEngine.GetParticleEngine(stdFileName);
+                             
+                                IClassifyEngine partEngine = m_classifyEngine.GetParticleEngine(stdFileName);
 
-                                if (!engine.Classify(part))
+                                if (!partEngine.Classify(part))
                                 {
-                                    
-                                    return false;
+
+                                    NLog.LogManager.GetCurrentClassLogger().Error("1 failed to classify!"+ "Particle Engine");
                                 }
                             }
 
@@ -1528,12 +1530,12 @@ namespace OTSModelSharp
                             {
 
 
-                                var m_classifyEngine = new CClassifyEngine();
-                                IClassifyEngine engine = m_classifyEngine.GetIncClassifyEngine();
-                                if (!engine.ClassifyIncA(part, (int)steelTech))
+                               
+                                IClassifyEngine incAEngine = m_classifyEngine.GetIncClassifyEngine();
+                                if (!incAEngine.ClassifyIncA(part, (int)steelTech))
                                 {
-                                   
-                                    return false;
+
+                                    NLog.LogManager.GetCurrentClassLogger().Error("2 failed to classify!" + "IncA Engine");
                                 }
                             }
                         }
@@ -1542,12 +1544,12 @@ namespace OTSModelSharp
                           
                             if (stdFileName != "NoSTDDB.db")
                             {
-                                var m_classifyEngine = new CClassifyEngine();
+                               
                                 IClassifyEngine engine = m_classifyEngine.GetParticleEngine(stdFileName);
                                 if (!engine.Classify(part))
                                 {
-                                  
-                                    return false;
+
+                                    NLog.LogManager.GetCurrentClassLogger().Error("3 failed to classify!" + "Particle Engine");
                                 }
                             }
                         }

+ 6 - 3
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -1184,6 +1184,7 @@ namespace OTSMeasureApp
 
         private void rbReClassify_Click(object sender, EventArgs e)
         {
+            this.Cursor = Cursors.WaitCursor;
             if (m_ProjData.Reclassify())
             {
                 m_ProjData.Save();
@@ -1195,6 +1196,7 @@ namespace OTSMeasureApp
             {
                 MessageBox.Show("reclassification failed");
             }
+            this.Cursor = Cursors.Default;
         }
 
         /// <summary>
@@ -1202,7 +1204,7 @@ namespace OTSMeasureApp
         /// </summary>
         private void OpenMeasureProjectFile()
         {
-
+            
 
             bool bOpenFlag=false;
             COTSMsrPrjResultData ProjDataMgr = new COTSMsrPrjResultData();
@@ -1220,8 +1222,8 @@ namespace OTSMeasureApp
 
 
                 strPathName = openFileDialog.FileName;
-           
 
+            this.Cursor = Cursors.WaitCursor;
             if (ProjDataMgr.Load(strPathName))
             {
                 m_ProjData = ProjDataMgr;
@@ -1230,7 +1232,7 @@ namespace OTSMeasureApp
                
                 bOpenFlag = true;
             }
-            
+            this.Cursor = Cursors.Default;
             if (bOpenFlag)
             {
                 if (!DisplayExistSampleFile())
@@ -1246,6 +1248,7 @@ namespace OTSMeasureApp
             {
                 log.Error("(OTSIncAMeasureAppForm.rbOpen_Click)  m_DataMgrFun.OpenExistSampleFile() Failed !");
             }
+           
         }
 
         private void OTSIncAMeasureAppForm_FormClosed(object sender, FormClosedEventArgs e)