Sfoglia il codice sorgente

optimize ExtenderWrapper

GSP 3 settimane fa
parent
commit
20a430577a
1 ha cambiato i file con 28 aggiunte e 27 eliminazioni
  1. 28 27
      OxfordExtenderWrapper/ExtenderWrapper.cs

+ 28 - 27
OxfordExtenderWrapper/ExtenderWrapper.cs

@@ -899,10 +899,10 @@ namespace OxfordExtenderWrapper
         void InitMicroscopeController()
         {
             this.microscopeController = AcquireFactory.CreateMicroscopeControl();
-            this.microscopeController.ColumnChange += this.OnMicroscopeColumnChange;
-            this.microscopeController.StageChange += this.OnMicroscopeStageChange;
-            this.microscopeController.ColumnConnected += this.OnMicroscopeColumnConnected;
-            this.microscopeController.StageConnected += this.OnMicroscopeStageConnected;
+            //this.microscopeController.ColumnChange += this.OnMicroscopeColumnChange;
+            //this.microscopeController.StageChange += this.OnMicroscopeStageChange;
+            //this.microscopeController.ColumnConnected += this.OnMicroscopeColumnConnected;
+            //this.microscopeController.StageConnected += this.OnMicroscopeStageConnected;
             this.microscopeController.ChangeCompleted += this.OnMicroscopeChangeCompleted;
 
 
@@ -918,10 +918,10 @@ namespace OxfordExtenderWrapper
             if (microscopeController != null)
             {
 
-                this.microscopeController.ColumnChange -= this.OnMicroscopeColumnChange;
-                this.microscopeController.StageChange -= this.OnMicroscopeStageChange;
-                this.microscopeController.ColumnConnected -= this.OnMicroscopeColumnConnected;
-                this.microscopeController.StageConnected -= this.OnMicroscopeStageConnected;
+                //this.microscopeController.ColumnChange -= this.OnMicroscopeColumnChange;
+                //this.microscopeController.StageChange -= this.OnMicroscopeStageChange;
+                //this.microscopeController.ColumnConnected -= this.OnMicroscopeColumnConnected;
+                //this.microscopeController.StageConnected -= this.OnMicroscopeStageConnected;
                 this.microscopeController.ChangeCompleted -= this.OnMicroscopeChangeCompleted;
                 microscopeController = null;
             }
@@ -1006,33 +1006,33 @@ namespace OxfordExtenderWrapper
         }
 
         //电镜控制改变事件
-        private void OnMicroscopeColumnChange(object sender, EventArgs e)
-        {
+        //private void OnMicroscopeColumnChange(object sender, EventArgs e)
+        //{
 
-            ReadMicroscopeColumn();
-        }
+        //    //ReadMicroscopeColumn();
+        //}
 
         //样品台控制改变事件
-        private void OnMicroscopeStageChange(object sender, EventArgs e)
-        {
+        //private void OnMicroscopeStageChange(object sender, EventArgs e)
+        //{
 
-            ReadStage();
-        }
+        //    ReadStage();
+        //}
 
         //镜筒控制连接或断开时的事件
-        private void OnMicroscopeColumnConnected(object sender, EventArgs e)
-        {
+        //private void OnMicroscopeColumnConnected(object sender, EventArgs e)
+        //{
 
 
-            ReadMicroscopeColumn();
-        }
+        //    ReadMicroscopeColumn();
+        //}
 
         //样品台控制连接或断开时的事件
-        private void OnMicroscopeStageConnected(object sender, EventArgs e)
-        {
+        //private void OnMicroscopeStageConnected(object sender, EventArgs e)
+        //{
 
-            ReadStage();
-        }
+        //    ReadStage();
+        //}
 
         //样品台控制、电镜控制、外围控制的事件改变完成
         private void OnMicroscopeChangeCompleted(object sender, CompletedEventArgs e)
@@ -1041,7 +1041,7 @@ namespace OxfordExtenderWrapper
             {
                 if (e.Success)
                 {
-
+                    ReadStage();
                     m_StageUpdated = true;
 
                 }
@@ -1051,6 +1051,7 @@ namespace OxfordExtenderWrapper
             {
                 if (e.Success)
                 {
+                    ReadMicroscopeColumn();
                     m_CollumnUpdated = true;
                 }
 
@@ -1063,8 +1064,8 @@ namespace OxfordExtenderWrapper
                 }
 
             }
-            ReadMicroscopeColumn();
-            ReadStage();
+           
+          
         }
 
         bool ifMagRead=false;