Przeglądaj źródła

标准库编辑器和OTSSysMgrApp中英文更新

cxs 1 rok temu
rodzic
commit
b46e28379a

+ 41 - 29
Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -6,6 +6,9 @@
     <Controls>
       <Control name="tabHardwareSet" text="HardwareSet" />
       <Control name="tabLanguage" text="LanguageSet" />
+	  <Control name="tabSysType" text="SystemTypeSet" />
+      <Control name="tabother" text="OtherSet" />
+	  <Control name="btn_otherconfig" text="OtherConfig" />
       <Control name="rdb_ch" text="Chinese[ZH]" />
       <Control name="rdb_en" text="English[EN]" />
       <Control name="btnEDSTest" text="EDSTest" />
@@ -21,6 +24,7 @@
     <Name>ControllerSettingForm</Name>
     <Controls>
       <Control name="tabXRay" text="X-RayTest" />
+	  <Control name="tabImage2" text="AxialOrientationTest" />
       <Control name="lblCollectionTime" text="Collection" />
       <Control name="groupBox1" text="ImageDisplay" />
       <Control name="btnDisplayXRay" text="DisplayXRay" />
@@ -32,8 +36,16 @@
       <Control name="btnSaveImage" text="SaveImage" />
       <Control name="btnAreaRay" text="AreaRay" />
       <Control name="btnPointXRay" text="PointXRay" />
-      <Control name="btnClearData" text="ClearData" />
+      <Control name="btnClearData" text="Clear" />
       <Control name="btnEanalysis" text="Eanalysis" />
+	  <Control name="btn_Recommendedconfiguration" text="Recommendedconfiguration" />
+      <Control name="label5" text="Please debug at 100 magnification" />
+      <Control name="btn_continuousshot" text="DirectionVerification" />
+	  <Control name="btn_confirm" text="Save" />
+	  <Control name="label_x" text="Xdirection" />
+	  <Control name="label_y" text="Ydirection" />
+	  <Control name="label1" text="100Screenwidth" />
+	  <Control name="label4" text="Resolution" />
 	   <Control name="str1" text="Collecting" />
 	  <Control name="str2" text="No image information was obtained! " />
 	  <Control name="message1" text="Please enter the parameters to be set!" />
@@ -58,41 +70,41 @@
       <Control name="lblGHT" text="Voltage" />
       <Control name="lblGScanMode" text="ScanMode" />
       <Control name="lblGKV" text="VoltageValue" />
-      <Control name="lblGFWD" text="WorkingDistance" />
+      <Control name="lblGFWD" text="WorkDistance" />
       <Control name="lblGContrast" text="Contrast" />
       <Control name="lblGBrightness" text="Brightness" />
       <Control name="lblGSpotSize" text="SpotSize" />
       <Control name="lblGMagnification" text="Magnification" />
       <Control name="lblGPositionR" text="PositionR" />
       <Control name="lblGBeamBlank" text="BeamBlank" />
-      <Control name="lblGPositionY" text="Y-axis" />
-      <Control name="lblGPositionX" text="X-axis" />
+      <Control name="lblGPositionY" text="Y" />
+      <Control name="lblGPositionX" text="X" />
       <Control name="btnDone" text="Done" />
-      <Control name="btnGPositionXYR" text="Obtain" />
-      <Control name="btnGContrast" text="Obtain" />
-      <Control name="btnGBrightness" text="Obtain" />
-      <Control name="btnGScanMode" text="Obtain" />
-      <Control name="btnGLienTime" text="Obtain" />
-      <Control name="btnGFWD" text="Obtain" />
-      <Control name="btnGMagnification" text="Obtain" />
-      <Control name="btnGBeamBlank" text="Obtain" />
-      <Control name="btnGKV" text="Obtain" />
-      <Control name="btnGSpotSize" text="Obtain" />
-      <Control name="btnGSemScanFieldXY" text="Obtain" />
+      <Control name="btnGPositionXYR" text="Get" />
+      <Control name="btnGContrast" text="Get" />
+      <Control name="btnGBrightness" text="Get" />
+      <Control name="btnGScanMode" text="Get" />
+      <Control name="btnGLienTime" text="Get" />
+      <Control name="btnGFWD" text="Get" />
+      <Control name="btnGMagnification" text="Get" />
+      <Control name="btnGBeamBlank" text="Get" />
+      <Control name="btnGKV" text="Get" />
+      <Control name="btnGSpotSize" text="Get" />
+      <Control name="btnGSemScanFieldXY" text="Get" />
       <Control name="gbSetMethods" text="SetMethods" />
