修改系统设置，增加电镜类型设置

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

@@ -81,22 +81,6 @@ namespace OTSModelSharp.ServiceCenter
                     case "PicoSmart":
                         edsctrl = new PicoSmartEDSController(SemType, deviceType, imgwidth, imgheight, expectCount, ifautoid, knownelements);
                         break;
-                    case "ComposeEds"://coxm picosmart ComposeEds;coxm picosmart 电镜组合eds
-                        if (deviceType == "Oxford")
-                        {
-                            edsctrl = new OxfordEDSController(expectCount, ifautoid, knownelements);
-
-                        }
-                        else if (deviceType == "Bruker")
-                        {
-                            var ctrl = new EDSController("Bruker", expectCount, ifautoid, knownelements);
-                            //var delayQuant = Convert.ToBoolean(FileHelper.GetIfDelayQuantify());
-                            var delayQuant = false;//Now it has proved that this method won't increase the speed of xray analysis.So deactivate it here.
-                            ctrl.delayQuant = delayQuant;
-                            edsctrl = ctrl;
-
-                        }
-                        break;
                     case "OffLine":
                         edsctrl = new EDSController("OffLine", expectCount, ifautoid, knownelements);
                         break;

OTSIncAMeasureApp/ServiceCenter/CoxmSem/CoxmSemController.cs

@@ -159,8 +159,8 @@ namespace OTSMeasureApp.ServiceCenter.Coxm
 
         public bool MoveSEMToPoint(double a_dPositionX, double a_dPositionY)
         {
-            //return true;//test when no stage
-           return m_api.MoveStageX_YAndConform(a_dPositionX, a_dPositionY);
+            return true;//test when no stage
+           //return m_api.MoveStageX_YAndConform(a_dPositionX, a_dPositionY);
         }
 
         public bool SetMagnification(double a_dMagnification)

OTSSysMgrApp/OTSSystemManagerForms.Designer.cs

@@ -50,6 +50,9 @@
             this.tabother = new System.Windows.Forms.TabPage();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.btn_otherconfig = new System.Windows.Forms.Button();
+            this.lblHSEMController = new System.Windows.Forms.Label();
+            this.CmbSEMController = new System.Windows.Forms.ComboBox();
+            this.btnSet = new System.Windows.Forms.Button();
             this.tabLanguage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
             this.tabControl1.SuspendLayout();
@@ -127,6 +130,9 @@
             // 
             // tabHardwareSet
             // 
+            this.tabHardwareSet.Controls.Add(this.btnSet);
+            this.tabHardwareSet.Controls.Add(this.CmbSEMController);
+            this.tabHardwareSet.Controls.Add(this.lblHSEMController);
             this.tabHardwareSet.Controls.Add(this.CmbEDSController);
             this.tabHardwareSet.Controls.Add(this.btnEDSTest);
             this.tabHardwareSet.Controls.Add(this.btnSEMTest);
@@ -152,16 +158,16 @@
             "OffLine",
             "Oxford",
             "FEI"});
-            this.CmbEDSController.Location = new System.Drawing.Point(218, 24);
+            this.CmbEDSController.Location = new System.Drawing.Point(197, 60);
             this.CmbEDSController.Margin = new System.Windows.Forms.Padding(2);
             this.CmbEDSController.Name = "CmbEDSController";
-            this.CmbEDSController.Size = new System.Drawing.Size(193, 20);
+            this.CmbEDSController.Size = new System.Drawing.Size(121, 20);
             this.CmbEDSController.TabIndex = 14;
             this.CmbEDSController.SelectedIndexChanged += new System.EventHandler(this.CmbEDSController_SelectedIndexChanged);
             // 
             // btnEDSTest
             // 
-            this.btnEDSTest.Location = new System.Drawing.Point(334, 71);
+            this.btnEDSTest.Location = new System.Drawing.Point(353, 58);
             this.btnEDSTest.Margin = new System.Windows.Forms.Padding(2);
             this.btnEDSTest.Name = "btnEDSTest";
             this.btnEDSTest.Size = new System.Drawing.Size(77, 24);
@@ -172,7 +178,7 @@
             // 
             // btnSEMTest
             // 
-            this.btnSEMTest.Location = new System.Drawing.Point(218, 71);
+            this.btnSEMTest.Location = new System.Drawing.Point(353, 13);
             this.btnSEMTest.Margin = new System.Windows.Forms.Padding(2);
             this.btnSEMTest.Name = "btnSEMTest";
             this.btnSEMTest.Size = new System.Drawing.Size(77, 24);
@@ -184,7 +190,7 @@
             // lblHEDSController
             // 
             this.lblHEDSController.AutoSize = true;
