修改模拟情况下面扫结果

OTSCPP/OTSControl/Simulate/OTSEDSSim.cpp

@@ -230,24 +230,83 @@ namespace OTSController {
 			// failed to call CollectASpectrumFromTxtFile method
 			LogTrace(__FILE__, __LINE__, _T("COTSEDSSim::GetXRayByFeatures: failed to call CollectASpectrumFromTxtFile method."));
 		}
+		int icount = 0;
 		for (auto pXrayPoi : a_listXRayPoints)
 		{
 			pXrayPoi->SetXrayData(m_nRayData);
 			if (m_bDoQuantification)
 			{
+				CString sResult = "";
 				CElementChemistriesList listElementQuantifyData;
 
 				//CString sResult = _T("Quant=O,K-Serie,28.5\nQuant=Al,L-Serie,26.4\nQuant=S,L-Serie,1.6\nQuant=Ca,L-Serie,15.8\nQuant=Fe,L-Serie,9.5");
 				//CString sResult = _T("Quant=O,K-Serie,28.5\nQuant=Fe,L-Serie,49.5");
 				CElementPtr pElement = CElementPtr(new CElement());
 				//listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+				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");
+					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+					break;
 
-				CString sResult = _T("Quant=O,K-Serie,28.5\nQuant=S,L-Serie,10\nQuant=Mn,L-Serie,20\nQuant=Fe,L-Serie,9.5");
-				listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
-				pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+				case 1://FeO
+					sResult = _T("Quant=O,K-Serie,4.84\nQuant=Al,L-Serie,1.47\nQuant=S,L-Serie,1.6\nQuant=Si,L-Serie,2.42\nQuant=Mn,L-Serie,2.97\nQuant=Fe,L-Serie,80.361");
+					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+					break;
 
-				pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+				case 3://Sulfide
+					sResult = _T("Quant=C,K-Serie,1.057\nQuant=S,L-Serie,2.177\nQuant=Fe,L-Serie,84.592");
+					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+					break;
+
+				case 4://Silicate
+					sResult = _T("Quant=O,K-Serie,9.75\nQuant=Al,L-Serie,1.08\nQuant=Si,L-Serie,5.261\nQuant=Mn,L-Serie,11.204\nQuant=Fe,L-Serie,50.403");
+					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+					break;
 
+				case 5://SiO2
+					sResult = _T("Quant=C,K-Serie,12.563\nQuant=O,L-Serie,1.906\nQuant=Si,L-Serie,26.126\nQuant=Fe,L-Serie,54.61");
+					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+					break;
+
+				case 6://AlO2
+					sResult = _T("Quant=Al,K-Serie,40\nQuant=O,L-Serie,40\nQuant=Fe,L-Serie,20");
+					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+					break;
+
+				//case 7:
+				//	sResult = _T("Quant=Al,K-Serie,1\nQuant=O,L-Serie,2\nQuant=Fe,L-Serie,2");
+				//	listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+				//	pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+				//	break;
+
+				//case 8:
+				//	sResult = _T("Quant=Fe,K-Serie,10\nQuant=C,L-Serie,30\nQuant=F,L-Serie,25");
+				//	listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+				//	pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+				//	break;
+
+				//case 9:
+				//	sResult = _T("Quant=O,K-Serie,40\nQuant=Si,L-Serie,40\nQuant=C,L-Serie,1");
+				//	listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+				//	pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+				//	break;
+
+				default://Not Identified
+					sResult = _T("Quant=C,K-Serie,7.992\nQuant=Si,L-Serie,15.969\nQuant=Fe,L-Serie,69.805");
+					listElementQuantifyData = pElement->ExtractElementChemistrys(sResult);
+					pXrayPoi->SetElementQuantifyData(listElementQuantifyData);
+					break;
+				}
+
+				icount++;
 			}
 
 		}