Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

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

@@ -90,7 +90,12 @@ namespace OTSModelSharp
 
                 if (m_pProjData.GetGenParam().AutoBeamOff)
                 {
+                    m_SemController.StopImageAcquisition();
+                    Thread.Sleep(500);
+
                     m_SemController.SetSemBeamBlank(false); //true?
+                    Thread.Sleep(500);
+                    m_SemController.RunHIGH_VACUUM();
                 }
             }
         }

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

@@ -313,5 +313,25 @@ namespace OTSModelSharp.ServiceCenter
         {
             return hw.SetSemHTOnOff(value);
         }
+
+        public bool RunHIGH_VACUUM()
+        {
+            return true;
+        }
+
+        public bool StopImageAcquisition()
+        {
+            return true;
+        }
+
+        public bool SetReducedArea()
+        {
+            return true;
+        }
+
+        public bool SetFullFrame()
+        {
+            return true;
+        }
     }
 }

OTSIncAMeasureApp/ServiceCenter/FEIAutoScript/FEISemController.cs

@@ -193,5 +193,25 @@ namespace OTSMeasureApp.ServiceCenter
         {
             return m_ApiClass.DisConnect();
         }
+
+        public bool RunHIGH_VACUUM()
+        {
+            return m_ApiClass.RunHIGH_VACUUM();
+        }
+
+        public bool StopImageAcquisition()
+        {
+            return m_ApiClass.Stop_acquisition();
+        }
+
+        public bool SetReducedArea()
+        {
+            return m_ApiClass.SetReducedArea();
+        }
+
+        public bool SetFullFrame()
+        {
+            return m_ApiClass.SetFullFrame();
+        }
     }
 }

OTSIncAMeasureApp/ServiceCenter/IMeasureHardware.cs

@@ -46,7 +46,11 @@ namespace OTSModelSharp.ServiceCenter
         bool SetSemHTOff(bool value);
         bool GetSemBeamBlank(ref int a_nBeamBlank);
         bool StopXrayAcquisition();
-       
+        bool RunHIGH_VACUUM();
+        bool StopImageAcquisition();
+        bool SetReducedArea();
+        bool SetFullFrame();
+
     }
     public interface IScanController
     {

OTSIncAMeasureApp/ServiceCenter/OxfordExtender/OxfordSemController.cs

@@ -212,5 +212,25 @@ namespace OTSMeasureApp.ServiceCenter
         {
             return true;
         }
+
+        public bool RunHIGH_VACUUM()
+        {
+            return true;
+        }
+
+        public bool StopImageAcquisition()
+        {
+            return true;
+        }
+
+        public bool SetReducedArea()
+        {
+            return true;
+        }
+
+        public bool SetFullFrame()
+        {
+            return true;
+        }
     }
 }

OTSSysMgrApp/SemTestForms.Designer.cs

@@ -114,14 +114,18 @@
             this.bVoltageStatus = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
+            this.btn_HIGH_VACUUM = new System.Windows.Forms.Button();
+            this.btn_StopImageAcquisition = new System.Windows.Forms.Button();
             this.button3 = new System.Windows.Forms.Button();
+            this.btn_FullFrame = new System.Windows.Forms.Button();
+            this.btn_SetReducedArea = new System.Windows.Forms.Button();
             this.gbGetMethods.SuspendLayout();
             this.gbSetMethods.SuspendLayout();
             this.SuspendLayout();
             // 
             // BtnConnect
             // 
-            this.BtnConnect.Location = new System.Drawing.Point(529, 339);
+            this.BtnConnect.Location = new System.Drawing.Point(541, 417);
             this.BtnConnect.Margin = new System.Windows.Forms.Padding(2);
             this.BtnConnect.Name = "BtnConnect";
             this.BtnConnect.Size = new System.Drawing.Size(77, 33);
@@ -581,7 +585,7 @@
             // 
             // btnDone
             // 
-            this.btnDone.Location = new System.Drawing.Point(611, 339);
+            this.btnDone.Location = new System.Drawing.Point(623, 417);
             this.btnDone.Margin = new System.Windows.Forms.Padding(2);
             this.btnDone.Name = "btnDone";
             this.btnDone.Size = new System.Drawing.Size(77, 33);
@@ -1040,7 +1044,7 @@
             // 
             // bVoltageClose
             // 
-            this.bVoltageClose.Location = new System.Drawing.Point(98, 324);
+            this.bVoltageClose.Location = new System.Drawing.Point(114, 325);
             this.bVoltageClose.Margin = new System.Windows.Forms.Padding(2);
             this.bVoltageClose.Name = "bVoltageClose";
             this.bVoltageClose.Size = new System.Drawing.Size(100, 33);
@@ -1051,7 +1055,7 @@
             // 
             // bVoltageStatus
             // 
-            this.bVoltageStatus.Location = new System.Drawing.Point(202, 323);
+            this.bVoltageStatus.Location = new System.Drawing.Point(228, 324);
             this.bVoltageStatus.Margin = new System.Windows.Forms.Padding(2);
             this.bVoltageStatus.Name = "bVoltageStatus";
             this.bVoltageStatus.Size = new System.Drawing.Size(100, 33);
@@ -1062,7 +1066,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(299, 323);
+            this.button1.Location = new System.Drawing.Point(341, 326);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(100, 32);
             this.button1.TabIndex = 12;
