ソースを参照

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

gsp 1 年間 前
コミット
e4dc5c0b95

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="ZEISS" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Bruker" DelayQuantify="false" />
+  <Member RegName="SemControllerName" Value="Bruker" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

+ 0 - 131
Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -1,131 +0,0 @@
-<XmlConfig>
-  <M_SY>
-    <str_tb_ZBT>OTS Report</str_tb_ZBT>
-    <str_tb_FBT>XX有限公司</str_tb_FBT>
-    <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
-    <b_ck_ypsm>True</b_ck_ypsm>
-    <b_ck_jggk>True</b_ck_jggk>
-    <str_bz>
-    </str_bz>
-    <str_xzkl>全部颗粒</str_xzkl>
-    <int_xzkl>0</int_xzkl>
-  </M_SY>
-  <M_YMYJ>
-    <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
-    <str_tb_KHH>Copi0000123012</str_tb_KHH>
-    <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>OTS Result</str_tb_yjwb>
-  </M_YMYJ>
-  <M_KLFXJG>
-    <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
-    <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
-    <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
-    <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
-    <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
-    <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
-    <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
-    <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
-    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
-  </M_KLFXJG>
-  <M_YSFXJG>
-    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
-    <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
-    <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
-    <list_str_tb_ysfx_xsys>
-      <YS0>Al</YS0>
-      <YS1>Si</YS1>
-      <YS2>C</YS2>
-      <YS3>S</YS3>
-      <YS4>N</YS4>
-      <YS5>O</YS5>
-      <YS6>Fe</YS6>
-      <YS7>Ti</YS7>
-      <YS8>Mn</YS8>
-      <YS9>Mg</YS9>
-      <YS10>Ca</YS10>
-      <YS11>Ce</YS11>
-      <YS12>La</YS12>
-    </list_str_tb_ysfx_xsys>
-    <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
-    <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
-    <index_cb_yscf_jsfs>0</index_cb_yscf_jsfs>
-    <index_cb_yscf_klfw>0</index_cb_yscf_klfw>
-    <str_tb_yscf_ysxx>H</str_tb_yscf_ysxx>
-    <list_str_tb_yscf_ysxx>
-      <YS0>H</YS0>
-    </list_str_tb_yscf_ysxx>
-  </M_YSFXJG>
-  <M_SYXT>
-    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
-    <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
-    <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
-    <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
-    <list_lbv_syxt_mblb>
-      <MB0>MgO.CaO.Al₂O₃</MB0>
-      <MB1>CaO.SiO₂.Al₂O₃</MB1>
-    </list_lbv_syxt_mblb>
-    <list_lbv_syxt_mblb_index>
-      <MBIndex0>0</MBIndex0>
-      <MBIndex1>2</MBIndex1>
-    </list_lbv_syxt_mblb_index>
-  </M_SYXT>
-  <M_KLLBXX>
-    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
-    <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
-    <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
-    <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
-    <str_tb_kllb_sxys>O,Al,Mg,Ca,Ti,Si,S,Mn</str_tb_kllb_sxys>
-    <list_str_tb_lllb_sxys>
-      <YS0>O</YS0>
-      <YS1>Al</YS1>
-      <YS2>Mg</YS2>
-      <YS3>Ca</YS3>
-      <YS4>Ti</YS4>
-      <YS5>Si</YS5>
-      <YS6>S</YS6>
-      <YS7>Mn</YS7>
-    </list_str_tb_lllb_sxys>
-    <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
-    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
-    <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
-    <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
-    <index_cb_kllb_sort>2</index_cb_kllb_sort>
-    <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
-    <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
-    <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
-    <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
-    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
-    <list_str_kllb_qcys>
-      <YS0>C</YS0>
-      <YS1>Fe</YS1>
-    </list_str_kllb_qcys>
-    <str_kllb_qcys>C,Fe</str_kllb_qcys>
-    <str_kllb_DeleteClass>FeO,SiC</str_kllb_DeleteClass>
-    <list_str_kllb_DeleteClass>
-      <YS0>FeO</YS0>
-      <YS1>SiC</YS1>
-    </list_str_kllb_DeleteClass>
-    <list_int_kllb_number>20</list_int_kllb_number>
-  </M_KLLBXX>
-  <M_address>
-    <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
-  </M_address>
-  <M_JZWZB>
-    <b_ck_surface>True</b_ck_surface>
-    <b_ck_chart>True</b_ck_chart>
-  </M_JZWZB>
-</XmlConfig>

+ 1 - 1
OTSIncAMeasureApp/ServiceCenter/CPP(Bruker)API/SemController.cs

@@ -20,7 +20,7 @@ namespace OTSModelSharp.ServiceCenter
      
         public static ISemController GetSEMController()
         {
-            var semtype = FileHelper.GetXMLInformations("SemControllerName");
+            var semtype = FileHelper.GetXMLInformations("EDSName");
             if (sem == null)
             {
                 if (semtype== "FEI")

+ 6 - 1
OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -1114,6 +1114,11 @@ namespace OTSIncAReportApp
             string fullPathR = "";
             ResultFile resfile = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.getSelectedIndex()];
             string str_libraryName = resfile.GetSTDName();
+            bool endsWithDb = str_libraryName.EndsWith(".db", StringComparison.OrdinalIgnoreCase);
+            if(!endsWithDb)
+            {
+                str_libraryName = str_libraryName + ".db";
+            }
             try
             {
                 fullPathM = System.IO.Directory.GetCurrentDirectory() + "\\Config\\SysData\\" + str_libraryName /*+ ".db"*/;
@@ -1149,7 +1154,7 @@ namespace OTSIncAReportApp
 
             }
             
-            if (resfile.GetSTDName() == "NoSTDDB.db" || m_mbszclass.M_SY.StandardLibraryName== "NoSTDDB.db")
+            if (str_libraryName == "NoSTDDB.db" || m_mbszclass.M_SY.StandardLibraryName== "NoSTDDB.db")
             {
                 m_mbszclass.M_SY.StandardLibraryName = "";
             }

+ 3 - 0
OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -764,6 +764,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             int ls = 0;
             DataTable REORDER_data = REORDER(a_datas[1], "Name");
+            if (REORDER_data.Rows.Count == 0)
+                return;
+
             for (int i = 0; i < REORDER_data.Rows.Count; i++)
             {
                 if (REORDER_data.Rows[i]["Name"].ToString() == "" || REORDER_data.Rows[i]["Name"].ToString() == null)

+ 1 - 0
OTSSysMgrApp/ControllerSettingForm.Designer.cs

@@ -174,6 +174,7 @@
             this.pbImage.Margin = new System.Windows.Forms.Padding(2);
             this.pbImage.Name = "pbImage";
             this.pbImage.Size = new System.Drawing.Size(1025, 674);
+            this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pbImage.TabIndex = 0;
             this.pbImage.TabStop = false;
             // 

+ 79 - 53
OTSSysMgrApp/OTSSystemManagerForms.Designer.cs

@@ -35,26 +35,31 @@
             this.rdb_ch = new System.Windows.Forms.RadioButton();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             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.tabSysType = new System.Windows.Forms.TabPage();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
             this.btn_ok = new System.Windows.Forms.Button();
             this.coB_CleannessType = new System.Windows.Forms.ComboBox();
             this.radioButton_CleannessA = new System.Windows.Forms.RadioButton();
             this.radioButton_IncA = new System.Windows.Forms.RadioButton();
+            this.tabother = new System.Windows.Forms.TabPage();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.btn_otherconfig = new System.Windows.Forms.Button();
             this.tabLanguage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
             this.tabControl1.SuspendLayout();
             this.tabHardwareSet.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.tabSysType.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
+            this.tabother.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
             // 
             // tabLanguage
@@ -65,7 +70,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(546, 133);
+            this.tabLanguage.Size = new System.Drawing.Size(476, 133);
             this.tabLanguage.TabIndex = 2;
             this.tabLanguage.Text = "语言";
             this.tabLanguage.UseVisualStyleBackColor = true;
@@ -73,7 +78,7 @@
             // pictureBox3
             // 
             this.pictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox3.Image")));
-            this.pictureBox3.Location = new System.Drawing.Point(38, 22);
+            this.pictureBox3.Location = new System.Drawing.Point(38, 24);
             this.pictureBox3.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox3.Name = "pictureBox3";
             this.pictureBox3.Size = new System.Drawing.Size(67, 66);
@@ -85,7 +90,7 @@
             // 
             this.rdb_en.AutoSize = true;
             this.rdb_en.Checked = true;
-            this.rdb_en.Location = new System.Drawing.Point(147, 58);
+            this.rdb_en.Location = new System.Drawing.Point(147, 73);
             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);
@@ -98,7 +103,7 @@
             // rdb_ch
             // 
             this.rdb_ch.AutoSize = true;
-            this.rdb_ch.Location = new System.Drawing.Point(147, 25);
+            this.rdb_ch.Location = new System.Drawing.Point(147, 26);
             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);
@@ -112,22 +117,21 @@
             this.tabControl1.Controls.Add(this.tabHardwareSet);
             this.tabControl1.Controls.Add(this.tabLanguage);
             this.tabControl1.Controls.Add(this.tabSysType);
+            this.tabControl1.Controls.Add(this.tabother);
             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(554, 159);
+            this.tabControl1.Size = new System.Drawing.Size(484, 159);
             this.tabControl1.TabIndex = 0;
             // 
             // tabHardwareSet
             // 
-            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);
@@ -135,29 +139,11 @@
             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(546, 133);
+            this.tabHardwareSet.Size = new System.Drawing.Size(476, 133);
             this.tabHardwareSet.TabIndex = 1;
             this.tabHardwareSet.Text = "硬件";
             this.tabHardwareSet.UseVisualStyleBackColor = true;
             // 
-            // CmbSEMController
-            // 
-            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);
-            // 
             // CmbEDSController
             // 
             this.CmbEDSController.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -167,7 +153,7 @@
             "OffLine",
             "Oxford",
             "FEI"});
-            this.CmbEDSController.Location = new System.Drawing.Point(227, 74);
+            this.CmbEDSController.Location = new System.Drawing.Point(218, 24);
             this.CmbEDSController.Margin = new System.Windows.Forms.Padding(2);
             this.CmbEDSController.Name = "CmbEDSController";
             this.CmbEDSController.Size = new System.Drawing.Size(193, 20);
@@ -176,7 +162,7 @@
             // 
             // btnEDSTest
             // 
-            this.btnEDSTest.Location = new System.Drawing.Point(429, 70);
+            this.btnEDSTest.Location = new System.Drawing.Point(334, 71);
             this.btnEDSTest.Margin = new System.Windows.Forms.Padding(2);
             this.btnEDSTest.Name = "btnEDSTest";
             this.btnEDSTest.Size = new System.Drawing.Size(77, 24);
@@ -187,7 +173,7 @@
             // 
             // btnSEMTest
             // 
-            this.btnSEMTest.Location = new System.Drawing.Point(429, 20);
+            this.btnSEMTest.Location = new System.Drawing.Point(218, 71);
             this.btnSEMTest.Margin = new System.Windows.Forms.Padding(2);
             this.btnSEMTest.Name = "btnSEMTest";
             this.btnSEMTest.Size = new System.Drawing.Size(77, 24);
@@ -199,27 +185,17 @@
             // lblHEDSController
             // 
             this.lblHEDSController.AutoSize = true;
-            this.lblHEDSController.Location = new System.Drawing.Point(122, 74);
+            this.lblHEDSController.Location = new System.Drawing.Point(121, 27);
             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控制器";
             // 
-            // lblHSEMController
-            // 
-            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控制器";
-            // 
             // pictureBox2
             // 
             this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
-            this.pictureBox2.Location = new System.Drawing.Point(38, 22);
+            this.pictureBox2.Location = new System.Drawing.Point(38, 24);
             this.pictureBox2.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox2.Name = "pictureBox2";
             this.pictureBox2.Size = new System.Drawing.Size(67, 66);
@@ -249,6 +225,7 @@
             // 
             // tabSysType
             // 
+            this.tabSysType.Controls.Add(this.pictureBox4);
             this.tabSysType.Controls.Add(this.btn_ok);
             this.tabSysType.Controls.Add(this.coB_CleannessType);
             this.tabSysType.Controls.Add(this.radioButton_CleannessA);
@@ -256,14 +233,25 @@
             this.tabSysType.Location = new System.Drawing.Point(4, 22);
             this.tabSysType.Name = "tabSysType";
             this.tabSysType.Padding = new System.Windows.Forms.Padding(3);
-            this.tabSysType.Size = new System.Drawing.Size(546, 133);
+            this.tabSysType.Size = new System.Drawing.Size(476, 133);
             this.tabSysType.TabIndex = 3;
             this.tabSysType.Text = "系统类型设置";
             this.tabSysType.UseVisualStyleBackColor = true;
             // 
+            // pictureBox4
+            // 
+            this.pictureBox4.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox4.Image")));
+            this.pictureBox4.Location = new System.Drawing.Point(38, 24);
+            this.pictureBox4.Margin = new System.Windows.Forms.Padding(2);
+            this.pictureBox4.Name = "pictureBox4";
+            this.pictureBox4.Size = new System.Drawing.Size(67, 66);
+            this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pictureBox4.TabIndex = 9;
+            this.pictureBox4.TabStop = false;
+            // 
             // btn_ok
             // 
-            this.btn_ok.Location = new System.Drawing.Point(253, 12);
+            this.btn_ok.Location = new System.Drawing.Point(358, 16);
             this.btn_ok.Name = "btn_ok";
             this.btn_ok.Size = new System.Drawing.Size(36, 78);
             this.btn_ok.TabIndex = 3;
@@ -275,7 +263,7 @@
             // 
             this.coB_CleannessType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.coB_CleannessType.FormattingEnabled = true;
-            this.coB_CleannessType.Location = new System.Drawing.Point(112, 70);
+            this.coB_CleannessType.Location = new System.Drawing.Point(217, 74);
             this.coB_CleannessType.Name = "coB_CleannessType";
             this.coB_CleannessType.Size = new System.Drawing.Size(121, 20);
             this.coB_CleannessType.TabIndex = 2;
@@ -284,7 +272,7 @@
             // radioButton_CleannessA
             // 
             this.radioButton_CleannessA.AutoSize = true;
-            this.radioButton_CleannessA.Location = new System.Drawing.Point(29, 71);
+            this.radioButton_CleannessA.Location = new System.Drawing.Point(134, 75);
             this.radioButton_CleannessA.Name = "radioButton_CleannessA";
             this.radioButton_CleannessA.Size = new System.Drawing.Size(65, 16);
             this.radioButton_CleannessA.TabIndex = 1;
@@ -295,7 +283,7 @@
             // radioButton_IncA
             // 
             this.radioButton_IncA.AutoSize = true;
-            this.radioButton_IncA.Location = new System.Drawing.Point(29, 25);
+            this.radioButton_IncA.Location = new System.Drawing.Point(134, 29);
             this.radioButton_IncA.Name = "radioButton_IncA";
             this.radioButton_IncA.Size = new System.Drawing.Size(65, 16);
             this.radioButton_IncA.TabIndex = 0;
@@ -304,18 +292,51 @@
             this.radioButton_IncA.UseVisualStyleBackColor = true;
             this.radioButton_IncA.CheckedChanged += new System.EventHandler(this.radioButton_IncA_CheckedChanged);
             // 
+            // tabother
+            // 
+            this.tabother.Controls.Add(this.pictureBox1);
+            this.tabother.Controls.Add(this.btn_otherconfig);
+            this.tabother.Location = new System.Drawing.Point(4, 22);
+            this.tabother.Name = "tabother";
+            this.tabother.Padding = new System.Windows.Forms.Padding(3);
+            this.tabother.Size = new System.Drawing.Size(476, 133);
+            this.tabother.TabIndex = 4;
+            this.tabother.Text = "其它";
+            this.tabother.UseVisualStyleBackColor = true;
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+            this.pictureBox1.Location = new System.Drawing.Point(38, 24);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(67, 66);
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pictureBox1.TabIndex = 8;
+            this.pictureBox1.TabStop = false;
+            // 
+            // btn_otherconfig
+            // 
+            this.btn_otherconfig.Location = new System.Drawing.Point(169, 23);
+            this.btn_otherconfig.Name = "btn_otherconfig";
+            this.btn_otherconfig.Size = new System.Drawing.Size(76, 37);
+            this.btn_otherconfig.TabIndex = 0;
+            this.btn_otherconfig.Text = "其它配置";
+            this.btn_otherconfig.UseVisualStyleBackColor = true;
+            this.btn_otherconfig.Click += new System.EventHandler(this.btn_otherconfig_Click);
+            // 
             // OTSSystemManagerForms
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(554, 159);
+            this.ClientSize = new System.Drawing.Size(484, 159);
             this.Controls.Add(this.tabControl1);
             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(570, 198);
-            this.MinimumSize = new System.Drawing.Size(570, 198);
+            this.MaximumSize = new System.Drawing.Size(500, 198);
+            this.MinimumSize = new System.Drawing.Size(500, 198);
             this.Name = "OTSSystemManagerForms";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "SysMgrApp";
@@ -330,6 +351,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             this.tabSysType.ResumeLayout(false);
             this.tabSysType.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
+            this.tabother.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -342,12 +366,10 @@
         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;
         private System.Windows.Forms.Button btnEDSTest;
         private System.Windows.Forms.Button btnSEMTest;
         private System.Windows.Forms.Label lblHEDSController;
-        private System.Windows.Forms.Label lblHSEMController;
         private System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Button button1;
@@ -356,5 +378,9 @@
         private System.Windows.Forms.RadioButton radioButton_IncA;
         private System.Windows.Forms.ComboBox coB_CleannessType;
         private System.Windows.Forms.Button btn_ok;
+        private System.Windows.Forms.TabPage tabother;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.Button btn_otherconfig;
+        private System.Windows.Forms.PictureBox pictureBox4;
     }
 }

+ 15 - 31
OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -160,11 +160,6 @@ namespace OTSSysMgrApp
         /// <param name="e"></param>
         private void btnSEMTest_Click(object sender, EventArgs e)
         {
-            if (CmbSEMController.Text.Equals(""))
-            {
-                string str1 = table["str1"].ToString();
-                MessageBox.Show(str1, "Tip");
-            }
             //实力窗口对象
             SemTestForms sTextForms = new SemTestForms();
             //判断窗口对话框返回值
@@ -180,8 +175,7 @@ namespace OTSSysMgrApp
             //获取下拉选项
             ReadXMLFile();
             string message = string.Empty;
-            //添加事件
-            CmbSEMController.SelectedIndexChanged += new EventHandler(CmbSEMController_SelectedIndexChanged);
+            
             CmbEDSController.SelectedIndexChanged += new EventHandler(CmbEDSController_SelectedIndexChanged);
 
             try
@@ -272,12 +266,6 @@ namespace OTSSysMgrApp
 
         private void SaveSEMAndEDSController()
         {
-            string SEMName = string.Empty;
-            if (CmbSEMController.SelectedItem != null)
-            {
-
-                SEMName = CmbSEMController.SelectedItem.ToString();
-            }
             string EDSName = string.Empty;
             if (CmbEDSController.SelectedItem != null)
             {
@@ -285,7 +273,7 @@ namespace OTSSysMgrApp
             }
             try
             {
-                if (!WriteXMLFile(SEMName, EDSName))
+                if (!WriteXMLFile(EDSName, EDSName))
                 {
                     log.Error("SaveSelectVersionInfo()--错误日志:请检查HardwareConfig.xml确保Value为值标签!");
                 }
@@ -303,10 +291,6 @@ namespace OTSSysMgrApp
             bool result = XMLOperationClass.ReadXMLFile(XMLFileName, ref xmlSEMName, ref xmlEDSName);
             if (result)
             {
-                if (xmlSEMName != "")
-                {
-                    CmbSEMController.SelectedItem = xmlSEMName.ToString();
-                }
                 if (xmlEDSName != "")
                 {
                     CmbEDSController.SelectedItem = xmlEDSName.ToString();
@@ -315,7 +299,6 @@ namespace OTSSysMgrApp
                 {
                     try
                     {
-                        CmbSEMController.SelectedItem = CmbSEMController.Items[0].ToString(); //"Bruker";
                         CmbEDSController.SelectedItem = CmbEDSController.Items[0].ToString();// "Genesis";
                     }
                     catch (Exception)
@@ -327,7 +310,6 @@ namespace OTSSysMgrApp
             }
             else
             {
-                CmbSEMController.SelectedItem = CmbSEMController.Items[0].ToString();
                 CmbEDSController.SelectedItem = CmbEDSController.Items[0].ToString();
             }
         }
@@ -413,13 +395,7 @@ namespace OTSSysMgrApp
 
         private void GetSEMAndEDSController()
         {
-            string xmlNodeSEM = XMLOperationClass.GetXMLInformations("SEMName");
             string xmlNodeEDS = XMLOperationClass.GetXMLInformations("EDSName");
-            if (xmlNodeSEM != null)
-            {
-
-                CmbSEMController.SelectedItem = xmlNodeSEM.ToString();
-            }
             if (xmlNodeEDS != null)
             {
                 CmbEDSController.SelectedItem = xmlNodeEDS.ToString();
@@ -437,11 +413,6 @@ namespace OTSSysMgrApp
                 RegistryKey aimdir = software.OpenSubKey(SubKey, true);
                 if (aimdir != null)
                 {
-                    if (IsRegeditExit("SEMName"))
-                    {
-                        SEMRegistData = aimdir.GetValue("SEMName").ToString();
-                        CmbSEMController.SelectedItem = SEMRegistData.ToString();
-                    }
                     if (IsRegeditExit("EDSName"))
                     {
                         EDSRegistData = aimdir.GetValue("EDSName").ToString();
@@ -661,5 +632,18 @@ namespace OTSSysMgrApp
             string path2 = Application.StartupPath + @"\Config\SysData\OTSReportMgrParam.rpf";
             bool resultreport = XMLOperationClass.WriteSysType(path2, "systype", Type);
         }
+
+        private void btn_otherconfig_Click(object sender, EventArgs e)
+        {
+            string filepath = @".\Config\ProData\HardwareConfig.xml";
+            if(File.Exists(filepath))
+            {
+                System.Diagnostics.Process.Start("notepad.exe", filepath);
+            }
+            else
+            {
+                MessageBox.Show("File is lost!");
+            }
+        }
     }
 }

+ 322 - 0
OTSSysMgrApp/OTSSystemManagerForms.resx

@@ -438,6 +438,328 @@
         0hjsOoMd7JRaXfSVq8Tz3LvI+P+UgE829YXz6n9HX51MPPVCaHSFKxhBUUeXhyrfIRAHyqO3/xjSAxAZ
         /98Xc+orw40/BS++l9x/wv3L/yKu3pfIeE53EBnP6Q4i4zndQWQ8pzuIjOd0B5HxnO4gMp7THUTGc7qD
         yHhO36Ubt/4X1wSr+KCdTCMAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="pictureBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        yHhO36Ubt/4X1wSr+KCdTCMAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        yHhO36Ubt/4X1wSr+KCdTCMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">