Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4

Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="1">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0" />

OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

@@ -1321,7 +1321,7 @@ namespace OTSClassifyEngine
 
 				// try to find the STD item
 				pOxideNitrSTDItem = GetSTDItemByName(listNitrideSTD, strOxide_NitrName);
-				if (strOxide_NitrName)
+				if (pOxideNitrSTDItem)
 				{
 					// found the STD item
 					a_nIncId = pOxideNitrSTDItem->GetSTDId();

OTSCPP/OTSClrInterface/ClassificationClr/OTSClassifyEngineClr.cpp

@@ -55,7 +55,9 @@ namespace OTSCLRINTERFACE {
 	bool COTSClassifyEngineClr::Classify(COTSParticleClr^ particle, int SteelTech)
 	{
 		auto part = particle->GetOTSParticlePtr();
+	
 		auto xraydata = part->GetXrayInfo();
+	
 		return engine->Classify(part, SteelTech, xraydata);
 		
 	}

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

@@ -859,6 +859,9 @@ namespace OTSModelSharp
             {
                 log.Info("Begin to collect particle's xray data!");
                 Thread.Sleep(100);
+
+                m_EDSHardwareMgr.SetResolution(a_pBSEImg.GetWidth(), a_pBSEImg.GetHeight());
+
                 CollectParticlesXrayData(curFldData);
 
                 Thread.Sleep(100);