中英文切换修改

几米阳光
Commit 190c39a1 由 几米阳光 编写于 2019-01-24 10:23:28 +0800
dll/CodeLibrary.dll
source/ACSingleStore/FrmStoreBox.Designer.cs
source/ACSingleStore/FrmStoreBox.cs
source/ACSingleStore/FrmStoreBox.resx
source/ACSingleStore/Properties/Resource.en-US.resx
source/ACSingleStore/Properties/Resource.zh-CN.resx
source/ACSingleStore/ResourceCulture.cs
--- a/dll/CodeLibrary.dll
查看文件 @190c39a
+++ b/dll/CodeLibrary.dll
查看文件 @190c39a
--- a/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @190c39a
+++ b/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @190c39a
@@ -223,7 +223,7 @@
            // chbAuto
            // 
            this.chbAuto.AutoSize = true;
-            this.chbAuto.Location = new System.Drawing.Point(29, 707);
+            this.chbAuto.Location = new System.Drawing.Point(445, 19);
            this.chbAuto.Name = "chbAuto";
            this.chbAuto.Size = new System.Drawing.Size(112, 24);
            this.chbAuto.TabIndex = 270;
@@ -233,7 +233,7 @@
            // 
            // groupBox1
            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
            this.groupBox1.Controls.Add(this.axis_1_Alarm);
            this.groupBox1.Controls.Add(this.axis_3_Alarm);
@@ -299,7 +299,7 @@
            this.label38.Name = "label38";
            this.label38.Size = new System.Drawing.Size(160, 17);
            this.label38.TabIndex = 263;
-            this.label38.Text = "ALM：";
+            this.label38.Text = "ALM:";
            this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // txtMiddleTarget
@@ -333,7 +333,7 @@
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(160, 17);
            this.label12.TabIndex = 258;
-            this.label12.Text = "出入库目标值：";
+            this.label12.Text = "出入库目标值:";
            this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // lblCountPulse1
@@ -391,7 +391,7 @@
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(95, 34);
            this.label4.TabIndex = 100;
-            this.label4.Text = "轴三：进出轴";
+            this.label4.Text = "轴三:进出轴";
            this.label4.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            // 
            // label3
@@ -401,7 +401,7 @@
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(95, 34);
            this.label3.TabIndex = 99;
-            this.label3.Text = "轴二：上下轴";
+            this.label3.Text = "轴二:上下轴";
            this.label3.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            // 
            // label1
@@ -411,7 +411,7 @@
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(95, 34);
            this.label1.TabIndex = 97;
-            this.label1.Text = "轴一：旋转轴";
+            this.label1.Text = "轴一:旋转轴";
            this.label1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            // 
            // label43
@@ -421,7 +421,7 @@
            this.label43.Name = "label43";
            this.label43.Size = new System.Drawing.Size(160, 17);
            this.label43.TabIndex = 23;
-            this.label43.Text = "输出脉冲值：";
+            this.label43.Text = "输出脉冲值:";
            this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // label42
@@ -431,7 +431,7 @@
            this.label42.Name = "label42";
            this.label42.Size = new System.Drawing.Size(160, 17);
            this.label42.TabIndex = 24;
-            this.label42.Text = "编码器计数：";
+            this.label42.Text = "编码器计数:";
            this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // groupBox3
@@ -439,6 +439,7 @@
            this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
            this.groupBox3.Controls.Add(this.lblWarnMsg);
+            this.groupBox3.Controls.Add(this.chbAuto);
            this.groupBox3.Controls.Add(this.lblThisSta);
            this.groupBox3.Location = new System.Drawing.Point(611, 38);
            this.groupBox3.Name = "groupBox3";
@@ -529,7 +530,7 @@
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(149, 17);
            this.label6.TabIndex = 300;
-            this.label6.Text = "原点信号：";
+            this.label6.Text = "原点信号:";
            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // label5
@@ -602,7 +603,7 @@
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(149, 17);
            this.label11.TabIndex = 292;
-            this.label11.Text = "HOME-CMP状态：";
+            this.label11.Text = "HOME-CMP状态:";
            this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // txtHomeStatus
@@ -629,7 +630,7 @@
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(149, 17);
            this.label10.TabIndex = 289;
-            this.label10.Text = "BUSY状态：";
+            this.label10.Text = "BUSY状态:";
            this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // txtBusyStatus
@@ -656,7 +657,7 @@
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(149, 17);
            this.label2.TabIndex = 286;
-            this.label2.Text = "报警状态：";
+            this.label2.Text = "报警状态:";
            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // txtAlarmStatus
@@ -705,21 +706,21 @@
            // label7
            // 
            this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(6, 118);
+            this.label7.Location = new System.Drawing.Point(4, 118);
            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(132, 17);
+            this.label7.Size = new System.Drawing.Size(136, 17);
            this.label7.TabIndex = 254;
-            this.label7.Text = "输出脉冲值：";
+            this.label7.Text = "输出脉冲值:";
            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // label8
            // 
            this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(6, 147);
+            this.label8.Location = new System.Drawing.Point(4, 147);
            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(132, 17);
+            this.label8.Size = new System.Drawing.Size(136, 17);
            this.label8.TabIndex = 255;
-            this.label8.Text = "编码器计数：";
+            this.label8.Text = "编码器计数:";
            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // btnOpenAxis
@@ -754,7 +755,7 @@
            // 
            // lblCountPulse
            // 
-            this.lblCountPulse.Location = new System.Drawing.Point(142, 144);
+            this.lblCountPulse.Location = new System.Drawing.Point(145, 144);
            this.lblCountPulse.Name = "lblCountPulse";
            this.lblCountPulse.ReadOnly = true;
            this.lblCountPulse.Size = new System.Drawing.Size(87, 23);
@@ -777,7 +778,7 @@
            // 
            // lblOutPulse
            // 
-            this.lblOutPulse.Location = new System.Drawing.Point(142, 114);
+            this.lblOutPulse.Location = new System.Drawing.Point(145, 114);
            this.lblOutPulse.Name = "lblOutPulse";
            this.lblOutPulse.ReadOnly = true;
            this.lblOutPulse.Size = new System.Drawing.Size(87, 23);
@@ -788,12 +789,12 @@
            this.label47.Cursor = System.Windows.Forms.Cursors.Default;
            this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.label47.Location = new System.Drawing.Point(233, 105);
+            this.label47.Location = new System.Drawing.Point(236, 105);
            this.label47.Name = "label47";
            this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.label47.Size = new System.Drawing.Size(66, 20);
            this.label47.TabIndex = 250;
-            this.label47.Text = "速度：";
+            this.label47.Text = "速度:";
            this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // btnAxisVMove
