Parcourir la source

修复sysmgr牛津选择后布鲁克插件类型选项还显示的bug

CXS il y a 3 ans
Parent
commit
582a6645c0

+ 10 - 8
OTSSysMgrApp/OTSSystemManagerForms.Designer.cs

@@ -61,7 +61,7 @@
             this.tabLanguage.Controls.Add(this.rdb_ch);
             this.tabLanguage.Location = new System.Drawing.Point(4, 28);
             this.tabLanguage.Name = "tabLanguage";
-            this.tabLanguage.Size = new System.Drawing.Size(1227, 432);
+            this.tabLanguage.Size = new System.Drawing.Size(818, 288);
             this.tabLanguage.TabIndex = 2;
             this.tabLanguage.Text = "语言";
             this.tabLanguage.UseVisualStyleBackColor = true;
@@ -116,7 +116,7 @@
             this.tabHardwareSet.Controls.Add(this.button1);
             this.tabHardwareSet.Location = new System.Drawing.Point(4, 28);
             this.tabHardwareSet.Name = "tabHardwareSet";
-            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(3);
             this.tabHardwareSet.Size = new System.Drawing.Size(818, 288);
             this.tabHardwareSet.TabIndex = 1;
             this.tabHardwareSet.Text = "硬件";
@@ -125,7 +125,7 @@
             // rbEsprit21
             // 
             this.rbEsprit21.AutoSize = true;
-            this.rbEsprit21.Location = new System.Drawing.Point(297, 213);
+            this.rbEsprit21.Location = new System.Drawing.Point(348, 213);
             this.rbEsprit21.Name = "rbEsprit21";
             this.rbEsprit21.Size = new System.Drawing.Size(249, 22);
             this.rbEsprit21.TabIndex = 15;
@@ -137,7 +137,7 @@
             // 
             this.rbEsprit19.AutoSize = true;
             this.rbEsprit19.Checked = true;
-            this.rbEsprit19.Location = new System.Drawing.Point(297, 180);
+            this.rbEsprit19.Location = new System.Drawing.Point(348, 180);
             this.rbEsprit19.Name = "rbEsprit19";
             this.rbEsprit19.Size = new System.Drawing.Size(249, 22);
             this.rbEsprit19.TabIndex = 15;
@@ -156,10 +156,11 @@
             "ESEM",
             "ZEISS",
             "Oxford"});
-            this.CmbSEMController.Location = new System.Drawing.Point(274, 33);
+            this.CmbSEMController.Location = new System.Drawing.Point(341, 33);
             this.CmbSEMController.Name = "CmbSEMController";
-            this.CmbSEMController.Size = new System.Drawing.Size(354, 26);
+            this.CmbSEMController.Size = new System.Drawing.Size(287, 26);
             this.CmbSEMController.TabIndex = 13;
+            this.CmbSEMController.SelectedIndexChanged += new System.EventHandler(this.CmbSEMController_SelectedIndexChanged);
             // 
             // CmbEDSController
             // 
@@ -169,10 +170,11 @@
             "Bruker",
             "OffLine",
             "Oxford"});
-            this.CmbEDSController.Location = new System.Drawing.Point(274, 111);
+            this.CmbEDSController.Location = new System.Drawing.Point(341, 111);
             this.CmbEDSController.Name = "CmbEDSController";
-            this.CmbEDSController.Size = new System.Drawing.Size(354, 26);
+            this.CmbEDSController.Size = new System.Drawing.Size(287, 26);
             this.CmbEDSController.TabIndex = 14;
+            this.CmbEDSController.SelectedIndexChanged += new System.EventHandler(this.CmbEDSController_SelectedIndexChanged);
             // 
             // btnEDSTest
             // 

+ 0 - 5
OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -117,7 +117,6 @@ namespace OTSSysMgrApp
             }
         }
         #endregion
-
         #region 控件事件汇总
         /// <summary>
         /// 打开SEM设置
@@ -145,9 +144,6 @@ namespace OTSSysMgrApp
         {
             //获取下拉选项
             ReadXMLFile();
-            //实例化C++对象 从选择文件对话框中 选择Lsk文件
-            //fun = new OTSINTERFACE.COTSLicMgrClr();
-            //otsInfoClr = new OTSINTERFACE.COTSLicenseInfoClr();
             //获取选择版本信息
             GetBrukerController();
             string message = string.Empty;
@@ -324,7 +320,6 @@ namespace OTSSysMgrApp
                 {
                     bool result = WriteXMLFileVersion(selectVersion);
                 }
-                log.Info("The current energy spectrum selection version is " + selectVersion);
             }
             catch (Exception ex)
             {