@@ -1072,7 +1076,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(405, 324);
+            this.button2.Location = new System.Drawing.Point(463, 328);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(100, 30);
             this.button2.TabIndex = 13;
@@ -1080,6 +1084,28 @@
             this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
+            // btn_HIGH_VACUUM
+            // 
+            this.btn_HIGH_VACUUM.Location = new System.Drawing.Point(11, 361);
+            this.btn_HIGH_VACUUM.Margin = new System.Windows.Forms.Padding(2);
+            this.btn_HIGH_VACUUM.Name = "btn_HIGH_VACUUM";
+            this.btn_HIGH_VACUUM.Size = new System.Drawing.Size(83, 33);
+            this.btn_HIGH_VACUUM.TabIndex = 48;
+            this.btn_HIGH_VACUUM.Text = "HIGH_VACUUM";
+            this.btn_HIGH_VACUUM.UseVisualStyleBackColor = true;
+            this.btn_HIGH_VACUUM.Click += new System.EventHandler(this.btn_HIGH_VACUUM_Click);
+            // 
+            // btn_StopImageAcquisition
+            // 
+            this.btn_StopImageAcquisition.Location = new System.Drawing.Point(114, 362);
+            this.btn_StopImageAcquisition.Margin = new System.Windows.Forms.Padding(2);
+            this.btn_StopImageAcquisition.Name = "btn_StopImageAcquisition";
+            this.btn_StopImageAcquisition.Size = new System.Drawing.Size(100, 33);
+            this.btn_StopImageAcquisition.TabIndex = 49;
+            this.btn_StopImageAcquisition.Text = "StopImageAcquisition";
+            this.btn_StopImageAcquisition.UseVisualStyleBackColor = true;
+            this.btn_StopImageAcquisition.Click += new System.EventHandler(this.btn_StopImageAcquisition_Click);
+            // 
             // button3
             // 
             this.button3.Location = new System.Drawing.Point(11, 324);
@@ -1091,11 +1117,37 @@
             this.button3.UseVisualStyleBackColor = true;
             this.button3.Click += new System.EventHandler(this.button3_Click_1);
             // 
+            // btn_FullFrame
+            // 
+            this.btn_FullFrame.Location = new System.Drawing.Point(228, 362);
+            this.btn_FullFrame.Margin = new System.Windows.Forms.Padding(2);
+            this.btn_FullFrame.Name = "btn_FullFrame";
+            this.btn_FullFrame.Size = new System.Drawing.Size(100, 33);
+            this.btn_FullFrame.TabIndex = 50;
+            this.btn_FullFrame.Text = "FullFrame";
+            this.btn_FullFrame.UseVisualStyleBackColor = true;
+            this.btn_FullFrame.Click += new System.EventHandler(this.btn_FullFrame_Click);
+            // 
+            // btn_SetReducedArea
+            // 
+            this.btn_SetReducedArea.Location = new System.Drawing.Point(341, 363);
+            this.btn_SetReducedArea.Margin = new System.Windows.Forms.Padding(2);
+            this.btn_SetReducedArea.Name = "btn_SetReducedArea";
+            this.btn_SetReducedArea.Size = new System.Drawing.Size(100, 33);
+            this.btn_SetReducedArea.TabIndex = 51;
+            this.btn_SetReducedArea.Text = "ReducedArea";
+            this.btn_SetReducedArea.UseVisualStyleBackColor = true;
+            this.btn_SetReducedArea.Click += new System.EventHandler(this.btn_SetReducedArea_Click);
+            // 
             // SemTestForms
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(710, 387);
+            this.ClientSize = new System.Drawing.Size(710, 461);
+            this.Controls.Add(this.btn_SetReducedArea);
+            this.Controls.Add(this.btn_FullFrame);
+            this.Controls.Add(this.btn_StopImageAcquisition);
+            this.Controls.Add(this.btn_HIGH_VACUUM);
             this.Controls.Add(this.button3);
             this.Controls.Add(this.button2);
             this.Controls.Add(this.button1);
@@ -1108,9 +1160,9 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(726, 426);
+            this.MaximumSize = new System.Drawing.Size(726, 500);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(726, 426);
+            this.MinimumSize = new System.Drawing.Size(726, 500);
             this.Name = "SemTestForms";
             this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -1211,6 +1263,10 @@
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Label label16;
         private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.Button btn_HIGH_VACUUM;
+        private System.Windows.Forms.Button btn_StopImageAcquisition;
         private System.Windows.Forms.Button button3;
+        private System.Windows.Forms.Button btn_FullFrame;
+        private System.Windows.Forms.Button btn_SetReducedArea;
     }
 }

OTSSysMgrApp/SemTestForms.cs

@@ -1123,5 +1123,25 @@ namespace OTSSysMgrApp
         {
             bool result = m_SemHardwareMgr.SetSemHTOff(true);
         }
+
+        private void btn_HIGH_VACUUM_Click(object sender, EventArgs e)
+        {
+            m_SemHardwareMgr.RunHIGH_VACUUM();
+        }
+
+        private void btn_StopImageAcquisition_Click(object sender, EventArgs e)
+        {
+            m_SemHardwareMgr.StopImageAcquisition();
+        }
+
+        private void btn_FullFrame_Click(object sender, EventArgs e)
+        {
+            m_SemHardwareMgr.SetFullFrame();
+        }
+
+        private void btn_SetReducedArea_Click(object sender, EventArgs e)
+        {
+            m_SemHardwareMgr.SetReducedArea();
+        }
     }
 }