@@ -900,12 +901,12 @@
            this.label48.Cursor = System.Windows.Forms.Cursors.Default;
            this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.label48.Location = new System.Drawing.Point(233, 67);
+            this.label48.Location = new System.Drawing.Point(236, 67);
            this.label48.Name = "label48";
            this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.label48.Size = new System.Drawing.Size(66, 20);
            this.label48.TabIndex = 243;
-            this.label48.Text = "位置：";
+            this.label48.Text = "位置:";
            this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // btnAxisStop
@@ -926,7 +927,7 @@
            // txtAxisValue
            // 
            this.txtAxisValue.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtAxisValue.Location = new System.Drawing.Point(142, 86);
+            this.txtAxisValue.Location = new System.Drawing.Point(145, 86);
            this.txtAxisValue.MaxLength = 10;
            this.txtAxisValue.Name = "txtAxisValue";
            this.txtAxisValue.Size = new System.Drawing.Size(87, 21);
@@ -936,7 +937,7 @@
            // txtAxisDeviceName
            // 
            this.txtAxisDeviceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtAxisDeviceName.Location = new System.Drawing.Point(142, 58);
+            this.txtAxisDeviceName.Location = new System.Drawing.Point(145, 58);
            this.txtAxisDeviceName.MaxLength = 10;
            this.txtAxisDeviceName.Name = "txtAxisDeviceName";
            this.txtAxisDeviceName.Size = new System.Drawing.Size(87, 21);
@@ -947,22 +948,22 @@
            // 
            this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label45.Location = new System.Drawing.Point(6, 60);
+            this.label45.Location = new System.Drawing.Point(4, 60);
            this.label45.Name = "label45";
-            this.label45.Size = new System.Drawing.Size(132, 17);
+            this.label45.Size = new System.Drawing.Size(136, 17);
            this.label45.TabIndex = 240;
-            this.label45.Text = "端口号：";
+            this.label45.Text = "端口号:";
            this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // label46
            // 
            this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label46.Location = new System.Drawing.Point(6, 89);
+            this.label46.Location = new System.Drawing.Point(4, 89);
            this.label46.Name = "label46";
-            this.label46.Size = new System.Drawing.Size(132, 17);
+            this.label46.Size = new System.Drawing.Size(136, 17);
            this.label46.TabIndex = 239;
-            this.label46.Text = "伺服地址：";
+            this.label46.Text = "伺服地址:";
            this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // cmbAxisList
@@ -972,7 +973,7 @@
            this.cmbAxisList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbAxisList.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmbAxisList.FormattingEnabled = true;
-            this.cmbAxisList.Location = new System.Drawing.Point(142, 29);
+            this.cmbAxisList.Location = new System.Drawing.Point(145, 29);
            this.cmbAxisList.Name = "cmbAxisList";
            this.cmbAxisList.Size = new System.Drawing.Size(220, 22);
            this.cmbAxisList.TabIndex = 234;
@@ -984,11 +985,11 @@
            // 
            this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label49.Location = new System.Drawing.Point(6, 31);
+            this.label49.Location = new System.Drawing.Point(4, 31);
            this.label49.Name = "label49";
-            this.label49.Size = new System.Drawing.Size(132, 17);
+            this.label49.Size = new System.Drawing.Size(136, 17);
            this.label49.TabIndex = 233;
-            this.label49.Text = "AC伺服：";
+            this.label49.Text = "AC伺服:";
            this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // richTextBox1
@@ -996,12 +997,11 @@
            this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
            | System.Windows.Forms.AnchorStyles.Left)));
            this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.richTextBox1.Location = new System.Drawing.Point(364, 691);
+            this.richTextBox1.Location = new System.Drawing.Point(17, 627);
            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(219, 76);
+            this.richTextBox1.Size = new System.Drawing.Size(583, 132);
            this.richTextBox1.TabIndex = 256;
            this.richTextBox1.Text = "";
-            this.richTextBox1.Visible = false;
            // 
            // groupBox2
            // 
@@ -1050,7 +1050,7 @@
            this.groupBox2.Controls.Add(this.btnUpDownP4);
            this.groupBox2.Location = new System.Drawing.Point(17, 38);
            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(583, 640);
+            this.groupBox2.Size = new System.Drawing.Size(583, 583);
            this.groupBox2.TabIndex = 100;
            this.groupBox2.TabStop = false;
            this.groupBox2.Text = "料仓操作";
@@ -1060,7 +1060,7 @@
            this.lblTemp.AutoSize = true;
            this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblTemp.ForeColor = System.Drawing.Color.Black;
-            this.lblTemp.Location = new System.Drawing.Point(15, 576);
+            this.lblTemp.Location = new System.Drawing.Point(11, 530);
            this.lblTemp.Name = "lblTemp";
            this.lblTemp.Size = new System.Drawing.Size(159, 20);
            this.lblTemp.TabIndex = 270;
@@ -1069,7 +1069,7 @@
            // btnClearLog
            // 
            this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClearLog.Location = new System.Drawing.Point(277, 558);
+            this.btnClearLog.Location = new System.Drawing.Point(285, 522);
            this.btnClearLog.Name = "btnClearLog";
            this.btnClearLog.Size = new System.Drawing.Size(127, 38);
            this.btnClearLog.TabIndex = 224;
@@ -1091,7 +1091,7 @@
            // btnSavePosition
            // 
            this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSavePosition.Location = new System.Drawing.Point(410, 558);
+            this.btnSavePosition.Location = new System.Drawing.Point(418, 522);
            this.btnSavePosition.Name = "btnSavePosition";
            this.btnSavePosition.Size = new System.Drawing.Size(127, 38);
            this.btnSavePosition.TabIndex = 217;
@@ -1117,7 +1117,7 @@
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(197, 20);
            this.label9.TabIndex = 220;
-            this.label9.Text = "入库间隔仓位：";
+            this.label9.Text = "入库间隔仓位:";
            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // txtJiange
@@ -1135,7 +1135,7 @@
            this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtComP1.Location = new System.Drawing.Point(191, 489);
+            this.txtComP1.Location = new System.Drawing.Point(191, 479);
            this.txtComP1.MaxLength = 0;
            this.txtComP1.Name = "txtComP1";
            this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1150,7 +1150,7 @@
            this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtInOutP2.Location = new System.Drawing.Point(191, 448);
+            this.txtInOutP2.Location = new System.Drawing.Point(191, 438);
            this.txtInOutP2.MaxLength = 0;
            this.txtInOutP2.Name = "txtInOutP2";
            this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1165,7 +1165,7 @@
            this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtInOutP1.Location = new System.Drawing.Point(191, 407);
+            this.txtInOutP1.Location = new System.Drawing.Point(191, 397);
            this.txtInOutP1.MaxLength = 0;
            this.txtInOutP1.Name = "txtInOutP1";
            this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1180,7 +1180,7 @@
            this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtMiddleP1.Location = new System.Drawing.Point(191, 366);