-      <Control name="btnSContrast" text="SetUp" />
-      <Control name="btnScanMode" text="SetUp" />
-      <Control name="btnSLienTime" text="SetUp" />
-      <Control name="btnSFWD" text="SetUp" />
-      <Control name="btnSMagnification" text="SetUp" />
-      <Control name="btnSBeamBlank" text="SetUp" />
-      <Control name="btnSKV" text="SetUp" />
-      <Control name="btnSBrightness" text="SetUp" />
-      <Control name="btnSSpotSize" text="SetUp" />
-      <Control name="btnSPositionXYR" text="SetUp" />
-      <Control name="btnHT" text="Obtain" />
-      <Control name="btnSHT" text="SetUp" />
-      <Control name="btnSSemScanFieldXY" text="SetUp" />
+      <Control name="btnSContrast" text="Set" />
+      <Control name="btnScanMode" text="Set" />
+      <Control name="btnSLienTime" text="Set" />
+      <Control name="btnSFWD" text="Set" />
+      <Control name="btnSMagnification" text="Set" />
+      <Control name="btnSBeamBlank" text="Set" />
+      <Control name="btnSKV" text="Set" />
+      <Control name="btnSBrightness" text="Set" />
+      <Control name="btnSSpotSize" text="Set" />
+      <Control name="btnSPositionXYR" text="Set" />
+      <Control name="btnHT" text="Get" />
+      <Control name="btnSHT" text="Set" />
+      <Control name="btnSSemScanFieldXY" text="Set" />
       <Control name="label15" text="ScanningMatrixY-axis" />
       <Control name="label14" text="ScanningMatrixX-axis" />
       <Control name="label13" text="Voltage" />
@@ -100,7 +112,7 @@
       <Control name="label11" text="VoltageValue" />
       <Control name="label1" text="X-axis" />
       <Control name="label10" text="WorkDistance" />
-      <Control name="label3" text="Y-axis" />
+      <Control name="label3" text="Y" />
       <Control name="label9" text="Contrast" />
       <Control name="label4" text="BeamBaffle" />
       <Control name="label5" text="Angle" />

+ 3 - 0
Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -6,6 +6,9 @@
     <Controls>
       <Control name="tabHardwareSet" text="硬件" />
       <Control name="tabLanguage" text="语言" />
+	  <Control name="tabSysType" text="系统类型设置" />
+      <Control name="tabother" text="其它" />
+	  <Control name="btn_otherconfig" text="其它配置" />
       <Control name="rdb_ch" text="中文[ZH]" />
       <Control name="rdb_en" text="英文[EN]" />
       <Control name="btnEDSTest" text="EDS测试" />

+ 7 - 4
Bin/x64/Debug/Resources/XMLData/ResourceForSTDManage-EN.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Resource>
 <Form>
-    <Name>Form_ConstantsEditor2</Name>
+    <Name>Form_Main</Name>
     <Controls>
-	  <Control name="Form_ConstantsEditor2" text="STDConstantsEditor"/>
+	  <Control name="Form_Main" text="STDConstantsEditor"/>
       <Control name="ribbon_ESDMaxRules" text="Max EDS Rules"/>
       <Control name="ribbon_ZeroRules" text="Zero Element Rules"/>
       <Control name="ribbon_UserConstants" text="User Constants"/>
@@ -14,6 +14,7 @@
       <Control name="ribbonPanel3" text="File Operations"/>
 	  <Control name="rbOpen" text="Open"/>
 	  <Control name="rbClose" text="Close"/>
+	  <Control name="rbNew" text="New"/>
       <Control name="rbRecover" text="ResetToFactorySettings"/>
       <Control name="rbBackup" text="SaveAs"/>
       <Control name="rbSave" text="Save"/>
@@ -52,8 +53,8 @@
     <Name>STDRuleslist</Name>
     <Controls>
 	  <Control name="STDRuleslist" text="STDRuleslist"/>
