铝酸盐更名钙铝酸盐

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -1154,8 +1154,16 @@
 	  <Control name="str4" text="Center Y coordinate" />
 	  <Control name="str5" text="WidthorDiameter" />
 	  <Control name="str6" text="Heightor0" />
-	  <Control name="m_DefaultSampleName" text="sample" />
-	  <Control name="message1" text="Are you sure you want to delete it?" />
+	  <Control name="str7" text="Circle" />
+	  <Control name="str8" text="Square" />
+	  <Control name="str9" text="The sample station name cannot be an empty string and cannot contain \ \ ', \ \' characters!" />
+	  <Control name="str2" text="HoleShape" />
+	  <Control name="str3" text="Center X coordinate" />
+	  <Control name="str4" text="Center Y coordinate" />
+	  <Control name="str5" text="WidthorDiameter" />
+	  <Control name="str6" text="Heightor0" />
+	  <Control name="str7" text="Circle" />
+	  <Control name="str8" text="Square" />
     </Controls>
  </Form>
   <Form>

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1149,8 +1149,16 @@
 	  <Control name="str4" text="中心y坐标" />
 	  <Control name="str5" text="宽度或直径" />
 	  <Control name="str6" text="高度或0" />
-	  <Control name="m_DefaultSampleName" text="样品" />
-	  <Control name="message1" text="是否确定删除？" />
+	  <Control name="str7" text="圆形" />
+	  <Control name="str8" text="方形" />
+	  <Control name="str9" text="样品台名不能为空字串，不能含\',\'字符!" />
+	  <Control name="str2" text="HoleShape" />
+	  <Control name="str3" text="Center X coordinate" />
+	  <Control name="str4" text="Center Y coordinate" />
+	  <Control name="str5" text="WidthorDiameter" />
+	  <Control name="str6" text="Heightor0" />
+	  <Control name="str7" text="Circle" />
+	  <Control name="str8" text="Square" />
     </Controls>
  </Form>
  <Form>

OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.h

@@ -101,7 +101,7 @@ namespace OTSClassifyEngine
 	const CString ALUMINATE_KEY_ELEMENT_NAME = _T("Al");
 	const double ALUMINAT_KEY_ELEMENT_MOLAR_TOTAL_MIN = 10.0;
 	const double ALUMINAT_KEY_ELEMENT_MOLAR_TOTAL_MAX = 90.0;
-	const CString ALUMINATE_STR = _T("Aluminate");
+	const CString ALUMINATE_STR = _T("Ca-Aluminate");
 
 	const CString STR_OXIDE = _T("O");
 	const double MIN_OXIDE_MOLAR = 5.0;

OTSCPP/OTSControl/Simulate/OTSEDSSim.cpp

@@ -144,7 +144,7 @@ namespace OTSController {
 				switch (icount % 7)
 				{
 				case 0://MnS
-					sResult = _T("Quant=O,K-Serie,28.5\nQuant=S,L-Serie,10\nQuant=Mn,L-Serie,20\nQuant=Fe,L-Serie,9.5");
+					sResult = _T("Quant=Al,K-Serie,19\nQuant=O,L-Serie,39\nQuant=Ca,L-Serie,20");
 					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
 					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
 					break;