+            this.txtMiddleP1.Location = new System.Drawing.Point(191, 356);
            this.txtMiddleP1.MaxLength = 0;
            this.txtMiddleP1.Name = "txtMiddleP1";
            this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1195,7 +1195,7 @@
            this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP7.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP7.Location = new System.Drawing.Point(191, 285);
+            this.txtUpDownP7.Location = new System.Drawing.Point(191, 275);
            this.txtUpDownP7.MaxLength = 0;
            this.txtUpDownP7.Name = "txtUpDownP7";
            this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1210,7 +1210,7 @@
            this.txtUpDownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP8.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP8.Location = new System.Drawing.Point(191, 325);
+            this.txtUpDownP8.Location = new System.Drawing.Point(191, 315);
            this.txtUpDownP8.MaxLength = 0;
            this.txtUpDownP8.Name = "txtUpDownP8";
            this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1225,7 +1225,7 @@
            this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP1.Location = new System.Drawing.Point(191, 205);
+            this.txtUpDownP1.Location = new System.Drawing.Point(191, 195);
            this.txtUpDownP1.MaxLength = 0;
            this.txtUpDownP1.Name = "txtUpDownP1";
            this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1240,7 +1240,7 @@
            this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP2.Location = new System.Drawing.Point(191, 245);
+            this.txtUpDownP2.Location = new System.Drawing.Point(191, 235);
            this.txtUpDownP2.MaxLength = 0;
            this.txtUpDownP2.Name = "txtUpDownP2";
            this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1255,7 +1255,7 @@
            this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtComP3.Location = new System.Drawing.Point(475, 489);
+            this.txtComP3.Location = new System.Drawing.Point(475, 479);
            this.txtComP3.MaxLength = 0;
            this.txtComP3.Name = "txtComP3";
            this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1270,7 +1270,7 @@
            this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtComP2.Location = new System.Drawing.Point(475, 448);
+            this.txtComP2.Location = new System.Drawing.Point(475, 438);
            this.txtComP2.MaxLength = 0;
            this.txtComP2.Name = "txtComP2";
            this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1285,7 +1285,7 @@
            this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtInOutP3.Location = new System.Drawing.Point(475, 407);
+            this.txtInOutP3.Location = new System.Drawing.Point(475, 397);
            this.txtInOutP3.MaxLength = 0;
            this.txtInOutP3.Name = "txtInOutP3";
            this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1300,7 +1300,7 @@
            this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtMiddleP2.Location = new System.Drawing.Point(475, 366);
+            this.txtMiddleP2.Location = new System.Drawing.Point(475, 356);
            this.txtMiddleP2.MaxLength = 0;
            this.txtMiddleP2.Name = "txtMiddleP2";
            this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1315,7 +1315,7 @@
            this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP5.Location = new System.Drawing.Point(475, 285);
+            this.txtUpDownP5.Location = new System.Drawing.Point(475, 275);
            this.txtUpDownP5.MaxLength = 0;
            this.txtUpDownP5.Name = "txtUpDownP5";
            this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1330,7 +1330,7 @@
            this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP6.Location = new System.Drawing.Point(475, 325);
+            this.txtUpDownP6.Location = new System.Drawing.Point(475, 315);
            this.txtUpDownP6.MaxLength = 0;
            this.txtUpDownP6.Name = "txtUpDownP6";
            this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1362,7 +1362,7 @@
            this.label21.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.label21.Size = new System.Drawing.Size(204, 34);
            this.label21.TabIndex = 172;
-            this.label21.Text = "选择仓位：";
+            this.label21.Text = "选择仓位:";
            this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // txtUpDownP3
@@ -1372,7 +1372,7 @@
            this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP3.Location = new System.Drawing.Point(475, 205);
+            this.txtUpDownP3.Location = new System.Drawing.Point(475, 195);
            this.txtUpDownP3.MaxLength = 0;
            this.txtUpDownP3.Name = "txtUpDownP3";
            this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1409,7 +1409,7 @@
            this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP4.Location = new System.Drawing.Point(475, 245);
+            this.txtUpDownP4.Location = new System.Drawing.Point(475, 235);
            this.txtUpDownP4.MaxLength = 0;
            this.txtUpDownP4.Name = "txtUpDownP4";
            this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1424,12 +1424,12 @@
            this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnComP1.ForeColor = System.Drawing.Color.Purple;
            this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnComP1.Location = new System.Drawing.Point(7, 485);
+            this.btnComP1.Location = new System.Drawing.Point(7, 475);
            this.btnComP1.Name = "btnComP1";
            this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnComP1.Size = new System.Drawing.Size(181, 31);
            this.btnComP1.TabIndex = 213;
-            this.btnComP1.Text = "压紧轴待机点P1：";
+            this.btnComP1.Text = "压紧轴待机点P1:";
            this.btnComP1.UseVisualStyleBackColor = true;
            this.btnComP1.Click += new System.EventHandler(this.btnComP1_Click);
            // 
@@ -1440,12 +1440,12 @@
            this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
            this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnInOutP2.Location = new System.Drawing.Point(7, 444);
+            this.btnInOutP2.Location = new System.Drawing.Point(7, 434);
            this.btnInOutP2.Name = "btnInOutP2";
            this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP2.Size = new System.Drawing.Size(181, 31);
            this.btnInOutP2.TabIndex = 211;
-            this.btnInOutP2.Text = "进出轴取料点P2：";
+            this.btnInOutP2.Text = "进出轴取料点P2:";
            this.btnInOutP2.UseVisualStyleBackColor = true;
            this.btnInOutP2.Click += new System.EventHandler(this.btnInOutP2_Click);
            // 
@@ -1456,12 +1456,12 @@
            this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
            this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnInOutP1.Location = new System.Drawing.Point(7, 403);
+            this.btnInOutP1.Location = new System.Drawing.Point(7, 393);
            this.btnInOutP1.Name = "btnInOutP1";
            this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP1.Size = new System.Drawing.Size(181, 31);
            this.btnInOutP1.TabIndex = 209;
-            this.btnInOutP1.Text = "进出轴待机点P1：";
+            this.btnInOutP1.Text = "进出轴待机点P1:";
            this.btnInOutP1.UseVisualStyleBackColor = true;
            this.btnInOutP1.Click += new System.EventHandler(this.btnInOutP1_Click);
            // 
@@ -1472,12 +1472,12 @@
            this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
            this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnMiddleP1.Location = new System.Drawing.Point(7, 362);