-      <Control name="新建ToolStripMenuItem" text="Create a new rule"/>
-      <Control name="删除ToolStripMenuItem" text="Delete the selected rule"/>
+      <Control name="ToolStripMenuItem_New" text="Create a new rule"/>
+      <Control name="ToolStripMenuItem_Del" text="Delete the selected rule"/>
     </Controls>
   </Form>
   <Form>
@@ -216,6 +217,8 @@
 	  <Control name="message6" text=",please modify!"/>
 	  <Control name="message7" text="No gruop is selected!"/>
 	  <Control name="message32" text="Tip"/>
+	  <Control name="ToolStripMenuItem_add" text="Add Group"/>
+	  <Control name="删除组ToolStripMenuItem" text="Delete Group"/>
     </Controls>
   </Form>
   <Form>

+ 1 - 1
OTSPartA_STDEditor/UI/Attributes.cs

@@ -111,7 +111,7 @@ namespace OTSPartA_STDEditor
 
             Grid_Attributes.Redim(13, 2);
 
-            if (m_MainForm.lan.GetNameTable("Form_ConstantsEditor2")["language"].ToString() == "ZH")
+            if (m_MainForm.lan.GetNameTable("Form_Main")["language"].ToString() == "ZH")
             {
                 //SourceGrid.Cells.ColumnHeader head1 = new SourceGrid.Cells.ColumnHeader("通用属性");
                 Grid_Attributes[0, 0] = new SourceGrid.Cells.Cell("通用属性 ", typeof(string));

+ 10 - 10
OTSPartA_STDEditor/UI/Form_GroupId.Designer.cs

@@ -33,7 +33,7 @@
             this.button_Cancel = new System.Windows.Forms.Button();
             this.Grid_FroupId = new SourceGrid.Grid();
             this.contextMenuStrip_GroupId = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.添加组ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ToolStripMenuItem_add = new System.Windows.Forms.ToolStripMenuItem();
             this.删除组ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.button_up = new System.Windows.Forms.Button();
             this.button_down = new System.Windows.Forms.Button();
@@ -78,22 +78,22 @@
             // contextMenuStrip_GroupId
             // 
             this.contextMenuStrip_GroupId.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.添加组ToolStripMenuItem,
+            this.ToolStripMenuItem_add,
             this.删除组ToolStripMenuItem});
             this.contextMenuStrip_GroupId.Name = "contextMenuStrip_GroupId";
-            this.contextMenuStrip_GroupId.Size = new System.Drawing.Size(113, 48);
+            this.contextMenuStrip_GroupId.Size = new System.Drawing.Size(181, 70);
             // 
-            // 添加组ToolStripMenuItem
+            // ToolStripMenuItem_add
             // 
-            this.添加组ToolStripMenuItem.Name = "添加组ToolStripMenuItem";
-            this.添加组ToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
-            this.添加组ToolStripMenuItem.Text = "添加组";
-            this.添加组ToolStripMenuItem.Click += new System.EventHandler(this.添加组ToolStripMenuItem_Click);
+            this.ToolStripMenuItem_add.Name = "ToolStripMenuItem_add";
+            this.ToolStripMenuItem_add.Size = new System.Drawing.Size(180, 22);
+            this.ToolStripMenuItem_add.Text = "添加组";
+            this.ToolStripMenuItem_add.Click += new System.EventHandler(this.添加组ToolStripMenuItem_Click);
             // 
             // 删除组ToolStripMenuItem
             // 
             this.删除组ToolStripMenuItem.Name = "删除组ToolStripMenuItem";
-            this.删除组ToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+            this.删除组ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.删除组ToolStripMenuItem.Text = "删除组";
             this.删除组ToolStripMenuItem.Click += new System.EventHandler(this.删除组ToolStripMenuItem_Click);
             // 
@@ -151,7 +151,7 @@
         private System.Windows.Forms.Button button_up;
         private System.Windows.Forms.Button button_down;
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip_GroupId;
-        private System.Windows.Forms.ToolStripMenuItem 添加组ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem_add;
         private System.Windows.Forms.ToolStripMenuItem 删除组ToolStripMenuItem;
     }
 }

