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

将HardwareConfig.xml中 标签名改为 value

zty 3 роки тому
батько
коміт
b1d38fbb34

+ 1 - 1
OTSIncAMeasureApp/ServiceCenter/FileHelper.cs

@@ -64,7 +64,7 @@ namespace OTSModelSharp.ServiceInterface
                     string name = ((XmlElement)node).GetAttribute("RegName");
                     if (name.Equals(Name))
                     {
-                        value = ((XmlElement)node).GetAttribute("drive");
+                        value = ((XmlElement)node).GetAttribute("Value");
                         break;
                     }
                 }

+ 148 - 148
OTSSysMgrApp/OTSSystemManagerForms.Designer.cs

@@ -31,24 +31,24 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OTSSystemManagerForms));
             this.tabLanguage = new System.Windows.Forms.TabPage();
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
-            this.rdb_en = new System.Windows.Forms.RadioButton();
-            this.rdb_ch = new System.Windows.Forms.RadioButton();
-            this.tabHardwareSet = new System.Windows.Forms.TabPage();
-            this.CmbSEMController = new System.Windows.Forms.ComboBox();
-            this.CmbEDSController = new System.Windows.Forms.ComboBox();
-            this.btnEDSTest = new System.Windows.Forms.Button();
-            this.btnSEMTest = new System.Windows.Forms.Button();
-            this.lblHEDSController = new System.Windows.Forms.Label();
-            this.lblHSEMController = new System.Windows.Forms.Label();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
             this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.button1 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            this.lblHSEMController = new System.Windows.Forms.Label();
+            this.lblHEDSController = new System.Windows.Forms.Label();
+            this.btnSEMTest = new System.Windows.Forms.Button();
+            this.btnEDSTest = new System.Windows.Forms.Button();
+            this.CmbEDSController = new System.Windows.Forms.ComboBox();
+            this.CmbSEMController = new System.Windows.Forms.ComboBox();
+            this.tabHardwareSet = new System.Windows.Forms.TabPage();
+            this.rdb_ch = new System.Windows.Forms.RadioButton();
+            this.rdb_en = new System.Windows.Forms.RadioButton();
             this.tabLanguage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
-            this.tabHardwareSet.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.tabControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+            this.tabHardwareSet.SuspendLayout();
             this.SuspendLayout();
             // 
             // tabLanguage
@@ -59,7 +59,7 @@
             this.tabLanguage.Location = new System.Drawing.Point(4, 22);
             this.tabLanguage.Margin = new System.Windows.Forms.Padding(2);
             this.tabLanguage.Name = "tabLanguage";
-            this.tabLanguage.Size = new System.Drawing.Size(547, 199);
+            this.tabLanguage.Size = new System.Drawing.Size(547, 185);
             this.tabLanguage.TabIndex = 2;
             this.tabLanguage.Text = "语言";
             this.tabLanguage.UseVisualStyleBackColor = true;
@@ -75,96 +75,68 @@
             this.pictureBox3.TabIndex = 8;
             this.pictureBox3.TabStop = false;
             // 
-            // rdb_en
+            // tabControl1
             // 
-            this.rdb_en.AutoSize = true;
-            this.rdb_en.Checked = true;
-            this.rdb_en.Location = new System.Drawing.Point(147, 58);
-            this.rdb_en.Margin = new System.Windows.Forms.Padding(2);
-            this.rdb_en.Name = "rdb_en";
-            this.rdb_en.Size = new System.Drawing.Size(71, 16);
-            this.rdb_en.TabIndex = 0;
-            this.rdb_en.TabStop = true;
-            this.rdb_en.Text = "英文[EN]";
-            this.rdb_en.UseVisualStyleBackColor = true;
-            this.rdb_en.Click += new System.EventHandler(this.rdb_en_Click);
+            this.tabControl1.Controls.Add(this.tabHardwareSet);
+            this.tabControl1.Controls.Add(this.tabLanguage);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Location = new System.Drawing.Point(0, 0);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(555, 161);
+            this.tabControl1.TabIndex = 0;
             // 
-            // rdb_ch
+            // button1
             // 