+            this.btnMiddleP1.Location = new System.Drawing.Point(7, 352);
            this.btnMiddleP1.Name = "btnMiddleP1";
            this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnMiddleP1.Size = new System.Drawing.Size(181, 31);
            this.btnMiddleP1.TabIndex = 207;
-            this.btnMiddleP1.Text = "旋转轴待机点P1：";
+            this.btnMiddleP1.Text = "旋转轴待机点P1:";
            this.btnMiddleP1.UseVisualStyleBackColor = true;
            this.btnMiddleP1.Click += new System.EventHandler(this.btnMiddleP1_Click);
            // 
@@ -1488,12 +1488,12 @@
            this.btnUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP7.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP7.Location = new System.Drawing.Point(7, 281);
+            this.btnUpDownP7.Location = new System.Drawing.Point(7, 271);
            this.btnUpDownP7.Name = "btnUpDownP7";
            this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP7.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP7.TabIndex = 203;
-            this.btnUpDownP7.Text = "升降轴取料缓冲点P7：";
+            this.btnUpDownP7.Text = "升降轴取料缓冲点P7:";
            this.btnUpDownP7.UseVisualStyleBackColor = true;
            this.btnUpDownP7.Click += new System.EventHandler(this.btnUpDownP7_Click);
            // 
@@ -1504,12 +1504,12 @@
            this.btnUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP8.Location = new System.Drawing.Point(7, 321);
+            this.btnUpDownP8.Location = new System.Drawing.Point(7, 311);
            this.btnUpDownP8.Name = "btnUpDownP8";
            this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP8.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP8.TabIndex = 205;
-            this.btnUpDownP8.Text = "升降轴出料缓冲点P8：";
+            this.btnUpDownP8.Text = "升降轴出料缓冲点P8:";
            this.btnUpDownP8.UseVisualStyleBackColor = true;
            this.btnUpDownP8.Click += new System.EventHandler(this.btnUpDownP8_Click);
            // 
@@ -1520,12 +1520,12 @@
            this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP1.Location = new System.Drawing.Point(7, 201);
+            this.btnUpDownP1.Location = new System.Drawing.Point(7, 191);
            this.btnUpDownP1.Name = "btnUpDownP1";
            this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP1.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP1.TabIndex = 199;
-            this.btnUpDownP1.Text = "升降轴取料点P1：";
+            this.btnUpDownP1.Text = "升降轴取料点P1:";
            this.btnUpDownP1.UseVisualStyleBackColor = true;
            this.btnUpDownP1.Click += new System.EventHandler(this.btnUpDownP1_Click);
            // 
@@ -1536,12 +1536,12 @@
            this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP2.Location = new System.Drawing.Point(7, 241);
+            this.btnUpDownP2.Location = new System.Drawing.Point(7, 231);
            this.btnUpDownP2.Name = "btnUpDownP2";
            this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP2.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP2.TabIndex = 201;
-            this.btnUpDownP2.Text = "升降轴出料前点P2：";
+            this.btnUpDownP2.Text = "升降轴出料前点P2:";
            this.btnUpDownP2.UseVisualStyleBackColor = true;
            this.btnUpDownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
            // 
@@ -1551,12 +1551,12 @@
            this.btnComP3.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnComP3.ForeColor = System.Drawing.Color.Purple;
-            this.btnComP3.Location = new System.Drawing.Point(291, 485);
+            this.btnComP3.Location = new System.Drawing.Point(291, 475);
            this.btnComP3.Name = "btnComP3";
            this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnComP3.Size = new System.Drawing.Size(181, 31);
            this.btnComP3.TabIndex = 197;
-            this.btnComP3.Text = "压紧轴压紧前点P3：";
+            this.btnComP3.Text = "压紧轴压紧前点P3:";
            this.btnComP3.UseVisualStyleBackColor = true;
            this.btnComP3.Click += new System.EventHandler(this.btnComP3_Click);
            // 
@@ -1566,12 +1566,12 @@
            this.btnComP2.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnComP2.ForeColor = System.Drawing.Color.Purple;
-            this.btnComP2.Location = new System.Drawing.Point(291, 444);
+            this.btnComP2.Location = new System.Drawing.Point(291, 434);
            this.btnComP2.Name = "btnComP2";
            this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnComP2.Size = new System.Drawing.Size(181, 31);
            this.btnComP2.TabIndex = 195;
-            this.btnComP2.Text = "压紧轴压紧点P2：";
+            this.btnComP2.Text = "压紧轴压紧点P2:";
            this.btnComP2.UseVisualStyleBackColor = true;
            this.btnComP2.Click += new System.EventHandler(this.btnComP2_Click);
            // 
@@ -1581,12 +1581,12 @@
            this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
-            this.btnInOutP3.Location = new System.Drawing.Point(291, 403);
+            this.btnInOutP3.Location = new System.Drawing.Point(291, 393);
            this.btnInOutP3.Name = "btnInOutP3";
            this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP3.Size = new System.Drawing.Size(181, 31);
            this.btnInOutP3.TabIndex = 193;
-            this.btnInOutP3.Text = "进出轴取料点P3：";
+            this.btnInOutP3.Text = "进出轴取料点P3:";
            this.btnInOutP3.UseVisualStyleBackColor = true;
            this.btnInOutP3.Click += new System.EventHandler(this.btnInOutP3_Click);
            // 
@@ -1596,12 +1596,12 @@
            this.btnMiddleP2.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.btnMiddleP2.Location = new System.Drawing.Point(291, 362);
+            this.btnMiddleP2.Location = new System.Drawing.Point(291, 352);
            this.btnMiddleP2.Name = "btnMiddleP2";
            this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnMiddleP2.Size = new System.Drawing.Size(181, 31);
            this.btnMiddleP2.TabIndex = 191;
-            this.btnMiddleP2.Text = "旋转轴库位点P2：";
+            this.btnMiddleP2.Text = "旋转轴库位点P2:";
            this.btnMiddleP2.UseVisualStyleBackColor = true;
            this.btnMiddleP2.Click += new System.EventHandler(this.btnMiddleP2_Click);
            // 
@@ -1611,12 +1611,12 @@
            this.btnUpDownP5.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP5.Location = new System.Drawing.Point(291, 281);
+            this.btnUpDownP5.Location = new System.Drawing.Point(291, 271);
            this.btnUpDownP5.Name = "btnUpDownP5";
            this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP5.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP5.TabIndex = 187;
-            this.btnUpDownP5.Text = "升降轴出料前点P5：";
+            this.btnUpDownP5.Text = "升降轴出料前点P5:";
            this.btnUpDownP5.UseVisualStyleBackColor = true;
            this.btnUpDownP5.Click += new System.EventHandler(this.btnUpDownP5_Click);
            // 
@@ -1626,12 +1626,12 @@
            this.btnUpDownP6.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP6.Location = new System.Drawing.Point(291, 321);
