Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4fe808a8 由 LN
选项

1

1 个父辈 1cbf2cc2
内嵌 并排
正在显示 85 个修改的文件 包含 515 行增加 和 389 行删除
source/ACSingleStore/FrmIOStatus.Designer.cs
...@@ -102,9 +102,9 @@ ...@@ -102,9 +102,9 @@
this.groupBox1.Controls.Add(this.btnCloseDoor); this.groupBox1.Controls.Add(this.btnCloseDoor);
this.groupBox1.Controls.Add(this.btnOpenDoor); this.groupBox1.Controls.Add(this.btnOpenDoor);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(482, 197); this.groupBox1.Location = new System.Drawing.Point(518, 197);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(332, 357); this.groupBox1.Size = new System.Drawing.Size(332, 366);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
...@@ -112,9 +112,9 @@ ...@@ -112,9 +112,9 @@
// btnCloseLed // btnCloseLed
// //
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(173, 317); this.btnCloseLed.Location = new System.Drawing.Point(168, 317);
this.btnCloseLed.Name = "btnCloseLed"; this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(102, 34); this.btnCloseLed.Size = new System.Drawing.Size(144, 34);
this.btnCloseLed.TabIndex = 256; this.btnCloseLed.TabIndex = 256;
this.btnCloseLed.Text = "关闭照明"; this.btnCloseLed.Text = "关闭照明";
this.btnCloseLed.UseVisualStyleBackColor = true; this.btnCloseLed.UseVisualStyleBackColor = true;
...@@ -122,12 +122,11 @@ ...@@ -122,12 +122,11 @@
// //
// label3 // label3
// //
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(14, 79); this.label3.Location = new System.Drawing.Point(6, 78);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(54, 17); this.label3.Size = new System.Drawing.Size(65, 17);
this.label3.TabIndex = 247; this.label3.TabIndex = 247;
this.label3.Text = "选择DO:"; this.label3.Text = "选择DO:";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -145,9 +144,9 @@ ...@@ -145,9 +144,9 @@
// btnOpenLed // btnOpenLed
// //
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(56, 317); this.btnOpenLed.Location = new System.Drawing.Point(19, 317);
this.btnOpenLed.Name = "btnOpenLed"; this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(102, 34); this.btnOpenLed.Size = new System.Drawing.Size(144, 34);
this.btnOpenLed.TabIndex = 255; this.btnOpenLed.TabIndex = 255;
this.btnOpenLed.Text = "打开照明"; this.btnOpenLed.Text = "打开照明";
this.btnOpenLed.UseVisualStyleBackColor = true; this.btnOpenLed.UseVisualStyleBackColor = true;
...@@ -155,12 +154,11 @@ ...@@ -155,12 +154,11 @@
// //
// label2 // label2
// //
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(181, 51); this.label2.Location = new System.Drawing.Point(155, 51);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(50, 17); this.label2.Size = new System.Drawing.Size(76, 17);
this.label2.TabIndex = 245; this.label2.TabIndex = 245;
this.label2.Text = "SlaveId"; this.label2.Text = "SlaveId";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -188,9 +186,9 @@ ...@@ -188,9 +186,9 @@
// btnCloseAxisBreak // btnCloseAxisBreak
// //
this.btnCloseAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxisBreak.Location = new System.Drawing.Point(173, 283); this.btnCloseAxisBreak.Location = new System.Drawing.Point(168, 283);
this.btnCloseAxisBreak.Name = "btnCloseAxisBreak"; this.btnCloseAxisBreak.Name = "btnCloseAxisBreak";
this.btnCloseAxisBreak.Size = new System.Drawing.Size(102, 34); this.btnCloseAxisBreak.Size = new System.Drawing.Size(144, 34);
this.btnCloseAxisBreak.TabIndex = 253; this.btnCloseAxisBreak.TabIndex = 253;
this.btnCloseAxisBreak.Text = "关闭刹车"; this.btnCloseAxisBreak.Text = "关闭刹车";
this.btnCloseAxisBreak.UseVisualStyleBackColor = true; this.btnCloseAxisBreak.UseVisualStyleBackColor = true;
...@@ -198,12 +196,11 @@ ...@@ -198,12 +196,11 @@
// //
// label17 // label17
// //
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(22, 25); this.label17.Location = new System.Drawing.Point(6, 24);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17); this.label17.Size = new System.Drawing.Size(65, 17);
this.label17.TabIndex = 240; this.label17.TabIndex = 240;
this.label17.Text = "设备IP:"; this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -211,9 +208,9 @@ ...@@ -211,9 +208,9 @@
// btnReadIO // btnReadIO
// //
this.btnReadIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReadIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadIO.Location = new System.Drawing.Point(56, 133); this.btnReadIO.Location = new System.Drawing.Point(19, 133);
this.btnReadIO.Name = "btnReadIO"; this.btnReadIO.Name = "btnReadIO";
this.btnReadIO.Size = new System.Drawing.Size(102, 34); this.btnReadIO.Size = new System.Drawing.Size(144, 34);
this.btnReadIO.TabIndex = 243; this.btnReadIO.TabIndex = 243;
this.btnReadIO.Text = "读取IO状态"; this.btnReadIO.Text = "读取IO状态";
this.btnReadIO.UseVisualStyleBackColor = true; this.btnReadIO.UseVisualStyleBackColor = true;
...@@ -222,9 +219,9 @@ ...@@ -222,9 +219,9 @@
// btnOpenAxisBreak // btnOpenAxisBreak
// //
this.btnOpenAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxisBreak.Location = new System.Drawing.Point(56, 283); this.btnOpenAxisBreak.Location = new System.Drawing.Point(19, 283);
this.btnOpenAxisBreak.Name = "btnOpenAxisBreak"; this.btnOpenAxisBreak.Name = "btnOpenAxisBreak";
this.btnOpenAxisBreak.Size = new System.Drawing.Size(102, 34); this.btnOpenAxisBreak.Size = new System.Drawing.Size(144, 34);
this.btnOpenAxisBreak.TabIndex = 252; this.btnOpenAxisBreak.TabIndex = 252;
this.btnOpenAxisBreak.Text = "打开刹车"; this.btnOpenAxisBreak.Text = "打开刹车";
this.btnOpenAxisBreak.UseVisualStyleBackColor = true; this.btnOpenAxisBreak.UseVisualStyleBackColor = true;
...@@ -232,12 +229,11 @@ ...@@ -232,12 +229,11 @@
// //
// label14 // label14
// //
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(24, 51); this.label14.Location = new System.Drawing.Point(6, 50);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(44, 17); this.label14.Size = new System.Drawing.Size(65, 17);
this.label14.TabIndex = 239; this.label14.TabIndex = 239;
this.label14.Text = "地址："; this.label14.Text = "地址：";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -245,9 +241,9 @@ ...@@ -245,9 +241,9 @@
// btnWriteSingleDO // btnWriteSingleDO
// //
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(173, 133); this.btnWriteSingleDO.Location = new System.Drawing.Point(168, 133);
this.btnWriteSingleDO.Name = "btnWriteSingleDO"; this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(102, 34); this.btnWriteSingleDO.Size = new System.Drawing.Size(144, 34);
this.btnWriteSingleDO.TabIndex = 232; this.btnWriteSingleDO.TabIndex = 232;
this.btnWriteSingleDO.Text = "写入DO"; this.btnWriteSingleDO.Text = "写入DO";
this.btnWriteSingleDO.UseVisualStyleBackColor = true; this.btnWriteSingleDO.UseVisualStyleBackColor = true;
...@@ -265,12 +261,11 @@ ...@@ -265,12 +261,11 @@
// //
// label5 // label5
// //
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(172, 106); this.label5.Location = new System.Drawing.Point(152, 106);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17); this.label5.Size = new System.Drawing.Size(85, 17);
this.label5.TabIndex = 237; this.label5.TabIndex = 237;
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -278,9 +273,9 @@ ...@@ -278,9 +273,9 @@
// btnReadAllDi // btnReadAllDi
// //
this.btnReadAllDi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReadAllDi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDi.Location = new System.Drawing.Point(56, 168); this.btnReadAllDi.Location = new System.Drawing.Point(19, 168);
this.btnReadAllDi.Name = "btnReadAllDi"; this.btnReadAllDi.Name = "btnReadAllDi";
this.btnReadAllDi.Size = new System.Drawing.Size(102, 34); this.btnReadAllDi.Size = new System.Drawing.Size(144, 34);
this.btnReadAllDi.TabIndex = 244; this.btnReadAllDi.TabIndex = 244;
this.btnReadAllDi.Text = "读取所有DI"; this.btnReadAllDi.Text = "读取所有DI";
this.btnReadAllDi.UseVisualStyleBackColor = true; this.btnReadAllDi.UseVisualStyleBackColor = true;
...@@ -303,12 +298,11 @@ ...@@ -303,12 +298,11 @@
// //
// label6 // label6
// //
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(21, 106); this.label6.Location = new System.Drawing.Point(6, 105);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 17); this.label6.Size = new System.Drawing.Size(65, 17);
this.label6.TabIndex = 235; this.label6.TabIndex = 235;
this.label6.Text = "写入值:"; this.label6.Text = "写入值:";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -316,9 +310,9 @@ ...@@ -316,9 +310,9 @@
// btnReadAllDo // btnReadAllDo
// //
this.btnReadAllDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReadAllDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDo.Location = new System.Drawing.Point(173, 168); this.btnReadAllDo.Location = new System.Drawing.Point(168, 168);
this.btnReadAllDo.Name = "btnReadAllDo"; this.btnReadAllDo.Name = "btnReadAllDo";
this.btnReadAllDo.Size = new System.Drawing.Size(102, 34); this.btnReadAllDo.Size = new System.Drawing.Size(144, 34);
this.btnReadAllDo.TabIndex = 245; this.btnReadAllDo.TabIndex = 245;
this.btnReadAllDo.Text = "读取所有DO"; this.btnReadAllDo.Text = "读取所有DO";
this.btnReadAllDo.UseVisualStyleBackColor = true; this.btnReadAllDo.UseVisualStyleBackColor = true;
...@@ -342,9 +336,9 @@ ...@@ -342,9 +336,9 @@
// btnCloseDoor // btnCloseDoor
// //
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(173, 213); this.btnCloseDoor.Location = new System.Drawing.Point(168, 213);
this.btnCloseDoor.Name = "btnCloseDoor"; this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(102, 34); this.btnCloseDoor.Size = new System.Drawing.Size(144, 34);
this.btnCloseDoor.TabIndex = 249; this.btnCloseDoor.TabIndex = 249;
this.btnCloseDoor.Text = "关闭仓门"; this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = true; this.btnCloseDoor.UseVisualStyleBackColor = true;
...@@ -353,9 +347,9 @@ ...@@ -353,9 +347,9 @@
// btnOpenDoor // btnOpenDoor
// //
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(56, 213); this.btnOpenDoor.Location = new System.Drawing.Point(19, 213);
this.btnOpenDoor.Name = "btnOpenDoor"; this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(102, 34); this.btnOpenDoor.Size = new System.Drawing.Size(144, 34);
this.btnOpenDoor.TabIndex = 248; this.btnOpenDoor.TabIndex = 248;
this.btnOpenDoor.Text = "打开仓门"; this.btnOpenDoor.Text = "打开仓门";
this.btnOpenDoor.UseVisualStyleBackColor = true; this.btnOpenDoor.UseVisualStyleBackColor = true;
...@@ -364,9 +358,9 @@ ...@@ -364,9 +358,9 @@
// button1 // button1
// //
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.Location = new System.Drawing.Point(683, 563); this.button1.Location = new System.Drawing.Point(686, 569);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37); this.button1.Size = new System.Drawing.Size(144, 34);
this.button1.TabIndex = 254; this.button1.TabIndex = 254;
this.button1.Text = "关闭"; this.button1.Text = "关闭";
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
...@@ -379,7 +373,7 @@ ...@@ -379,7 +373,7 @@
this.chbAutoRead.Checked = true; this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(499, 568); this.chbAutoRead.Location = new System.Drawing.Point(588, 577);
this.chbAutoRead.Name = "chbAutoRead"; this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21); this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244; this.chbAutoRead.TabIndex = 244;
...@@ -391,9 +385,9 @@ ...@@ -391,9 +385,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(247, 8); this.groupBox4.Location = new System.Drawing.Point(269, 8);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(229, 594); this.groupBox4.Size = new System.Drawing.Size(252, 603);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -410,7 +404,7 @@ ...@@ -410,7 +404,7 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 574); this.tableLayoutPanel2.Size = new System.Drawing.Size(241, 583);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -420,7 +414,7 @@ ...@@ -420,7 +414,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(12, 8); this.groupBox3.Location = new System.Drawing.Point(12, 8);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(229, 594); this.groupBox3.Size = new System.Drawing.Size(252, 603);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -437,7 +431,7 @@ ...@@ -437,7 +431,7 @@
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 574); this.tableLayoutPanel1.Size = new System.Drawing.Size(241, 583);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox2 // groupBox2
...@@ -459,7 +453,7 @@ ...@@ -459,7 +453,7 @@
this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.txtAI1); this.groupBox2.Controls.Add(this.txtAI1);
this.groupBox2.Controls.Add(this.label1); this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Location = new System.Drawing.Point(482, 8); this.groupBox2.Location = new System.Drawing.Point(518, 8);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(332, 189); this.groupBox2.Size = new System.Drawing.Size(332, 189);
this.groupBox2.TabIndex = 245; this.groupBox2.TabIndex = 245;
...@@ -504,21 +498,20 @@ ...@@ -504,21 +498,20 @@
// //
this.txtSize.Enabled = false; this.txtSize.Enabled = false;
this.txtSize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSize.Location = new System.Drawing.Point(253, 156); this.txtSize.Location = new System.Drawing.Point(289, 156);
this.txtSize.MaxLength = 10; this.txtSize.MaxLength = 10;
this.txtSize.Name = "txtSize"; this.txtSize.Name = "txtSize";
this.txtSize.Size = new System.Drawing.Size(71, 23); this.txtSize.Size = new System.Drawing.Size(35, 23);
this.txtSize.TabIndex = 256; this.txtSize.TabIndex = 256;
this.txtSize.Text = "0"; this.txtSize.Text = "0";
// //
// label10 // label10
// //
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label10.Location = new System.Drawing.Point(179, 159); this.label10.Location = new System.Drawing.Point(169, 159);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(68, 17); this.label10.Size = new System.Drawing.Size(115, 17);
this.label10.TabIndex = 255; this.label10.TabIndex = 255;
this.label10.Text = "料盘尺寸："; this.label10.Text = "料盘尺寸：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -527,21 +520,20 @@ ...@@ -527,21 +520,20 @@
// //
this.txtHeight.Enabled = false; this.txtHeight.Enabled = false;
this.txtHeight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHeight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHeight.Location = new System.Drawing.Point(89, 156); this.txtHeight.Location = new System.Drawing.Point(118, 156);
this.txtHeight.MaxLength = 10; this.txtHeight.MaxLength = 10;
this.txtHeight.Name = "txtHeight"; this.txtHeight.Name = "txtHeight";
this.txtHeight.Size = new System.Drawing.Size(71, 23); this.txtHeight.Size = new System.Drawing.Size(35, 23);
this.txtHeight.TabIndex = 254; this.txtHeight.TabIndex = 254;
this.txtHeight.Text = "0"; this.txtHeight.Text = "0";
// //
// label9 // label9
// //
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label9.Location = new System.Drawing.Point(15, 159); this.label9.Location = new System.Drawing.Point(0, 159);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(68, 17); this.label9.Size = new System.Drawing.Size(115, 17);
this.label9.TabIndex = 253; this.label9.TabIndex = 253;
this.label9.Text = "料盘高度："; this.label9.Text = "料盘高度：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -664,7 +656,7 @@ ...@@ -664,7 +656,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(829, 612); this.ClientSize = new System.Drawing.Size(882, 621);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
......
source/ACSingleStore/FrmIOStatus.cs
...@@ -51,7 +51,7 @@ namespace OnlineStore.ACSingleStore ...@@ -51,7 +51,7 @@ namespace OnlineStore.ACSingleStore
{ {
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(); IOTextControl control = new IOTextControl();
control.IOName = ioValue.ElectricalDefinition + "_" + ioValue.Explain; control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain);
control.IOValue = 0; control.IOValue = 0;
control.isCanClick = false; control.isCanClick = false;
control.Name = "IO_" + ioValue.ProName; control.Name = "IO_" + ioValue.ProName;
...@@ -69,7 +69,7 @@ namespace OnlineStore.ACSingleStore ...@@ -69,7 +69,7 @@ namespace OnlineStore.ACSingleStore
{ {
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(); IOTextControl control = new IOTextControl();
control.IOName = ioValue.ElectricalDefinition + "_" + ioValue.Explain; control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain);
control.IOValue = 0; control.IOValue = 0;
control.isCanClick = true; control.isCanClick = true;
//control.Location = new System.Drawing.Point(0, 25*roleindex); //control.Location = new System.Drawing.Point(0, 25*roleindex);
......
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
this.txtUpDownP5 = new System.Windows.Forms.TextBox(); this.txtUpDownP5 = new System.Windows.Forms.TextBox();
this.txtUpDownP6 = new System.Windows.Forms.TextBox(); this.txtUpDownP6 = new System.Windows.Forms.TextBox();
this.cmbPosition = new System.Windows.Forms.ComboBox(); this.cmbPosition = new System.Windows.Forms.ComboBox();
this.label21 = new System.Windows.Forms.Label();
this.txtUpDownP3 = new System.Windows.Forms.TextBox(); this.txtUpDownP3 = new System.Windows.Forms.TextBox();
this.btnInStore = new System.Windows.Forms.Button(); this.btnInStore = new System.Windows.Forms.Button();
this.btnOutStore = new System.Windows.Forms.Button(); this.btnOutStore = new System.Windows.Forms.Button();
...@@ -233,7 +232,7 @@ ...@@ -233,7 +232,7 @@
this.tabControl2.Location = new System.Drawing.Point(6, 4); this.tabControl2.Location = new System.Drawing.Point(6, 4);
this.tabControl2.Name = "tabControl2"; this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0; this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(1080, 80); this.tabControl2.Size = new System.Drawing.Size(1091, 80);
this.tabControl2.TabIndex = 271; this.tabControl2.TabIndex = 271;
// //
// tabPage4 // tabPage4
...@@ -248,7 +247,7 @@ ...@@ -248,7 +247,7 @@
this.tabPage4.Location = new System.Drawing.Point(4, 29); this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3); this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(1072, 47); this.tabPage4.Size = new System.Drawing.Size(1083, 47);
this.tabPage4.TabIndex = 0; this.tabPage4.TabIndex = 0;
this.tabPage4.Text = " 料仓操作 "; this.tabPage4.Text = " 料仓操作 ";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
...@@ -258,7 +257,7 @@ ...@@ -258,7 +257,7 @@
this.chbBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbBuzzer.AutoSize = true; this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(694, 13); this.chbBuzzer.Location = new System.Drawing.Point(736, 13);
this.chbBuzzer.Name = "chbBuzzer"; this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24); this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 271; this.chbBuzzer.TabIndex = 271;
...@@ -269,9 +268,10 @@ ...@@ -269,9 +268,10 @@
// btnStoreExit // btnStoreExit
// //
this.btnStoreExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStoreExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreExit.Location = new System.Drawing.Point(541, 4); this.btnStoreExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreExit.Location = new System.Drawing.Point(541, 1);
this.btnStoreExit.Name = "btnStoreExit"; this.btnStoreExit.Name = "btnStoreExit";
this.btnStoreExit.Size = new System.Drawing.Size(132, 39); this.btnStoreExit.Size = new System.Drawing.Size(132, 45);
this.btnStoreExit.TabIndex = 4; this.btnStoreExit.TabIndex = 4;
this.btnStoreExit.Text = "退出系统"; this.btnStoreExit.Text = "退出系统";
this.btnStoreExit.UseVisualStyleBackColor = true; this.btnStoreExit.UseVisualStyleBackColor = true;
...@@ -280,9 +280,10 @@ ...@@ -280,9 +280,10 @@
// btnStoreHome // btnStoreHome
// //
this.btnStoreHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStoreHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreHome.Location = new System.Drawing.Point(406, 4); this.btnStoreHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreHome.Location = new System.Drawing.Point(406, 1);
this.btnStoreHome.Name = "btnStoreHome"; this.btnStoreHome.Name = "btnStoreHome";
this.btnStoreHome.Size = new System.Drawing.Size(132, 39); this.btnStoreHome.Size = new System.Drawing.Size(132, 45);
this.btnStoreHome.TabIndex = 3; this.btnStoreHome.TabIndex = 3;
this.btnStoreHome.Text = "回待机位"; this.btnStoreHome.Text = "回待机位";
this.btnStoreHome.UseVisualStyleBackColor = true; this.btnStoreHome.UseVisualStyleBackColor = true;
...@@ -293,7 +294,7 @@ ...@@ -293,7 +294,7 @@
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbAuto.AutoSize = true; this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(817, 13); this.chbAuto.Location = new System.Drawing.Point(890, 13);
this.chbAuto.Name = "chbAuto"; this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24); this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270; this.chbAuto.TabIndex = 270;
...@@ -304,9 +305,10 @@ ...@@ -304,9 +305,10 @@
// btnSotreReset // btnSotreReset
// //
this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSotreReset.Location = new System.Drawing.Point(273, 4); this.btnSotreReset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSotreReset.Location = new System.Drawing.Point(273, 1);
this.btnSotreReset.Name = "btnSotreReset"; this.btnSotreReset.Name = "btnSotreReset";
this.btnSotreReset.Size = new System.Drawing.Size(132, 39); this.btnSotreReset.Size = new System.Drawing.Size(132, 45);
this.btnSotreReset.TabIndex = 2; this.btnSotreReset.TabIndex = 2;
this.btnSotreReset.Text = "复位"; this.btnSotreReset.Text = "复位";
this.btnSotreReset.UseVisualStyleBackColor = true; this.btnSotreReset.UseVisualStyleBackColor = true;
...@@ -315,9 +317,10 @@ ...@@ -315,9 +317,10 @@
// btnStoreStop // btnStoreStop
// //
this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStop.Location = new System.Drawing.Point(140, 4); this.btnStoreStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreStop.Location = new System.Drawing.Point(140, 1);
this.btnStoreStop.Name = "btnStoreStop"; this.btnStoreStop.Name = "btnStoreStop";
this.btnStoreStop.Size = new System.Drawing.Size(132, 39); this.btnStoreStop.Size = new System.Drawing.Size(132, 45);
this.btnStoreStop.TabIndex = 1; this.btnStoreStop.TabIndex = 1;
this.btnStoreStop.Text = "停止"; this.btnStoreStop.Text = "停止";
this.btnStoreStop.UseVisualStyleBackColor = true; this.btnStoreStop.UseVisualStyleBackColor = true;
...@@ -326,9 +329,10 @@ ...@@ -326,9 +329,10 @@
// btnStoreStart // btnStoreStart
// //
this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStart.Location = new System.Drawing.Point(7, 4); this.btnStoreStart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreStart.Location = new System.Drawing.Point(7, 1);
this.btnStoreStart.Name = "btnStoreStart"; this.btnStoreStart.Name = "btnStoreStart";
this.btnStoreStart.Size = new System.Drawing.Size(132, 39); this.btnStoreStart.Size = new System.Drawing.Size(132, 45);
this.btnStoreStart.TabIndex = 0; this.btnStoreStart.TabIndex = 0;
this.btnStoreStart.Text = "启动"; this.btnStoreStart.Text = "启动";
this.btnStoreStart.UseVisualStyleBackColor = true; this.btnStoreStart.UseVisualStyleBackColor = true;
...@@ -343,10 +347,10 @@ ...@@ -343,10 +347,10 @@
this.tabPage5.Controls.Add(this.btnScanCode); this.tabPage5.Controls.Add(this.btnScanCode);
this.tabPage5.Controls.Add(this.btnAxisP); this.tabPage5.Controls.Add(this.btnAxisP);
this.tabPage5.Controls.Add(this.btnIO); this.tabPage5.Controls.Add(this.btnIO);
this.tabPage5.Location = new System.Drawing.Point(4, 30); this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5"; this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3); this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(1072, 46); this.tabPage5.Size = new System.Drawing.Size(1083, 47);
this.tabPage5.TabIndex = 1; this.tabPage5.TabIndex = 1;
this.tabPage5.Text = " 设备调试 "; this.tabPage5.Text = " 设备调试 ";
this.tabPage5.UseVisualStyleBackColor = true; this.tabPage5.UseVisualStyleBackColor = true;
...@@ -354,9 +358,10 @@ ...@@ -354,9 +358,10 @@
// btnUpdown // btnUpdown
// //
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Location = new System.Drawing.Point(672, 4); this.btnUpdown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdown.Location = new System.Drawing.Point(672, 0);
this.btnUpdown.Name = "btnUpdown"; this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(132, 39); this.btnUpdown.Size = new System.Drawing.Size(132, 45);
this.btnUpdown.TabIndex = 272; this.btnUpdown.TabIndex = 272;
this.btnUpdown.Text = "升降轴位置调试"; this.btnUpdown.Text = "升降轴位置调试";
this.btnUpdown.UseVisualStyleBackColor = true; this.btnUpdown.UseVisualStyleBackColor = true;
...@@ -365,9 +370,10 @@ ...@@ -365,9 +370,10 @@
// btnDebug // btnDebug
// //
this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDebug.Location = new System.Drawing.Point(806, 4); this.btnDebug.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDebug.Location = new System.Drawing.Point(806, 0);
this.btnDebug.Name = "btnDebug"; this.btnDebug.Name = "btnDebug";
this.btnDebug.Size = new System.Drawing.Size(132, 39); this.btnDebug.Size = new System.Drawing.Size(132, 45);
this.btnDebug.TabIndex = 12; this.btnDebug.TabIndex = 12;
this.btnDebug.Text = "启用调试"; this.btnDebug.Text = "启用调试";
this.btnDebug.UseVisualStyleBackColor = true; this.btnDebug.UseVisualStyleBackColor = true;
...@@ -376,9 +382,10 @@ ...@@ -376,9 +382,10 @@
// btnAxisOff // btnAxisOff
// //
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(539, 4); this.btnAxisOff.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOff.Location = new System.Drawing.Point(539, 0);
this.btnAxisOff.Name = "btnAxisOff"; this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(132, 39); this.btnAxisOff.Size = new System.Drawing.Size(132, 45);
this.btnAxisOff.TabIndex = 11; this.btnAxisOff.TabIndex = 11;
this.btnAxisOff.Text = "料仓运转OFF"; this.btnAxisOff.Text = "料仓运转OFF";
this.btnAxisOff.UseVisualStyleBackColor = true; this.btnAxisOff.UseVisualStyleBackColor = true;
...@@ -387,9 +394,10 @@ ...@@ -387,9 +394,10 @@
// btnAxisOn // btnAxisOn
// //
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(406, 4); this.btnAxisOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOn.Location = new System.Drawing.Point(406, 0);
this.btnAxisOn.Name = "btnAxisOn"; this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(132, 39); this.btnAxisOn.Size = new System.Drawing.Size(132, 45);
this.btnAxisOn.TabIndex = 10; this.btnAxisOn.TabIndex = 10;
this.btnAxisOn.Text = "料仓运转ON"; this.btnAxisOn.Text = "料仓运转ON";
this.btnAxisOn.UseVisualStyleBackColor = true; this.btnAxisOn.UseVisualStyleBackColor = true;
...@@ -398,9 +406,10 @@ ...@@ -398,9 +406,10 @@
// btnScanCode // btnScanCode
// //
this.btnScanCode.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnScanCode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScanCode.Location = new System.Drawing.Point(140, 4); this.btnScanCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnScanCode.Location = new System.Drawing.Point(140, 0);
this.btnScanCode.Name = "btnScanCode"; this.btnScanCode.Name = "btnScanCode";
this.btnScanCode.Size = new System.Drawing.Size(132, 39); this.btnScanCode.Size = new System.Drawing.Size(132, 45);
this.btnScanCode.TabIndex = 9; this.btnScanCode.TabIndex = 9;
this.btnScanCode.Text = "扫码测试"; this.btnScanCode.Text = "扫码测试";
this.btnScanCode.UseVisualStyleBackColor = true; this.btnScanCode.UseVisualStyleBackColor = true;
...@@ -409,9 +418,10 @@ ...@@ -409,9 +418,10 @@
// btnAxisP // btnAxisP
// //
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Location = new System.Drawing.Point(273, 4); this.btnAxisP.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisP.Location = new System.Drawing.Point(273, 0);
this.btnAxisP.Name = "btnAxisP"; this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(132, 39); this.btnAxisP.Size = new System.Drawing.Size(132, 45);
this.btnAxisP.TabIndex = 8; this.btnAxisP.TabIndex = 8;
this.btnAxisP.Text = "轴卡点动"; this.btnAxisP.Text = "轴卡点动";
this.btnAxisP.UseVisualStyleBackColor = true; this.btnAxisP.UseVisualStyleBackColor = true;
...@@ -420,9 +430,10 @@ ...@@ -420,9 +430,10 @@
// btnIO // btnIO
// //
this.btnIO.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnIO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIO.Location = new System.Drawing.Point(7, 4); this.btnIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnIO.Location = new System.Drawing.Point(7, 0);
this.btnIO.Name = "btnIO"; this.btnIO.Name = "btnIO";
this.btnIO.Size = new System.Drawing.Size(132, 39); this.btnIO.Size = new System.Drawing.Size(132, 45);
this.btnIO.TabIndex = 5; this.btnIO.TabIndex = 5;
this.btnIO.Text = "查看IO"; this.btnIO.Text = "查看IO";
this.btnIO.UseVisualStyleBackColor = true; this.btnIO.UseVisualStyleBackColor = true;
...@@ -434,9 +445,9 @@ ...@@ -434,9 +445,9 @@
this.tabPage6.Controls.Add(this.button4); this.tabPage6.Controls.Add(this.button4);
this.tabPage6.Controls.Add(this.btnClearL); this.tabPage6.Controls.Add(this.btnClearL);
this.tabPage6.Controls.Add(this.btnLogDebug); this.tabPage6.Controls.Add(this.btnLogDebug);
this.tabPage6.Location = new System.Drawing.Point(4, 30); this.tabPage6.Location = new System.Drawing.Point(4, 29);
this.tabPage6.Name = "tabPage6"; this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(1072, 46); this.tabPage6.Size = new System.Drawing.Size(1083, 47);
this.tabPage6.TabIndex = 2; this.tabPage6.TabIndex = 2;
this.tabPage6.Text = " 其他 "; this.tabPage6.Text = " 其他 ";
this.tabPage6.UseVisualStyleBackColor = true; this.tabPage6.UseVisualStyleBackColor = true;
...@@ -444,9 +455,10 @@ ...@@ -444,9 +455,10 @@
// btnLan // btnLan
// //
this.btnLan.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLan.Location = new System.Drawing.Point(4, 3); this.btnLan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLan.Location = new System.Drawing.Point(4, 1);
this.btnLan.Name = "btnLan"; this.btnLan.Name = "btnLan";
this.btnLan.Size = new System.Drawing.Size(132, 39); this.btnLan.Size = new System.Drawing.Size(132, 45);
this.btnLan.TabIndex = 225; this.btnLan.TabIndex = 225;
this.btnLan.Text = "语言"; this.btnLan.Text = "语言";
this.btnLan.UseVisualStyleBackColor = true; this.btnLan.UseVisualStyleBackColor = true;
...@@ -455,9 +467,10 @@ ...@@ -455,9 +467,10 @@
// button4 // button4
// //
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Location = new System.Drawing.Point(403, 3); this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(403, 1);
this.button4.Name = "button4"; this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(132, 39); this.button4.Size = new System.Drawing.Size(132, 45);
this.button4.TabIndex = 15; this.button4.TabIndex = 15;
this.button4.Text = "关于软件"; this.button4.Text = "关于软件";
this.button4.UseVisualStyleBackColor = true; this.button4.UseVisualStyleBackColor = true;
...@@ -466,9 +479,10 @@ ...@@ -466,9 +479,10 @@
// btnClearL // btnClearL
// //
this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearL.Location = new System.Drawing.Point(270, 3); this.btnClearL.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearL.Location = new System.Drawing.Point(270, 1);
this.btnClearL.Name = "btnClearL"; this.btnClearL.Name = "btnClearL";
this.btnClearL.Size = new System.Drawing.Size(132, 39); this.btnClearL.Size = new System.Drawing.Size(132, 45);
this.btnClearL.TabIndex = 14; this.btnClearL.TabIndex = 14;
this.btnClearL.Text = "清理日志"; this.btnClearL.Text = "清理日志";
this.btnClearL.UseVisualStyleBackColor = true; this.btnClearL.UseVisualStyleBackColor = true;
...@@ -477,9 +491,10 @@ ...@@ -477,9 +491,10 @@
// btnLogDebug // btnLogDebug
// //
this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLogDebug.Location = new System.Drawing.Point(137, 3); this.btnLogDebug.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLogDebug.Location = new System.Drawing.Point(137, 1);
this.btnLogDebug.Name = "btnLogDebug"; this.btnLogDebug.Name = "btnLogDebug";
this.btnLogDebug.Size = new System.Drawing.Size(132, 39); this.btnLogDebug.Size = new System.Drawing.Size(132, 45);
this.btnLogDebug.TabIndex = 13; this.btnLogDebug.TabIndex = 13;
this.btnLogDebug.Text = "开启DEBUG"; this.btnLogDebug.Text = "开启DEBUG";
this.btnLogDebug.UseVisualStyleBackColor = true; this.btnLogDebug.UseVisualStyleBackColor = true;
...@@ -493,10 +508,10 @@ ...@@ -493,10 +508,10 @@
this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(509, 89); this.tabControl1.Location = new System.Drawing.Point(542, 89);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(580, 649); this.tabControl1.Size = new System.Drawing.Size(555, 651);
this.tabControl1.TabIndex = 272; this.tabControl1.TabIndex = 272;
// //
// tabPage3 // tabPage3
...@@ -509,7 +524,7 @@ ...@@ -509,7 +524,7 @@
this.tabPage3.Controls.Add(this.richTextBox1); this.tabPage3.Controls.Add(this.richTextBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 29); this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(572, 616); this.tabPage3.Size = new System.Drawing.Size(547, 618);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 操作日志 "; this.tabPage3.Text = " 操作日志 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -518,9 +533,9 @@ ...@@ -518,9 +533,9 @@
// //
this.btnCloseLed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCloseLed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(149, 514); this.btnCloseLed.Location = new System.Drawing.Point(149, 516);
this.btnCloseLed.Name = "btnCloseLed"; this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(105, 38); this.btnCloseLed.Size = new System.Drawing.Size(117, 38);
this.btnCloseLed.TabIndex = 260; this.btnCloseLed.TabIndex = 260;
this.btnCloseLed.Text = "关闭照明"; this.btnCloseLed.Text = "关闭照明";
this.btnCloseLed.UseVisualStyleBackColor = true; this.btnCloseLed.UseVisualStyleBackColor = true;
...@@ -530,9 +545,9 @@ ...@@ -530,9 +545,9 @@
// //
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(313, 461); this.btnClearLog.Location = new System.Drawing.Point(313, 463);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 38); this.btnClearLog.Size = new System.Drawing.Size(117, 38);
this.btnClearLog.TabIndex = 224; this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志"; this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = true; this.btnClearLog.UseVisualStyleBackColor = true;
...@@ -542,9 +557,9 @@ ...@@ -542,9 +557,9 @@
// //
this.btnOpenLed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnOpenLed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(32, 514); this.btnOpenLed.Location = new System.Drawing.Point(32, 516);
this.btnOpenLed.Name = "btnOpenLed"; this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(105, 38); this.btnOpenLed.Size = new System.Drawing.Size(117, 38);
this.btnOpenLed.TabIndex = 259; this.btnOpenLed.TabIndex = 259;
this.btnOpenLed.Text = "打开照明"; this.btnOpenLed.Text = "打开照明";
this.btnOpenLed.UseVisualStyleBackColor = true; this.btnOpenLed.UseVisualStyleBackColor = true;
...@@ -554,9 +569,9 @@ ...@@ -554,9 +569,9 @@
// //
this.btnCloseDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCloseDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(149, 461); this.btnCloseDoor.Location = new System.Drawing.Point(149, 463);
this.btnCloseDoor.Name = "btnCloseDoor"; this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(105, 38); this.btnCloseDoor.Size = new System.Drawing.Size(117, 38);
this.btnCloseDoor.TabIndex = 258; this.btnCloseDoor.TabIndex = 258;
this.btnCloseDoor.Text = "关闭仓门"; this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = true; this.btnCloseDoor.UseVisualStyleBackColor = true;
...@@ -566,9 +581,9 @@ ...@@ -566,9 +581,9 @@
// //
this.btnOpenDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnOpenDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(32, 461); this.btnOpenDoor.Location = new System.Drawing.Point(32, 463);
this.btnOpenDoor.Name = "btnOpenDoor"; this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(105, 38); this.btnOpenDoor.Size = new System.Drawing.Size(117, 38);
this.btnOpenDoor.TabIndex = 257; this.btnOpenDoor.TabIndex = 257;
this.btnOpenDoor.Text = "打开仓门"; this.btnOpenDoor.Text = "打开仓门";
this.btnOpenDoor.UseVisualStyleBackColor = true; this.btnOpenDoor.UseVisualStyleBackColor = true;
...@@ -582,7 +597,7 @@ ...@@ -582,7 +597,7 @@
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(7, 9); this.richTextBox1.Location = new System.Drawing.Point(7, 9);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(545, 427); this.richTextBox1.Size = new System.Drawing.Size(553, 429);
this.richTextBox1.TabIndex = 256; this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = ""; this.richTextBox1.Text = "";
// //
...@@ -592,16 +607,16 @@ ...@@ -592,16 +607,16 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(572, 616); this.tabPage1.Size = new System.Drawing.Size(547, 618);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 "; this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Location = new System.Drawing.Point(7, 8); this.axisMoveControl1.Location = new System.Drawing.Point(4, 8);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(564, 529); this.axisMoveControl1.Size = new System.Drawing.Size(540, 529);
this.axisMoveControl1.TabIndex = 0; this.axisMoveControl1.TabIndex = 0;
// //
// tabPage2 // tabPage2
...@@ -611,7 +626,7 @@ ...@@ -611,7 +626,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(572, 616); this.tabPage2.Size = new System.Drawing.Size(547, 618);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 压紧轴/温湿度 "; this.tabPage2.Text = " 压紧轴/温湿度 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -866,7 +881,7 @@ ...@@ -866,7 +881,7 @@
// txtHum // txtHum
// //
this.txtHum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHum.Location = new System.Drawing.Point(95, 86); this.txtHum.Location = new System.Drawing.Point(109, 86);
this.txtHum.MaxLength = 10; this.txtHum.MaxLength = 10;
this.txtHum.Name = "txtHum"; this.txtHum.Name = "txtHum";
this.txtHum.Size = new System.Drawing.Size(87, 26); this.txtHum.Size = new System.Drawing.Size(87, 26);
...@@ -875,12 +890,11 @@ ...@@ -875,12 +890,11 @@
// //
// label29 // label29
// //
this.label29.AutoSize = true;
this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label29.Location = new System.Drawing.Point(38, 89); this.label29.Location = new System.Drawing.Point(4, 89);
this.label29.Name = "label29"; this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(44, 17); this.label29.Size = new System.Drawing.Size(102, 17);
this.label29.TabIndex = 246; this.label29.TabIndex = 246;
this.label29.Text = "湿度："; this.label29.Text = "湿度：";
this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -888,7 +902,7 @@ ...@@ -888,7 +902,7 @@
// txtTemp // txtTemp
// //
this.txtTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTemp.Location = new System.Drawing.Point(95, 55); this.txtTemp.Location = new System.Drawing.Point(109, 55);
this.txtTemp.MaxLength = 10; this.txtTemp.MaxLength = 10;
this.txtTemp.Name = "txtTemp"; this.txtTemp.Name = "txtTemp";
this.txtTemp.Size = new System.Drawing.Size(87, 26); this.txtTemp.Size = new System.Drawing.Size(87, 26);
...@@ -897,12 +911,11 @@ ...@@ -897,12 +911,11 @@
// //
// label28 // label28
// //
this.label28.AutoSize = true;
this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label28.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label28.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label28.Location = new System.Drawing.Point(38, 59); this.label28.Location = new System.Drawing.Point(4, 59);
this.label28.Name = "label28"; this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(44, 17); this.label28.Size = new System.Drawing.Size(102, 17);
this.label28.TabIndex = 244; this.label28.TabIndex = 244;
this.label28.Text = "温度："; this.label28.Text = "温度：";
this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -910,7 +923,7 @@ ...@@ -910,7 +923,7 @@
// txtTempPort // txtTempPort
// //
this.txtTempPort.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtTempPort.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTempPort.Location = new System.Drawing.Point(95, 24); this.txtTempPort.Location = new System.Drawing.Point(109, 24);
this.txtTempPort.MaxLength = 10; this.txtTempPort.MaxLength = 10;
this.txtTempPort.Name = "txtTempPort"; this.txtTempPort.Name = "txtTempPort";
this.txtTempPort.Size = new System.Drawing.Size(87, 26); this.txtTempPort.Size = new System.Drawing.Size(87, 26);
...@@ -919,12 +932,11 @@ ...@@ -919,12 +932,11 @@
// //
// label27 // label27
// //
this.label27.AutoSize = true;
this.label27.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label27.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label27.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label27.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label27.Location = new System.Drawing.Point(26, 29); this.label27.Location = new System.Drawing.Point(4, 29);
this.label27.Name = "label27"; this.label27.Name = "label27";
this.label27.Size = new System.Drawing.Size(56, 17); this.label27.Size = new System.Drawing.Size(102, 17);
this.label27.TabIndex = 242; this.label27.TabIndex = 242;
this.label27.Text = "端口号："; this.label27.Text = "端口号：";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -955,7 +967,7 @@ ...@@ -955,7 +967,7 @@
this.groupBox3.Controls.Add(this.lblThisSta); this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(7, 90); this.groupBox3.Location = new System.Drawing.Point(7, 90);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(496, 142); this.groupBox3.Size = new System.Drawing.Size(529, 126);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
...@@ -964,9 +976,9 @@ ...@@ -964,9 +976,9 @@
// //
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(12, 61); this.lblWarnMsg.Location = new System.Drawing.Point(14, 49);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(471, 65); this.lblWarnMsg.Size = new System.Drawing.Size(507, 65);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -975,7 +987,7 @@ ...@@ -975,7 +987,7 @@
this.lblThisSta.AutoSize = true; this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green; this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(14, 30); this.lblThisSta.Location = new System.Drawing.Point(72, 22);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19); this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216; this.lblThisSta.TabIndex = 216;
...@@ -1004,7 +1016,6 @@ ...@@ -1004,7 +1016,6 @@
this.groupInout.Controls.Add(this.txtUpDownP5); this.groupInout.Controls.Add(this.txtUpDownP5);
this.groupInout.Controls.Add(this.txtUpDownP6); this.groupInout.Controls.Add(this.txtUpDownP6);
this.groupInout.Controls.Add(this.cmbPosition); this.groupInout.Controls.Add(this.cmbPosition);
this.groupInout.Controls.Add(this.label21);
this.groupInout.Controls.Add(this.txtUpDownP3); this.groupInout.Controls.Add(this.txtUpDownP3);
this.groupInout.Controls.Add(this.btnInStore); this.groupInout.Controls.Add(this.btnInStore);
this.groupInout.Controls.Add(this.btnOutStore); this.groupInout.Controls.Add(this.btnOutStore);
...@@ -1026,9 +1037,9 @@ ...@@ -1026,9 +1037,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(7, 236); this.groupInout.Location = new System.Drawing.Point(7, 218);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(496, 502); this.groupInout.Size = new System.Drawing.Size(529, 520);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -1038,7 +1049,7 @@ ...@@ -1038,7 +1049,7 @@
this.lblTemp.AutoSize = true; 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.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.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(11, 450); this.lblTemp.Location = new System.Drawing.Point(11, 475);
this.lblTemp.Name = "lblTemp"; this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20); this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 270; this.lblTemp.TabIndex = 270;
...@@ -1049,7 +1060,7 @@ ...@@ -1049,7 +1060,7 @@
this.lblMsg.AutoSize = true; this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Green; this.lblMsg.ForeColor = System.Drawing.Color.Green;
this.lblMsg.Location = new System.Drawing.Point(269, 81); this.lblMsg.Location = new System.Drawing.Point(30, 113);
this.lblMsg.Name = "lblMsg"; this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(135, 20); this.lblMsg.Size = new System.Drawing.Size(135, 20);
this.lblMsg.TabIndex = 223; this.lblMsg.TabIndex = 223;
...@@ -1060,9 +1071,9 @@ ...@@ -1060,9 +1071,9 @@
this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control; this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(362, 446); this.btnSavePosition.Location = new System.Drawing.Point(362, 471);
this.btnSavePosition.Name = "btnSavePosition"; this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(105, 38); this.btnSavePosition.Size = new System.Drawing.Size(117, 38);
this.btnSavePosition.TabIndex = 217; this.btnSavePosition.TabIndex = 217;
this.btnSavePosition.Text = "保存位置"; this.btnSavePosition.Text = "保存位置";
this.btnSavePosition.UseVisualStyleBackColor = false; this.btnSavePosition.UseVisualStyleBackColor = false;
...@@ -1073,9 +1084,9 @@ ...@@ -1073,9 +1084,9 @@
this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control; this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control;
this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(158, 72); this.btnStartAuTo.Location = new System.Drawing.Point(271, 70);
this.btnStartAuTo.Name = "btnStartAuTo"; this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(105, 38); this.btnStartAuTo.Size = new System.Drawing.Size(192, 38);
this.btnStartAuTo.TabIndex = 222; this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "启动自动模式"; this.btnStartAuTo.Text = "启动自动模式";
this.btnStartAuTo.UseVisualStyleBackColor = false; this.btnStartAuTo.UseVisualStyleBackColor = false;
...@@ -1083,17 +1094,17 @@ ...@@ -1083,17 +1094,17 @@
// //
// label9 // label9
// //
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(12, 83); this.label9.Location = new System.Drawing.Point(15, 81);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(92, 17); this.label9.Size = new System.Drawing.Size(207, 17);
this.label9.TabIndex = 220; this.label9.TabIndex = 220;
this.label9.Text = "入库间隔仓位："; this.label9.Text = "入库间隔仓位：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtJiange // txtJiange
// //
this.txtJiange.Location = new System.Drawing.Point(107, 78); this.txtJiange.Location = new System.Drawing.Point(228, 76);
this.txtJiange.Name = "txtJiange"; this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(37, 26); this.txtJiange.Size = new System.Drawing.Size(37, 26);
this.txtJiange.TabIndex = 221; this.txtJiange.TabIndex = 221;
...@@ -1106,7 +1117,7 @@ ...@@ -1106,7 +1117,7 @@
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(153, 404); this.txtComP1.Location = new System.Drawing.Point(169, 429);
this.txtComP1.MaxLength = 0; this.txtComP1.MaxLength = 0;
this.txtComP1.Name = "txtComP1"; this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1121,7 +1132,7 @@ ...@@ -1121,7 +1132,7 @@
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(153, 364); this.txtInOutP2.Location = new System.Drawing.Point(169, 389);
this.txtInOutP2.MaxLength = 0; this.txtInOutP2.MaxLength = 0;
this.txtInOutP2.Name = "txtInOutP2"; this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1136,7 +1147,7 @@ ...@@ -1136,7 +1147,7 @@
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(153, 324); this.txtInOutP1.Location = new System.Drawing.Point(169, 349);
this.txtInOutP1.MaxLength = 0; this.txtInOutP1.MaxLength = 0;
this.txtInOutP1.Name = "txtInOutP1"; this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1151,7 +1162,7 @@ ...@@ -1151,7 +1162,7 @@
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(153, 284); this.txtMiddleP1.Location = new System.Drawing.Point(169, 309);
this.txtMiddleP1.MaxLength = 0; this.txtMiddleP1.MaxLength = 0;
this.txtMiddleP1.Name = "txtMiddleP1"; this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1166,7 +1177,7 @@ ...@@ -1166,7 +1177,7 @@
this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP7.Location = new System.Drawing.Point(153, 204); this.txtUpDownP7.Location = new System.Drawing.Point(169, 229);
this.txtUpDownP7.MaxLength = 0; this.txtUpDownP7.MaxLength = 0;
this.txtUpDownP7.Name = "txtUpDownP7"; this.txtUpDownP7.Name = "txtUpDownP7";
this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1181,7 +1192,7 @@ ...@@ -1181,7 +1192,7 @@
this.txtUpDownP8.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP8.Location = new System.Drawing.Point(153, 244); this.txtUpDownP8.Location = new System.Drawing.Point(169, 269);
this.txtUpDownP8.MaxLength = 0; this.txtUpDownP8.MaxLength = 0;
this.txtUpDownP8.Name = "txtUpDownP8"; this.txtUpDownP8.Name = "txtUpDownP8";
this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1196,7 +1207,7 @@ ...@@ -1196,7 +1207,7 @@
this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(153, 124); this.txtUpDownP1.Location = new System.Drawing.Point(169, 149);
this.txtUpDownP1.MaxLength = 0; this.txtUpDownP1.MaxLength = 0;
this.txtUpDownP1.Name = "txtUpDownP1"; this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1211,7 +1222,7 @@ ...@@ -1211,7 +1222,7 @@
this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP2.Location = new System.Drawing.Point(153, 164); this.txtUpDownP2.Location = new System.Drawing.Point(169, 189);
this.txtUpDownP2.MaxLength = 0; this.txtUpDownP2.MaxLength = 0;
this.txtUpDownP2.Name = "txtUpDownP2"; this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1226,7 +1237,7 @@ ...@@ -1226,7 +1237,7 @@
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(395, 404); this.txtComP3.Location = new System.Drawing.Point(432, 429);
this.txtComP3.MaxLength = 0; this.txtComP3.MaxLength = 0;
this.txtComP3.Name = "txtComP3"; this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1241,7 +1252,7 @@ ...@@ -1241,7 +1252,7 @@
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(395, 364); this.txtComP2.Location = new System.Drawing.Point(432, 389);
this.txtComP2.MaxLength = 0; this.txtComP2.MaxLength = 0;
this.txtComP2.Name = "txtComP2"; this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1256,7 +1267,7 @@ ...@@ -1256,7 +1267,7 @@
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(395, 324); this.txtInOutP3.Location = new System.Drawing.Point(432, 349);
this.txtInOutP3.MaxLength = 0; this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3"; this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1271,7 +1282,7 @@ ...@@ -1271,7 +1282,7 @@
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(395, 284); this.txtMiddleP2.Location = new System.Drawing.Point(432, 309);
this.txtMiddleP2.MaxLength = 0; this.txtMiddleP2.MaxLength = 0;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1286,7 +1297,7 @@ ...@@ -1286,7 +1297,7 @@
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(395, 204); this.txtUpDownP5.Location = new System.Drawing.Point(432, 229);
this.txtUpDownP5.MaxLength = 0; this.txtUpDownP5.MaxLength = 0;
this.txtUpDownP5.Name = "txtUpDownP5"; this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1301,7 +1312,7 @@ ...@@ -1301,7 +1312,7 @@
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(395, 244); this.txtUpDownP6.Location = new System.Drawing.Point(432, 269);
this.txtUpDownP6.MaxLength = 0; this.txtUpDownP6.MaxLength = 0;
this.txtUpDownP6.Name = "txtUpDownP6"; this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1317,26 +1328,12 @@ ...@@ -1317,26 +1328,12 @@
this.cmbPosition.Items.AddRange(new object[] { this.cmbPosition.Items.AddRange(new object[] {
"料仓0", "料仓0",
"料仓1"}); "料仓1"});
this.cmbPosition.Location = new System.Drawing.Point(76, 31); this.cmbPosition.Location = new System.Drawing.Point(10, 31);
this.cmbPosition.Name = "cmbPosition"; this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(189, 28); this.cmbPosition.Size = new System.Drawing.Size(255, 28);
this.cmbPosition.TabIndex = 174; this.cmbPosition.TabIndex = 174;
this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged); this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
// //
// label21
//
this.label21.AutoSize = true;
this.label21.Cursor = System.Windows.Forms.Cursors.Default;
this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.ForeColor = System.Drawing.SystemColors.ControlText;
this.label21.Location = new System.Drawing.Point(11, 37);
this.label21.Name = "label21";
this.label21.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label21.Size = new System.Drawing.Size(68, 17);
this.label21.TabIndex = 172;
this.label21.Text = "选择仓位：";
this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtUpDownP3 // txtUpDownP3
// //
this.txtUpDownP3.AcceptsReturn = true; this.txtUpDownP3.AcceptsReturn = true;
...@@ -1344,7 +1341,7 @@ ...@@ -1344,7 +1341,7 @@
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(395, 124); this.txtUpDownP3.Location = new System.Drawing.Point(432, 149);
this.txtUpDownP3.MaxLength = 0; this.txtUpDownP3.MaxLength = 0;
this.txtUpDownP3.Name = "txtUpDownP3"; this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1359,7 +1356,7 @@ ...@@ -1359,7 +1356,7 @@
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(271, 26); this.btnInStore.Location = new System.Drawing.Point(271, 26);
this.btnInStore.Name = "btnInStore"; this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(105, 38); this.btnInStore.Size = new System.Drawing.Size(117, 38);
this.btnInStore.TabIndex = 102; this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试"; this.btnInStore.Text = "入库测试";
this.btnInStore.UseVisualStyleBackColor = false; this.btnInStore.UseVisualStyleBackColor = false;
...@@ -1370,9 +1367,9 @@ ...@@ -1370,9 +1367,9 @@
this.btnOutStore.BackColor = System.Drawing.SystemColors.Control; this.btnOutStore.BackColor = System.Drawing.SystemColors.Control;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(379, 26); this.btnOutStore.Location = new System.Drawing.Point(394, 26);
this.btnOutStore.Name = "btnOutStore"; this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(105, 38); this.btnOutStore.Size = new System.Drawing.Size(117, 38);
this.btnOutStore.TabIndex = 101; this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出库测试"; this.btnOutStore.Text = "出库测试";
this.btnOutStore.UseVisualStyleBackColor = false; this.btnOutStore.UseVisualStyleBackColor = false;
...@@ -1385,7 +1382,7 @@ ...@@ -1385,7 +1382,7 @@
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(395, 164); this.txtUpDownP4.Location = new System.Drawing.Point(432, 189);
this.txtUpDownP4.MaxLength = 0; this.txtUpDownP4.MaxLength = 0;
this.txtUpDownP4.Name = "txtUpDownP4"; this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1402,10 +1399,10 @@ ...@@ -1402,10 +1399,10 @@
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(10, 399); this.btnComP1.Location = new System.Drawing.Point(5, 424);
this.btnComP1.Name = "btnComP1"; this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(140, 33); this.btnComP1.Size = new System.Drawing.Size(160, 33);
this.btnComP1.TabIndex = 213; this.btnComP1.TabIndex = 213;
this.btnComP1.Text = "压紧轴待机点P1："; this.btnComP1.Text = "压紧轴待机点P1：";
this.btnComP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1421,10 +1418,10 @@ ...@@ -1421,10 +1418,10 @@
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(10, 359); this.btnInOutP2.Location = new System.Drawing.Point(5, 384);
this.btnInOutP2.Name = "btnInOutP2"; this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 33); this.btnInOutP2.Size = new System.Drawing.Size(160, 33);
this.btnInOutP2.TabIndex = 211; this.btnInOutP2.TabIndex = 211;
this.btnInOutP2.Text = "进出轴取料点P2："; this.btnInOutP2.Text = "进出轴取料点P2：";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1440,10 +1437,10 @@ ...@@ -1440,10 +1437,10 @@
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(10, 319); this.btnInOutP1.Location = new System.Drawing.Point(5, 344);
this.btnInOutP1.Name = "btnInOutP1"; this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(140, 33); this.btnInOutP1.Size = new System.Drawing.Size(160, 33);
this.btnInOutP1.TabIndex = 209; this.btnInOutP1.TabIndex = 209;
this.btnInOutP1.Text = "进出轴待机点P1："; this.btnInOutP1.Text = "进出轴待机点P1：";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1459,10 +1456,10 @@ ...@@ -1459,10 +1456,10 @@
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(10, 279); this.btnMiddleP1.Location = new System.Drawing.Point(5, 304);
this.btnMiddleP1.Name = "btnMiddleP1"; this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(140, 33); this.btnMiddleP1.Size = new System.Drawing.Size(160, 33);
this.btnMiddleP1.TabIndex = 207; this.btnMiddleP1.TabIndex = 207;
this.btnMiddleP1.Text = "旋转轴待机点P1："; this.btnMiddleP1.Text = "旋转轴待机点P1：";
this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1478,10 +1475,10 @@ ...@@ -1478,10 +1475,10 @@
this.btnUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP7.Location = new System.Drawing.Point(10, 199); this.btnUpDownP7.Location = new System.Drawing.Point(5, 224);
this.btnUpDownP7.Name = "btnUpDownP7"; this.btnUpDownP7.Name = "btnUpDownP7";
this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP7.Size = new System.Drawing.Size(142, 33); this.btnUpDownP7.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP7.TabIndex = 203; this.btnUpDownP7.TabIndex = 203;
this.btnUpDownP7.Text = "升降轴入料缓冲点P7："; this.btnUpDownP7.Text = "升降轴入料缓冲点P7：";
this.btnUpDownP7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1497,10 +1494,10 @@ ...@@ -1497,10 +1494,10 @@
this.btnUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP8.Location = new System.Drawing.Point(10, 239); this.btnUpDownP8.Location = new System.Drawing.Point(5, 264);
this.btnUpDownP8.Name = "btnUpDownP8"; this.btnUpDownP8.Name = "btnUpDownP8";
this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP8.Size = new System.Drawing.Size(142, 33); this.btnUpDownP8.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP8.TabIndex = 205; this.btnUpDownP8.TabIndex = 205;
this.btnUpDownP8.Text = "升降轴出料缓冲点P8："; this.btnUpDownP8.Text = "升降轴出料缓冲点P8：";
this.btnUpDownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1516,10 +1513,10 @@ ...@@ -1516,10 +1513,10 @@
this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(10, 119); this.btnUpDownP1.Location = new System.Drawing.Point(5, 144);
this.btnUpDownP1.Name = "btnUpDownP1"; this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(140, 33); this.btnUpDownP1.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP1.TabIndex = 199; this.btnUpDownP1.TabIndex = 199;
this.btnUpDownP1.Text = "升降轴入料点P1："; this.btnUpDownP1.Text = "升降轴入料点P1：";
this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1535,10 +1532,10 @@ ...@@ -1535,10 +1532,10 @@
this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.Location = new System.Drawing.Point(10, 159); this.btnUpDownP2.Location = new System.Drawing.Point(5, 184);
this.btnUpDownP2.Name = "btnUpDownP2"; this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(140, 33); this.btnUpDownP2.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP2.TabIndex = 201; this.btnUpDownP2.TabIndex = 201;
this.btnUpDownP2.Text = "升降轴出料前点P2："; this.btnUpDownP2.Text = "升降轴出料前点P2：";
this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1553,10 +1550,10 @@ ...@@ -1553,10 +1550,10 @@
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(251, 399); this.btnComP3.Location = new System.Drawing.Point(267, 424);
this.btnComP3.Name = "btnComP3"; this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(140, 33); this.btnComP3.Size = new System.Drawing.Size(160, 33);
this.btnComP3.TabIndex = 197; this.btnComP3.TabIndex = 197;
this.btnComP3.Text = "压紧轴压紧前点P3："; this.btnComP3.Text = "压紧轴压紧前点P3：";
this.btnComP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1571,10 +1568,10 @@ ...@@ -1571,10 +1568,10 @@
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(251, 359); this.btnComP2.Location = new System.Drawing.Point(267, 384);
this.btnComP2.Name = "btnComP2"; this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(140, 33); this.btnComP2.Size = new System.Drawing.Size(160, 33);
this.btnComP2.TabIndex = 195; this.btnComP2.TabIndex = 195;
this.btnComP2.Text = "压紧轴压紧点P2："; this.btnComP2.Text = "压紧轴压紧点P2：";
this.btnComP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1589,10 +1586,10 @@ ...@@ -1589,10 +1586,10 @@
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(251, 319); this.btnInOutP3.Location = new System.Drawing.Point(267, 344);
this.btnInOutP3.Name = "btnInOutP3"; this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(140, 33); this.btnInOutP3.Size = new System.Drawing.Size(160, 33);
this.btnInOutP3.TabIndex = 193; this.btnInOutP3.TabIndex = 193;
this.btnInOutP3.Text = "进出轴取料点P3："; this.btnInOutP3.Text = "进出轴取料点P3：";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1607,10 +1604,10 @@ ...@@ -1607,10 +1604,10 @@
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(251, 279); this.btnMiddleP2.Location = new System.Drawing.Point(267, 304);
this.btnMiddleP2.Name = "btnMiddleP2"; this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(140, 33); this.btnMiddleP2.Size = new System.Drawing.Size(160, 33);
this.btnMiddleP2.TabIndex = 191; this.btnMiddleP2.TabIndex = 191;
this.btnMiddleP2.Text = "旋转轴库位点P2："; this.btnMiddleP2.Text = "旋转轴库位点P2：";
this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1625,10 +1622,10 @@ ...@@ -1625,10 +1622,10 @@
this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(251, 199); this.btnUpDownP5.Location = new System.Drawing.Point(267, 224);
this.btnUpDownP5.Name = "btnUpDownP5"; this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(140, 33); this.btnUpDownP5.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP5.TabIndex = 187; this.btnUpDownP5.TabIndex = 187;
this.btnUpDownP5.Text = "升降轴出料前点P5："; this.btnUpDownP5.Text = "升降轴出料前点P5：";
this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1643,10 +1640,10 @@ ...@@ -1643,10 +1640,10 @@
this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(251, 239); this.btnUpDownP6.Location = new System.Drawing.Point(267, 264);
this.btnUpDownP6.Name = "btnUpDownP6"; this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(142, 33); this.btnUpDownP6.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP6.TabIndex = 189; this.btnUpDownP6.TabIndex = 189;
this.btnUpDownP6.Text = "升降轴出料缓冲点P6："; this.btnUpDownP6.Text = "升降轴出料缓冲点P6：";
this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1661,10 +1658,10 @@ ...@@ -1661,10 +1658,10 @@
this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(251, 119); this.btnUpDownP3.Location = new System.Drawing.Point(267, 144);
this.btnUpDownP3.Name = "btnUpDownP3"; this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(140, 33); this.btnUpDownP3.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP3.TabIndex = 161; this.btnUpDownP3.TabIndex = 161;
this.btnUpDownP3.Text = "升降轴入料前点P3："; this.btnUpDownP3.Text = "升降轴入料前点P3：";
this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1679,10 +1676,10 @@ ...@@ -1679,10 +1676,10 @@
this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(251, 159); this.btnUpDownP4.Location = new System.Drawing.Point(267, 184);
this.btnUpDownP4.Name = "btnUpDownP4"; this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(142, 33); this.btnUpDownP4.Size = new System.Drawing.Size(160, 33);
this.btnUpDownP4.TabIndex = 165; this.btnUpDownP4.TabIndex = 165;
this.btnUpDownP4.Text = "升降轴入料缓冲点P4："; this.btnUpDownP4.Text = "升降轴入料缓冲点P4：";
this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1992,7 +1989,6 @@ ...@@ -1992,7 +1989,6 @@
public System.Windows.Forms.Button btnUpDownP3; public System.Windows.Forms.Button btnUpDownP3;
public System.Windows.Forms.TextBox txtUpDownP4; public System.Windows.Forms.TextBox txtUpDownP4;
public System.Windows.Forms.Button btnUpDownP4; public System.Windows.Forms.Button btnUpDownP4;
public System.Windows.Forms.Label label21;
private System.Windows.Forms.ComboBox cmbPosition; private System.Windows.Forms.ComboBox cmbPosition;
public System.Windows.Forms.Button btnComP1; public System.Windows.Forms.Button btnComP1;
public System.Windows.Forms.TextBox txtComP1; public System.Windows.Forms.TextBox txtComP1;
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -163,6 +163,17 @@ namespace OnlineStore.ACSingleStore ...@@ -163,6 +163,17 @@ namespace OnlineStore.ACSingleStore
groupCode.Visible = false; groupCode.Visible = false;
} }
private string WaitStart = ResourceCulture.GetString("等待启动");
private string dooropen = ResourceCulture.GetString("前门未关");
private string HasWare = ResourceCulture.GetString("叉子料盘检测有料，请检查");
private string StartAuto = ResourceCulture.GetString("开始自动出入库");
private string StopAuto = ResourceCulture.GetString("停止自动出入库");
private string AutoOut = ResourceCulture.GetString("自动出库：");
private string AutoIn = ResourceCulture.GetString("自动入库：");
public static string cannotMove = ResourceCulture.GetString("定位气缸不在下降端，不能移动进出轴");
public static string warn = ResourceCulture.GetString("警告");
private string StartCycle = ResourceCulture.GetString("开始循环出库");
private string StopCycle = ResourceCulture.GetString("停止循环出库");
private DateTime preReadModblsTime = DateTime.Now; private DateTime preReadModblsTime = DateTime.Now;
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
...@@ -228,7 +239,7 @@ namespace OnlineStore.ACSingleStore ...@@ -228,7 +239,7 @@ namespace OnlineStore.ACSingleStore
//如果不在出入库中，且叉子上有信号，需要提示检查叉子 //如果不在出入库中，且叉子上有信号，需要提示检查叉子
if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH)) if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 叉子料盘检测有料，请检查"; lblWarnMsg.Text = lblWarnMsg.Text + " "+ HasWare;
} }
if (store.TempOrHumidityIsAlarm) if (store.TempOrHumidityIsAlarm)
{ {
...@@ -238,14 +249,14 @@ namespace OnlineStore.ACSingleStore ...@@ -238,14 +249,14 @@ namespace OnlineStore.ACSingleStore
{ {
string msg = store.autoMsg; string msg = store.autoMsg;
lblMsg.Text = msg; lblMsg.Text = msg;
if (btnStartAuTo.Text.Equals("开始自动出入库")) if (btnStartAuTo.Text.Equals(StartAuto))
{ {
btnStartAuTo.Text = "停止自动出入库"; btnStartAuTo.Text = StopAuto;
} }
try try
{ {
msg = msg.Replace("自动出库：", ""); msg = msg.Replace(AutoOut, "");
msg = msg.Replace("自动入库：", ""); msg = msg.Replace(AutoIn, "");
int index = store.PositionNumList.IndexOf(msg); int index = store.PositionNumList.IndexOf(msg);
if (index >= 0 && (!msg.Equals(""))) if (index >= 0 && (!msg.Equals("")))
{ {
...@@ -257,17 +268,17 @@ namespace OnlineStore.ACSingleStore ...@@ -257,17 +268,17 @@ namespace OnlineStore.ACSingleStore
else else
{ {
// lblMsg.Text = "没有开启自动出入库"; // lblMsg.Text = "没有开启自动出入库";
if (btnStartAuTo.Text.Equals("停止自动出入库")) if (btnStartAuTo.Text.Equals(StopAuto))
{ {
btnStartAuTo.Text = "开始自动出入库"; btnStartAuTo.Text = StartAuto;
} }
} }
} }
else else
{ {
lblThisSta.Text = "等待启动"; lblThisSta.Text = WaitStart;
lblWarnMsg.Text = ""; lblWarnMsg.Text = "";
btnStartAuTo.Text = "开始自动出入库"; btnStartAuTo.Text = StartAuto;
} }
} }
...@@ -662,11 +673,6 @@ namespace OnlineStore.ACSingleStore ...@@ -662,11 +673,6 @@ namespace OnlineStore.ACSingleStore
MyMessage.Show("请先启动料仓！"); MyMessage.Show("请先启动料仓！");
} }
} }
//private void btnAxisConfig_Click(object sender, EventArgs e)
//{
// FormManager.ShowAxisConfig(store);
//}
private void 轴卡点动ToolStripMenuItem_Click(object sender, EventArgs e) private void 轴卡点动ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
...@@ -738,16 +744,6 @@ namespace OnlineStore.ACSingleStore ...@@ -738,16 +744,6 @@ namespace OnlineStore.ACSingleStore
private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e) private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
//IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
//string message = "";
//List<string> codeList = CodeManager.CameraScan();
//foreach (string str in codeList)
//{
// message = message + str + "##";
//}
//LogUtil.info("扫码测试收到二维码 ：" + message);
//IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
store.dlScanSocket.StartConnect(); store.dlScanSocket.StartConnect();
store.GetCameraCode(); store.GetCameraCode();
} }
...@@ -1020,11 +1016,11 @@ namespace OnlineStore.ACSingleStore ...@@ -1020,11 +1016,11 @@ namespace OnlineStore.ACSingleStore
{ {
if (status) if (status)
{ {
btnDebug.Text = "禁用调试"; btnDebug.Text = ResourceCulture.GetString("禁用调试");
} }
else else
{ {
btnDebug.Text = "启用调试"; btnDebug.Text = ResourceCulture.GetString("启用调试");
} }
axisMoveControl1.Enabled = status; axisMoveControl1.Enabled = status;
groupInout.Enabled = status; groupInout.Enabled = status;
...@@ -1032,7 +1028,7 @@ namespace OnlineStore.ACSingleStore ...@@ -1032,7 +1028,7 @@ namespace OnlineStore.ACSingleStore
private void btnDebug_Click(object sender, EventArgs e) private void btnDebug_Click(object sender, EventArgs e)
{ {
if (btnDebug.Text.Equals("启用调试")) if (btnDebug.Text.Equals(ResourceCulture.GetString("启用调试")))
{ {
DebugStatus(true); DebugStatus(true);
} }
...@@ -1110,6 +1106,42 @@ namespace OnlineStore.ACSingleStore ...@@ -1110,6 +1106,42 @@ namespace OnlineStore.ACSingleStore
this.LanguageProcess(); this.LanguageProcess();
} }
public override void LanguagePro()
{
if (store != null)
{
axisMoveControl1.LoadData(store, store.moveAxisList.ToArray());
}
string className = this.ClassName;
CurrLanguage = ResourceCulture.CurrLanguage;
WaitStart = ResourceCulture.GetString("等待启动");
dooropen = ResourceCulture.GetString("前门未关");
HasWare = ResourceCulture.GetString("叉子料盘检测有料，请检查");
StartAuto = ResourceCulture.GetString("开始自动出入库");
StopAuto = ResourceCulture.GetString("停止自动出入库");
AutoOut = ResourceCulture.GetString("自动出库：");
AutoIn = ResourceCulture.GetString("自动入库：");
cannotMove = ResourceCulture.GetString("定位气缸不在下降端，不能移动进出轴");
warn = ResourceCulture.GetString("警告");
StartCycle = ResourceCulture.GetString("开始循环出库");
StopCycle = ResourceCulture.GetString("停止循环出库");
显示ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, 显示ToolStripMenuItem.Name), 显示ToolStripMenuItem.Text);
toolStripMenuItem1.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, toolStripMenuItem1.Name), toolStripMenuItem1.Text);
notifyIcon1.Text = this.Text;
if (CurrLanguage.Equals(ResourceCulture.China))
{
LogUtil.logBox = this.richTextBox1;
}
else
{
LogUtil.ClearLog();
LogUtil.logBox = null;
this.richTextBox1.Clear();
}
}
} }
} }
source/ACSingleStore/ResourceCulture.cs
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
...@@ -44,8 +45,8 @@ namespace OnlineStore ...@@ -44,8 +45,8 @@ namespace OnlineStore
private static void LoadData() private static void LoadData()
{ {
//ResourceControl.GetStringEvent += GetString; //ResourceControl.GetStringEvent += GetString;
//CSVResourceControl.GetStrEvent += GetString; CSVResourceControl.GetStrEvent += GetString;
//CSVResourceControl.GetStringEvent += GetString; CSVResourceControl.GetStringEvent += GetString;
CodeLibrary.CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent; CodeLibrary.CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent;
//string englishPath = Application.StartupPath + @"\resource\en-US.resource"; //string englishPath = Application.StartupPath + @"\resource\en-US.resource";
//string chinaPath = Application.StartupPath + @"\resource\zh-CN.resource"; //string chinaPath = Application.StartupPath + @"\resource\zh-CN.resource";
...@@ -60,26 +61,32 @@ namespace OnlineStore ...@@ -60,26 +61,32 @@ namespace OnlineStore
string[] lines = File.ReadAllLines(rPath); string[] lines = File.ReadAllLines(rPath);
foreach (string line in lines) foreach (string line in lines)
{ {
if (String.IsNullOrEmpty(line)) try
{
continue;
}
string[] array = line.Split(spilt);
if (array.Length >= 2)
{ {
string key = array[0].Trim(); if (String.IsNullOrEmpty(line))
string china = array[1].Replace('&', ',').Trim();
string eng = "";
if (array.Length >= 3)
{ {
eng = array[2].Replace('&', ',').Trim(); continue;
} }
ChinaMap.Add(key, china); string[] array = line.Split(spilt);
if (String.IsNullOrEmpty(eng).Equals(false)) if (array.Length >= 2)
{ {
EnglishMap.Add(key, eng); string key = array[0].Trim();
string china = array[1].Replace('&', ',').Trim();
string eng = "";
if (array.Length >= 3)
{
eng = array[2].Replace('&', ',').Trim();
}
ChinaMap.Add(key, china);
if (String.IsNullOrEmpty(eng).Equals(false))
{
EnglishMap.Add(key, eng);
}
} }
}catch(Exception ex)
{
LogUtil.error("读取文件【"+ rPath + "】【"+ line + "】出错：" + ex.ToString());
} }
} }
} }
...@@ -240,23 +247,26 @@ namespace OnlineStore ...@@ -240,23 +247,26 @@ namespace OnlineStore
} }
try try
{ {
if (!ResourceMap.ContainsKey(CurrLanguage)) if (ResourceMap != null)
{ {
if (ShowMsg) if (!ResourceMap.ContainsKey(CurrLanguage))
{ {
LogUtil.error("No Language Resources:[" + id + "], please add"); if (ShowMsg)
} {
return defaultStr; LogUtil.error("No Language Resources:[" + id + "], please add");
} }
else return defaultStr;
{
if (ResourceMap[CurrLanguage].ContainsKey(id.Trim()))
{
strCurLanguage = ResourceMap[CurrLanguage][id];
} }
else else
{ {
NoIdLog(id, defaultStr); if (ResourceMap[CurrLanguage].ContainsKey(id.Trim()))
{
strCurLanguage = ResourceMap[CurrLanguage][id];
}
else
{
NoIdLog(id, defaultStr);
}
} }
} }
return strCurLanguage; return strCurLanguage;
......
source/ACSingleStore/resource/language - 副本.resource.csv
...@@ -210,3 +210,46 @@ FrmAbout_lblCodeName_Text,软件编号:52 43 2D 44 4C 2D 41 43 53 69 6E 67 6C 65 53 ...@@ -210,3 +210,46 @@ FrmAbout_lblCodeName_Text,软件编号:52 43 2D 44 4C 2D 41 43 53 69 6E 67 6C 65 53
FrmAbout_lblTime_Text,更新时间:2020-02-07 21:16,UpdateTime:2020-02-07 21:16 FrmAbout_lblTime_Text,更新时间:2020-02-07 21:16,UpdateTime:2020-02-07 21:16
FrmAbout_lblVersion_Text,版本号:1.0.7342.38298,Version:1.0.7342.38298 FrmAbout_lblVersion_Text,版本号:1.0.7342.38298,Version:1.0.7342.38298
FrmAbout_btnNext_Text,确定,Confirm FrmAbout_btnNext_Text,确定,Confirm
Middle_Axis,（轴一）旋转轴,(Axis 1) rotation axis
UpDown_Axis,（轴二）升降轴轴,(Axis 2) lifting axis
InOut_Axis,（轴三）进出轴,(Axis 3) in-out axis
Comp_Axis,（轴四）压紧轴,(Axis 4)pressure axis
启用调试,启用调试,Enable debugging
等待启动,等待启动,Wait to start
前门未关,前门未关,Front door open
叉子料盘检测有料，请检查,叉子料盘检测有料，请检查,Fork tray full& please check
开始自动出入库,开始自动出入库,Start auto storing
停止自动出入库,停止自动出入库,Stop auto storing
自动出库：,自动出库：,
自动入库：,自动入库：,
定位气缸不在下降端，不能移动进出轴,定位气缸不在下降端，不能移动进出轴,The position cylinder is not at the descent position& not move the in-out axis
警告,警告,Warning
开始循环出库,开始循环出库,Start looping out
停止循环出库,停止循环出库,Stop the loop
FrmStoreBox_显示ToolStripMenuItem_Text,显示,Show
FrmStoreBox_toolStripMenuItem1_Text,退出,Exit
X01,急停,Emergency stop
X02,复位,Reset
X03,自动,
X04,气压检测,Pressure detection
X05,料盘检测1（进料口）,
X06,料盘检测2（料叉）,
X07,进料口门上升端,Portal ascent position
X08,进料口门下降端,Portal descent position
X09,安全光栅,Security grating
X10,前门限位,
X11,左侧门限位,
X12,右侧门限位,
Y01,自动指示灯,Auto indicator light
Y02,故障指示灯,Error indicator light
Y03,待机指示灯,indicator light
Y04,故障蜂鸣器,
Y05,吹气SOL ON,Blowing SOL ON
Y06,料仓运转ON,SMD BOX operating ON
Y07,轴2刹车电源ON,Brake power of axis2 ON
Y08,进料口门上升SOL,Portal ascent SOL
Y09,进料口门下降SOL,Portal descent SOL
Y10,相机照明开,Camera light ON
升降轴位置调试：,升降轴位置调试：,Updown-Axis Debug Location：
是否确定退出？,是否确定退出？,
提示,提示,Remind
source/ACSingleStore/resource/language.resource
...@@ -210,3 +210,46 @@ FrmAbout_lblCodeName_Text,软件编号:52 43 2D 44 4C 2D 41 43 53 69 6E 67 6C 65 ...@@ -210,3 +210,46 @@ FrmAbout_lblCodeName_Text,软件编号:52 43 2D 44 4C 2D 41 43 53 69 6E 67 6C 65
FrmAbout_lblTime_Text,更新时间:2020-02-07 21:16,UpdateTime:2020-02-07 21:16 FrmAbout_lblTime_Text,更新时间:2020-02-07 21:16,UpdateTime:2020-02-07 21:16
FrmAbout_lblVersion_Text,版本号:1.0.7342.38298,Version:1.0.7342.38298 FrmAbout_lblVersion_Text,版本号:1.0.7342.38298,Version:1.0.7342.38298
FrmAbout_btnNext_Text,确定,Confirm FrmAbout_btnNext_Text,确定,Confirm
Middle_Axis,（轴一）旋转轴,(Axis 1) rotation axis
UpDown_Axis,（轴二）升降轴轴,(Axis 2) lifting axis
InOut_Axis,（轴三）进出轴,(Axis 3) in-out axis
Comp_Axis,（轴四）压紧轴,(Axis 4)pressure axis
启用调试,启用调试,Enable debugging
等待启动,等待启动,Wait to start
前门未关,前门未关,Front door open
叉子料盘检测有料，请检查,叉子料盘检测有料，请检查,Fork tray full& please check
开始自动出入库,开始自动出入库,Start auto storing
停止自动出入库,停止自动出入库,Stop auto storing
自动出库：,自动出库：,
自动入库：,自动入库：,
定位气缸不在下降端，不能移动进出轴,定位气缸不在下降端，不能移动进出轴,The position cylinder is not at the descent position& not move the in-out axis
警告,警告,Warning
开始循环出库,开始循环出库,Start looping out
停止循环出库,停止循环出库,Stop the loop
FrmStoreBox_显示ToolStripMenuItem_Text,显示,Show
FrmStoreBox_toolStripMenuItem1_Text,退出,Exit
X01,急停,Emergency stop
X02,复位,Reset
X03,自动,
X04,气压检测,Pressure detection
X05,料盘检测1（进料口）,
X06,料盘检测2（料叉）,
X07,进料口门上升端,Portal ascent position
X08,进料口门下降端,Portal descent position
X09,安全光栅,Security grating
X10,前门限位,
X11,左侧门限位,
X12,右侧门限位,
Y01,自动指示灯,Auto indicator light
Y02,故障指示灯,Error indicator light
Y03,待机指示灯,indicator light
Y04,故障蜂鸣器,
Y05,吹气SOL ON,Blowing SOL ON
Y06,料仓运转ON,SMD BOX operating ON
Y07,轴2刹车电源ON,Brake power of axis2 ON
Y08,进料口门上升SOL,Portal ascent SOL
Y09,进料口门下降SOL,Portal descent SOL
Y10,相机照明开,Camera light ON
升降轴位置调试：,升降轴位置调试：,Updown-Axis Debug Location：
是否确定退出？,是否确定退出？,
提示,提示,Remind
source/ACSingleStore/useControl/AxisMoveControl.Designer.cs
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
this.label45 = new System.Windows.Forms.Label(); this.label45 = new System.Windows.Forms.Label();
this.label46 = new System.Windows.Forms.Label(); this.label46 = new System.Windows.Forms.Label();
this.comboBox1 = new System.Windows.Forms.ComboBox(); this.comboBox1 = new System.Windows.Forms.ComboBox();
this.label49 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.axis_4_Alarm = new UserFromControl.IOStatusControl(); this.axis_4_Alarm = new UserFromControl.IOStatusControl();
this.txt4Target = new System.Windows.Forms.TextBox(); this.txt4Target = new System.Windows.Forms.TextBox();
...@@ -133,11 +132,10 @@ ...@@ -133,11 +132,10 @@
this.groupAxis.Controls.Add(this.label45); this.groupAxis.Controls.Add(this.label45);
this.groupAxis.Controls.Add(this.label46); this.groupAxis.Controls.Add(this.label46);
this.groupAxis.Controls.Add(this.comboBox1); this.groupAxis.Controls.Add(this.comboBox1);
this.groupAxis.Controls.Add(this.label49);
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(9, 6); this.groupAxis.Location = new System.Drawing.Point(6, 4);
this.groupAxis.Name = "groupAxis"; this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(535, 320); this.groupAxis.Size = new System.Drawing.Size(531, 312);
this.groupAxis.TabIndex = 217; this.groupAxis.TabIndex = 217;
this.groupAxis.TabStop = false; this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动"; this.groupAxis.Text = "伺服运动";
...@@ -145,12 +143,12 @@ ...@@ -145,12 +143,12 @@
// //
// label7 // label7
// //
this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(10, 172);
this.label7.Location = new System.Drawing.Point(51, 172);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(59, 17); this.label7.Size = new System.Drawing.Size(99, 17);
this.label7.TabIndex = 328; this.label7.TabIndex = 328;
this.label7.Text = "伺服状态:"; this.label7.Text = "伺服状态:";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtServoStatue // txtServoStatue
// //
...@@ -162,10 +160,9 @@ ...@@ -162,10 +160,9 @@
// //
// label17 // label17
// //
this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(144, 272);
this.label17.Location = new System.Drawing.Point(150, 272);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(71, 17); this.label17.Size = new System.Drawing.Size(99, 17);
this.label17.TabIndex = 316; this.label17.TabIndex = 316;
this.label17.Text = "负极限信号:"; this.label17.Text = "负极限信号:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -173,17 +170,16 @@ ...@@ -173,17 +170,16 @@
// txtLimit2 // txtLimit2
// //
this.txtLimit2.Enabled = false; this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(226, 269); this.txtLimit2.Location = new System.Drawing.Point(247, 269);
this.txtLimit2.Name = "txtLimit2"; this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23); this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313; this.txtLimit2.TabIndex = 313;
// //
// label19 // label19
// //
this.label19.AutoSize = true; this.label19.Location = new System.Drawing.Point(144, 238);
this.label19.Location = new System.Drawing.Point(150, 238);
this.label19.Name = "label19"; this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(71, 17); this.label19.Size = new System.Drawing.Size(99, 17);
this.label19.TabIndex = 312; this.label19.TabIndex = 312;
this.label19.Text = "正极限信号:"; this.label19.Text = "正极限信号:";
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -191,36 +187,36 @@ ...@@ -191,36 +187,36 @@
// txtLimit1 // txtLimit1
// //
this.txtLimit1.Enabled = false; this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(226, 235); this.txtLimit1.Location = new System.Drawing.Point(247, 235);
this.txtLimit1.Name = "txtLimit1"; this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23); this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309; this.txtLimit1.TabIndex = 309;
// //
// label6 // label6
// //
this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(144, 204);
this.label6.Location = new System.Drawing.Point(162, 204);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17); this.label6.Size = new System.Drawing.Size(99, 17);
this.label6.TabIndex = 300; this.label6.TabIndex = 300;
this.label6.Text = "原点信号:"; this.label6.Text = "原点信号:";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtHomeSingle // txtHomeSingle
// //
this.txtHomeSingle.Enabled = false; this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(226, 201); this.txtHomeSingle.Location = new System.Drawing.Point(247, 201);
this.txtHomeSingle.Name = "txtHomeSingle"; this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23); this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297; this.txtHomeSingle.TabIndex = 297;
// //
// label11 // label11
// //
this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(10, 272);
this.label11.Location = new System.Drawing.Point(5, 272);
this.label11.Name = "label11"; this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(105, 17); this.label11.Size = new System.Drawing.Size(99, 17);
this.label11.TabIndex = 292; this.label11.TabIndex = 292;
this.label11.Text = "HOME-CMP状态:"; this.label11.Text = "HOME-CMP状态:";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtHomeStatus // txtHomeStatus
// //
...@@ -232,12 +228,12 @@ ...@@ -232,12 +228,12 @@
// //
// label10 // label10
// //
this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(10, 238);
this.label10.Location = new System.Drawing.Point(44, 238);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17); this.label10.Size = new System.Drawing.Size(99, 17);
this.label10.TabIndex = 289; this.label10.TabIndex = 289;
this.label10.Text = "BUSY状态:"; this.label10.Text = "BUSY状态:";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtBusyStatus // txtBusyStatus
// //
...@@ -249,12 +245,12 @@ ...@@ -249,12 +245,12 @@
// //
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(10, 204);
this.label2.Location = new System.Drawing.Point(51, 204);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(59, 17); this.label2.Size = new System.Drawing.Size(99, 17);
this.label2.TabIndex = 286; this.label2.TabIndex = 286;
this.label2.Text = "报警状态:"; this.label2.Text = "报警状态:";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtAlarmStatus // txtAlarmStatus
// //
...@@ -294,13 +290,13 @@ ...@@ -294,13 +290,13 @@
// //
// label8 // label8
// //
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(143, 171); this.label8.Location = new System.Drawing.Point(144, 171);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17); this.label8.Size = new System.Drawing.Size(99, 17);
this.label8.TabIndex = 255; this.label8.TabIndex = 255;
this.label8.Text = "实时位置:"; this.label8.Text = "实时位置:";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnOpenAxis // btnOpenAxis
// //
...@@ -336,7 +332,7 @@ ...@@ -336,7 +332,7 @@
// //
// txtP // txtP
// //
this.txtP.Location = new System.Drawing.Point(207, 169); this.txtP.Location = new System.Drawing.Point(247, 169);
this.txtP.Name = "txtP"; this.txtP.Name = "txtP";
this.txtP.ReadOnly = true; this.txtP.ReadOnly = true;
this.txtP.Size = new System.Drawing.Size(87, 23); this.txtP.Size = new System.Drawing.Size(87, 23);
...@@ -349,24 +345,23 @@ ...@@ -349,24 +345,23 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText; this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(189, 111); this.txtASpeed.Location = new System.Drawing.Point(206, 111);
this.txtASpeed.MaxLength = 12; this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed"; this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtASpeed.Size = new System.Drawing.Size(82, 23); this.txtASpeed.Size = new System.Drawing.Size(85, 23);
this.txtASpeed.TabIndex = 251; this.txtASpeed.TabIndex = 251;
this.txtASpeed.Text = "30"; this.txtASpeed.Text = "30";
// //
// label47 // label47
// //
this.label47.AutoSize = true;
this.label47.Cursor = System.Windows.Forms.Cursors.Default; 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.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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(152, 112); this.label47.Location = new System.Drawing.Point(149, 113);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(35, 17); this.label47.Size = new System.Drawing.Size(55, 17);
this.label47.TabIndex = 250; this.label47.TabIndex = 250;
this.label47.Text = "速度:"; this.label47.Text = "速度:";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -453,24 +448,23 @@ ...@@ -453,24 +448,23 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText; this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(189, 72); this.txtAPosition.Location = new System.Drawing.Point(206, 72);
this.txtAPosition.MaxLength = 12; this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition"; this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAPosition.Size = new System.Drawing.Size(82, 23); this.txtAPosition.Size = new System.Drawing.Size(85, 23);
this.txtAPosition.TabIndex = 244; this.txtAPosition.TabIndex = 244;
this.txtAPosition.Text = "3000"; this.txtAPosition.Text = "3000";
// //
// label48 // label48
// //
this.label48.AutoSize = true;
this.label48.Cursor = System.Windows.Forms.Cursors.Default; 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.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.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(152, 73); this.label48.Location = new System.Drawing.Point(149, 74);
this.label48.Name = "label48"; this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(35, 17); this.label48.Size = new System.Drawing.Size(55, 17);
this.label48.TabIndex = 243; this.label48.TabIndex = 243;
this.label48.Text = "位置:"; this.label48.Text = "位置:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -515,24 +509,22 @@ ...@@ -515,24 +509,22 @@
// //
// label45 // label45
// //
this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(31, 75); this.label45.Location = new System.Drawing.Point(10, 75);
this.label45.Name = "label45"; this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(47, 17); this.label45.Size = new System.Drawing.Size(75, 17);
this.label45.TabIndex = 240; this.label45.TabIndex = 240;
this.label45.Text = "端口号:"; this.label45.Text = "端口号:";
this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label46 // label46
// //
this.label46.AutoSize = true;
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(43, 114); this.label46.Location = new System.Drawing.Point(10, 114);
this.label46.Name = "label46"; this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17); this.label46.Size = new System.Drawing.Size(75, 17);
this.label46.TabIndex = 239; this.label46.TabIndex = 239;
this.label46.Text = "地址:"; this.label46.Text = "地址:";
this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -540,27 +532,15 @@ ...@@ -540,27 +532,15 @@
// comboBox1 // comboBox1
// //
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true; this.comboBox1.FormattingEnabled = true;
this.comboBox1.ItemHeight = 20; this.comboBox1.ItemHeight = 17;
this.comboBox1.Location = new System.Drawing.Point(88, 26); this.comboBox1.Location = new System.Drawing.Point(13, 28);
this.comboBox1.Name = "comboBox1"; this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(187, 28); this.comboBox1.Size = new System.Drawing.Size(278, 25);
this.comboBox1.TabIndex = 234; this.comboBox1.TabIndex = 234;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
// //
// label49
//
this.label49.AutoSize = true;
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(27, 33);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.TabIndex = 233;
this.label49.Text = "AC伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// groupBox1 // 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.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -590,9 +570,9 @@ ...@@ -590,9 +570,9 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(9, 332); this.groupBox1.Location = new System.Drawing.Point(6, 315);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(535, 182); this.groupBox1.Size = new System.Drawing.Size(531, 207);
this.groupBox1.TabIndex = 218; this.groupBox1.TabIndex = 218;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态"; this.groupBox1.Text = "伺服状态";
...@@ -602,14 +582,14 @@ ...@@ -602,14 +582,14 @@
this.axis_4_Alarm.IOName = ""; this.axis_4_Alarm.IOName = "";
this.axis_4_Alarm.IOValue = 0; this.axis_4_Alarm.IOValue = 0;
this.axis_4_Alarm.isCanClick = false; this.axis_4_Alarm.isCanClick = false;
this.axis_4_Alarm.Location = new System.Drawing.Point(432, 39); this.axis_4_Alarm.Location = new System.Drawing.Point(453, 59);
this.axis_4_Alarm.Name = "axis_4_Alarm"; this.axis_4_Alarm.Name = "axis_4_Alarm";
this.axis_4_Alarm.Size = new System.Drawing.Size(43, 39); this.axis_4_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_4_Alarm.TabIndex = 271; this.axis_4_Alarm.TabIndex = 271;
// //
// txt4Target // txt4Target
// //
this.txt4Target.Location = new System.Drawing.Point(409, 143); this.txt4Target.Location = new System.Drawing.Point(430, 163);
this.txt4Target.Name = "txt4Target"; this.txt4Target.Name = "txt4Target";
this.txt4Target.ReadOnly = true; this.txt4Target.ReadOnly = true;
this.txt4Target.Size = new System.Drawing.Size(87, 23); this.txt4Target.Size = new System.Drawing.Size(87, 23);
...@@ -617,7 +597,7 @@ ...@@ -617,7 +597,7 @@
// //
// lblTargetP4 // lblTargetP4
// //
this.lblTargetP4.Location = new System.Drawing.Point(409, 115); this.lblTargetP4.Location = new System.Drawing.Point(430, 135);
this.lblTargetP4.Name = "lblTargetP4"; this.lblTargetP4.Name = "lblTargetP4";
this.lblTargetP4.ReadOnly = true; this.lblTargetP4.ReadOnly = true;
this.lblTargetP4.Size = new System.Drawing.Size(87, 23); this.lblTargetP4.Size = new System.Drawing.Size(87, 23);
...@@ -625,7 +605,7 @@ ...@@ -625,7 +605,7 @@
// //
// lblActual4 // lblActual4
// //
this.lblActual4.Location = new System.Drawing.Point(409, 87); this.lblActual4.Location = new System.Drawing.Point(430, 107);
this.lblActual4.Name = "lblActual4"; this.lblActual4.Name = "lblActual4";
this.lblActual4.ReadOnly = true; this.lblActual4.ReadOnly = true;
this.lblActual4.Size = new System.Drawing.Size(87, 23); this.lblActual4.Size = new System.Drawing.Size(87, 23);
...@@ -633,20 +613,20 @@ ...@@ -633,20 +613,20 @@
// //
// label1 // label1
// //
this.label1.AutoSize = true;
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(406, 14); this.label1.Location = new System.Drawing.Point(427, 14);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 17); this.label1.Size = new System.Drawing.Size(94, 42);
this.label1.TabIndex = 267; this.label1.TabIndex = 267;
this.label1.Text = "轴四:压紧轴"; this.label1.Text = "轴四:压紧轴";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// axis_1_Alarm // axis_1_Alarm
// //
this.axis_1_Alarm.IOName = ""; this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0; this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false; this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(127, 40); this.axis_1_Alarm.Location = new System.Drawing.Point(148, 60);
this.axis_1_Alarm.Name = "axis_1_Alarm"; this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39); this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264; this.axis_1_Alarm.TabIndex = 264;
...@@ -656,7 +636,7 @@ ...@@ -656,7 +636,7 @@
this.axis_3_Alarm.IOName = ""; this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0; this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false; this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(329, 40); this.axis_3_Alarm.Location = new System.Drawing.Point(350, 60);
this.axis_3_Alarm.Name = "axis_3_Alarm"; this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39); this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266; this.axis_3_Alarm.TabIndex = 266;
...@@ -666,24 +646,24 @@ ...@@ -666,24 +646,24 @@
this.axis_2_Alarm.IOName = ""; this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0; this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false; this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(224, 40); this.axis_2_Alarm.Location = new System.Drawing.Point(245, 60);
this.axis_2_Alarm.Name = "axis_2_Alarm"; this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39); this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265; this.axis_2_Alarm.TabIndex = 265;
// //
// label38 // label38
// //
this.label38.AutoSize = true;
this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label38.Location = new System.Drawing.Point(49, 40); this.label38.Location = new System.Drawing.Point(7, 62);
this.label38.Name = "label38"; this.label38.Name = "label38";
this.label38.Size = new System.Drawing.Size(37, 17); this.label38.Size = new System.Drawing.Size(116, 17);
this.label38.TabIndex = 263; this.label38.TabIndex = 263;
this.label38.Text = "ALM:"; this.label38.Text = "ALM:";
this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtMiddleTarget // txtMiddleTarget
// //
this.txtMiddleTarget.Location = new System.Drawing.Point(105, 144); this.txtMiddleTarget.Location = new System.Drawing.Point(126, 164);
this.txtMiddleTarget.Name = "txtMiddleTarget"; this.txtMiddleTarget.Name = "txtMiddleTarget";
this.txtMiddleTarget.ReadOnly = true; this.txtMiddleTarget.ReadOnly = true;
this.txtMiddleTarget.Size = new System.Drawing.Size(87, 23); this.txtMiddleTarget.Size = new System.Drawing.Size(87, 23);
...@@ -691,7 +671,7 @@ ...@@ -691,7 +671,7 @@
// //
// txtInoutTarget // txtInoutTarget
// //
this.txtInoutTarget.Location = new System.Drawing.Point(306, 144); this.txtInoutTarget.Location = new System.Drawing.Point(327, 164);
this.txtInoutTarget.Name = "txtInoutTarget"; this.txtInoutTarget.Name = "txtInoutTarget";
this.txtInoutTarget.ReadOnly = true; this.txtInoutTarget.ReadOnly = true;
this.txtInoutTarget.Size = new System.Drawing.Size(87, 23); this.txtInoutTarget.Size = new System.Drawing.Size(87, 23);
...@@ -699,7 +679,7 @@ ...@@ -699,7 +679,7 @@
// //
// txtUpdownTarget // txtUpdownTarget
// //
this.txtUpdownTarget.Location = new System.Drawing.Point(206, 144); this.txtUpdownTarget.Location = new System.Drawing.Point(227, 164);
this.txtUpdownTarget.Name = "txtUpdownTarget"; this.txtUpdownTarget.Name = "txtUpdownTarget";
this.txtUpdownTarget.ReadOnly = true; this.txtUpdownTarget.ReadOnly = true;
this.txtUpdownTarget.Size = new System.Drawing.Size(87, 23); this.txtUpdownTarget.Size = new System.Drawing.Size(87, 23);
...@@ -707,17 +687,17 @@ ...@@ -707,17 +687,17 @@
// //
// label12 // label12
// //
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(7, 147); this.label12.Location = new System.Drawing.Point(7, 167);
this.label12.Name = "label12"; this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(83, 17); this.label12.Size = new System.Drawing.Size(116, 17);
this.label12.TabIndex = 258; this.label12.TabIndex = 258;
this.label12.Text = "出入库目标值:"; this.label12.Text = "出入库目标值:";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// lblTargetP1 // lblTargetP1
// //
this.lblTargetP1.Location = new System.Drawing.Point(105, 116); this.lblTargetP1.Location = new System.Drawing.Point(126, 136);
this.lblTargetP1.Name = "lblTargetP1"; this.lblTargetP1.Name = "lblTargetP1";
this.lblTargetP1.ReadOnly = true; this.lblTargetP1.ReadOnly = true;
this.lblTargetP1.Size = new System.Drawing.Size(87, 23); this.lblTargetP1.Size = new System.Drawing.Size(87, 23);
...@@ -725,7 +705,7 @@ ...@@ -725,7 +705,7 @@
// //
// lblActual1 // lblActual1
// //
this.lblActual1.Location = new System.Drawing.Point(105, 88); this.lblActual1.Location = new System.Drawing.Point(126, 108);
this.lblActual1.Name = "lblActual1"; this.lblActual1.Name = "lblActual1";
this.lblActual1.ReadOnly = true; this.lblActual1.ReadOnly = true;
this.lblActual1.Size = new System.Drawing.Size(87, 23); this.lblActual1.Size = new System.Drawing.Size(87, 23);
...@@ -733,7 +713,7 @@ ...@@ -733,7 +713,7 @@
// //
// lblTargetP3 // lblTargetP3
// //
this.lblTargetP3.Location = new System.Drawing.Point(306, 116); this.lblTargetP3.Location = new System.Drawing.Point(327, 136);
this.lblTargetP3.Name = "lblTargetP3"; this.lblTargetP3.Name = "lblTargetP3";
this.lblTargetP3.ReadOnly = true; this.lblTargetP3.ReadOnly = true;
this.lblTargetP3.Size = new System.Drawing.Size(87, 23); this.lblTargetP3.Size = new System.Drawing.Size(87, 23);
...@@ -741,7 +721,7 @@ ...@@ -741,7 +721,7 @@
// //
// lblActual3 // lblActual3
// //
this.lblActual3.Location = new System.Drawing.Point(306, 88); this.lblActual3.Location = new System.Drawing.Point(327, 108);
this.lblActual3.Name = "lblActual3"; this.lblActual3.Name = "lblActual3";
this.lblActual3.ReadOnly = true; this.lblActual3.ReadOnly = true;
this.lblActual3.Size = new System.Drawing.Size(87, 23); this.lblActual3.Size = new System.Drawing.Size(87, 23);
...@@ -749,7 +729,7 @@ ...@@ -749,7 +729,7 @@
// //
// lblTargetP2 // lblTargetP2
// //
this.lblTargetP2.Location = new System.Drawing.Point(207, 116); this.lblTargetP2.Location = new System.Drawing.Point(228, 136);
this.lblTargetP2.Name = "lblTargetP2"; this.lblTargetP2.Name = "lblTargetP2";
this.lblTargetP2.ReadOnly = true; this.lblTargetP2.ReadOnly = true;
this.lblTargetP2.Size = new System.Drawing.Size(87, 23); this.lblTargetP2.Size = new System.Drawing.Size(87, 23);
...@@ -757,7 +737,7 @@ ...@@ -757,7 +737,7 @@
// //
// lblActual2 // lblActual2
// //
this.lblActual2.Location = new System.Drawing.Point(206, 88); this.lblActual2.Location = new System.Drawing.Point(227, 108);
this.lblActual2.Name = "lblActual2"; this.lblActual2.Name = "lblActual2";
this.lblActual2.ReadOnly = true; this.lblActual2.ReadOnly = true;
this.lblActual2.Size = new System.Drawing.Size(87, 23); this.lblActual2.Size = new System.Drawing.Size(87, 23);
...@@ -765,53 +745,53 @@ ...@@ -765,53 +745,53 @@
// //
// label4 // label4
// //
this.label4.AutoSize = true;
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(303, 15); this.label4.Location = new System.Drawing.Point(327, 15);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(71, 17); this.label4.Size = new System.Drawing.Size(94, 42);
this.label4.TabIndex = 100; this.label4.TabIndex = 100;
this.label4.Text = "轴三:进出轴"; this.label4.Text = "轴三:进出轴";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// label3 // label3
// //
this.label3.AutoSize = true;
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(204, 15); this.label3.Location = new System.Drawing.Point(227, 15);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(71, 17); this.label3.Size = new System.Drawing.Size(94, 42);
this.label3.TabIndex = 99; this.label3.TabIndex = 99;
this.label3.Text = "轴二:上下轴"; this.label3.Text = "轴二:上下轴";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// label5 // label5
// //
this.label5.AutoSize = true;
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(106, 15); this.label5.Location = new System.Drawing.Point(127, 15);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(71, 17); this.label5.Size = new System.Drawing.Size(94, 42);
this.label5.TabIndex = 97; this.label5.TabIndex = 97;
this.label5.Text = "轴一:旋转轴"; this.label5.Text = "轴一:旋转轴";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// label43 // label43
// //
this.label43.AutoSize = true;
this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label43.Location = new System.Drawing.Point(15, 90); this.label43.Location = new System.Drawing.Point(7, 110);
this.label43.Name = "label43"; this.label43.Name = "label43";
this.label43.Size = new System.Drawing.Size(71, 17); this.label43.Size = new System.Drawing.Size(116, 17);
this.label43.TabIndex = 23; this.label43.TabIndex = 23;
this.label43.Text = "输出脉冲值:"; this.label43.Text = "输出脉冲值:";
this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label42 // label42
// //
this.label42.AutoSize = true;
this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label42.Location = new System.Drawing.Point(15, 117); this.label42.Location = new System.Drawing.Point(7, 137);
this.label42.Name = "label42"; this.label42.Name = "label42";
this.label42.Size = new System.Drawing.Size(71, 17); this.label42.Size = new System.Drawing.Size(116, 17);
this.label42.TabIndex = 24; this.label42.TabIndex = 24;
this.label42.Text = "编码器计数:"; this.label42.Text = "编码器计数:";
this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// AxisMoveControl // AxisMoveControl
// //
...@@ -819,7 +799,7 @@ ...@@ -819,7 +799,7 @@
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupAxis); this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl"; this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(564, 529); this.Size = new System.Drawing.Size(542, 525);
this.groupAxis.ResumeLayout(false); this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout(); this.groupAxis.PerformLayout();
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
...@@ -866,7 +846,6 @@ ...@@ -866,7 +846,6 @@
private System.Windows.Forms.Label label45; private System.Windows.Forms.Label label45;
private System.Windows.Forms.Label label46; private System.Windows.Forms.Label label46;
private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Label label49;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private UserFromControl.IOStatusControl axis_4_Alarm; private UserFromControl.IOStatusControl axis_4_Alarm;
private System.Windows.Forms.TextBox txt4Target; private System.Windows.Forms.TextBox txt4Target;
......
source/ACSingleStore/useControl/AxisMoveControl.cs
...@@ -32,18 +32,18 @@ namespace OnlineStore.ACPackingStore ...@@ -32,18 +32,18 @@ namespace OnlineStore.ACPackingStore
axisList = new List<ConfigMoveAxis>(moveAxis); axisList = new List<ConfigMoveAxis>(moveAxis);
if (axisList.Count > 0) if (axisList.Count > 0)
{ {
comboBox1.Items.Clear(); comboBox1.Items.Clear();
foreach (ConfigMoveAxis a in axisList) foreach (ConfigMoveAxis a in axisList)
{ {
comboBox1.Items.Add(a.Explain); comboBox1.Items.Add(a.DisplayStr);
} }
comboBox1.SelectedIndex = 0; comboBox1.SelectedIndex = 0;
PortName = moveAxis[0].DeviceName; PortName = moveAxis[0].DeviceName;
SlvAddr = moveAxis[0].GetAxisValue(); SlvAddr = moveAxis[0].GetAxisValue();
txtAxisDeviceName.Text = PortName; txtAxisDeviceName.Text = PortName;
txtAxisValue.Text = SlvAddr.ToString(); txtAxisValue.Text = SlvAddr.ToString();
} }
} }
private void btnOpenAxis_Click(object sender, EventArgs e) private void btnOpenAxis_Click(object sender, EventArgs e)
......
source/LoadCVSLibrary/CSVResourceControl.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OnlineStore.LoadCSVLibrary
{
public class CSVResourceControl
{
public delegate string GetStrDelegate(string id, string defaultStr);
public static event GetStrDelegate GetStrEvent;
public delegate string GetStringDelegate(string id, string defaultStr, params object[] param);
public static event GetStringDelegate GetStringEvent;
public static string GetString(string id, string defaultStr)
{
string result = GetStrEvent?.Invoke(id, defaultStr);
return result;
}
public static string GetString(string id, string defaultStr, params object[] param)
{
string result = GetStringEvent?.Invoke(id, defaultStr, param);
return result;
}
}
}
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="CSVExection.cs" /> <Compile Include="CSVExection.cs" />
<Compile Include="CSVResourceControl.cs" />
<Compile Include="position\ACSAStorePosition.cs" /> <Compile Include="position\ACSAStorePosition.cs" />
<Compile Include="storeConfig\ConfigItemBase.cs" /> <Compile Include="storeConfig\ConfigItemBase.cs" />
<Compile Include="storeConfig\ConfigProAttribute.cs" /> <Compile Include="storeConfig\ConfigProAttribute.cs" />
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
...@@ -149,10 +149,14 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -149,10 +149,14 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// 下拉列表显示 /// 下拉列表显示
/// </summary> /// </summary>
/// <summary>
/// 下拉列表显示
/// </summary>
public string DisplayStr public string DisplayStr
{ {
get { get
return Explain + "（" + ProName + "）"; {
return CSVResourceControl.GetString(ProName, Explain) + "（" + ProName + "）";
} }
set set
{ {
...@@ -243,7 +247,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -243,7 +247,7 @@ namespace OnlineStore.LoadCSVLibrary
{ {
get get
{ {
return ElectricalDefinition + "_" + Explain + "（" + ProName+"）"; return ElectricalDefinition + "_" + CSVResourceControl.GetString(ElectricalDefinition, Explain) + "（" + ProName + "）";
} }
set set
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!