-            this.rdb_ch.AutoSize = true;
-            this.rdb_ch.Location = new System.Drawing.Point(147, 25);
-            this.rdb_ch.Margin = new System.Windows.Forms.Padding(2);
-            this.rdb_ch.Name = "rdb_ch";
-            this.rdb_ch.Size = new System.Drawing.Size(71, 16);
-            this.rdb_ch.TabIndex = 0;
-            this.rdb_ch.Text = "中文[ZH]";
-            this.rdb_ch.UseVisualStyleBackColor = true;
-            this.rdb_ch.Click += new System.EventHandler(this.rdb_ch_Click);
+            this.button1.Location = new System.Drawing.Point(410, 366);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(67, 22);
+            this.button1.TabIndex = 2;
+            this.button1.Text = "button1";
+            this.button1.UseVisualStyleBackColor = true;
             // 
-            // tabHardwareSet
+            // button2
             // 
-            this.tabHardwareSet.Controls.Add(this.CmbSEMController);
-            this.tabHardwareSet.Controls.Add(this.CmbEDSController);
-            this.tabHardwareSet.Controls.Add(this.btnEDSTest);
-            this.tabHardwareSet.Controls.Add(this.btnSEMTest);
-            this.tabHardwareSet.Controls.Add(this.lblHEDSController);
-            this.tabHardwareSet.Controls.Add(this.lblHSEMController);
-            this.tabHardwareSet.Controls.Add(this.pictureBox2);
-            this.tabHardwareSet.Controls.Add(this.button2);
-            this.tabHardwareSet.Controls.Add(this.button1);
-            this.tabHardwareSet.Location = new System.Drawing.Point(4, 22);
-            this.tabHardwareSet.Margin = new System.Windows.Forms.Padding(2);
-            this.tabHardwareSet.Name = "tabHardwareSet";
-            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(2);
-            this.tabHardwareSet.Size = new System.Drawing.Size(547, 135);
-            this.tabHardwareSet.TabIndex = 1;
-            this.tabHardwareSet.Text = "硬件";
-            this.tabHardwareSet.UseVisualStyleBackColor = true;
+            this.button2.Location = new System.Drawing.Point(482, 366);
+            this.button2.Margin = new System.Windows.Forms.Padding(2);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(67, 22);
+            this.button2.TabIndex = 2;
+            this.button2.Text = "button1";
+            this.button2.UseVisualStyleBackColor = true;
             // 
-            // CmbSEMController
+            // pictureBox2
             // 
-            this.CmbSEMController.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.CmbSEMController.FormattingEnabled = true;
-            this.CmbSEMController.Items.AddRange(new object[] {
-            "Bruker",
-            "OffLine",
-            "ESEM",
-            "ZEISS",
-            "Oxford",
-            "FEI"});
-            this.CmbSEMController.Location = new System.Drawing.Point(227, 22);
-            this.CmbSEMController.Margin = new System.Windows.Forms.Padding(2);
-            this.CmbSEMController.Name = "CmbSEMController";
-            this.CmbSEMController.Size = new System.Drawing.Size(193, 20);
-            this.CmbSEMController.TabIndex = 13;
-            this.CmbSEMController.SelectedIndexChanged += new System.EventHandler(this.CmbSEMController_SelectedIndexChanged);
+            this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
+            this.pictureBox2.Location = new System.Drawing.Point(38, 22);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(2);
+            this.pictureBox2.Name = "pictureBox2";
+            this.pictureBox2.Size = new System.Drawing.Size(67, 66);
+            this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pictureBox2.TabIndex = 7;
+            this.pictureBox2.TabStop = false;
             // 
-            // CmbEDSController
+            // lblHSEMController
             // 
-            this.CmbEDSController.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.CmbEDSController.FormattingEnabled = true;
-            this.CmbEDSController.Items.AddRange(new object[] {
-            "Bruker",
-            "OffLine",
-            "Oxford",
-            "FEI"});
-            this.CmbEDSController.Location = new System.Drawing.Point(227, 74);
-            this.CmbEDSController.Margin = new System.Windows.Forms.Padding(2);
-            this.CmbEDSController.Name = "CmbEDSController";
-            this.CmbEDSController.Size = new System.Drawing.Size(193, 20);
-            this.CmbEDSController.TabIndex = 14;
-            this.CmbEDSController.SelectedIndexChanged += new System.EventHandler(this.CmbEDSController_SelectedIndexChanged);
+            this.lblHSEMController.AutoSize = true;
+            this.lblHSEMController.Location = new System.Drawing.Point(122, 26);
+            this.lblHSEMController.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lblHSEMController.Name = "lblHSEMController";
+            this.lblHSEMController.Size = new System.Drawing.Size(59, 12);
+            this.lblHSEMController.TabIndex = 9;
+            this.lblHSEMController.Text = "SEM控制器";
             // 
