Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

Bin/x64/Debug/Config/ReportTemplate/CleannessA_Template/ReportTemplateConfig.xml

@@ -12,7 +12,7 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>white.png</LOGName>
-    <StandardLibraryName>Cleanness_F.db</StandardLibraryName>
+    <StandardLibraryName>Cleanness_ND - 副本.db</StandardLibraryName>
     <str_tb_SampleName>
     </str_tb_SampleName>
     <str_tb_djsb>
@@ -133,7 +133,7 @@
       <YS0>misc</YS0>
       <YS1>Other Non-Magnetic</YS1>
     </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>10</list_int_kllb_number>
+    <list_int_kllb_number>15</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
@@ -145,10 +145,10 @@
   <whole>
     <list_str_MainPriority>System.Collections.Generic.List`1[System.String]</list_str_MainPriority>
     <list_str_SecondaryPriority>System.Collections.Generic.List`1[System.String]<YS0>Nialloy</YS0><YS1>Fe-O</YS1><YS2>Fe-Cr</YS2><YS3>Fe-alloy</YS3></list_str_SecondaryPriority>
-    <str_MainPriority>Cu(Zn):Cu alloy , Cu(Zn):Cu(Zn) , Cu(Zn):Zn alloy , Cu(Zn):Cu-O , Cu(Zn):Zn-O , Ferrous:Fe-Cr-Ni , Ferrous:Fe-Cr , Ferrous:Fe-Ni , Ferrous:Fe-O , Ferrous:Fe-NCM  , Ferrous:Fe-P , Ferrous:Fe-alloy , NonFerrous:Nialloy , NonFerrous:Ni-Cr , NonFerrous:Cr-alloy , NonFerrous:NCM , NonFerrous:W-alloy , NonFerrous:Zr alloy , NonFerrous:Ti alloy , NonFerrous:Al alloy , NonFerrous:Al-0</str_MainPriority>
+    <str_MainPriority>Cu(Zn):Cu alloy , Cu(Zn):Cu(Zn) , Cu(Zn):Zn alloy , Cu(Zn):Cu 10-20 , Cu(Zn):Zn 10-20 , Cu(Zn):Cu(&lt;10) , Cu(Zn):Zn(&lt;10) , Cu(Zn):Cu-O , Cu(Zn):Zn-O , Ferrous:Fe-Cr-Ni , Ferrous:Fe-Cr , Ferrous:Fe-Ni , Ferrous:Fe&gt;90 , Ferrous:low Fe-O , Ferrous:Fe-O , Ferrous:Fe 80-90 , Ferrous:Fe 50-80 , Ferrous:Fe 20-50 , Ferrous:Fe-P-Si , Ferrous:Fe-P-Cr , Ferrous:Fe-NCM  , Ferrous:Fe-P , Ferrous:Fe-alloy , Ferrous:Fe-P-Ni , NonFerrousMetal:Ni alloy , NonFerrousMetal:Ni-Cr , NonFerrousMetal:Cr-alloy , NonFerrousMetal:NCM , NonFerrousMetal:W-alloy , NonFerrousMetal:Zr alloy , NonFerrousMetal:Ti alloy , NonFerrousMetal:Al alloy , NonFerrousMetal:Oxidized Al , NonFerrousMetal:Ca-Mg-Na-K-Si , Default:NoFerous Mental</str_MainPriority>
     <str_SecondaryPriority>Nialloy,Fe-O,Fe-Cr,Fe-alloy</str_SecondaryPriority>
     <list_str_MainPriority_Serial>System.Collections.Generic.List`1[System.String]</list_str_MainPriority_Serial>
-    <str_MainPriorityID>1:40003 , 1:40004 , 1:40005 , 1:40002 , 1:40009 , 2:40006 , 2:40007 , 2:40008 , 2:40001 , 2:40012 , 2:40013 , 2:40014 , 3:40010 , 3:40011 , 3:40015 , 3:40016 , 3:40017 , 3:40018 , 3:40019 , 3:40020 , 3:40021</str_MainPriorityID>
+    <str_MainPriorityID>1:40003 , 1:40004 , 1:40005 , 1:40031 , 1:40032 , 1:40033 , 1:40034 , 1:40002 , 1:40009 , 2:40006 , 2:40007 , 2:40008 , 2:40026 , 2:40027 , 2:40001 , 2:40028 , 2:40029 , 2:40030 , 2:40035 , 2:40036 , 2:40012 , 2:40013 , 2:40014 , 2:40037 , 3:40010 , 3:40011 , 3:40015 , 3:40016 , 3:40017 , 3:40018 , 3:40019 , 3:40020 , 3:40021 , 3:40022 , 0:40024</str_MainPriorityID>
   </whole>
   <M_DZ>
     <Notes>

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="BatteryCleannessA">
-  <Member RegName="GenParam" DefaultArea="1400" DefaultSampleName="Sample" DefaultShape="0" EngineType="1:ExpressionParse" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Cleanness_F" SteelTechnology="0" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
-    <Member RegName="BGGray" end="26" start="0" />
-    <Member RegName="IncArea" end="200" start="25" />
-    <Member RegName="ParticleGray" end="255" start="200" />
+  <Member RegName="GenParam" DefaultArea="1400" DefaultSampleName="Sample" DefaultShape="0" EngineType="2:InclutionPlusExpressionParse" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Cleanness_ND - 副本" SteelTechnology="0" />
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="0" OverlapParam="0" ParticleSelectionCondition="">
+    <Member RegName="BGGray" end="40" start="0" />
+    <Member RegName="IncArea" end="10000" start="5" />
+    <Member RegName="ParticleGray" end="255" start="0" />
   </Member>
-  <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="30" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
-  <Member RegName="SpecialGrayParam" ToRun="true">
-    <Collection RegName="GrayRangeList">
-      <Member collectXray="true" diameterEnd="200" diameterStart="5" end="248" rngName="rang1" start="170" />
-    </Collection>
+  <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="0:Spiral" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
+  <Member RegName="SpecialGrayParam" ToRun="false">
+    <Collection RegName="GrayRangeList" />
   </Member>
   <Member RegName="StageData" ControlDelay="2000" MinMag="65" scanFieldSize="1270" xAxisDir="1:RIGHT_TOWARD" yAxisDir="0:UP_TOWARD">
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>
-  <Member RegName="XrayParam" AnalyExpCount="100" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="100" QuantifyMinSize="1" ScanMode="0:PointMode" SmallPartAQTime="100" UseFilter="false" UsingXray="true" XrayLimit="50" />
+  <Member RegName="XrayParam" AnalyExpCount="3000" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="300" QuantifyMinSize="5" ScanMode="0:PointMode" SmallPartAQTime="300" UseFilter="false" UsingXray="true" XrayLimit="200" />
 </XMLData>

OTSCPP/OTSClassifyEngine/ExpressionClassifyEngine.cpp

@@ -49,7 +49,7 @@ bool ExpressionClassifyEngine::ClassifyExpression(COTSParticlePtr particle, CPos
 	{
 		auto& originalPartEles = xray->GetElementQuantifyData();//find all the elements containing in the particle xray.
 
-		//zero element process,if satisfied the condition than set the particular element percentage to 0.and make it 100% of all the element percentage.
+		//zero element process,if satisfied the condition than set the particular element percentage to 0.and make it 100% of all the other element percentage.
 
 		auto partEles = ZeroElementProcess(particle, xray);//
 
@@ -528,7 +528,7 @@ CElementChemistriesList ExpressionClassifyEngine::ZeroElementProcess(COTSParticl
 			continue;
 		}
 	}
-
+	particle->GetXrayInfo()->SetElementQuantifyData(partEles);//set the particle's xray element quantify data to the new partEles.
 	return partEles;
 
 }

OTSIncAMeasureApp/1-OTSMeasure/Measure/2-OTSCleanliness/SmplMeasureCleanliness.cs

@@ -62,7 +62,7 @@ namespace OTSModelSharp
             int nSize = (int)a_listAnalysisParticles.Count();
 
             // go through all analysis particles
-            int quantifyNum = 0;
+         
             for (int i = 0; i < nSize; ++i)
             {
                 COTSParticleClr pParticle = a_listAnalysisParticles[i];
@@ -73,27 +73,10 @@ namespace OTSModelSharp
 
                 if (!IsLowCounts(pParticle))
                 {
-                    if (m_EDSController.GetIfDelayQuantify())
-                    {
-
-                        if (engine.ClassifyByExpressionTemporarySpectrum(pParticle))
-                        {
-                            if (pParticle.GetType() == (int)OTS_PARTICLE_TYPE.NOT_IDENTIFIED)
-                            {
-                                quantifyNum += 1;
-                                m_EDSController.QuantifyXrayByPart(pParticle);
-                                engine.ClassifyByExpression(pParticle);
-                            }
-
-                        }
-                        int specComp = nSize - quantifyNum;
-                        log.Info("spectrum compare:" + specComp.ToString() + "element quantify:" + quantifyNum);
-                    }
-                    else 
-                    {
+                    
                         engine.ClassifyByExpression(pParticle);
 
-                    }
+                   
                     
 
 

OTSIncAMeasureApp/ServiceCenter/CClassifyEngine.cs

@@ -14,7 +14,7 @@ namespace OTSModelSharp.ServiceCenter
    public class CClassifyEngine : IClassifyEngine
     {
         COTSClassifyEngineClr myEng;
-        bool ifWeightPercentageToAtomicPercentage;
+        bool ifWeightPercentageToAtomicPercentage=false;
 
         public bool ClassifyIncA(COTSParticleClr particle, int steelTech)
         {

OTSIncAMeasureApp/ServiceCenter/CPP(Bruker)API/EDSController.cs

@@ -361,9 +361,9 @@ namespace OTSModelSharp.ServiceCenter
             return result;
         }
 
-        public bool GetIfDelayQuantify()
-        {
-            return false;
-        }
+        //public bool GetIfDelayQuantify()
+        //{
+        //    return false;
+        //}
     }
 }

OTSIncAMeasureApp/ServiceCenter/FEIAutoScript/FEIEDSController.cs

@@ -169,10 +169,10 @@ namespace OTSMeasureApp.ServiceCenter
             return AnalyExpCount;
         }
 
-        public bool GetIfDelayQuantify()
-        {
-            return false;
-        }
+        //public bool GetIfDelayQuantify()
+        //{
+        //    return false;
+        //}
 
         public void SetQuantifiCationParam(bool IfAutoId, string knownElements)
         {

OTSIncAMeasureApp/ServiceCenter/IMeasureHardware.cs

@@ -87,7 +87,7 @@ namespace OTSModelSharp.ServiceCenter
         void SetFilterKeyEleNames(List<string> KeyNameList);
         void SetResolution(int resolutionWidth, int resolutionHeight);
         int GetExpectCount();
-        bool GetIfDelayQuantify();
+        //bool GetIfDelayQuantify();
 
         void SetQuantifiCationParam(bool IfAutoId, String knownElements);
     }

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordEDSController.cs

@@ -188,10 +188,10 @@ namespace OTSMeasureApp.ServiceCenter
             return AnalyExpCount;
         }
 
-        public bool GetIfDelayQuantify()
-        {
-            return false;
-        }
+        //public bool GetIfDelayQuantify()
+        //{
+        //    return false;
+        //}
 
         public void SetQuantifiCationParam(bool IfAutoId, string knownElements)
         {