optimize some features of the bruker eds driver.optimize the interface of the eds hardware.

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" WeightPercentageToAtomicPercentage="false" />
+  <Member RegName="SemControllerName" Value="Bruker" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Bruker" WeightPercentageToAtomicPercentage="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

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

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="TCCleannessA">
+<XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="BrightnessContrastRegulateParam" AutoRegulateType="EveryPeriod" BrightPhaseElement="Al" BrightPhaseValue="124" DarkPhaseElement="C" DarkPhaseValue="11" InitialBrightness="45.53382111" InitialContrast="60.21995716" mag="100" Period="5" StdMaterialOTSPos="41475,-4357" ToRun="false" />
-  <Member RegName="GenParam" DefaultArea="1450" DefaultSampleName="Sample" DefaultShape="0" EngineType="1:ExpressionParse" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="zz" SteelTechnology="0" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="0" OverlapParam="0" ParticleSelectionCondition="">
+  <Member RegName="GenParam" DefaultArea="50" DefaultSampleName="Sample" DefaultShape="0" EngineType="0:InclustionEngine" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="zz" SteelTechnology="0" />
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="0:AUTO" MatrixStep="0" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="110" start="0" />
-    <Member RegName="IncArea" end="200" start="3" />
+    <Member RegName="IncArea" end="200" start="1" />
     <Member RegName="ParticleGray" end="255" start="0" />
   </Member>
-  <Member RegName="ImageScanParam" ImageResolution="3:_1024_768" SatrtImageMode="0:Spiral" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="2" StopParamMeasTime="360" StopParamParticles="5000" />
+  <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="2" StopParamMeasTime="360" StopParamParticles="5000" />
   <Member RegName="SpecialGrayParam" ToRun="false">
     <Collection RegName="GrayRangeList" />
   </Member>
@@ -15,5 +15,5 @@
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>
-  <Member RegName="XrayParam" AnalyExpCount="1000" 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="false" XrayLimit="200" />
+  <Member RegName="XrayParam" AnalyExpCount="1000" 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>

Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="TCCleannessA">
+<XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="ParticleCoordinate,Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation,XRayDataCount" />
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />

Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="false" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="4">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="4">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />

OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -87,7 +87,7 @@ namespace OTSController {
 			if (!m_bInit)
 			{
 				// failed to load bruker client dll
-				AfxMessageBox(_T("cann't load Bruker dll！ name:" + strBruckerDllName));
+				AfxMessageBox(_T("cann't load Bruker dll锟斤拷 name:" + strBruckerDllName));
 				LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::Init: failed to load Bruker Client Dll , Dll Name: %s"), strBruckerDllName);
 				
 				return false;
@@ -1099,7 +1099,7 @@ namespace OTSController {
 	}
 	
 
-	// check detector states and set m_nSPU                    // Bruker四个有一个盒子，盒子共接4个探头
+	// check detector states and set m_nSPU                    // Bruker锟侥革拷锟斤拷一锟斤拷锟斤拷锟接ｏ拷锟斤拷锟接癸拷锟斤拷4锟斤拷探头
 	BOOL COTSBrukerImpl::SetSPU(void)
 	{
 
@@ -1585,7 +1585,7 @@ BOOL COTSBrukerImpl::GetXRayByPointsOnHardwareLimit(CPosXrayList& a_listXrayPois
 
 		if (BrukerDll::StartPointListMeasurement(m_nClientID, m_nSPU, nCollectCount, segmentArray.get(), a_nACTimeMS) != 0)
 		{
-			LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::StartPointListMeasurement：Call StartPointListMeasurement failed: client id is %d(%d, %d, %d)"), m_nClientID, m_nSPU, nCollectCount, a_nACTimeMS);
+			LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::StartPointListMeasurement锟斤拷Call StartPointListMeasurement failed: client id is %d(%d, %d, %d)"), m_nClientID, m_nSPU, nCollectCount, a_nACTimeMS);
 			return FALSE;
 		}
 
@@ -2581,7 +2581,7 @@ BOOL COTSBrukerImpl::GetLoadDllName(CString& csDllName)
 
 
 	tinyxml2::XMLDocument doc;
-	doc.LoadFile(DllXMLFileName);//载入xml文件
+	doc.LoadFile(DllXMLFileName);//锟斤拷锟斤拷xml锟侥硷拷
 
 	xmls::Slo subClass;
 

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CMeasure.cs

@@ -97,6 +97,7 @@ namespace OTSModelSharp
                     Thread.Sleep(500);
 
                     m_SemController.SetSemBeamBlank(false); //true?
+                    m_SemController.SetSemHTOff();
                     Thread.Sleep(500);
                     m_SemController.RunHIGH_VACUUM();
                 }

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

@@ -102,7 +102,7 @@ namespace OTSModelSharp.ServiceCenter
                 }
                 foreach (var e in eleChemistry)
                 {
-                    e.SetPercentage(resultInfo[e.GetName()]/sumvalue);
+                    e.SetPercentage(resultInfo[e.GetName()]/sumvalue*100);
                 
                 }
                 partWithXrayInfo.GetXray().SetElementQuantifyData(eleChemistry);

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

@@ -299,9 +299,9 @@ namespace OTSModelSharp.ServiceCenter
 
     
 
-        public bool SetSemBeamCurrentOff(bool value)
+        public bool SetSemBeamCurrentOff()
         {
-            return hw.SetSemBeamCurrent(value);
+            return hw.SetSemBeamCurrent(false);
         }
 
         bool ISemController.StopXrayAcquisition()
@@ -309,9 +309,9 @@ namespace OTSModelSharp.ServiceCenter
             throw new NotImplementedException();
         }
 
-        public bool SetSemHTOff(bool value)
+        public bool SetSemHTOff()
         {
-            return hw.SetSemHTOnOff(value);
+            return hw.SetSemHTOnOff(false);
         }
 
         public bool RunHIGH_VACUUM()

OTSIncAMeasureApp/ServiceCenter/FEIAutoScript/FEISemController.cs

@@ -152,16 +152,11 @@ namespace OTSMeasureApp.ServiceCenter
             }
         }
 
-        public bool SetSemBeamCurrentOff(bool val)
+        public bool SetSemBeamCurrentOff()
         {
-            if (val)
-            {
-                return m_ApiClass.SetBeamStateOn();
-            }
-            else
-            {
+          
                 return m_ApiClass.SetBeamStateOff();
-            }
+           
         }
 
         public bool SetSemBrightness(double a_dBrightness)
@@ -179,7 +174,7 @@ namespace OTSMeasureApp.ServiceCenter
             return m_ApiClass.SetHightVoltage(a_dKV);
         }
 
-        public bool SetSemHTOff(bool value)
+        public bool SetSemHTOff()
         {
             return m_ApiClass.SetBeamStateOff();
         }

OTSIncAMeasureApp/ServiceCenter/IMeasureHardware.cs

@@ -48,10 +48,10 @@ namespace OTSModelSharp.ServiceCenter
         bool GetSemContrast(ref double a_dContrast);
         bool SetSemHighTension(double a_dKV);
         bool GetSemHighTension(ref double a_dKV);
-        bool SetSemBeamCurrentOff(bool value);
+        bool SetSemBeamCurrentOff();
         bool SetSemBeamBlank(bool value);
 
-        bool SetSemHTOff(bool value);
+        bool SetSemHTOff();
         bool GetSemBeamBlank(ref int a_nBeamBlank);
         bool StopXrayAcquisition();
         bool RunHIGH_VACUUM();

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordSemController.cs

@@ -196,9 +196,9 @@ namespace OTSMeasureApp.ServiceCenter
         }
 
 
-        public bool SetSemBeamCurrentOff(bool val)
+        public bool SetSemBeamCurrentOff()
         {
-            return iExtender.SetBeamAndFilamentOnOrOff(val);
+            return iExtender.SetBeamAndFilamentOnOrOff(false);
         }
 
         public bool SetSemBeamBlank(bool val)
@@ -211,9 +211,9 @@ namespace OTSMeasureApp.ServiceCenter
             return true;
         }
 
-        public bool SetSemHTOff(bool value)
+        public bool SetSemHTOff()
         {
-            return iExtender.SetBeamAndFilamentOnOrOff(value);
+            return iExtender.SetBeamAndFilamentOnOrOff(false);
         }
 
         public bool RunHIGH_VACUUM()

OTSSysMgrApp/SemTestForms.cs

@@ -651,7 +651,7 @@ namespace OTSSysMgrApp
                 }
               
 
-                bool result = m_SemHardwareMgr.SetSemBeamBlank(true);
+                bool result = m_SemHardwareMgr.SetSemBeamBlank(true);//true
             }
             catch (Exception ex)
             {
@@ -1036,7 +1036,7 @@ namespace OTSSysMgrApp
                 //赋值
                 a_bHTValue = cbSHT.Checked;
                 //获取结果参数
-                bool result = m_SemHardwareMgr.SetSemBeamBlank(a_bHTValue);
+                bool result = m_SemHardwareMgr.SetSemBeamBlank(a_bHTValue);//a_bHTValue
                 if (result)
                 {
                     //配置结果提示
@@ -1077,16 +1077,16 @@ namespace OTSSysMgrApp
 
         private void bVoltageClose_Click(object sender, EventArgs e)
         {
-            bool a_HTValue = false;
-            bool result = m_SemHardwareMgr.SetSemBeamCurrentOff(a_HTValue);
+            //bool a_HTValue = false;
+            bool result = m_SemHardwareMgr.SetSemBeamCurrentOff();
 
         }
 
         private void bVoltageStatus_Click(object sender, EventArgs e)
         {
-            bool a_HTValue = false;
+            //bool a_HTValue = false;
    
-            bool result = m_SemHardwareMgr.SetSemBeamBlank(a_HTValue);
+            bool result = m_SemHardwareMgr.SetSemBeamBlank(false);
 
         }
 
@@ -1121,7 +1121,7 @@ namespace OTSSysMgrApp
 
         private void button3_Click_1(object sender, EventArgs e)
         {
-            bool result = m_SemHardwareMgr.SetSemHTOff(false);
+            bool result = m_SemHardwareMgr.SetSemHTOff();//false
         }
 
         private void btn_HIGH_VACUUM_Click(object sender, EventArgs e)