-            // btnEDSTest
+            // lblHEDSController
             // 
-            this.btnEDSTest.Location = new System.Drawing.Point(429, 70);
-            this.btnEDSTest.Margin = new System.Windows.Forms.Padding(2);
-            this.btnEDSTest.Name = "btnEDSTest";
-            this.btnEDSTest.Size = new System.Drawing.Size(77, 24);
-            this.btnEDSTest.TabIndex = 12;
-            this.btnEDSTest.Text = "EDS测试";
-            this.btnEDSTest.UseVisualStyleBackColor = true;
-            this.btnEDSTest.Click += new System.EventHandler(this.btnEDSTest_Click);
+            this.lblHEDSController.AutoSize = true;
+            this.lblHEDSController.Location = new System.Drawing.Point(122, 74);
+            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);
+            this.lblHEDSController.TabIndex = 8;
+            this.lblHEDSController.Text = "EDS控制器";
             // 
             // btnSEMTest
             // 
@@ -177,68 +149,96 @@
             this.btnSEMTest.UseVisualStyleBackColor = true;
             this.btnSEMTest.Click += new System.EventHandler(this.btnSEMTest_Click);
             // 
-            // lblHEDSController
+            // btnEDSTest
             // 
-            this.lblHEDSController.AutoSize = true;
-            this.lblHEDSController.Location = new System.Drawing.Point(122, 74);
-            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);
-            this.lblHEDSController.TabIndex = 8;
-            this.lblHEDSController.Text = "EDS控制器";
+            this.btnEDSTest.Location = new System.Drawing.Point(429, 70);
+            this.btnEDSTest.Margin = new System.Windows.Forms.Padding(2);
+            this.btnEDSTest.Name = "btnEDSTest";
+            this.btnEDSTest.Size = new System.Drawing.Size(77, 24);
+            this.btnEDSTest.TabIndex = 12;
+            this.btnEDSTest.Text = "EDS测试";
+            this.btnEDSTest.UseVisualStyleBackColor = true;
+            this.btnEDSTest.Click += new System.EventHandler(this.btnEDSTest_Click);
             // 
-            // lblHSEMController
+            // CmbEDSController
             // 
-            this.lblHSEMController.AutoSize = true;
-            this.lblHSEMController.Location = new System.Drawing.Point(122, 26);
-            this.lblHSEMController.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.lblHSEMController.Name = "lblHSEMController";
-            this.lblHSEMController.Size = new System.Drawing.Size(59, 12);
-            this.lblHSEMController.TabIndex = 9;
-            this.lblHSEMController.Text = "SEM控制器";
+            this.CmbEDSController.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CmbEDSController.FormattingEnabled = true;
+            this.CmbEDSController.Items.AddRange(new object[] {
+            "Bruker",
+            "OffLine",
+            "Oxford",
+            "FEI"});
+            this.CmbEDSController.Location = new System.Drawing.Point(227, 74);
+            this.CmbEDSController.Margin = new System.Windows.Forms.Padding(2);
+            this.CmbEDSController.Name = "CmbEDSController";
+            this.CmbEDSController.Size = new System.Drawing.Size(193, 20);
+            this.CmbEDSController.TabIndex = 14;
+            this.CmbEDSController.SelectedIndexChanged += new System.EventHandler(this.CmbEDSController_SelectedIndexChanged);
             // 
-            // pictureBox2
+            // CmbSEMController
             // 
-            this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
-            this.pictureBox2.Location = new System.Drawing.Point(38, 22);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(2);
-            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(67, 66);
-            this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
-            this.pictureBox2.TabIndex = 7;
-            this.pictureBox2.TabStop = false;
+            this.CmbSEMController.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CmbSEMController.FormattingEnabled = true;
+            this.CmbSEMController.Items.AddRange(new object[] {
+            "Bruker",
+            "OffLine",
+            "ESEM",
+            "ZEISS",
+            "Oxford",
+            "FEI"});
+            this.CmbSEMController.Location = new System.Drawing.Point(227, 22);
+            this.CmbSEMController.Margin = new System.Windows.Forms.Padding(2);
+            this.CmbSEMController.Name = "CmbSEMController";
+            this.CmbSEMController.Size = new System.Drawing.Size(193, 20);
+            this.CmbSEMController.TabIndex = 13;
+            this.CmbSEMController.SelectedIndexChanged += new System.EventHandler(this.CmbSEMController_SelectedIndexChanged);
             // 