-            this.lblHEDSController.Location = new System.Drawing.Point(121, 27);
+            this.lblHEDSController.Location = new System.Drawing.Point(121, 64);
             this.lblHEDSController.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblHEDSController.Name = "lblHEDSController";
             this.lblHEDSController.Size = new System.Drawing.Size(59, 12);
@@ -313,6 +319,39 @@
             this.btn_otherconfig.UseVisualStyleBackColor = true;
             this.btn_otherconfig.Click += new System.EventHandler(this.btn_otherconfig_Click);
             // 
+            // lblHSEMController
+            // 
+            this.lblHSEMController.AutoSize = true;
+            this.lblHSEMController.Location = new System.Drawing.Point(121, 19);
+            this.lblHSEMController.Name = "lblHSEMController";
+            this.lblHSEMController.Size = new System.Drawing.Size(59, 12);
+            this.lblHSEMController.TabIndex = 15;
+            this.lblHSEMController.Text = "SEM控制器";
+            // 
+            // CmbSEMController
+            // 
+            this.CmbSEMController.FormattingEnabled = true;
+            this.CmbSEMController.Items.AddRange(new object[] {
+            "FEI",
+            "ZEISS",
+            "Coxm",
+            "PicoSmart",
+            "OffLine"});
+            this.CmbSEMController.Location = new System.Drawing.Point(197, 15);
+            this.CmbSEMController.Name = "CmbSEMController";
+            this.CmbSEMController.Size = new System.Drawing.Size(121, 20);
+            this.CmbSEMController.TabIndex = 16;
+            // 
+            // btnSet
+            // 
+            this.btnSet.Location = new System.Drawing.Point(197, 101);
+            this.btnSet.Name = "btnSet";
+            this.btnSet.Size = new System.Drawing.Size(121, 23);
+            this.btnSet.TabIndex = 17;
+            this.btnSet.Text = "设置";
+            this.btnSet.UseVisualStyleBackColor = true;
+            this.btnSet.Click += new System.EventHandler(this.btnSet_Click);
+            // 
             // OTSSystemManagerForms
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -369,5 +408,8 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Button btn_otherconfig;
         private System.Windows.Forms.PictureBox pictureBox4;
+        private System.Windows.Forms.ComboBox CmbSEMController;
+        private System.Windows.Forms.Label lblHSEMController;
+        private System.Windows.Forms.Button btnSet;
     }
 }

OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -171,10 +171,12 @@ namespace OTSSysMgrApp
         /// <param name="e"></param>
         private void btnSEMTest_Click(object sender, EventArgs e)
         {
+            SaveSEMAndEDSController();
             //实力窗口对象
             SemTestForms sTextForms = new SemTestForms();
             //判断窗口对话框返回值
             sTextForms.ShowDialog();
+
         }
         /// <summary>
         /// 窗口加载
@@ -188,7 +190,7 @@ namespace OTSSysMgrApp
             string message = string.Empty;
             
             CmbEDSController.SelectedIndexChanged += new EventHandler(CmbEDSController_SelectedIndexChanged);
-
+            CmbSEMController.SelectedIndexChanged += new EventHandler(CmbSEMController_SelectedIndexChanged);
             try
             {
    
@@ -265,6 +267,7 @@ namespace OTSSysMgrApp
 
         private void btnEDSTest_Click(object sender, EventArgs e)
         {
+            SaveSEMAndEDSController();
             //实例窗口对象
             ControllerSettingForm sTextForms = new ControllerSettingForm();
             try
@@ -280,13 +283,18 @@ namespace OTSSysMgrApp
         private void SaveSEMAndEDSController()
         {
             string EDSName = string.Empty;
+            string SEMName = CmbSEMController.SelectedText;
             if (CmbEDSController.SelectedItem != null)
             {
                 EDSName = CmbEDSController.SelectedItem.ToString();
             }
+            if (CmbSEMController.SelectedItem != null)
+            {
+                SEMName = CmbSEMController.SelectedItem.ToString();
+            }
             try
             {
-                if (!WriteXMLFile(EDSName, EDSName))
+                if (!WriteXMLFile(SEMName, EDSName))
                 {
                     log.Error("SaveSelectVersionInfo()--错误日志:请检查HardwareConfig.xml确保Value为值标签！");
                 }
@@ -320,10 +328,27 @@ namespace OTSSysMgrApp
                         throw;
                     }
                 }
+                if (xmlSEMName != "")
+                {
+                    CmbSEMController.SelectedItem = xmlSEMName;
+                }
+                else
+                {
+                    try
+                    {
+                        CmbSEMController.SelectedItem = 0;// "Genesis";
+                    }
+                    catch (Exception)
+                    {
+
+                        throw;
+                    }
+                }
             }
             else
             {
                 CmbEDSController.SelectedItem = CmbEDSController.Items[0].ToString();
+                CmbSEMController.SelectedItem = 0;
             }
         }
         private bool WriteXMLFile(string xmlSEMName, string xmlEDSName)