+ 1 - 1
OTSPartA_STDEditor/UI/Form_Main.cs

@@ -68,7 +68,7 @@ namespace OTSPartA_STDEditor
         private void Form_ConstantsEditor2_Load(object sender, EventArgs e)
         {
             lan = new Language(this);
-            table = lan.GetNameTable("Form_ConstantsEditor2");
+            table = lan.GetNameTable("Form_Main");
             if (STDDBAddress != "")
             {
                 InitForms(STDDBAddress);

+ 4 - 5
OTSPartA_STDEditor/UI/ReferenceLibrary.cs

@@ -50,7 +50,7 @@ namespace OTSPartA_STDEditor
             {
                 List<String> listColName = new List<string>();
 
-                if (m_SubMidWindow.m_MainForm.lan.GetNameTable("Form_ConstantsEditor2")["language"].ToString() == "ZH")
+                if (m_SubMidWindow.m_MainForm.lan.GetNameTable("Form_Main")["language"].ToString() == "ZH")
                 {
                     listColName.Add("规则名称");
                     listColName.Add("颜色");
@@ -429,11 +429,10 @@ namespace OTSPartA_STDEditor
                 //规则名称不为空
                 if (m_SubMidWindow.m_MainForm.m_STDRuleslist.Grid_Minerals[i, j].Value.ToString().Replace(" ", "").Trim() != "")
                 {
-                    
-                            m_SubMidWindow.m_MainForm.SaveDataOfSelRule(i, j);
 
-                            AddIntoMainLab();
-                        
+                    m_SubMidWindow.m_MainForm.SaveDataOfSelRule(i, j);
+
+                    AddIntoMainLab();
                 }
             }
             else if(i==-1&&j==-1)

+ 4 - 4
OTSPartA_STDEditor/UI/STDEditor.Designer.cs

@@ -502,9 +502,9 @@
             // 
             // button_PeriodicTableSwitch
             // 
-            this.button_PeriodicTableSwitch.Location = new System.Drawing.Point(18, 79);
+            this.button_PeriodicTableSwitch.Location = new System.Drawing.Point(6, 79);
             this.button_PeriodicTableSwitch.Name = "button_PeriodicTableSwitch";
-            this.button_PeriodicTableSwitch.Size = new System.Drawing.Size(96, 25);
+            this.button_PeriodicTableSwitch.Size = new System.Drawing.Size(108, 25);
             this.button_PeriodicTableSwitch.TabIndex = 33;
             this.button_PeriodicTableSwitch.Text = "PeriodicTable";
             this.button_PeriodicTableSwitch.UseVisualStyleBackColor = true;
@@ -513,9 +513,9 @@
             // comboBox_PeriodicTable
             // 
             this.comboBox_PeriodicTable.FormattingEnabled = true;
-            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(18, 36);
+            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(6, 36);
             this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
-            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(96, 20);
+            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(108, 20);
             this.comboBox_PeriodicTable.TabIndex = 1;
             this.comboBox_PeriodicTable.SelectedIndexChanged += new System.EventHandler(this.comboBox_PeriodicTable_SelectedIndexChanged);
             this.comboBox_PeriodicTable.KeyDown += new System.Windows.Forms.KeyEventHandler(this.comboBox_PeriodicTable_KeyDown);

+ 2 - 2
OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -32,7 +32,7 @@ namespace OTSPartA_STDEditor
             table_STDRuleslist = m_MainForm.lan.GetNameTable("Attributes");
             Grid_Minerals.Redim(m_MainForm.STDDictionary.Count + 1, 2);
             SourceGrid.Cells.ColumnHeader head1 = null;
-            if (m_MainForm.lan.GetNameTable("Form_ConstantsEditor2")["language"].ToString() == "EN")
+            if (m_MainForm.lan.GetNameTable("Form_Main")["language"].ToString() == "EN")
             {
                 head1 = new SourceGrid.Cells.ColumnHeader("Rule Name");
             }
@@ -43,7 +43,7 @@ namespace OTSPartA_STDEditor
             Grid_Minerals[0, 0] = head1;
 
             SourceGrid.Cells.ColumnHeader head2 = null;
-            if (m_MainForm.lan.GetNameTable("Form_ConstantsEditor2")["language"].ToString() == "EN")
+            if (m_MainForm.lan.GetNameTable("Form_Main")["language"].ToString() == "EN")
             {
                 head2 = new SourceGrid.Cells.ColumnHeader("Color");
             }

+ 14 - 14
OTSSysMgrApp/ControllerSettingForm.Designer.cs

@@ -210,7 +210,7 @@
             this.btnDisplay.Location = new System.Drawing.Point(684, 8);
             this.btnDisplay.Margin = new System.Windows.Forms.Padding(2);
             this.btnDisplay.Name = "btnDisplay";
-            this.btnDisplay.Size = new System.Drawing.Size(67, 33);
+            this.btnDisplay.Size = new System.Drawing.Size(133, 33);
             this.btnDisplay.TabIndex = 5;
             this.btnDisplay.Text = "图像采集";
             this.btnDisplay.UseVisualStyleBackColor = true;
@@ -319,10 +319,10 @@
             // btnClearData
             // 
             this.btnClearData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClearData.Location = new System.Drawing.Point(688, 9);
+            this.btnClearData.Location = new System.Drawing.Point(702, 9);
             this.btnClearData.Margin = new System.Windows.Forms.Padding(2);
             this.btnClearData.Name = "btnClearData";
-            this.btnClearData.Size = new System.Drawing.Size(39, 33);
+            this.btnClearData.Size = new System.Drawing.Size(49, 33);
             this.btnClearData.TabIndex = 5;
             this.btnClearData.Text = "清空";
             this.btnClearData.UseVisualStyleBackColor = true;
@@ -331,7 +331,7 @@
             // btnAreaRay
             // 
             this.btnAreaRay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnAreaRay.Location = new System.Drawing.Point(458, 9);
+            this.btnAreaRay.Location = new System.Drawing.Point(425, 9);
             this.btnAreaRay.Margin = new System.Windows.Forms.Padding(2);
             this.btnAreaRay.Name = "btnAreaRay";
             this.btnAreaRay.Size = new System.Drawing.Size(67, 33);
@@ -343,10 +343,10 @@
             // btnPointXRay
             // 
             this.btnPointXRay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnPointXRay.Location = new System.Drawing.Point(617, 9);
+            this.btnPointXRay.Location = new System.Drawing.Point(595, 9);
             this.btnPointXRay.Margin = new System.Windows.Forms.Padding(2);
             this.btnPointXRay.Name = "btnPointXRay";
-            this.btnPointXRay.Size = new System.Drawing.Size(67, 33);
+            this.btnPointXRay.Size = new System.Drawing.Size(89, 33);
             this.btnPointXRay.TabIndex = 3;
             this.btnPointXRay.Text = "多点采集";
             this.btnPointXRay.UseVisualStyleBackColor = true;
@@ -367,10 +367,10 @@
             // btnDisplayXRay
             // 
             this.btnDisplayXRay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDisplayXRay.Location = new System.Drawing.Point(538, 9);
+            this.btnDisplayXRay.Location = new System.Drawing.Point(496, 9);
             this.btnDisplayXRay.Margin = new System.Windows.Forms.Padding(2);
             this.btnDisplayXRay.Name = "btnDisplayXRay";
-            this.btnDisplayXRay.Size = new System.Drawing.Size(76, 33);
+            this.btnDisplayXRay.Size = new System.Drawing.Size(95, 33);
             this.btnDisplayXRay.TabIndex = 2;
             this.btnDisplayXRay.Text = "默认点采集";
             this.btnDisplayXRay.UseVisualStyleBackColor = true;
@@ -485,7 +485,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(512, 53);
+            this.label5.Location = new System.Drawing.Point(391, 53);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(131, 12);
             this.label5.TabIndex = 15;
@@ -514,9 +514,9 @@
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(597, 11);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(29, 12);
+            this.label3.Size = new System.Drawing.Size(17, 12);
             this.label3.TabIndex = 8;
-            this.label3.Text = "微米";
+            this.label3.Text = "um";
             // 
             // tB_scanFieldSize100
             // 
@@ -537,9 +537,9 @@
             // 
             // btn_confirm
             // 
-            this.btn_confirm.Location = new System.Drawing.Point(730, 11);
+            this.btn_confirm.Location = new System.Drawing.Point(827, 12);
             this.btn_confirm.Name = "btn_confirm";
-            this.btn_confirm.Size = new System.Drawing.Size(75, 60);
+            this.btn_confirm.Size = new System.Drawing.Size(75, 61);
             this.btn_confirm.TabIndex = 5;
             this.btn_confirm.Text = "保存";
             this.btn_confirm.UseVisualStyleBackColor = true;
@@ -585,7 +585,7 @@
             // 
             this.btn_continuousshot.Location = new System.Drawing.Point(649, 11);
             this.btn_continuousshot.Name = "btn_continuousshot";
-            this.btn_continuousshot.Size = new System.Drawing.Size(75, 61);
+            this.btn_continuousshot.Size = new System.Drawing.Size(163, 61);
             this.btn_continuousshot.TabIndex = 0;
             this.btn_continuousshot.Text = "轴方向验证";
             this.btn_continuousshot.UseVisualStyleBackColor = true;

+ 1 - 1
OTSSysMgrApp/ControllerSettingForm.cs

@@ -1419,7 +1419,7 @@ namespace OTSSysMgrApp
         {
             if (recommendedConfiguration == null || recommendedConfiguration.IsDisposed)
             {
-                recommendedConfiguration = new RecommendedConfiguration();
+                recommendedConfiguration = new RecommendedConfiguration(Language.ReadDefaultLanguage());
 
                 recommendedConfiguration.Show();
             }

+ 3 - 3
OTSSysMgrApp/OTSSystemManagerForms.Designer.cs

@@ -255,7 +255,7 @@
             this.btn_ok.Name = "btn_ok";
             this.btn_ok.Size = new System.Drawing.Size(36, 78);
             this.btn_ok.TabIndex = 3;
-            this.btn_ok.Text = "确定";
+            this.btn_ok.Text = "OK";
             this.btn_ok.UseVisualStyleBackColor = true;
             this.btn_ok.Click += new System.EventHandler(this.btn_ok_Click);
             // 
@@ -317,9 +317,9 @@
             // 
             // btn_otherconfig
             // 
-            this.btn_otherconfig.Location = new System.Drawing.Point(169, 23);
+            this.btn_otherconfig.Location = new System.Drawing.Point(167, 37);
             this.btn_otherconfig.Name = "btn_otherconfig";
-            this.btn_otherconfig.Size = new System.Drawing.Size(76, 37);
+            this.btn_otherconfig.Size = new System.Drawing.Size(114, 37);
             this.btn_otherconfig.TabIndex = 0;
             this.btn_otherconfig.Text = "其它配置";
             this.btn_otherconfig.UseVisualStyleBackColor = true;

+ 2 - 2
OTSSysMgrApp/OTSSystemManagerForms.resx

@@ -279,7 +279,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
@@ -440,7 +440,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

+ 4 - 4
OTSSysMgrApp/RecommendedConfiguration.Designer.cs

@@ -37,7 +37,7 @@ namespace OTSSysMgrApp
             this.richTextBox_RecommendedConfiguration.Dock = System.Windows.Forms.DockStyle.Fill;
             this.richTextBox_RecommendedConfiguration.Location = new System.Drawing.Point(0, 0);
             this.richTextBox_RecommendedConfiguration.Name = "richTextBox_RecommendedConfiguration";
-            this.richTextBox_RecommendedConfiguration.Size = new System.Drawing.Size(657, 261);
+            this.richTextBox_RecommendedConfiguration.Size = new System.Drawing.Size(734, 261);
             this.richTextBox_RecommendedConfiguration.TabIndex = 1;
             this.richTextBox_RecommendedConfiguration.Text = "";
             // 
@@ -45,11 +45,11 @@ namespace OTSSysMgrApp
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(657, 261);
+            this.ClientSize = new System.Drawing.Size(734, 261);
             this.Controls.Add(this.richTextBox_RecommendedConfiguration);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(673, 300);
-            this.MinimumSize = new System.Drawing.Size(673, 300);
+            this.MaximumSize = new System.Drawing.Size(750, 300);
+            this.MinimumSize = new System.Drawing.Size(750, 300);
             this.Name = "RecommendedConfiguration";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

+ 23 - 8
OTSSysMgrApp/RecommendedConfiguration.cs

@@ -12,20 +12,35 @@ namespace OTSSysMgrApp
 {
     public partial class RecommendedConfiguration : Form
     {
-        public RecommendedConfiguration()
+        string _lanType = "";
+        public RecommendedConfiguration(string a_lanType)
         {
             InitializeComponent();
+            _lanType = a_lanType;
         }
 
         private void RecommendedConfiguration_Load(object sender, EventArgs e)
         {
-            richTextBox_RecommendedConfiguration.Text = "电镜型号   能谱型号	  x轴正方向	y轴正方向	100倍下屏幕宽度      分辨率\n";
-            richTextBox_RecommendedConfiguration.Text+= " FEI	     牛津	   向右为正	 向上为正	  1270(宝丽来)      1024*704\n";
-            richTextBox_RecommendedConfiguration.Text+= "            布鲁克	   向右为正	 向上为正	  1270(宝丽来)      1024*768\n";
-            richTextBox_RecommendedConfiguration.Text+= "             FEI	   向右为正	 向上为正	  1270(宝丽来)      1536*1024\n";
-            richTextBox_RecommendedConfiguration.Text+= " 蔡司	     牛津	   向左为正	 向下为正	  1142(宝丽来)      1024*768\n";
-            richTextBox_RecommendedConfiguration.Text+= "            布鲁克	   向左为正	 向下为正	  1142(宝丽来)      1024*768\n";
-            richTextBox_RecommendedConfiguration.Text+= " Coxem	     牛津	   向左为正	 向下为正	  1972(宝丽来)      1024*768";
+            if (_lanType == "ZH")
+            {
+                richTextBox_RecommendedConfiguration.Text  = " SEM       EDS	   x轴正方向	y轴正方向	100倍下屏幕宽度       分辨率\n";
+                richTextBox_RecommendedConfiguration.Text += " FEI	     Oxford	   向右为正	    向上为正	  1270(Polaroid)      1024*704\n";
+                richTextBox_RecommendedConfiguration.Text += "           Bluke	   向右为正	    向上为正	  1270(Polaroid)      1024*768\n";
+                richTextBox_RecommendedConfiguration.Text += "           FEI	   向右为正	    向上为正	  1270(Polaroid)      1536*1024\n";
+                richTextBox_RecommendedConfiguration.Text += " Zeiss	 Oxford	   向左为正	    向下为正	  1142(Polaroid)      1024*768\n";
+                richTextBox_RecommendedConfiguration.Text += "           Bluke	   向左为正	    向下为正	  1142(Polaroid)      1024*768\n";
+                richTextBox_RecommendedConfiguration.Text += " Coxem	 Oxford	   向左为正	    向下为正	  1972(Polaroid)      1024*768";
+            }
+            else
+            {
+                richTextBox_RecommendedConfiguration.Text  = " SEM     EDS      X_positive_direction  Y_axis_positive_direction  ScreenWidth_at_100_magnification   resolution\n";
+                richTextBox_RecommendedConfiguration.Text += " FEI	   Oxford	Right is positive	  Up is positive	         1270(Polaroid)             1024*704\n";
+                richTextBox_RecommendedConfiguration.Text += "         Bluke	Right is positive	  Up is positive           	 1270(Polaroid)             1024*768\n";
+                richTextBox_RecommendedConfiguration.Text += "         FEI	    Right is positive	  Up is positive	         1270(Polaroid)             1536*1024\n";
+                richTextBox_RecommendedConfiguration.Text += " Zeiss   Oxford	   Left	                    Down	             1142(Polaroid)             1024*768\n";
+                richTextBox_RecommendedConfiguration.Text += "         Bluke	   Left	                    Down                 1142(Polaroid)             1024*768\n";
+                richTextBox_RecommendedConfiguration.Text += " Coxem   Oxford	   Left	                    Down                 1972(Polaroid)             1024*768";
+            }
             richTextBox_RecommendedConfiguration.Enabled = false;
         }
     }

Plik diff jest za duży
+ 166 - 166
OTSSysMgrApp/SemTestForms.Designer.cs


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików