Browse Source

0927selpa电镜测试,修改点击测量程序中打开报告选项时结束能谱连接的单例模式

shiyanshi 3 years ago
parent
commit
e089bb0dbf

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" drive="OffLine" ImageInputSources="BSE" />
-  <Member RegName="EDSName" drive="OffLine" />
+  <Member RegName="SemControllerName" drive="Bruker" ImageInputSources="BSE" />
+  <Member RegName="EDSName" drive="Bruker" />
 </XMLData>

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSStage.stg

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

+ 18 - 0
OTSCPP/OTSControl/Bruker/OTSSEMBruker.cpp

@@ -63,6 +63,24 @@ namespace OTSController {
 		return TRUE;
 	}
 
+	BOOL COTSSEMBruker::Disconnect()
+	{
+		
+			if (m_bConnected)
+			{
+				 m_pBrukerImplPtr->DisConnect();
+				m_bConnected = false;
+				return true;
+			}
+			else
+			{
+				return true;
+			}
+
+
+	
+	}
+
 
 
 	// set beam blank

+ 2 - 13
OTSCPP/OTSControl/Bruker/OTSSEMBruker.h

@@ -19,19 +19,8 @@ namespace OTSController {
 		virtual BOOL IsConnected(void) override;
 
 		virtual BOOL Connect(void) override;
-		virtual BOOL Disconnect(void) override
-		{ 
-			if (m_bConnected)
-			{
-				return m_pBrukerImplPtr->DisConnect();
-			}
-			else
-			{
-				return true;
-			}
-			
-			 
-		} ;// do nothing for this controller.
+		virtual BOOL Disconnect(void) override;
+
 
 		virtual BOOL GetBeamBlank(long& a_nBeamBlank) override { return TRUE; }
 		virtual BOOL SetBeamBlank(long a_nBeamBlank) override;