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

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="3">
+<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

@@ -2094,6 +2094,13 @@ namespace OTSClassifyEngine
 		if (dKeyElMolar100 > ALUMINAT_KEY_ELEMENT_MOLAR_TOTAL_MIN && dKeyElMolar100 < ALUMINAT_KEY_ELEMENT_MOLAR_TOTAL_MAX)
 		{
 			CElementChemistryPtr pKeyElChem2 = GetNamedElementChemistry(a_listElChems, ALUMINATE_KEY_ELEMENT_NAME[1]);
+
+			if (!pKeyElChem2)
+			{
+				strName = ALUMINATE_STR;
+				return TRUE;
+			}
+
 			double dFirstElMolar = pKeyElChem->GetMolarPercentage();//Al
 			double dSecondElMolar = pKeyElChem2->GetMolarPercentage();//Ca
 			double dRatio = dFirstElMolar/dSecondElMolar ;// Al/Ca

OTSCPP/OTSClrInterface/ClassificationClr/OTSClassifyEngineClr.cpp

@@ -40,7 +40,15 @@ namespace OTSCLRINTERFACE {
 	{
 		auto part = particle->GetOTSParticlePtr();
 		auto xraydata = part->GetXrayInfo();
-		return engine->Classify(part, xraydata);
+		if (xraydata != nullptr)
+		{
+			return engine->Classify(part, xraydata);
+		}
+		else
+		{
+			return false;
+		}
+		
 		
 	}
 

OTSSysMgrApp/SemTestForms.cs

@@ -1296,19 +1296,19 @@ namespace OTSSysMgrApp
 
         }
 
-        private void button_VoltageStatus_Click(object sender, EventArgs e)
+        private void bVoltageClose_Click(object sender, EventArgs e)
         {
-            //连接电镜 关闭电压
             int a_HTValue = 0;
-            bool result = cfun.GetSemHTOnOff(ref a_HTValue);
-                MessageBox.Show("电压当前状态：" + Convert.ToBoolean(a_HTValue).ToString());
+            bool result = cfun.SetSemHTOnOff(a_HTValue);
+            MessageBox.Show("关闭电压是否成功：" + Convert.ToBoolean(result).ToString());
         }
 
-        private void button_VoltageClose_Click(object sender, EventArgs e)
+        private void bVoltageStatus_Click(object sender, EventArgs e)
         {
-            int a_HTValue = 0; 
-            bool result = cfun.SetSemHTOnOff(a_HTValue);
-                MessageBox.Show("关闭电压是否成功：" + Convert.ToBoolean(result).ToString());
+            //连接电镜 关闭电压
+            int a_HTValue = 0;
+            bool result = cfun.GetSemHTOnOff(ref a_HTValue);
+            MessageBox.Show("电压当前状态：" + Convert.ToBoolean(a_HTValue).ToString());
         }
     }
 }