Bladeren bron

save the invalid particle into db.So we can see all the particles in the report app.

gsp 3 jaren geleden
bovenliggende
commit
0e92772677

BIN
Bin/x64/Debug/Config/SysData/IncA/Baohuzha.db


BIN
Bin/x64/Debug/Config/SysData/IncA/OTSIncASTD1.db


+ 2 - 2
OTSCPP/OTSClassifyEngine/ParticleEngine/ParticleSTDDB.cpp

@@ -226,12 +226,12 @@ namespace OTSClassifyEngine
 		stdItem->SetGrpID(grpid);
 
 		CString grpName;
-		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN+(int)CSTDGroupTable::ColumnID::S_NAME- (int)CSTDGroupTable::ColumnID::MIN;
+		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN+(int)CSTDGroupTable::ColumnID::S_NAME- (int)CSTDGroupTable::ColumnID::MIN+1;
 		grpName = a_query->GetColStringValue(nCol, _T(""));
 		stdItem->SetGrpName(grpName.GetString());
 
 		CString grpColor;
-		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN + (int)CSTDGroupTable::ColumnID::S_COLOR - (int)CSTDGroupTable::ColumnID::MIN;
+		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN + (int)CSTDGroupTable::ColumnID::S_COLOR - (int)CSTDGroupTable::ColumnID::MIN+1;
 		grpColor = a_query->GetColStringValue(nCol, _T(""));
 		if (grpColor.Left(1) != "#") sColor = "#" + grpColor;
 		stdItem->SetGrpColor(grpColor.GetString());

+ 10 - 10
OTSIncAMeasureApp/0-OTSModel/Measure/1-OTSInclution/SmplMeasureInclution.cs

@@ -250,16 +250,16 @@ namespace OTSModelSharp
             {
                 log.Info(" classify failed. " + e.Message);
             }
-            var partlist = curFldData.GetListAnalysisParticles();
-            var validPars = new List<COTSParticleClr>();
-            foreach (var p in partlist)
-            {
-                if (p.GetGrpId() > INVALIDPART_GROUPID)
-                {
-                    validPars.Add(p);
-                }
-            }
-            curFldData.SetListAnalysisParticles(validPars);
+            //var partlist = curFldData.GetListAnalysisParticles();
+            //var validPars = new List<COTSParticleClr>();
+            //foreach (var p in partlist)
+            //{
+            //    if (p.GetGrpId() > INVALIDPART_GROUPID)
+            //    {
+            //        validPars.Add(p);
+            //    }
+            //}
+            //curFldData.SetListAnalysisParticles(validPars);
         }
         public override void ClassifyMergedParticles(List<COTSParticleClr> mergedParts)
         {

+ 1 - 1
OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -448,7 +448,7 @@ namespace OTSModelSharp
                 }
             }
             log.Info("Begin to move SEM stage to " + a_SEMpt.X + "," + a_SEMpt.Y);
-            Thread.Sleep(hardWareDelay);
+          
             // move SEM to the position (rotation 0)
             if (!pSEMController.MoveSEMToPoint(a_SEMpt, 0))
             {

+ 0 - 3
OTSIncAMeasureApp/0-OTSModel/Measure/DBDataTransition/IncAFileMgr.cs

@@ -238,8 +238,6 @@ namespace OTSModelSharp
             m_generalInfoDB = GetGeneralInfoDB();
             m_generalInfoDB.UpdateTimeStampRow(m_generalInfoDB.GetTableItemNameTimeEnd(), "");
 
-            //int sta = Convert.ToInt32(msrStatus.GetStatus());
-            //m_generalInfoDB.UpdateIntegerRow(m_generalInfoDB.GetTableItemNameResultStatus(), sta, "");
             return true;
         }
         public void BeginTransaction()
@@ -266,7 +264,6 @@ namespace OTSModelSharp
 
                 var cmd = m_IncADataDB.GegInsertingAnIncACmd(pParticle, m_FieldPos);
 
-                //var cmd = new KeyValuePair<string, SQLiteParameter[]>(sql1,null);
                 cmds.Add(cmd);
       
                 var featurecmd = m_SegmentDB.GetSavingFeatureCmd(pParticle);