+            this.btnUpDownP6.Location = new System.Drawing.Point(291, 311);
            this.btnUpDownP6.Name = "btnUpDownP6";
            this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP6.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP6.TabIndex = 189;
-            this.btnUpDownP6.Text = "升降轴出料缓冲点P6：";
+            this.btnUpDownP6.Text = "升降轴出料缓冲点P6:";
            this.btnUpDownP6.UseVisualStyleBackColor = true;
            this.btnUpDownP6.Click += new System.EventHandler(this.btnUpDownP6_Click);
            // 
@@ -1641,12 +1641,12 @@
            this.btnUpDownP3.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP3.Location = new System.Drawing.Point(291, 201);
+            this.btnUpDownP3.Location = new System.Drawing.Point(291, 191);
            this.btnUpDownP3.Name = "btnUpDownP3";
            this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP3.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP3.TabIndex = 161;
-            this.btnUpDownP3.Text = "升降轴入料前点P3：";
+            this.btnUpDownP3.Text = "升降轴入料前点P3:";
            this.btnUpDownP3.UseVisualStyleBackColor = true;
            this.btnUpDownP3.Click += new System.EventHandler(this.btnUpDownP3_Click);
            // 
@@ -1656,12 +1656,12 @@
            this.btnUpDownP4.Cursor = System.Windows.Forms.Cursors.Default;
            this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP4.Location = new System.Drawing.Point(291, 241);
+            this.btnUpDownP4.Location = new System.Drawing.Point(291, 231);
            this.btnUpDownP4.Name = "btnUpDownP4";
            this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP4.Size = new System.Drawing.Size(181, 31);
            this.btnUpDownP4.TabIndex = 165;
-            this.btnUpDownP4.Text = "升降轴入料缓冲点P4：";
+            this.btnUpDownP4.Text = "升降轴入料缓冲点P4:";
            this.btnUpDownP4.UseVisualStyleBackColor = true;
            this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
            // 
@@ -1809,15 +1809,13 @@
            // toolStripSeparator10
            // 
            this.toolStripSeparator10.Name = "toolStripSeparator10";
-            this.toolStripSeparator10.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
-            this.toolStripSeparator10.Visible = false;
            // 
            // 学习二维码ToolStripMenuItem
            // 
            this.学习二维码ToolStripMenuItem.Name = "学习二维码ToolStripMenuItem";
-            this.学习二维码ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
+            this.学习二维码ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
            this.学习二维码ToolStripMenuItem.Text = "学习二维码";
-            this.学习二维码ToolStripMenuItem.Visible = false;
            this.学习二维码ToolStripMenuItem.Click += new System.EventHandler(this.学习二维码ToolStripMenuItem_Click);
            // 
            // toolStripSeparator5
@@ -1941,7 +1939,6 @@
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
            this.ClientSize = new System.Drawing.Size(1253, 779);
-            this.Controls.Add(this.chbAuto);
            this.Controls.Add(this.groupBox1);
            this.Controls.Add(this.groupBox3);
            this.Controls.Add(this.groupBox5);

--- a/source/ACSingleStore/FrmStoreBox.cs
查看文件 @190c39a
+++ b/source/ACSingleStore/FrmStoreBox.cs
查看文件 @190c39a
@@ -117,7 +117,18 @@ namespace OnlineStore.ACSingleStore
            AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
            AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
+            学习二维码ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
+            toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
+            // richTextBox1.Visible = CurrLanguage.Equals(ResourceCulture.China);
+            if (CurrLanguage.Equals(ResourceCulture.China))
+            {
+                LogUtil.logBox = this.richTextBox1;
+            }
+            else
+            {
+                LogUtil.ClearLog();
+                LogUtil.logBox = null; 
+            }
            ToolStripItemCollection collection = menuStrip1.Items;
            for (int i = 0; i < collection.Count; i++)
            {
@@ -354,6 +365,7 @@ namespace OnlineStore.ACSingleStore
                    lblOutPulse.Text = lblOutPulse1.Text;
                    lblCountPulse.Text = lblCountPulse1.Text;
                }
            }
            if (ACServerManager.ServerOnStatus(store.Config.UpDown_Axis.DeviceName, store.Config.UpDown_Axis.GetAxisValue()))
            {
@@ -500,18 +512,7 @@ namespace OnlineStore.ACSingleStore
                txtAxisDeviceName.Text = SlvAddr.DeviceName;
                txtAxisValue.Text = SlvAddr.GetAxisValue().ToString();
                txtASpeed.Text = SlvAddr.TargetSpeed.ToString();
-                //if (SlvAddr.Equals(store.Config.InOut_Axis))
-                //{
-                //    txtASpeed.Text = store.Config.InOutAxis_P1_Speed.ToString();
-                //}
-                //else if (SlvAddr.Equals(store.Config.Middle_Axis))
-                //{
-                //    txtASpeed.Text = store.Config.MiddleAxis_P1_Speed.ToString();
-                //}
-                //else if (SlvAddr.Equals(store.Config.UpDown_Axis))
-                //{
-                //    txtASpeed.Text = store.Config.UpDownAxis_P1_Speed.ToString();
-                //}
            }
        }
@@ -522,11 +523,7 @@ namespace OnlineStore.ACSingleStore
            short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
            int position = FormUtil.GetIntValue(txtAPosition);
            int speed = FormUtil.GetIntValue(txtASpeed);
-            //if (axisC.PositionIsHasLimit() && (axisC.PositionMin > position || axisC.PositionMax < position))
-            //{
-            //    MessageBox.Show("位置超出" + axisC.Explain + "上下限（" + axisC.PositionMin + "-" + axisC.PositionMax + "）");
-            //    return;
-            //}
            //if (portName.Equals(store.Config.InOut_Axis.DeviceName) && (store.LoacationIsDown().Equals(false)))
            if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.LoacationIsDown().Equals(false)))
            {
@@ -1204,7 +1201,8 @@ namespace OnlineStore.ACSingleStore
            string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName);
            string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
            HDCodeLearnHelper.LoadConfig(nameStr, codeStr);
-            FrmCodeLearn learn = new FrmCodeLearn();
+            //FrmCodeLearn learn = new FrmCodeLearn();
+            FrmCodeDecode learn = new FrmCodeDecode();
            learn.ShowDialog();
            store.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
        }

--- a/source/ACSingleStore/FrmStoreBox.resx
查看文件 @190c39a
+++ b/source/ACSingleStore/FrmStoreBox.resx
查看文件 @190c39a
@@ -1263,7 +1263,7 @@
    <value>107, 16</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>162</value>
+    <value>47</value>
  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>

--- a/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @190c39a
+++ b/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @190c39a
@@ -391,7 +391,7 @@
    <value>lifting axis</value>
  </data>
  <data name="FrmStoreBox_label43_Text" xml:space="preserve">