-            // button2
+            // tabHardwareSet
             // 
-            this.button2.Location = new System.Drawing.Point(482, 366);
-            this.button2.Margin = new System.Windows.Forms.Padding(2);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(67, 22);
-            this.button2.TabIndex = 2;
-            this.button2.Text = "button1";
-            this.button2.UseVisualStyleBackColor = true;
+            this.tabHardwareSet.Controls.Add(this.CmbSEMController);
+            this.tabHardwareSet.Controls.Add(this.CmbEDSController);
+            this.tabHardwareSet.Controls.Add(this.btnEDSTest);
+            this.tabHardwareSet.Controls.Add(this.btnSEMTest);
+            this.tabHardwareSet.Controls.Add(this.lblHEDSController);
+            this.tabHardwareSet.Controls.Add(this.lblHSEMController);
+            this.tabHardwareSet.Controls.Add(this.pictureBox2);
+            this.tabHardwareSet.Controls.Add(this.button2);
+            this.tabHardwareSet.Controls.Add(this.button1);
+            this.tabHardwareSet.Location = new System.Drawing.Point(4, 22);
+            this.tabHardwareSet.Margin = new System.Windows.Forms.Padding(2);
+            this.tabHardwareSet.Name = "tabHardwareSet";
+            this.tabHardwareSet.Padding = new System.Windows.Forms.Padding(2);
+            this.tabHardwareSet.Size = new System.Drawing.Size(547, 135);
+            this.tabHardwareSet.TabIndex = 1;
+            this.tabHardwareSet.Text = "硬件";
+            this.tabHardwareSet.UseVisualStyleBackColor = true;
             // 
-            // button1
+            // rdb_ch
             // 
-            this.button1.Location = new System.Drawing.Point(410, 366);
-            this.button1.Margin = new System.Windows.Forms.Padding(2);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(67, 22);
-            this.button1.TabIndex = 2;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
+            this.rdb_ch.AutoSize = true;
+            this.rdb_ch.Location = new System.Drawing.Point(147, 25);
+            this.rdb_ch.Margin = new System.Windows.Forms.Padding(2);
+            this.rdb_ch.Name = "rdb_ch";
+            this.rdb_ch.Size = new System.Drawing.Size(71, 16);
+            this.rdb_ch.TabIndex = 0;
+            this.rdb_ch.Text = "中文[ZH]";
+            this.rdb_ch.UseVisualStyleBackColor = true;
+            this.rdb_ch.Click += new System.EventHandler(this.rdb_ch_Click);
             // 
-            // tabControl1
+            // rdb_en
             // 
-            this.tabControl1.Controls.Add(this.tabHardwareSet);
-            this.tabControl1.Controls.Add(this.tabLanguage);
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(555, 161);
-            this.tabControl1.TabIndex = 0;
+            this.rdb_en.AutoSize = true;
+            this.rdb_en.Checked = true;
+            this.rdb_en.Location = new System.Drawing.Point(147, 58);
+            this.rdb_en.Margin = new System.Windows.Forms.Padding(2);
+            this.rdb_en.Name = "rdb_en";
+            this.rdb_en.Size = new System.Drawing.Size(71, 16);
+            this.rdb_en.TabIndex = 0;
+            this.rdb_en.TabStop = true;
+            this.rdb_en.Text = "英文[EN]";
+            this.rdb_en.UseVisualStyleBackColor = true;
+            this.rdb_en.Click += new System.EventHandler(this.rdb_en_Click);
             // 
             // OTSSystemManagerForms
             // 
@@ -259,10 +259,10 @@
             this.tabLanguage.ResumeLayout(false);
             this.tabLanguage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
+            this.tabControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             this.tabHardwareSet.ResumeLayout(false);
             this.tabHardwareSet.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-            this.tabControl1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -273,6 +273,7 @@
         private System.Windows.Forms.PictureBox pictureBox3;
         private System.Windows.Forms.RadioButton rdb_en;
         private System.Windows.Forms.RadioButton rdb_ch;
