cxs преди 2 години
родител
ревизия
c746a0d69b

+ 5 - 3
OTSCPP/OTSClassifyEngine/ParticleClassifyEngine.cpp

@@ -627,12 +627,14 @@ CElementChemistriesList ParticleClassifyEngine::ZeroElementProcess(COTSParticleP
 }
 
 
-OTSClassifyEngine::CLEEnginePtr GetParticleEngine(std::string libName)
+OTSClassifyEngine::CLEEnginePtr GetParticleEngine(std::string a_libName)
 {
 	static CLEEnginePtr engine;
-	if (engine == NULL)
+	static std::string libName="";
+	if (engine == NULL || libName != a_libName)
 	{
-		engine = CLEEnginePtr(new ParticleClassifyEngine(libName));
+		engine = CLEEnginePtr(new ParticleClassifyEngine(a_libName));
+		libName = a_libName;
 		engine->Init();
 	}
 	return engine;

+ 1 - 0
OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -1532,6 +1532,7 @@ namespace OTSModelSharp
                     {
                         part.SetType((int)OTS_PARTCLE_TYPE.NOT_IDENTIFIED);
                         part.SetTypeName("Not Identified");
+                        part.SetTypeColor("#000000");
                     }
                 }
 

+ 7 - 1
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -6,6 +6,7 @@ using OTS.WinFormsUI.Docking;
 using OTSDataType;
 using OTSMeasureApp._3_OTSDisplaySourceGridData;
 using OTSModelSharp.ResourceManage;
+using System.Collections.Generic;
 
 namespace OTSMeasureApp
 {
@@ -91,6 +92,8 @@ namespace OTSMeasureApp
             //设置样品属性参数成功
             OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
             var m_measurePara = m_MeasureAppForm.m_ProjParam;
+            var curSample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
+            var curpara = curSample.GetMsrParams();
             //当前正在测量
             if (PropertyMeasureThreadRunFlag)//measureThread is running
             {
@@ -112,7 +115,10 @@ namespace OTSMeasureApp
             {
                 if (m_measurePara.SetSTDFileName((int)ObjVal))
                 {
-                 
+                    //int pos=0;
+                    //var filenamelist = new List<string>();
+                    //m_measurePara.GetSTDFileName(ref pos, ref filenamelist);
+                    //curpara.SetSTDName(filenamelist[pos]);
                     m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                    
                     DisplaySampleMeasureInfo(SMInfo);