-    <value>Output impulse valve:</value>
+    <value>Output impulse:</value>
  </data>
  <data name="FrmStoreBox_label42_Text" xml:space="preserve">
    <value>Encoder count:</value>
@@ -448,7 +448,7 @@
    <value>Read position</value>
  </data>
  <data name="FrmStoreBox_label7_Text" xml:space="preserve">
-    <value>Output impulse valve:</value>
+    <value>Output impulse:</value>
  </data>
  <data name="FrmStoreBox_label8_Text" xml:space="preserve">
    <value>Encoder count:</value>
@@ -780,4 +780,37 @@
  <data name="FrmStoreBox_退出ToolStripMenuItem_Text" xml:space="preserve">
    <value>Exit</value>
  </data>
+<data name="FrmCodeDecode_Text xml:space=preserve">    <value>Qr code recognition</value></data>
+<data name="FrmCodeDecode_label4_Text xml:space=preserve">    <value>Parameters of the path</value></data>
+<data name="FrmCodeDecode_chbUseParam_Text xml:space=preserve">    <value>operation parameter</value></data>
+<data name="FrmCodeDecode_btnAn_Text xml:space=preserve">    <value>darken</value></data>
+<data name="FrmCodeDecode_btnLight_Text xml:space=preserve">    <value>brighten</value></data>
+<data name="FrmCodeDecode_label3_Text xml:space=preserve">    <value>Bar code type:</value></data>
+<data name="FrmCodeDecode_label2_Text xml:space=preserve">    <value>Camera list:</value></data>
+<data name="FrmCodeDecode_btnExit_Text xml:space=preserve">    <value>Exit</value></data>
+<data name="FrmCodeDecode_btnCameraImage_Text xml:space=preserve">    <value>camera image</value></data>
+<data name="FrmCodeDecode_lblCount_Text xml:space=preserve">    <value>Barcode number:</value></data>
+<data name="FrmCodeDecode_btnClearLog_Text xml:space=preserve">    <value>Clear log</value></data>
+<data name="FrmCodeDecode_btnDCode_Text xml:space=preserve">    <value>Qr code recognition</value></data>
+<data name="FrmCodeDecode_btnLearn_Text xml:space=preserve">    <value>learn</value></data>
+<data name="FrmCodeDecode_btnbarCode_Text xml:space=preserve">    <value>One dimensional code recognition</value></data>
+<data name="FrmCodeDecode_btnGray_Text xml:space=preserve">    <value>Turning grey</value></data>
+<data name="FrmCodeDecode_btnErZhi_Text xml:space=preserve">    <value>binaryzation </value></data>
+<data name="FrmCodeDecode_btnSelImage_Text xml:space=preserve">    <value>Open local image</value></data>
+<data name="FrmCodeDecode_label1_Text xml:space=preserve">    <value>Image path</value></data>
+<data name="FrmCodeLearn_Text xml:space=preserve">    <value>Bar code parameter learning</value></data>
+<data name="FrmCodeLearn_chbHalcon_Text xml:space=preserve">    <value>Halcon Get photo</value></data>
+<data name="FrmCodeLearn_label4_Text xml:space=preserve">    <value>Image path</value></data>
+<data name="FrmCodeLearn_btnDelOld_Text xml:space=preserve">    <value>Delete old parameter</value></data>
+<data name="FrmCodeLearn_chbUseCamera_Text xml:space=preserve">    <value>camera image</value></data>
+<data name="FrmCodeLearn_btnSelImage_Text xml:space=preserve">    <value>Open local image</value></data>
+<data name="FrmCodeLearn_chbTest_Text xml:space=preserve">    <value>Automatic identification test</value></data>
+<data name="FrmCodeLearn_btnClearLog_Text xml:space=preserve">    <value>Clear log</value></data>
+<data name="FrmCodeLearn_lblCount_Text xml:space=preserve">    <value>Barcode number:</value></data>
+<data name="FrmCodeLearn_label3_Text xml:space=preserve">    <value>Parameters of the path</value></data>
+<data name="FrmCodeLearn_label2_Text xml:space=preserve">    <value>Type:</value></data>
+<data name="FrmCodeLearn_label1_Text xml:space=preserve">    <value>camera:</value></data>
+<data name="FrmCodeLearn_btnExit_Text xml:space=preserve">    <value>Exit</value></data>
+<data name="FrmCodeLearn_btnStop_Text xml:space=preserve">    <value>End of learning</value></data>
+<data name="FrmCodeLearn_btnOpen_Text xml:space=preserve">    <value>start to learn</value></data>
 </root>
\ No newline at end of file
--- a/source/ACSingleStore/Properties/Resource.zh-CN.resx
查看文件 @190c39a
+++ b/source/ACSingleStore/Properties/Resource.zh-CN.resx
查看文件 @190c39a
@@ -151,10 +151,10 @@
    <value>请先输入正确的速度</value>
  </data>
  <data name="AutoOut" xml:space="preserve">
-    <value>自动出库：</value>
+    <value>自动出库:</value>
  </data>
  <data name="AutoIn" xml:space="preserve">
-    <value>自动入库：</value>
+    <value>自动入库:</value>
  </data>
  <data name="AutoEnd" xml:space="preserve">
    <value>自动出入库结束</value>
@@ -253,16 +253,16 @@
    <value>报警</value>
  </data>
  <data name="InStoreError" xml:space="preserve">
-    <value>入库库位格式错误：</value>
+    <value>入库库位格式错误:</value>
  </data>
  <data name="InStoreNoPosition" xml:space="preserve">
-    <value>入库未找到库位：</value>
+    <value>入库未找到库位:</value>
  </data>
  <data name="OutStoreError" xml:space="preserve">
-    <value>出库格式错误：</value>
+    <value>出库格式错误:</value>
  </data>
  <data name="OutStoreNoPosition" xml:space="preserve">
-    <value>出库未找库位：</value>
+    <value>出库未找库位:</value>
  </data>
  <data name="AbsMove" xml:space="preserve">
    <value>绝对运动</value>
@@ -271,10 +271,10 @@
    <value>IO信号等待</value>
  </data>
  <data name="WaitTime" xml:space="preserve">
-    <value>时间等待：</value>
+    <value>时间等待:</value>
  </data>
  <data name="TargetPosition" xml:space="preserve">
-    <value>电缸目标位置：</value>
+    <value>电缸目标位置:</value>
  </data>
  <data name="X01" xml:space="preserve">
    <value>急停</value>
@@ -379,10 +379,10 @@
    <value>轴一：旋转轴</value>
  </data>
  <data name="FrmStoreBox_label38_Text" xml:space="preserve">
