Переглянути джерело

optimize the sysmgrApp system.

cxs 3 роки тому
батько
коміт
16fee79e9a

+ 1 - 1
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.cpp

@@ -51,7 +51,7 @@ void OxfordControllerWrapper::CloseClient(void)
 	}
 
 	_controllerThread->Abort();
-	_controllerThread = nullptr;
+	//_controllerThread = nullptr;
 	_microscopeController = nullptr;
 	_edSpectrumController = nullptr;
 	_imageAcqusitionController = nullptr;

+ 2 - 7
OTSSysMgrApp/ControllerSettingForm.cs

@@ -800,13 +800,8 @@ namespace OTSSysMgrApp
         {
             try
             {
-                //cfun.EDSFinishedInstance();
-                //cfun.ScanFinishedInstance();
-                //if (ConnectionState)
-                //{
-                //    ConnectionState = cfun.DisConnectSem();
-                //}
-                //cfun.FreeDll();
+                cfun.DisconnectSem();
+          
             }
             catch (Exception ex)
             {

+ 1 - 1
OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -536,7 +536,7 @@ namespace OTSSysMgrApp
         private void OTSSystemManagerForms_FormClosing(object sender, FormClosingEventArgs e)
         {
            
-           
+
         }
 
         private void lnklab_about_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)