소스 검색

diagnose the otscontrol dll

gsp 3 년 전
부모
커밋
b3e4b445b8

+ 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="Bruker" ImageInputSources="BSE" />
-  <Member RegName="EDSName" drive="Bruker" />
+  <Member RegName="SemControllerName" drive="OffLine" ImageInputSources="BSE" />
+  <Member RegName="EDSName" drive="OffLine" />
 </XMLData>

+ 5 - 1
OTSCPP/OTSControl/Bruker/OTSSEMBruker.h

@@ -21,7 +21,11 @@ namespace OTSController {
 		virtual BOOL Connect(void) override;
 		virtual BOOL Disconnect(void) override
 		{ 
-			return m_pBrukerImplPtr->DisConnect();
+			if (m_bConnected)
+			{
+				return m_pBrukerImplPtr->DisConnect();
+			}
+			
 			 
 		} ;// do nothing for this controller.
 

+ 0 - 1
OTSCPP/OTSControl/OTSControl.vcxproj

@@ -395,7 +395,6 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="ClassDiagram.cd" />
     <None Include="hardwareClass.cd" />
     <None Include="res\OTSControl.def" />
     <None Include="res\OTSControl.rc2" />

+ 0 - 3
OTSCPP/OTSControl/OTSControl.vcxproj.filters

@@ -188,9 +188,6 @@
     <None Include="res\OTSControl.def">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="ClassDiagram.cd">
-      <Filter>Header Files</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\OTSControl.rc">

+ 2 - 1
OTSSysMgrApp/ControllerSettingForm.cs

@@ -256,6 +256,7 @@ namespace OTSSysMgrApp
                             bitmap = ImageDispose.ToGrayBitmap(ImageByte, width, height);
                             pbImage.Image = bitmap;
                             btnSaveImage.Enabled = true;
+                            log.Info("Image capture success!\nImage resolution:" + tbRWidth.Text + "X" + tbRHeight.Text + ";");
                         }
                         else
                         {
@@ -266,7 +267,7 @@ namespace OTSSysMgrApp
                     {
                         MessageBox.Show(str2, "Tip");
                     }
-                    log.Info("Image capture success!\nImage resolution:"+ tbRWidth.Text+"X"+ tbRHeight.Text+";");
+                    
                 }
                 catch (Exception ex)
                 {

+ 2 - 2
OTSSysMgrApp/SemTestForms.cs

@@ -518,9 +518,9 @@ namespace OTSSysMgrApp
             try
             {
                 //断开电镜连接
-                //cfun.DisConnectSem();
+                cfun.DisconnectSem();
                 //释放DLL内存
-                cfun.FreeHardware();
+                //cfun.FreeHardware();
                 
             }
             catch (Exception ex)