-    <value>ALM：</value>
+    <value>ALM:</value>
  </data>
  <data name="FrmStoreBox_label12_Text" xml:space="preserve">
-    <value>出入库目标值：</value>
+    <value>出入库目标值:</value>
  </data>
  <data name="FrmStoreBox_label4_Text" xml:space="preserve">
    <value>轴三：进出轴</value>
@@ -391,10 +391,10 @@
    <value>轴二：上下轴</value>
  </data>
  <data name="FrmStoreBox_label43_Text" xml:space="preserve">
-    <value>输出脉冲值：</value>
+    <value>输出脉冲值:</value>
  </data>
  <data name="FrmStoreBox_label42_Text" xml:space="preserve">
-    <value>编码器计数：</value>
+    <value>编码器计数:</value>
  </data>
  <data name="FrmStoreBox_groupBox3_Text" xml:space="preserve">
    <value>设备状态</value>
@@ -406,7 +406,7 @@
    <value>伺服运动</value>
  </data>
  <data name="FrmStoreBox_label6_Text" xml:space="preserve">
-    <value>原点信号：</value>
+    <value>原点信号:</value>
  </data>
  <data name="FrmStoreBox_label5_Text" xml:space="preserve">
    <value>1=ON，0=OFF</value>
@@ -427,19 +427,19 @@
    <value>1=报警，0=正常</value>
  </data>
  <data name="FrmStoreBox_label11_Text" xml:space="preserve">
-    <value>HOME-CMP状态：</value>
+    <value>HOME-CMP状态:</value>
  </data>
  <data name="FrmStoreBox_button2_Text" xml:space="preserve">
    <value>读HOME状态</value>
  </data>
  <data name="FrmStoreBox_label10_Text" xml:space="preserve">
-    <value>BUSY状态：</value>
+    <value>BUSY状态:</value>
  </data>
  <data name="FrmStoreBox_button1_Text" xml:space="preserve">
    <value>读BUSY状态</value>
  </data>
  <data name="FrmStoreBox_label2_Text" xml:space="preserve">
-    <value>报警状态：</value>
+    <value>报警状态:</value>
  </data>
  <data name="FrmStoreBox_btnGetAlarm_Text" xml:space="preserve">
    <value>读报警状态</value>
@@ -448,10 +448,10 @@
    <value>读取位置</value>
  </data>
  <data name="FrmStoreBox_label7_Text" xml:space="preserve">
-    <value>输出脉冲值：</value>
+    <value>输出脉冲值:</value>
  </data>
  <data name="FrmStoreBox_label8_Text" xml:space="preserve">
-    <value>编码器计数：</value>
+    <value>编码器计数:</value>
  </data>
  <data name="FrmStoreBox_btnOpenAxis_Text" xml:space="preserve">
    <value>打开伺服</value>
@@ -460,7 +460,7 @@
    <value>关闭伺服</value>
  </data>
  <data name="FrmStoreBox_label47_Text" xml:space="preserve">
-    <value>速度：</value>
+    <value>速度:</value>
  </data>
  <data name="FrmStoreBox_btnAxisVMove_Text" xml:space="preserve">
    <value>匀速运动</value>
@@ -481,19 +481,19 @@
    <value>清除报警</value>
  </data>
  <data name="FrmStoreBox_label48_Text" xml:space="preserve">
-    <value>位置：</value>
+    <value>位置:</value>
  </data>
  <data name="FrmStoreBox_btnAxisStop_Text" xml:space="preserve">
    <value> 停止运动</value>
  </data>
  <data name="FrmStoreBox_label45_Text" xml:space="preserve">
-    <value>端口号：</value>
+    <value>端口号:</value>
  </data>
  <data name="FrmStoreBox_label46_Text" xml:space="preserve">
-    <value>伺服地址：</value>
+    <value>伺服地址:</value>
  </data>
  <data name="FrmStoreBox_label49_Text" xml:space="preserve">
-    <value>AC伺服：</value>
+    <value>AC伺服:</value>
  </data>
  <data name="FrmStoreBox_groupBox2_Text" xml:space="preserve">
    <value>料仓操作</value>
@@ -514,10 +514,10 @@
    <value>启动自动模式</value>
  </data>
  <data name="FrmStoreBox_label9_Text" xml:space="preserve">
-    <value>入库间隔仓位：</value>
+    <value>入库间隔仓位:</value>
  </data>
  <data name="FrmStoreBox_label21_Text" xml:space="preserve">
-    <value>选择仓位：</value>
+    <value>选择仓位:</value>
  </data>
  <data name="FrmStoreBox_btnInStore_Text" xml:space="preserve">
    <value>入库测试</value>
@@ -526,52 +526,52 @@
    <value>出库测试</value>
  </data>
  <data name="FrmStoreBox_btnComP1_Text" xml:space="preserve">
-    <value>压紧轴待机点P1：</value>
+    <value>压紧轴待机点P1:</value>
  </data>
  <data name="FrmStoreBox_btnInOutP2_Text" xml:space="preserve">
-    <value>进出轴取料点P2：</value>
+    <value>进出轴取料点P2:</value>
  </data>
  <data name="FrmStoreBox_btnInOutP1_Text" xml:space="preserve">
-    <value>进出轴待机点P1：</value>
+    <value>进出轴待机点P1:</value>
  </data>
  <data name="FrmStoreBox_btnMiddleP1_Text" xml:space="preserve">
-    <value>旋转轴待机点P1：</value>
+    <value>旋转轴待机点P1:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP7_Text" xml:space="preserve">
-    <value>升降轴取料缓冲点P7：</value>
+    <value>升降轴取料缓冲点P7:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP8_Text" xml:space="preserve">
-    <value>升降轴出料缓冲点P8：</value>
+    <value>升降轴出料缓冲点P8:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP1_Text" xml:space="preserve">
-    <value>升降轴取料点P1：</value>
+    <value>升降轴取料点P1:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP2_Text" xml:space="preserve">
-    <value>升降轴出料前点P2：</value>
+    <value>升降轴出料前点P2:</value>
  </data>
  <data name="FrmStoreBox_btnComP3_Text" xml:space="preserve">
-    <value>压紧轴压紧前点P3：</value>
+    <value>压紧轴压紧前点P3:</value>
  </data>
  <data name="FrmStoreBox_btnComP2_Text" xml:space="preserve">
-    <value>压紧轴压紧点P2：</value>
+    <value>压紧轴压紧点P2:</value>
  </data>
  <data name="FrmStoreBox_btnInOutP3_Text" xml:space="preserve">
-    <value>进出轴取料点P3：</value>
+    <value>进出轴取料点P3:</value>
  </data>
  <data name="FrmStoreBox_btnMiddleP2_Text" xml:space="preserve">