+        private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabHardwareSet;
         private System.Windows.Forms.ComboBox CmbSEMController;
         private System.Windows.Forms.ComboBox CmbEDSController;
@@ -283,6 +284,5 @@
         private System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.TabControl tabControl1;
     }
 }

+ 4 - 1
OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -226,7 +226,10 @@ namespace OTSSysMgrApp
             }
             try
             {
-                bool result = WriteXMLFile(SEMName, EDSName);
+                if (!WriteXMLFile(SEMName, EDSName))
+                {
+                    log.Error("SaveSelectVersionInfo()--错误日志:请检查HardwareConfig.xml确保Value为值标签!");
+                }
             }
             catch (Exception ex)
             {

+ 26 - 40
OTSSysMgrApp/XMLOperationClass.cs

@@ -106,25 +106,33 @@ namespace OTSSysMgrApp
        /// <param name="RegName">节点名称</param>
        /// <param name="Name">节点属性名称</param>
        /// <param name="Value">节点属性值</param>
-        public static void EditXmlInfoWidthPath(string FilePath,string RegName,string Name, string Value)
+        public static bool EditXmlInfoWidthPath(string FilePath,string RegName,string Name, string Value)
         {
-                XmlDocument xmlDoc = new XmlDocument();
+            bool isSuccess = false;
 
-                xmlDoc.Load(FilePath);    //加载Xml文件  
+            XmlDocument xmlDoc = new XmlDocument();
 
-            XmlNodeList nodeList = xmlDoc.GetElementsByTagName("Member");
+            xmlDoc.Load(FilePath);    //加载Xml文件  
 
-                foreach (XmlNode node in nodeList)
-                {
-                    XmlElement ele = (XmlElement)node;
+            XmlNodeList nodeList = xmlDoc.GetElementsByTagName("Member");
 
-                    if (ele.GetAttribute("RegName") == RegName)
-                    {
+            foreach (XmlNode node in nodeList)
+            {
+                XmlElement ele = (XmlElement)node;
 
-                        ele.SetAttribute(Name, Value);
-                    }
+                if (ele.GetAttribute("RegName") == RegName)
+                {
+                    ele.SetAttribute(Name, Value);
+                    isSuccess = true;
+                    break;
                 }
+            }
+            if (isSuccess)
+            {
                 xmlDoc.Save(FilePath);
+            }
+
+            return isSuccess;
         }
         #endregion
 
@@ -278,9 +286,11 @@ namespace OTSSysMgrApp
         {
             try
             {
-                EditXmlInfoWidthPath(FileName, "SemControllerName", "drive", SEMName);
-                EditXmlInfoWidthPath(FileName, "EDSName", "drive", EDSName);
-                return true;
+                bool isSuccessSem = false;
+                bool isSuccessEds = false;
+                isSuccessSem = EditXmlInfoWidthPath(FileName, "SemControllerName", "Value", SEMName);
+                isSuccessEds = EditXmlInfoWidthPath(FileName, "EDSName", "Value", EDSName);
+                return isSuccessSem && isSuccessEds;
             }
             catch (Exception)
             {
@@ -288,18 +298,6 @@ namespace OTSSysMgrApp
             }
             
         }
-        public static bool WriteXMLFileVersion(string FileName, string selectVersion)
-        {
-            try
-            {
-                EditXmlInfoWidthPath(FileName, "BrukerDllVersion", "Version", selectVersion);
-                return true;
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        }
         #endregion
 
         #region 读取COTSXMLFileDllExportForCShape
@@ -307,8 +305,8 @@ namespace OTSSysMgrApp
         {
             try
             {
-                SEMName = GetXMLReg(FileName, "SemControllerName", "drive");
-                EDSName = GetXMLReg(FileName, "EDSName", "drive");
+                SEMName = GetXMLReg(FileName, "SemControllerName", "Value");
+                EDSName = GetXMLReg(FileName, "EDSName", "Value");
                 return true;
             }
             catch (Exception)
@@ -317,18 +315,6 @@ namespace OTSSysMgrApp
             }
             
         }
-        public static bool ReadXMLFileVersion(string FileName, ref string selectVersion)
-        {
-            try
-            {
-                selectVersion = GetXMLReg(FileName, "BrukerDllVersion", "Version");
-                return true;
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        }
         #endregion
     }
 }