@@ -547,7 +572,8 @@ namespace OTSSysMgrApp
 
         private void OTSSystemManagerForms_FormClosing(object sender, FormClosingEventArgs e)
         {
-         var   m_SemHardwareMgr = SemController.GetSEMController();
+            SaveSEMAndEDSController();
+            var   m_SemHardwareMgr = SemController.GetSEMController();
             m_SemHardwareMgr.DisConnect();
 
         }
@@ -613,12 +639,12 @@ namespace OTSSysMgrApp
 
         private void CmbSEMController_SelectedIndexChanged(object sender, EventArgs e)
         {
-            SaveSEMAndEDSController();
+           // SaveSEMAndEDSController();
         }
 
         private void CmbEDSController_SelectedIndexChanged(object sender, EventArgs e)
         {
-            SaveSEMAndEDSController();
+          //  SaveSEMAndEDSController();
         }
 
      
@@ -697,5 +723,10 @@ namespace OTSSysMgrApp
                 MessageBox.Show("File is lost!");
             }
         }
+
+        private void btnSet_Click(object sender, EventArgs e)
+        {
+            SaveSEMAndEDSController();
+        }
     }
 }

OTSSysMgrApp/OTSSystemManagerForms.resx

@@ -165,7 +165,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAAGd5JREFUeF7tnIl3m9WZ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAAGd5JREFUeF7tnIl3m9WZ
         xilJHG+yJUu2JVn7vu+7bK3WbmuxtXlN7OwbZA9JICRAtgkhQHZCICQtCUlpyWK7MKcwQ4GWc+ZMKe3Q
         QgvJnzKP/EFKbw+BLLY6gznP+bjv910t3y/P+9732pIfeujGrTn9UJHxnO4gMp7THUTGc7qDyHhOdxAZ
         V1WMqZu8qS/bpr4izv+riIyrJMnUX+Pb98c27F6+ekNi9/PJp49qJ/9CzKm+yLhKipz/ldZgyfSVlRqT
@@ -279,7 +279,7 @@
         yHhO36Ubt/4X1wSr+KCdTCMAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="pictureBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="pictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -326,7 +326,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAAGd5JREFUeF7tnIl3m9WZ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAAGd5JREFUeF7tnIl3m9WZ
         xilJHG+yJUu2JVn7vu+7bK3WbmuxtXlN7OwbZA9JICRAtgkhQHZCICQtCUlpyWK7MKcwQ4GWc+ZMKe3Q
         QgvJnzKP/EFKbw+BLLY6gznP+bjv910t3y/P+9732pIfeujGrTn9UJHxnO4gMp7THUTGc7qDyHhOdxAZ
         V1WMqZu8qS/bpr4izv+riIyrJMnUX+Pb98c27F6+ekNi9/PJp49qJ/9CzKm+yLhKipz/ldZgyfSVlRqT
@@ -440,7 +440,7 @@
         yHhO36Ubt/4X1wSr+KCdTCMAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="pictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="pictureBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAIDAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -487,7 +487,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAAGd5JREFUeF7tnIl3m9WZ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAAGd5JREFUeF7tnIl3m9WZ
         xilJHG+yJUu2JVn7vu+7bK3WbmuxtXlN7OwbZA9JICRAtgkhQHZCICQtCUlpyWK7MKcwQ4GWc+ZMKe3Q
         QgvJnzKP/EFKbw+BLLY6gznP+bjv910t3y/P+9732pIfeujGrTn9UJHxnO4gMp7THUTGc7qDyHhOdxAZ
         V1WMqZu8qS/bpr4izv+riIyrJMnUX+Pb98c27F6+ekNi9/PJp49qJ/9CzKm+yLhKipz/ldZgyfSVlRqT
@@ -648,7 +648,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAAGd5JREFUeF7tnIl3m9WZ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAAGd5JREFUeF7tnIl3m9WZ
         xilJHG+yJUu2JVn7vu+7bK3WbmuxtXlN7OwbZA9JICRAtgkhQHZCICQtCUlpyWK7MKcwQ4GWc+ZMKe3Q
         QgvJnzKP/EFKbw+BLLY6gznP+bjv910t3y/P+9732pIfeujGrTn9UJHxnO4gMp7THUTGc7qDyHhOdxAZ
         V1WMqZu8qS/bpr4izv+riIyrJMnUX+Pb98c27F6+ekNi9/PJp49qJ/9CzKm+yLhKipz/ldZgyfSVlRqT