-    <value>旋转轴库位点P2：</value>
+    <value>旋转轴库位点P2:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP5_Text" xml:space="preserve">
-    <value>升降轴出料前点P5：</value>
+    <value>升降轴出料前点P5:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP6_Text" xml:space="preserve">
-    <value>升降轴出料缓冲点P6：</value>
+    <value>升降轴出料缓冲点P6:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP3_Text" xml:space="preserve">
-    <value>升降轴入料前点P3：</value>
+    <value>升降轴入料前点P3:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP4_Text" xml:space="preserve">
-    <value>升降轴入料缓冲点P4：</value>
+    <value>升降轴入料缓冲点P4:</value>
  </data>
  <data name="FrmIOStatus_Text" xml:space="preserve">
    <value>IO查看</value>
@@ -634,7 +634,7 @@
    <value>设备IP:</value>
  </data>
  <data name="FrmIOStatus_label14_Text" xml:space="preserve">
-    <value>地址：</value>
+    <value>地址:</value>
  </data>
  <data name="FrmIOStatus_label5_Text" xml:space="preserve">
    <value>定时(ms):</value>
@@ -777,4 +777,42 @@
  <data name="FrmStoreBox_退出ToolStripMenuItem_Text" xml:space="preserve">
    <value>退出系统</value>
  </data>
+  <data name="FrmStoreBox_toolStripMenuItem1_Text" xml:space="preserve">
+    <value>退出</value>
+  </data>
+  <data name="FrmCodeDecode_Text" xml:space="preserve">    <value>二维码识别</value></data>
+  <data name="FrmCodeDecode_label4_Text" xml:space="preserve">    <value>参数路径</value></data>
+  <data name="FrmCodeDecode_chbUseParam_Text" xml:space="preserve">    <value>使用参数</value></data>
+  <data name="FrmCodeDecode_btnAn_Text" xml:space="preserve">    <value>变暗</value></data>
+  <data name="FrmCodeDecode_btnLight_Text" xml:space="preserve">    <value>提亮</value></data>
+  <data name="FrmCodeDecode_label3_Text" xml:space="preserve">    <value>条码类型：</value></data>
+  <data name="FrmCodeDecode_label2_Text" xml:space="preserve">    <value>相机列表：</value></data>
+  <data name="FrmCodeDecode_btnExit_Text" xml:space="preserve">    <value>退出</value></data>
+  <data name="FrmCodeDecode_btnCameraImage_Text" xml:space="preserve">    <value>相机获取图片</value></data>
+  <data name="FrmCodeDecode_lblCount_Text" xml:space="preserve">    <value>条码数量：</value></data>
+  <data name="FrmCodeDecode_btnClearLog_Text" xml:space="preserve">    <value>清理日志</value></data>
+  <data name="FrmCodeDecode_btnDCode_Text" xml:space="preserve">    <value>二维码识别</value></data>
+  <data name="FrmCodeDecode_btnLearn_Text" xml:space="preserve">    <value>学习</value></data>
+  <data name="FrmCodeDecode_btnbarCode_Text" xml:space="preserve">    <value>一维码识别</value></data>
+  <data name="FrmCodeDecode_btnGray_Text" xml:space="preserve">    <value>图像转灰</value></data>
+  <data name="FrmCodeDecode_btnErZhi_Text" xml:space="preserve">    <value>二值化</value></data>
+  <data name="FrmCodeDecode_btnSelImage_Text" xml:space="preserve">    <value>打开本地图片</value></data>
+  <data name="FrmCodeDecode_label1_Text" xml:space="preserve">    <value>图片路径</value></data>
+  <data name="FrmCodeLearn_Text" xml:space="preserve">    <value>条码参数学习</value></data>
+  <data name="FrmCodeLearn_chbHalcon_Text" xml:space="preserve">    <value>Halcon获取图片</value></data>
+  <data name="FrmCodeLearn_label4_Text" xml:space="preserve">    <value>图片路径</value></data>
+  <data name="FrmCodeLearn_btnDelOld_Text" xml:space="preserve">    <value>删除旧参数</value></data>
+  <data name="FrmCodeLearn_chbUseCamera_Text" xml:space="preserve">    <value>相机获取实时图片</value></data>
+  <data name="FrmCodeLearn_btnSelImage_Text" xml:space="preserve">    <value>打开本地图片</value></data>
+  <data name="FrmCodeLearn_chbTest_Text" xml:space="preserve">    <value>学习结束自动识别测试</value></data>
+  <data name="FrmCodeLearn_btnClearLog_Text" xml:space="preserve">    <value>清理日志</value></data>
+  <data name="FrmCodeLearn_lblCount_Text" xml:space="preserve">    <value>条码数量：</value></data>
+  <data name="FrmCodeLearn_label3_Text" xml:space="preserve">    <value>参数路径</value></data>
+  <data name="FrmCodeLearn_label2_Text" xml:space="preserve">    <value>类型：</value></data>
+  <data name="FrmCodeLearn_label1_Text" xml:space="preserve">    <value>相机：</value></data>
+  <data name="FrmCodeLearn_btnExit_Text" xml:space="preserve">    <value>退出</value></data>
+  <data name="FrmCodeLearn_btnStop_Text" xml:space="preserve">    <value>结束学习</value></data>
+  <data name="FrmCodeLearn_btnOpen_Text" xml:space="preserve">    <value>开始学习</value></data>
 </root>
\ No newline at end of file
--- a/source/ACSingleStore/ResourceCulture.cs
查看文件 @190c39a
+++ b/source/ACSingleStore/ResourceCulture.cs
查看文件 @190c39a
@@ -29,7 +29,11 @@ namespace OnlineStore.ACSingleStore
        {
            ResourceControl.GetStrEvent += GetString;
            ResourceControl.GetStringEvent += GetString;
+            CodeLibrary.CodeResourceControl.GetStrEvent += GetString;
+            CodeLibrary.CodeResourceControl.GetStringEvent += GetString;
+            CodeLibrary.CodeResourceControl.GetIdStrEvent += GetTextIdStr;
+            CodeLibrary.CodeResourceControl.GetProStrEvent += GetTextIdStr;
+            CodeLibrary.CodeResourceControl.GetLanguageEvent += GetLanguage;
            //UserFromControl.UserControlResource.GetStrEvent += GetString;
            //UserFromControl.UserControlResource.GetStringEvent += GetString;
            if (string.IsNullOrEmpty(name))
@@ -39,7 +43,10 @@ namespace OnlineStore.ACSingleStore
            CurrLanguage = name;
            Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
        }
+        public static string GetLanguage()
+        {
+            return CurrLanguage;
+        }
        private static  Assembly assembly = Assembly.GetExecutingAssembly();
        public static string GetString(string id,string defaultStr)
        {