Skip to content

李娜 / SO827-AssemblyLine

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

界面调整，1024X768

1 个父辈 087b7734
内嵌 并排
正在显示 19 个修改的文件 包含 618 行增加 和 982 行删除
source/AssemblyLineClient/App.config
......@@ -61,7 +61,7 @@
<add key="Feed_LastShelfID_104" value="B7" />
<add key="SaveErrorImageToFile" value="1" />
<add key="UseHCBoard" value="1" />
<add key="ShowIOForm" value="1" />
<add key="ShowIOForm" value="0" />
<add key="RfidServer_Port" value="12001" />
</appSettings>
<log4net>
......
source/AssemblyLineClient/FrmAbout.Designer.cs
......@@ -41,9 +41,9 @@
this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(210, 140);
this.btnNext.Location = new System.Drawing.Point(200, 174);
this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(120, 45);
this.btnNext.Size = new System.Drawing.Size(104, 45);
this.btnNext.TabIndex = 275;
this.btnNext.Text = "确定";
this.btnNext.UseVisualStyleBackColor = false;
......@@ -55,7 +55,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.lblVersion.Location = new System.Drawing.Point(12, 36);
this.lblVersion.Name = "lblVersion";
this.lblVersion.Size = new System.Drawing.Size(529, 23);
this.lblVersion.Size = new System.Drawing.Size(503, 23);
this.lblVersion.TabIndex = 276;
this.lblVersion.Text = "版本号：1.1.0000.0000";
this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -64,9 +64,9 @@
//
this.lblTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblTime.Location = new System.Drawing.Point(81, 66);
this.lblTime.Location = new System.Drawing.Point(81, 79);
this.lblTime.Name = "lblTime";
this.lblTime.Size = new System.Drawing.Size(379, 23);
this.lblTime.Size = new System.Drawing.Size(353, 23);
this.lblTime.TabIndex = 277;
this.lblTime.Text = "更新时间：0000-00-00 00:00:00";
this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -75,18 +75,18 @@
//
this.lblCodeName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblCodeName.Location = new System.Drawing.Point(12, 100);
this.lblCodeName.Location = new System.Drawing.Point(12, 122);
this.lblCodeName.Name = "lblCodeName";
this.lblCodeName.Size = new System.Drawing.Size(529, 23);
this.lblCodeName.Size = new System.Drawing.Size(503, 23);
this.lblCodeName.TabIndex = 278;
this.lblCodeName.Text = "软件编号：？？？";
this.lblCodeName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// btnCopy
//
this.btnCopy.Location = new System.Drawing.Point(466, 64);
this.btnCopy.Location = new System.Drawing.Point(451, 77);
this.btnCopy.Name = "btnCopy";
this.btnCopy.Size = new System.Drawing.Size(75, 25);
this.btnCopy.Size = new System.Drawing.Size(74, 25);
this.btnCopy.TabIndex = 279;
this.btnCopy.Text = "复制编号";
this.btnCopy.UseVisualStyleBackColor = true;
......@@ -96,7 +96,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(553, 222);
this.ClientSize = new System.Drawing.Size(543, 248);
this.Controls.Add(this.btnCopy);
this.Controls.Add(this.lblCodeName);
this.Controls.Add(this.lblTime);
......
source/AssemblyLineClient/FrmEquipBase.Designer.cs
......@@ -29,6 +29,7 @@
private void InitializeComponent()
{
this.panBase = new System.Windows.Forms.Panel();
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.btnExit = new System.Windows.Forms.Button();
this.lblName = new System.Windows.Forms.Label();
this.chbDebug = new System.Windows.Forms.CheckBox();
......@@ -37,7 +38,6 @@
this.btnStart = new System.Windows.Forms.Button();
this.btnInStore = new System.Windows.Forms.Button();
this.btnStop = new System.Windows.Forms.Button();
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.panBase.SuspendLayout();
this.SuspendLayout();
//
......@@ -57,18 +57,29 @@
this.panBase.Controls.Add(this.btnStop);
this.panBase.Location = new System.Drawing.Point(3, 3);
this.panBase.Name = "panBase";
this.panBase.Size = new System.Drawing.Size(1177, 50);
this.panBase.Size = new System.Drawing.Size(997, 50);
this.panBase.TabIndex = 259;
//
// chbMoveStop
//
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(657, 12);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 262;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
//
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.BackColor = System.Drawing.Color.White;
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExit.Location = new System.Drawing.Point(1062, 4);
this.btnExit.Location = new System.Drawing.Point(887, 4);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(110, 40);
this.btnExit.Size = new System.Drawing.Size(105, 40);
this.btnExit.TabIndex = 260;
this.btnExit.Text = "退出";
this.btnExit.UseVisualStyleBackColor = false;
......@@ -80,7 +91,7 @@
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 4);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.Size = new System.Drawing.Size(120, 40);
this.lblName.TabIndex = 250;
this.lblName.Text = "进仓移栽";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -89,7 +100,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(666, 12);
this.chbDebug.Location = new System.Drawing.Point(568, 12);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -102,7 +113,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(862, 14);
this.lblStoreStatus.Location = new System.Drawing.Point(746, 14);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -114,9 +125,9 @@
this.btnOutStore.BackColor = System.Drawing.Color.White;
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.Location = new System.Drawing.Point(414, 4);
this.btnOutStore.Location = new System.Drawing.Point(347, 4);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 40);
this.btnOutStore.Size = new System.Drawing.Size(105, 40);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出库测试";
this.btnOutStore.UseVisualStyleBackColor = false;
......@@ -126,9 +137,9 @@
this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(188, 4);
this.btnStart.Location = new System.Drawing.Point(129, 4);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.Size = new System.Drawing.Size(105, 40);
this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false;
......@@ -138,9 +149,9 @@
this.btnInStore.BackColor = System.Drawing.Color.White;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(527, 4);
this.btnInStore.Location = new System.Drawing.Point(456, 4);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(110, 40);
this.btnInStore.Size = new System.Drawing.Size(105, 40);
this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试";
this.btnInStore.UseVisualStyleBackColor = false;
......@@ -150,29 +161,18 @@
this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(301, 4);
this.btnStop.Location = new System.Drawing.Point(238, 4);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.Size = new System.Drawing.Size(105, 40);
this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false;
//
// chbMoveStop
//
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(764, 12);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 262;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
//
// FrmEquipBase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1184, 611);
this.ClientSize = new System.Drawing.Size(1004, 711);
this.Controls.Add(this.panBase);
this.Name = "FrmEquipBase";
this.Text = "FrmEquipBase";
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -21,8 +21,7 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.lblAddr = new System.Windows.Forms.Label();
this.btnOpenDo = new System.Windows.Forms.Button();
this.txtSlaveId = new System.Windows.Forms.TextBox();
this.cmbWriteIO = new System.Windows.Forms.ComboBox();
......@@ -63,8 +62,6 @@
this.lblInstoreList = new System.Windows.Forms.Label();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.clampJawControl1 = new OnlineStore.AssemblyLine.useControl.ClampJawControl();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.lblTestMsg = new System.Windows.Forms.Label();
......@@ -100,7 +97,6 @@
this.label4 = new System.Windows.Forms.Label();
this.btnMoveto = new System.Windows.Forms.Button();
this.txtSizePosition = new System.Windows.Forms.TextBox();
this.chbBoxSendShelf = new System.Windows.Forms.CheckBox();
this.btnScan = new System.Windows.Forms.Button();
this.panBase.SuspendLayout();
this.groupBox1.SuspendLayout();
......@@ -111,7 +107,6 @@
this.tabPage3.SuspendLayout();
this.groupBox6.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox7.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupDetial.SuspendLayout();
......@@ -121,9 +116,8 @@
//
// panBase
//
this.panBase.Controls.Add(this.chbBoxSendShelf);
this.panBase.Controls.Add(this.btnScan);
this.panBase.Size = new System.Drawing.Size(1226, 50);
this.panBase.Size = new System.Drawing.Size(996, 50);
this.panBase.Controls.SetChildIndex(this.chbMoveStop, 0);
this.panBase.Controls.SetChildIndex(this.btnStop, 0);
this.panBase.Controls.SetChildIndex(this.btnInStore, 0);
......@@ -133,21 +127,20 @@
this.panBase.Controls.SetChildIndex(this.btnScan, 0);
this.panBase.Controls.SetChildIndex(this.lblName, 0);
this.panBase.Controls.SetChildIndex(this.btnExit, 0);
this.panBase.Controls.SetChildIndex(this.chbBoxSendShelf, 0);
this.panBase.Controls.SetChildIndex(this.chbDebug, 0);
//
// btnExit
//
this.btnExit.Location = new System.Drawing.Point(1111, 4);
this.btnExit.Click += new System.EventHandler(this.btnClose_Click);
//
// chbDebug
//
this.chbDebug.Location = new System.Drawing.Point(461, 12);
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
//
// lblStoreStatus
//
this.lblStoreStatus.Location = new System.Drawing.Point(880, 14);
this.lblStoreStatus.Location = new System.Drawing.Point(639, 14);
//
// btnOutStore
//
......@@ -168,6 +161,7 @@
//
// chbMoveStop
//
this.chbMoveStop.Location = new System.Drawing.Point(550, 12);
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
//
// timer1
......@@ -180,8 +174,7 @@
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.lblAddr);
this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.cmbWriteIO);
......@@ -189,9 +182,9 @@
this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5);
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(685, 6);
this.groupBox1.Location = new System.Drawing.Point(468, 6);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(521, 107);
this.groupBox1.Size = new System.Drawing.Size(501, 107);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -200,54 +193,44 @@
//
this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(178, 65);
this.txtDOIndex.Location = new System.Drawing.Point(445, 64);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
this.txtDOIndex.TabIndex = 260;
this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false;
//
// txtDoName
//
this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(72, 65);
this.txtDoName.Location = new System.Drawing.Point(386, 64);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(53, 23);
this.txtDoName.TabIndex = 259;
this.txtDoName.Text = "0";
this.txtDoName.Visible = false;
//
// 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(17, 68);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17);
this.label17.TabIndex = 258;
this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(134, 68);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 257;
this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// lblAddr
//
this.lblAddr.AutoSize = true;
this.lblAddr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(326, 27);
this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(46, 17);
this.lblAddr.TabIndex = 258;
this.lblAddr.Text = "设备IP:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnOpenDo
//
this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(397, 18);
this.btnOpenDo.Location = new System.Drawing.Point(147, 55);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(110, 34);
this.btnOpenDo.TabIndex = 256;
......@@ -258,7 +241,7 @@
// txtSlaveId
//
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(379, 24);
this.txtSlaveId.Location = new System.Drawing.Point(427, 27);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
......@@ -274,9 +257,9 @@
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(17, 21);
this.cmbWriteIO.Location = new System.Drawing.Point(29, 21);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(356, 28);
this.cmbWriteIO.Size = new System.Drawing.Size(284, 28);
this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
......@@ -287,7 +270,7 @@
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(397, 59);
this.btnWriteSingleDO.Location = new System.Drawing.Point(262, 55);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(110, 34);
this.btnWriteSingleDO.TabIndex = 232;
......@@ -298,10 +281,10 @@
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(303, 65);
this.txtWriteTime.Location = new System.Drawing.Point(82, 61);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
this.txtWriteTime.Size = new System.Drawing.Size(60, 23);
this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0";
//
......@@ -310,7 +293,7 @@
this.label5.AutoSize = true;
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.Location = new System.Drawing.Point(234, 68);
this.label5.Location = new System.Drawing.Point(17, 64);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237;
......@@ -322,7 +305,7 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(347, 242);
this.btnCloseAll.Location = new System.Drawing.Point(320, 242);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(140, 34);
this.btnCloseAll.TabIndex = 259;
......@@ -335,7 +318,7 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(457, 6);
this.groupBox4.Location = new System.Drawing.Point(235, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(220, 599);
this.groupBox4.TabIndex = 104;
......@@ -408,9 +391,9 @@
this.groupDO.Controls.Add(this.SL_Entry_StopDown);
this.groupDO.Controls.Add(this.SL_LocationCylinder_Up);
this.groupDO.Controls.Add(this.SL_MoveCylinder_Take);
this.groupDO.Location = new System.Drawing.Point(685, 119);
this.groupDO.Location = new System.Drawing.Point(468, 119);
this.groupDO.Name = "groupDO";
this.groupDO.Size = new System.Drawing.Size(521, 300);
this.groupDO.Size = new System.Drawing.Size(501, 300);
this.groupDO.TabIndex = 255;
this.groupDO.TabStop = false;
this.groupDO.Text = "IO操作测试";
......@@ -420,7 +403,7 @@
this.SL_TrayLocation_After.BackColor = System.Drawing.Color.White;
this.SL_TrayLocation_After.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_TrayLocation_After.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TrayLocation_After.Location = new System.Drawing.Point(347, 85);
this.SL_TrayLocation_After.Location = new System.Drawing.Point(320, 85);
this.SL_TrayLocation_After.Name = "SL_TrayLocation_After";
this.SL_TrayLocation_After.Size = new System.Drawing.Size(153, 34);
this.SL_TrayLocation_After.TabIndex = 282;
......@@ -433,7 +416,7 @@
this.SL_MoveCylinder_Give.BackColor = System.Drawing.Color.White;
this.SL_MoveCylinder_Give.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_MoveCylinder_Give.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_MoveCylinder_Give.Location = new System.Drawing.Point(183, 242);
this.SL_MoveCylinder_Give.Location = new System.Drawing.Point(169, 242);
this.SL_MoveCylinder_Give.Name = "SL_MoveCylinder_Give";
this.SL_MoveCylinder_Give.Size = new System.Drawing.Size(140, 34);
this.SL_MoveCylinder_Give.TabIndex = 279;
......@@ -446,7 +429,7 @@
this.SL_LocationCylinder_Down.BackColor = System.Drawing.Color.White;
this.SL_LocationCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_LocationCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_LocationCylinder_Down.Location = new System.Drawing.Point(347, 190);
this.SL_LocationCylinder_Down.Location = new System.Drawing.Point(320, 190);
this.SL_LocationCylinder_Down.Name = "SL_LocationCylinder_Down";
this.SL_LocationCylinder_Down.Size = new System.Drawing.Size(140, 34);
this.SL_LocationCylinder_Down.TabIndex = 278;
......@@ -459,7 +442,7 @@
this.SL_FixedCylinder_Down.BackColor = System.Drawing.Color.White;
this.SL_FixedCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_FixedCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_FixedCylinder_Down.Location = new System.Drawing.Point(183, 190);
this.SL_FixedCylinder_Down.Location = new System.Drawing.Point(169, 190);
this.SL_FixedCylinder_Down.Name = "SL_FixedCylinder_Down";
this.SL_FixedCylinder_Down.Size = new System.Drawing.Size(140, 34);
this.SL_FixedCylinder_Down.TabIndex = 277;
......@@ -472,7 +455,7 @@
this.SL_TopCylinder_Down.BackColor = System.Drawing.Color.White;
this.SL_TopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_TopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TopCylinder_Down.Location = new System.Drawing.Point(20, 190);
this.SL_TopCylinder_Down.Location = new System.Drawing.Point(17, 190);
this.SL_TopCylinder_Down.Name = "SL_TopCylinder_Down";
this.SL_TopCylinder_Down.Size = new System.Drawing.Size(140, 34);
this.SL_TopCylinder_Down.TabIndex = 276;
......@@ -485,7 +468,7 @@
this.SL_TopCylinder_Up.BackColor = System.Drawing.Color.White;
this.SL_TopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_TopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TopCylinder_Up.Location = new System.Drawing.Point(20, 150);
this.SL_TopCylinder_Up.Location = new System.Drawing.Point(17, 150);
this.SL_TopCylinder_Up.Name = "SL_TopCylinder_Up";
this.SL_TopCylinder_Up.Size = new System.Drawing.Size(140, 34);
this.SL_TopCylinder_Up.TabIndex = 274;
......@@ -498,7 +481,7 @@
this.SL_FixedCylinder_Up.BackColor = System.Drawing.Color.White;
this.SL_FixedCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_FixedCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_FixedCylinder_Up.Location = new System.Drawing.Point(183, 150);
this.SL_FixedCylinder_Up.Location = new System.Drawing.Point(169, 150);
this.SL_FixedCylinder_Up.Name = "SL_FixedCylinder_Up";
this.SL_FixedCylinder_Up.Size = new System.Drawing.Size(140, 34);
this.SL_FixedCylinder_Up.TabIndex = 273;
......@@ -511,7 +494,7 @@
this.SL_Out_StopDown.BackColor = System.Drawing.Color.White;
this.SL_Out_StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_Out_StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_Out_StopDown.Location = new System.Drawing.Point(20, 102);
this.SL_Out_StopDown.Location = new System.Drawing.Point(17, 102);
this.SL_Out_StopDown.Name = "SL_Out_StopDown";
this.SL_Out_StopDown.Size = new System.Drawing.Size(140, 34);
this.SL_Out_StopDown.TabIndex = 272;
......@@ -524,7 +507,7 @@
this.SL_TrayLocation_Before.BackColor = System.Drawing.Color.White;
this.SL_TrayLocation_Before.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_TrayLocation_Before.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TrayLocation_Before.Location = new System.Drawing.Point(347, 45);
this.SL_TrayLocation_Before.Location = new System.Drawing.Point(320, 45);
this.SL_TrayLocation_Before.Name = "SL_TrayLocation_Before";
this.SL_TrayLocation_Before.Size = new System.Drawing.Size(153, 34);
this.SL_TrayLocation_Before.TabIndex = 255;
......@@ -537,7 +520,7 @@
this.SL_OutSideWay_Run.BackColor = System.Drawing.Color.White;
this.SL_OutSideWay_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_OutSideWay_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_OutSideWay_Run.Location = new System.Drawing.Point(183, 102);
this.SL_OutSideWay_Run.Location = new System.Drawing.Point(169, 102);
this.SL_OutSideWay_Run.Name = "SL_OutSideWay_Run";
this.SL_OutSideWay_Run.Size = new System.Drawing.Size(140, 34);
this.SL_OutSideWay_Run.TabIndex = 265;
......@@ -550,7 +533,7 @@
this.SL_LocationSideWay_Run.BackColor = System.Drawing.Color.White;
this.SL_LocationSideWay_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_LocationSideWay_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_LocationSideWay_Run.Location = new System.Drawing.Point(183, 62);
this.SL_LocationSideWay_Run.Location = new System.Drawing.Point(169, 62);
this.SL_LocationSideWay_Run.Name = "SL_LocationSideWay_Run";
this.SL_LocationSideWay_Run.Size = new System.Drawing.Size(140, 34);
this.SL_LocationSideWay_Run.TabIndex = 264;
......@@ -563,7 +546,7 @@
this.SL_Buffer_StopDown.BackColor = System.Drawing.Color.White;
this.SL_Buffer_StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_Buffer_StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_Buffer_StopDown.Location = new System.Drawing.Point(20, 62);
this.SL_Buffer_StopDown.Location = new System.Drawing.Point(17, 62);
this.SL_Buffer_StopDown.Name = "SL_Buffer_StopDown";
this.SL_Buffer_StopDown.Size = new System.Drawing.Size(140, 34);
this.SL_Buffer_StopDown.TabIndex = 267;
......@@ -576,7 +559,7 @@
this.SL_Line_Run.BackColor = System.Drawing.Color.White;
this.SL_Line_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_Line_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_Line_Run.Location = new System.Drawing.Point(183, 22);
this.SL_Line_Run.Location = new System.Drawing.Point(169, 22);
this.SL_Line_Run.Name = "SL_Line_Run";
this.SL_Line_Run.Size = new System.Drawing.Size(140, 34);
this.SL_Line_Run.TabIndex = 263;
......@@ -589,7 +572,7 @@
this.SL_Entry_StopDown.BackColor = System.Drawing.Color.White;
this.SL_Entry_StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_Entry_StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_Entry_StopDown.Location = new System.Drawing.Point(20, 22);
this.SL_Entry_StopDown.Location = new System.Drawing.Point(17, 22);
this.SL_Entry_StopDown.Name = "SL_Entry_StopDown";
this.SL_Entry_StopDown.Size = new System.Drawing.Size(140, 34);
this.SL_Entry_StopDown.TabIndex = 266;
......@@ -602,7 +585,7 @@
this.SL_LocationCylinder_Up.BackColor = System.Drawing.Color.White;
this.SL_LocationCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_LocationCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_LocationCylinder_Up.Location = new System.Drawing.Point(347, 150);
this.SL_LocationCylinder_Up.Location = new System.Drawing.Point(320, 150);
this.SL_LocationCylinder_Up.Name = "SL_LocationCylinder_Up";
this.SL_LocationCylinder_Up.Size = new System.Drawing.Size(140, 34);
this.SL_LocationCylinder_Up.TabIndex = 256;
......@@ -615,7 +598,7 @@
this.SL_MoveCylinder_Take.BackColor = System.Drawing.Color.White;
this.SL_MoveCylinder_Take.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.SL_MoveCylinder_Take.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_MoveCylinder_Take.Location = new System.Drawing.Point(20, 242);
this.SL_MoveCylinder_Take.Location = new System.Drawing.Point(17, 242);
this.SL_MoveCylinder_Take.Name = "SL_MoveCylinder_Take";
this.SL_MoveCylinder_Take.Size = new System.Drawing.Size(140, 34);
this.SL_MoveCylinder_Take.TabIndex = 252;
......@@ -632,7 +615,7 @@
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(406, 14);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(756, 330);
this.lblThisSta.Size = new System.Drawing.Size(526, 330);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -648,7 +631,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 60);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1223, 645);
this.tabControl1.Size = new System.Drawing.Size(993, 645);
this.tabControl1.TabIndex = 257;
//
// tabPage3
......@@ -656,7 +639,7 @@
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1215, 615);
this.tabPage3.Size = new System.Drawing.Size(985, 615);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "状态信息";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -675,7 +658,7 @@
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(3, 3);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(1209, 609);
this.groupBox6.Size = new System.Drawing.Size(979, 609);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
......@@ -744,7 +727,7 @@
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(406, 258);
this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(636, 109);
this.lblInstoreList.Size = new System.Drawing.Size(406, 109);
this.lblInstoreList.TabIndex = 277;
//
// tabPage1
......@@ -752,52 +735,23 @@
this.tabPage1.Controls.Add(this.groupDO);
this.tabPage1.Controls.Add(this.clampJawControl1);
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1215, 615);
this.tabPage1.Size = new System.Drawing.Size(985, 615);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// clampJawControl1
//
this.clampJawControl1.Location = new System.Drawing.Point(680, 425);
this.clampJawControl1.Location = new System.Drawing.Point(462, 422);
this.clampJawControl1.Name = "clampJawControl1";
this.clampJawControl1.Size = new System.Drawing.Size(230, 167);
this.clampJawControl1.Size = new System.Drawing.Size(239, 167);
this.clampJawControl1.TabIndex = 280;
//
// groupBox7
//
this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox7.Controls.Add(this.tableLayoutPanel3);
this.groupBox7.Location = new System.Drawing.Point(232, 6);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(220, 599);
this.groupBox7.TabIndex = 279;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "DI列表";
//
// tableLayoutPanel3
//
this.tableLayoutPanel3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel3.AutoScroll = true;
this.tableLayoutPanel3.ColumnCount = 1;
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(209, 579);
this.tableLayoutPanel3.TabIndex = 102;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.groupBox5);
......@@ -808,7 +762,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1215, 615);
this.tabPage2.Size = new System.Drawing.Size(985, 615);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -819,9 +773,9 @@
this.groupBox5.Controls.Add(this.btnTestStop);
this.groupBox5.Controls.Add(this.lblTargetP3);
this.groupBox5.Controls.Add(this.btnStartTest);
this.groupBox5.Location = new System.Drawing.Point(16, 405);
this.groupBox5.Location = new System.Drawing.Point(10, 405);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(557, 114);
this.groupBox5.Size = new System.Drawing.Size(477, 114);
this.groupBox5.TabIndex = 320;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "提升轴上料测试";
......@@ -833,7 +787,7 @@
this.lblTestMsg.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTestMsg.Location = new System.Drawing.Point(6, 64);
this.lblTestMsg.Name = "lblTestMsg";
this.lblTestMsg.Size = new System.Drawing.Size(545, 43);
this.lblTestMsg.Size = new System.Drawing.Size(469, 43);
this.lblTestMsg.TabIndex = 318;
this.lblTestMsg.Text = "测试信息：";
this.lblTestMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -846,7 +800,7 @@
this.btnTestStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTestStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTestStop.ForeColor = System.Drawing.Color.Red;
this.btnTestStop.Location = new System.Drawing.Point(354, 23);
this.btnTestStop.Location = new System.Drawing.Point(294, 23);
this.btnTestStop.Name = "btnTestStop";
this.btnTestStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnTestStop.Size = new System.Drawing.Size(163, 34);
......@@ -860,7 +814,7 @@
this.lblTargetP3.AutoSize = true;
this.lblTargetP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTargetP3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTargetP3.Location = new System.Drawing.Point(39, 32);
this.lblTargetP3.Location = new System.Drawing.Point(10, 32);
this.lblTargetP3.Name = "lblTargetP3";
this.lblTargetP3.Size = new System.Drawing.Size(70, 17);
this.lblTargetP3.TabIndex = 316;
......@@ -874,7 +828,7 @@
this.btnStartTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartTest.ForeColor = System.Drawing.Color.Red;
this.btnStartTest.Location = new System.Drawing.Point(167, 23);
this.btnStartTest.Location = new System.Drawing.Point(127, 23);
this.btnStartTest.Name = "btnStartTest";
this.btnStartTest.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnStartTest.Size = new System.Drawing.Size(163, 34);
......@@ -893,9 +847,9 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(587, 316);
this.groupDetial.Location = new System.Drawing.Point(498, 316);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(603, 204);
this.groupDetial.Size = new System.Drawing.Size(478, 204);
this.groupDetial.TabIndex = 319;
this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置";
......@@ -904,7 +858,7 @@
//
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(139, 143);
this.btnDSave.Location = new System.Drawing.Point(103, 143);
this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(94, 34);
this.btnDSave.TabIndex = 322;
......@@ -917,11 +871,11 @@
this.label3.AutoSize = true;
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.Location = new System.Drawing.Point(33, 110);
this.label3.Location = new System.Drawing.Point(23, 110);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 17);
this.label3.Size = new System.Drawing.Size(70, 17);
this.label3.TabIndex = 321;
this.label3.Text = "升降轴P2位置：";
this.label3.Text = "升降轴P2：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtDP2
......@@ -930,7 +884,7 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(141, 104);
this.txtDP2.Location = new System.Drawing.Point(105, 104);
this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -943,7 +897,7 @@
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 20;
this.listDetitalP2.Location = new System.Drawing.Point(256, 17);
this.listDetitalP2.Location = new System.Drawing.Point(205, 17);
this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(251, 164);
this.listDetitalP2.TabIndex = 319;
......@@ -954,7 +908,7 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(141, 68);
this.cmbDHeight.Location = new System.Drawing.Point(105, 68);
this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(90, 28);
this.cmbDHeight.TabIndex = 318;
......@@ -965,7 +919,7 @@
this.label2.AutoSize = true;
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.Location = new System.Drawing.Point(59, 74);
this.label2.Location = new System.Drawing.Point(23, 74);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17);
this.label2.TabIndex = 317;
......@@ -977,7 +931,7 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(141, 32);
this.cmbDSize.Location = new System.Drawing.Point(105, 32);
this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(90, 28);
this.cmbDSize.TabIndex = 316;
......@@ -988,7 +942,7 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(59, 38);
this.label1.Location = new System.Drawing.Point(23, 38);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 315;
......@@ -1004,9 +958,9 @@
this.groupBox9.Controls.Add(this.btnBP1);
this.groupBox9.Controls.Add(this.btnBP2);
this.groupBox9.Controls.Add(this.txtBP2);
this.groupBox9.Location = new System.Drawing.Point(587, 8);
this.groupBox9.Location = new System.Drawing.Point(498, 8);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(603, 114);
this.groupBox9.Size = new System.Drawing.Size(478, 114);
this.groupBox9.TabIndex = 220;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "上料提升轴位置配置";
......@@ -1018,10 +972,10 @@
this.btnBP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP3.ForeColor = System.Drawing.Color.Red;
this.btnBP3.Location = new System.Drawing.Point(258, 25);
this.btnBP3.Location = new System.Drawing.Point(242, 25);
this.btnBP3.Name = "btnBP3";
this.btnBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP3.Size = new System.Drawing.Size(163, 34);
this.btnBP3.Size = new System.Drawing.Size(154, 34);
this.btnBP3.TabIndex = 312;
this.btnBP3.Text = "上料目标点P3";
this.btnBP3.UseVisualStyleBackColor = true;
......@@ -1033,7 +987,7 @@
this.txtBP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBP3.Location = new System.Drawing.Point(424, 29);
this.txtBP3.Location = new System.Drawing.Point(399, 28);
this.txtBP3.MaxLength = 12;
this.txtBP3.Name = "txtBP3";
this.txtBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1046,9 +1000,9 @@
this.btnBSave.BackColor = System.Drawing.SystemColors.Control;
this.btnBSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBSave.ForeColor = System.Drawing.Color.Red;
this.btnBSave.Location = new System.Drawing.Point(258, 67);
this.btnBSave.Location = new System.Drawing.Point(242, 67);
this.btnBSave.Name = "btnBSave";
this.btnBSave.Size = new System.Drawing.Size(163, 34);
this.btnBSave.Size = new System.Drawing.Size(154, 34);
this.btnBSave.TabIndex = 310;
this.btnBSave.Text = "保存位置";
this.btnBSave.UseVisualStyleBackColor = false;
......@@ -1060,7 +1014,7 @@
this.txtBp1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBp1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBp1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBp1.Location = new System.Drawing.Point(180, 29);
this.txtBp1.Location = new System.Drawing.Point(163, 28);
this.txtBp1.MaxLength = 12;
this.txtBp1.Name = "txtBp1";
this.txtBp1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1075,10 +1029,10 @@
this.btnBP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP1.ForeColor = System.Drawing.Color.Red;
this.btnBP1.Location = new System.Drawing.Point(14, 25);
this.btnBP1.Location = new System.Drawing.Point(6, 25);
this.btnBP1.Name = "btnBP1";
this.btnBP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP1.Size = new System.Drawing.Size(163, 34);
this.btnBP1.Size = new System.Drawing.Size(154, 34);
this.btnBP1.TabIndex = 307;
this.btnBP1.Text = "上升待机点P1：";
this.btnBP1.UseVisualStyleBackColor = true;
......@@ -1091,10 +1045,10 @@
this.btnBP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP2.ForeColor = System.Drawing.Color.Red;
this.btnBP2.Location = new System.Drawing.Point(14, 67);
this.btnBP2.Location = new System.Drawing.Point(6, 67);
this.btnBP2.Name = "btnBP2";
this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP2.Size = new System.Drawing.Size(163, 34);
this.btnBP2.Size = new System.Drawing.Size(154, 34);
this.btnBP2.TabIndex = 306;
this.btnBP2.Text = "下降固定料串点P2";
this.btnBP2.UseVisualStyleBackColor = true;
......@@ -1106,7 +1060,7 @@
this.txtBP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBP2.Location = new System.Drawing.Point(180, 71);
this.txtBP2.Location = new System.Drawing.Point(163, 70);
this.txtBP2.MaxLength = 12;
this.txtBP2.Name = "txtBP2";
this.txtBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1116,9 +1070,9 @@
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(6, 4);
this.axisMoveControl1.Location = new System.Drawing.Point(4, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(575, 398);
this.axisMoveControl1.Size = new System.Drawing.Size(488, 403);
this.axisMoveControl1.TabIndex = 219;
//
// groupBox2
......@@ -1133,9 +1087,9 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnMoveto);
this.groupBox2.Controls.Add(this.txtSizePosition);
this.groupBox2.Location = new System.Drawing.Point(587, 125);
this.groupBox2.Location = new System.Drawing.Point(498, 125);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(603, 188);
this.groupBox2.Size = new System.Drawing.Size(478, 188);
this.groupBox2.TabIndex = 218;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "移栽升降轴位置配置";
......@@ -1146,7 +1100,7 @@
this.lblP2List.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblP2List.Location = new System.Drawing.Point(12, 100);
this.lblP2List.Name = "lblP2List";
this.lblP2List.Size = new System.Drawing.Size(585, 35);
this.lblP2List.Size = new System.Drawing.Size(445, 35);
this.lblP2List.TabIndex = 313;
this.lblP2List.Text = "P2列表：";
this.lblP2List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1157,7 +1111,7 @@
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(424, 65);
this.txtUpdownP3.Location = new System.Drawing.Point(399, 65);
this.txtUpdownP3.MaxLength = 12;
this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1172,10 +1126,10 @@
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.ForeColor = System.Drawing.Color.Blue;
this.btnUpdownP3.Location = new System.Drawing.Point(258, 61);
this.btnUpdownP3.Location = new System.Drawing.Point(242, 61);
this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(163, 34);
this.btnUpdownP3.Size = new System.Drawing.Size(154, 34);
this.btnUpdownP3.TabIndex = 311;
this.btnUpdownP3.Text = "升降轴取料点P3：";
this.btnUpdownP3.UseVisualStyleBackColor = true;
......@@ -1188,7 +1142,7 @@
this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(258, 141);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(163, 34);
this.btnSave.Size = new System.Drawing.Size(140, 34);
this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = false;
......@@ -1200,7 +1154,7 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(424, 24);
this.txtP1.Location = new System.Drawing.Point(399, 24);
this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1215,10 +1169,10 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(258, 20);
this.btnMoveToP1.Location = new System.Drawing.Point(242, 20);
this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
this.btnMoveToP1.Size = new System.Drawing.Size(154, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
......@@ -1231,7 +1185,7 @@
this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(109, 23);
this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(143, 28);
this.cmbSizeList.Size = new System.Drawing.Size(120, 28);
this.cmbSizeList.TabIndex = 303;
this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged);
//
......@@ -1254,10 +1208,10 @@
this.btnMoveto.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveto.ForeColor = System.Drawing.Color.Blue;
this.btnMoveto.Location = new System.Drawing.Point(16, 61);
this.btnMoveto.Location = new System.Drawing.Point(8, 61);
this.btnMoveto.Name = "btnMoveto";
this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveto.Size = new System.Drawing.Size(163, 34);
this.btnMoveto.Size = new System.Drawing.Size(154, 34);
this.btnMoveto.TabIndex = 306;
this.btnMoveto.Text = "托盘放料点P2";
this.btnMoveto.UseVisualStyleBackColor = true;
......@@ -1269,7 +1223,7 @@
this.txtSizePosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtSizePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSizePosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtSizePosition.Location = new System.Drawing.Point(182, 65);
this.txtSizePosition.Location = new System.Drawing.Point(163, 65);
this.txtSizePosition.MaxLength = 12;
this.txtSizePosition.Name = "txtSizePosition";
this.txtSizePosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1277,26 +1231,14 @@
this.txtSizePosition.TabIndex = 305;
this.txtSizePosition.Text = "-1";
//
// chbBoxSendShelf
//
this.chbBoxSendShelf.AutoSize = true;
this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBoxSendShelf.Location = new System.Drawing.Point(524, 12);
this.chbBoxSendShelf.Name = "chbBoxSendShelf";
this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24);
this.chbBoxSendShelf.TabIndex = 251;
this.chbBoxSendShelf.Text = "出库完成送出料架";
this.chbBoxSendShelf.UseVisualStyleBackColor = true;
this.chbBoxSendShelf.CheckedChanged += new System.EventHandler(this.chbBoxSendShelf_CheckedChanged);
//
// btnScan
//
this.btnScan.BackColor = System.Drawing.Color.White;
this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnScan.Location = new System.Drawing.Point(414, 4);
this.btnScan.Location = new System.Drawing.Point(348, 4);
this.btnScan.Name = "btnScan";
this.btnScan.Size = new System.Drawing.Size(110, 40);
this.btnScan.Size = new System.Drawing.Size(103, 40);
this.btnScan.TabIndex = 248;
this.btnScan.Text = "扫码测试";
this.btnScan.UseVisualStyleBackColor = false;
......@@ -1306,7 +1248,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1234, 711);
this.ClientSize = new System.Drawing.Size(1004, 711);
this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
......@@ -1330,7 +1272,6 @@
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.tabPage1.ResumeLayout(false);
this.groupBox7.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
......@@ -1377,13 +1318,10 @@
private System.Windows.Forms.Label lblAgvInfo;
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.Label lblInstoreList;
private System.Windows.Forms.GroupBox groupBox7;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.Button btnOpenDo;
private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label lblAddr;
private System.Windows.Forms.Button SL_Entry_StopDown;
private System.Windows.Forms.Button SL_OutSideWay_Run;
private System.Windows.Forms.Button SL_Line_Run;
......@@ -1404,7 +1342,6 @@
internal System.Windows.Forms.Button btnUpdownP3;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.Label lblwidth;
private System.Windows.Forms.CheckBox chbBoxSendShelf;
private System.Windows.Forms.Button SL_Out_StopDown;
private System.Windows.Forms.Button btnUpdateShelf;
private System.Windows.Forms.TextBox txtShelfID;
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -39,18 +39,18 @@ namespace OnlineStore.AssemblyLine
int roleindex = 0;
this.tableLayoutPanel1.RowStyles.Clear();
this.tableLayoutPanel1.RowCount = maxCount;
this.tableLayoutPanel3.RowStyles.Clear();
this.tableLayoutPanel3.RowCount = maxCount;
//this.tableLayoutPanel3.RowStyles.Clear();
//this.tableLayoutPanel3.RowCount = maxCount;
int i = 0;
foreach (ConfigIO ioValue in equipBean.Config.DIList.Values)
{
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
if (i >= maxCount)
{
this.tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel3.Controls.Add(control, 0, roleindex - maxCount);
}
else
//if (i >= maxCount)
//{
// this.tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
// this.tableLayoutPanel3.Controls.Add(control, 0, roleindex - maxCount);
//}
//else
{
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
......@@ -122,10 +122,10 @@ namespace OnlineStore.AssemblyLine
FormStatus(false);
}
}
if (!equipBean.OutEndSendShelfOut.Equals(chbBoxSendShelf.Checked) && (!IsInCheck))
{
chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
}
//if (!equipBean.OutEndSendShelfOut.Equals(chbBoxSendShelf.Checked) && (!IsInCheck))
//{
// chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
//}
lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() +
"\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
string canOut = equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块";
......@@ -219,6 +219,7 @@ namespace OnlineStore.AssemblyLine
txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP;
txtSlaveId.Text = io.SlaveID.ToString();
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue;
......@@ -256,9 +257,9 @@ namespace OnlineStore.AssemblyLine
txtBP3.Text = equipBean.Config.BatchAxisP3.ToString();
lblName.Text = equipBean.Name;
this.Text = equipBean.Name;
chbBoxSendShelf.Visible = equipBean.Config.IsCanOut.Equals(1);
//chbBoxSendShelf.Visible = equipBean.Config.IsCanOut.Equals(1);
//chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
btnScan.Visible = equipBean.Config.IsCanOut.Equals(0);
chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
btnOutStore.Visible = equipBean.Config.IsCanOut.Equals(1);
lblTargetP3.Text = "目标P3：" + equipBean.Config.BatchAxisP3 ;
lblTestMsg.Text = "";
......@@ -569,10 +570,10 @@ namespace OnlineStore.AssemblyLine
}
private void chbBoxSendShelf_CheckedChanged(object sender, EventArgs e)
{
IsInCheck = true;
LogUtil.info(equipBean.Name + "界面点击：出库完成送出料架=" + chbBoxSendShelf.Checked);
equipBean.OutEndSendShelfOut = chbBoxSendShelf.Checked;
IsInCheck = false;
//IsInCheck = true;
//LogUtil.info(equipBean.Name + "界面点击：出库完成送出料架=" + chbBoxSendShelf.Checked);
//equipBean.OutEndSendShelfOut = chbBoxSendShelf.Checked;
//IsInCheck = false;
}
private void btnOutStopDown_Click(object sender, EventArgs e)
{
......
source/AssemblyLineClient/FrmHYEquip.Designer.cs
......@@ -22,8 +22,7 @@
this.btnCloseAll = new System.Windows.Forms.Button();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.lblAddr = new System.Windows.Forms.Label();
this.btnOpenDo = new System.Windows.Forms.Button();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox();
......@@ -90,11 +89,10 @@
//
// panBase
//
this.panBase.Size = new System.Drawing.Size(1246, 50);
this.panBase.Size = new System.Drawing.Size(996, 50);
//
// btnExit
//
this.btnExit.Location = new System.Drawing.Point(1131, 4);
this.btnExit.Click += new System.EventHandler(this.btnClose_Click);
//
// lblName
......@@ -103,13 +101,13 @@
//
// chbDebug
//
this.chbDebug.Location = new System.Drawing.Point(662, 13);
this.chbDebug.Location = new System.Drawing.Point(353, 12);
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
this.chbDebug.Click += new System.EventHandler(this.chbDebug_CheckedChanged);
//
// lblStoreStatus
//
this.lblStoreStatus.Location = new System.Drawing.Point(868, 15);
this.lblStoreStatus.Location = new System.Drawing.Point(531, 14);
//
// btnOutStore
//
......@@ -122,6 +120,7 @@
//
// btnInStore
//
this.btnInStore.Location = new System.Drawing.Point(348, 24);
this.btnInStore.Visible = false;
//
// btnStop
......@@ -130,6 +129,7 @@
//
// chbMoveStop
//
this.chbMoveStop.Location = new System.Drawing.Point(442, 12);
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
//
// timer1
......@@ -142,8 +142,7 @@
this.groupBox1.Controls.Add(this.btnCloseAll);
this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.lblAddr);
this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.btnWriteSingleDO);
this.groupBox1.Controls.Add(this.txtWriteTime);
......@@ -151,9 +150,9 @@
this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.cmbWriteIO);
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(497, 380);
this.groupBox1.Location = new System.Drawing.Point(497, 484);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(731, 111);
this.groupBox1.Size = new System.Drawing.Size(481, 124);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -163,9 +162,9 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(552, 24);
this.btnCloseAll.Location = new System.Drawing.Point(279, 72);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(140, 34);
this.btnCloseAll.Size = new System.Drawing.Size(114, 34);
this.btnCloseAll.TabIndex = 259;
this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false;
......@@ -175,58 +174,46 @@
//
this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(160, 71);
this.txtDOIndex.Location = new System.Drawing.Point(60, 63);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(38, 23);
this.txtDOIndex.TabIndex = 284;
this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false;
//
// txtDoName
//
this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(63, 71);
this.txtDoName.Location = new System.Drawing.Point(21, 63);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(52, 23);
this.txtDoName.Size = new System.Drawing.Size(38, 23);
this.txtDoName.TabIndex = 283;
this.txtDoName.Text = "0";
this.txtDoName.Visible = false;
//
// 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(23, 74);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(35, 17);
this.label17.TabIndex = 282;
this.label17.Text = "设备:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Visible = false;
//
// 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(120, 74);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 281;
this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// lblAddr
//
this.lblAddr.AutoSize = true;
this.lblAddr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(243, 32);
this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(35, 17);
this.lblAddr.TabIndex = 282;
this.lblAddr.Text = "设备:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnOpenDo
//
this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(386, 22);
this.btnOpenDo.Location = new System.Drawing.Point(37, 72);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(140, 34);
this.btnOpenDo.Size = new System.Drawing.Size(114, 34);
this.btnOpenDo.TabIndex = 280;
this.btnOpenDo.Text = "打开";
this.btnOpenDo.UseVisualStyleBackColor = false;
......@@ -237,9 +224,9 @@
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(386, 65);
this.btnWriteSingleDO.Location = new System.Drawing.Point(158, 72);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(140, 34);
this.btnWriteSingleDO.Size = new System.Drawing.Size(114, 34);
this.btnWriteSingleDO.TabIndex = 277;
this.btnWriteSingleDO.Text = "关闭";
this.btnWriteSingleDO.UseVisualStyleBackColor = false;
......@@ -248,7 +235,7 @@
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(268, 71);
this.txtWriteTime.Location = new System.Drawing.Point(361, 29);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(66, 23);
......@@ -260,7 +247,7 @@
this.label5.AutoSize = true;
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.Location = new System.Drawing.Point(203, 74);
this.label5.Location = new System.Drawing.Point(296, 32);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 278;
......@@ -270,7 +257,7 @@
// txtSlaveId
//
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(338, 30);
this.txtSlaveId.Location = new System.Drawing.Point(355, 72);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
......@@ -286,9 +273,9 @@
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(17, 25);
this.cmbWriteIO.Location = new System.Drawing.Point(13, 26);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(315, 28);
this.cmbWriteIO.Size = new System.Drawing.Size(224, 28);
this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
......@@ -301,7 +288,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 507);
this.groupBox4.Size = new System.Drawing.Size(240, 607);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -319,7 +306,7 @@
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.Size = new System.Drawing.Size(229, 487);
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 587);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -329,7 +316,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 507);
this.groupBox3.Size = new System.Drawing.Size(240, 607);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -347,7 +334,7 @@
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.Size = new System.Drawing.Size(229, 487);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 587);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupDo
......@@ -362,9 +349,9 @@
this.groupDo.Controls.Add(this.HY_LineRun);
this.groupDo.Controls.Add(this.HY_TopCylinder_Up);
this.groupDo.Controls.Add(this.HY_LineBackRun);
this.groupDo.Location = new System.Drawing.Point(497, 180);
this.groupDo.Location = new System.Drawing.Point(497, 280);
this.groupDo.Name = "groupDo";
this.groupDo.Size = new System.Drawing.Size(731, 195);
this.groupDo.Size = new System.Drawing.Size(481, 198);
this.groupDo.TabIndex = 255;
this.groupDo.TabStop = false;
this.groupDo.Text = "IO操作测试";
......@@ -509,7 +496,7 @@
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(6, 93);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(719, 63);
this.lblThisSta.Size = new System.Drawing.Size(470, 162);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -524,7 +511,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 57);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1243, 549);
this.tabControl1.Size = new System.Drawing.Size(993, 649);
this.tabControl1.TabIndex = 257;
//
// tabPage1
......@@ -537,7 +524,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1235, 519);
this.tabPage1.Size = new System.Drawing.Size(985, 619);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -553,7 +540,7 @@
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(497, 6);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(731, 169);
this.groupBox6.Size = new System.Drawing.Size(481, 268);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
......@@ -563,7 +550,7 @@
this.lblHyInfo.AutoSize = true;
this.lblHyInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHyInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblHyInfo.Location = new System.Drawing.Point(444, 19);
this.lblHyInfo.Location = new System.Drawing.Point(281, 19);
this.lblHyInfo.Name = "lblHyInfo";
this.lblHyInfo.Size = new System.Drawing.Size(68, 17);
this.lblHyInfo.TabIndex = 281;
......@@ -598,7 +585,7 @@
this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1235, 519);
this.tabPage2.Size = new System.Drawing.Size(985, 619);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "伺服调试";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -613,9 +600,9 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(577, 266);
this.groupDetial.Location = new System.Drawing.Point(511, 266);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(642, 205);
this.groupDetial.Size = new System.Drawing.Size(468, 205);
this.groupDetial.TabIndex = 318;
this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置";
......@@ -624,9 +611,9 @@
//
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(108, 150);
this.btnDSave.Location = new System.Drawing.Point(36, 143);
this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(94, 34);
this.btnDSave.Size = new System.Drawing.Size(130, 34);
this.btnDSave.TabIndex = 322;
this.btnDSave.Text = "保存";
this.btnDSave.UseVisualStyleBackColor = true;
......@@ -639,9 +626,9 @@
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(9, 111);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 17);
this.label3.Size = new System.Drawing.Size(70, 17);
this.label3.TabIndex = 321;
this.label3.Text = "升降轴P2位置：";
this.label3.Text = "升降轴P2：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtDP2
......@@ -650,7 +637,7 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(108, 105);
this.txtDP2.Location = new System.Drawing.Point(86, 105);
this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -663,9 +650,9 @@
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 20;
this.listDetitalP2.Location = new System.Drawing.Point(231, 27);
this.listDetitalP2.Location = new System.Drawing.Point(194, 25);
this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(270, 164);
this.listDetitalP2.Size = new System.Drawing.Size(259, 164);
this.listDetitalP2.TabIndex = 319;
this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged);
//
......@@ -674,7 +661,7 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(108, 67);
this.cmbDHeight.Location = new System.Drawing.Point(86, 67);
this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(90, 28);
this.cmbDHeight.TabIndex = 318;
......@@ -697,7 +684,7 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(108, 29);
this.cmbDSize.Location = new System.Drawing.Point(86, 29);
this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(90, 28);
this.cmbDSize.TabIndex = 316;
......@@ -728,31 +715,35 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnP2);
this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(577, 6);
this.groupBox2.Location = new System.Drawing.Point(511, 6);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(643, 248);
this.groupBox2.Size = new System.Drawing.Size(469, 248);
this.groupBox2.TabIndex = 219;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置";
//
// lblP3List
//
this.lblP3List.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblP3List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP3List.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP3List.Location = new System.Drawing.Point(8, 196);
this.lblP3List.Name = "lblP3List";
this.lblP3List.Size = new System.Drawing.Size(627, 40);
this.lblP3List.Size = new System.Drawing.Size(453, 40);
this.lblP3List.TabIndex = 315;
this.lblP3List.Text = "P3列表：";
this.lblP3List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblP2List
//
this.lblP2List.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblP2List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP2List.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP2List.Location = new System.Drawing.Point(8, 156);
this.lblP2List.Name = "lblP2List";
this.lblP2List.Size = new System.Drawing.Size(627, 40);
this.lblP2List.Size = new System.Drawing.Size(453, 40);
this.lblP2List.TabIndex = 313;
this.lblP2List.Text = "P2列表：";
this.lblP2List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -764,10 +755,10 @@
this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.Color.Blue;
this.btnP3.Location = new System.Drawing.Point(273, 64);
this.btnP3.Location = new System.Drawing.Point(240, 64);
this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(163, 34);
this.btnP3.Size = new System.Drawing.Size(130, 34);
this.btnP3.TabIndex = 312;
this.btnP3.Text = "接驳台放料点P3";
this.btnP3.UseVisualStyleBackColor = true;
......@@ -779,7 +770,7 @@
this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP3.Location = new System.Drawing.Point(439, 68);
this.txtP3.Location = new System.Drawing.Point(374, 68);
this.txtP3.MaxLength = 12;
this.txtP3.Name = "txtP3";
this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -792,9 +783,9 @@
this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(272, 106);
this.btnSave.Location = new System.Drawing.Point(240, 106);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(163, 34);
this.btnSave.Size = new System.Drawing.Size(130, 34);
this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = false;
......@@ -806,7 +797,7 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(439, 28);
this.txtP1.Location = new System.Drawing.Point(374, 28);
this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -821,10 +812,10 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(272, 24);
this.btnMoveToP1.Location = new System.Drawing.Point(240, 24);
this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
this.btnMoveToP1.Size = new System.Drawing.Size(130, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
......@@ -835,9 +826,9 @@
this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(97, 28);
this.cmbSizeList.Location = new System.Drawing.Point(72, 28);
this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(168, 28);
this.cmbSizeList.Size = new System.Drawing.Size(162, 28);
this.cmbSizeList.TabIndex = 303;
this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged);
//
......@@ -846,7 +837,7 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(17, 34);
this.label4.Location = new System.Drawing.Point(7, 34);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 302;
......@@ -863,7 +854,7 @@
this.btnP2.Location = new System.Drawing.Point(12, 68);
this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(163, 34);
this.btnP2.Size = new System.Drawing.Size(130, 34);
this.btnP2.TabIndex = 306;
this.btnP2.Text = "托盘取料点P2";
this.btnP2.UseVisualStyleBackColor = true;
......@@ -875,7 +866,7 @@
this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP2.Location = new System.Drawing.Point(178, 72);
this.txtP2.Location = new System.Drawing.Point(147, 72);
this.txtP2.MaxLength = 12;
this.txtP2.Name = "txtP2";
this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -888,14 +879,14 @@
this.axisMoveControl1.Location = new System.Drawing.Point(5, 3);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(566, 440);
this.axisMoveControl1.Size = new System.Drawing.Size(496, 440);
this.axisMoveControl1.TabIndex = 0;
//
// FrmHYEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1254, 611);
this.ClientSize = new System.Drawing.Size(1004, 711);
this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
......@@ -950,8 +941,7 @@
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label lblAddr;
private System.Windows.Forms.Button btnOpenDo;
private System.Windows.Forms.Button btnWriteSingleDO;
private System.Windows.Forms.TextBox txtWriteTime;
......
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -202,6 +202,7 @@ namespace OnlineStore.AssemblyLine
txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP;
txtSlaveId.Text = io.SlaveID.ToString();
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue;
......
source/AssemblyLineClient/FrmLineIO.Designer.cs
......@@ -91,9 +91,9 @@
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.cmbWriteIO);
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(492, 3);
this.groupBox1.Location = new System.Drawing.Point(9, 462);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(382, 130);
this.groupBox1.Size = new System.Drawing.Size(363, 130);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -102,7 +102,7 @@
//
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(138, 85);
this.button1.Location = new System.Drawing.Point(127, 85);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(110, 34);
this.button1.TabIndex = 256;
......@@ -113,7 +113,7 @@
// txtDOIndex
//
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(185, 53);
this.txtDOIndex.Location = new System.Drawing.Point(176, 53);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(52, 23);
......@@ -123,7 +123,7 @@
// txtDoName
//
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(73, 53);
this.txtDoName.Location = new System.Drawing.Point(70, 53);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(52, 23);
......@@ -135,7 +135,7 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(257, 85);
this.btnCloseAll.Location = new System.Drawing.Point(239, 85);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(110, 34);
this.btnCloseAll.TabIndex = 274;
......@@ -160,7 +160,7 @@
this.label14.AutoSize = true;
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.Location = new System.Drawing.Point(133, 56);
this.label14.Location = new System.Drawing.Point(127, 56);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(44, 17);
this.label14.TabIndex = 239;
......@@ -171,7 +171,7 @@
//
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(20, 85);
this.btnWriteSingleDO.Location = new System.Drawing.Point(15, 85);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(110, 34);
this.btnWriteSingleDO.TabIndex = 232;
......@@ -182,7 +182,7 @@
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(313, 53);
this.txtWriteTime.Location = new System.Drawing.Point(298, 52);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(52, 23);
......@@ -194,7 +194,7 @@
this.label5.AutoSize = true;
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.Location = new System.Drawing.Point(245, 56);
this.label5.Location = new System.Drawing.Point(233, 56);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237;
......@@ -211,7 +211,7 @@
this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(11, 18);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(356, 28);
this.cmbWriteIO.Size = new System.Drawing.Size(343, 28);
this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
......@@ -222,9 +222,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(777, 135);
this.groupBox4.Location = new System.Drawing.Point(272, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(270, 449);
this.groupBox4.Size = new System.Drawing.Size(250, 449);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -242,7 +242,7 @@
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.Size = new System.Drawing.Size(259, 429);
this.tableLayoutPanel2.Size = new System.Drawing.Size(239, 429);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -250,9 +250,9 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(494, 135);
this.groupBox3.Location = new System.Drawing.Point(11, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(276, 449);
this.groupBox3.Size = new System.Drawing.Size(250, 449);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -270,14 +270,14 @@
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.Size = new System.Drawing.Size(265, 429);
this.tableLayoutPanel1.Size = new System.Drawing.Size(239, 429);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupBox5
//
this.groupBox5.Controls.Add(this.btnLineStop);
this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
this.groupBox5.Location = new System.Drawing.Point(879, 3);
this.groupBox5.Location = new System.Drawing.Point(382, 462);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(168, 130);
this.groupBox5.TabIndex = 246;
......@@ -311,17 +311,17 @@
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.groupBox5);
this.panel1.Controls.Add(this.groupBox1);
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.lblMsg);
this.panel1.Controls.Add(this.lblMoveInfo);
this.panel1.Controls.Add(this.groupBox4);
this.panel1.Controls.Add(this.groupBox3);
this.panel1.Controls.Add(this.groupBox5);
this.panel1.Controls.Add(this.groupBox1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1060, 611);
this.panel1.Size = new System.Drawing.Size(965, 611);
this.panel1.TabIndex = 248;
//
// groupBox2
......@@ -332,9 +332,9 @@
this.groupBox2.Controls.Add(this.btnClear);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.lblSelTrayNum);
this.groupBox2.Location = new System.Drawing.Point(10, 3);
this.groupBox2.Location = new System.Drawing.Point(534, 6);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(475, 337);
this.groupBox2.Size = new System.Drawing.Size(408, 449);
this.groupBox2.TabIndex = 283;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "托盘信息编辑";
......@@ -384,9 +384,9 @@
this.groupTray.Controls.Add(this.btnUpdateTray);
this.groupTray.Enabled = false;
this.groupTray.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupTray.Location = new System.Drawing.Point(6, 66);
this.groupTray.Location = new System.Drawing.Point(13, 66);
this.groupTray.Name = "groupTray";
this.groupTray.Size = new System.Drawing.Size(463, 139);
this.groupTray.Size = new System.Drawing.Size(383, 206);
this.groupTray.TabIndex = 277;
this.groupTray.TabStop = false;
//
......@@ -409,7 +409,7 @@
// chbSmall
//
this.chbSmall.AutoSize = true;
this.chbSmall.Location = new System.Drawing.Point(316, 62);
this.chbSmall.Location = new System.Drawing.Point(22, 147);
this.chbSmall.Name = "chbSmall";
this.chbSmall.Size = new System.Drawing.Size(63, 21);
this.chbSmall.TabIndex = 279;
......@@ -419,7 +419,7 @@
// rdbCutreel
//
this.rdbCutreel.AutoSize = true;
this.rdbCutreel.Location = new System.Drawing.Point(386, 25);
this.rdbCutreel.Location = new System.Drawing.Point(239, 99);
this.rdbCutreel.Name = "rdbCutreel";
this.rdbCutreel.Size = new System.Drawing.Size(62, 21);
this.rdbCutreel.TabIndex = 278;
......@@ -430,7 +430,7 @@
// rdbUrg
//
this.rdbUrg.AutoSize = true;
this.rdbUrg.Location = new System.Drawing.Point(317, 25);
this.rdbUrg.Location = new System.Drawing.Point(170, 99);
this.rdbUrg.Name = "rdbUrg";
this.rdbUrg.Size = new System.Drawing.Size(62, 21);
this.rdbUrg.TabIndex = 277;
......@@ -441,7 +441,7 @@
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(245, 64);
this.label9.Location = new System.Drawing.Point(269, 61);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(16, 17);
this.label9.TabIndex = 213;
......@@ -451,7 +451,7 @@
//
this.cmbHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHeight.FormattingEnabled = true;
this.cmbHeight.Location = new System.Drawing.Point(262, 60);
this.cmbHeight.Location = new System.Drawing.Point(286, 57);
this.cmbHeight.Name = "cmbHeight";
this.cmbHeight.Size = new System.Drawing.Size(45, 25);
this.cmbHeight.TabIndex = 212;
......@@ -460,7 +460,7 @@
//
this.cmbWidth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWidth.FormattingEnabled = true;
this.cmbWidth.Location = new System.Drawing.Point(199, 60);
this.cmbWidth.Location = new System.Drawing.Point(223, 57);
this.cmbWidth.Name = "cmbWidth";
this.cmbWidth.Size = new System.Drawing.Size(45, 25);
this.cmbWidth.TabIndex = 211;
......@@ -468,7 +468,7 @@
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(158, 64);
this.label8.Location = new System.Drawing.Point(176, 60);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(35, 17);
this.label8.TabIndex = 210;
......@@ -502,7 +502,7 @@
// chbInStoNG
//
this.chbInStoNG.AutoSize = true;
this.chbInStoNG.Location = new System.Drawing.Point(386, 62);
this.chbInStoNG.Location = new System.Drawing.Point(92, 147);
this.chbInStoNG.Name = "chbInStoNG";
this.chbInStoNG.Size = new System.Drawing.Size(70, 21);
this.chbInStoNG.TabIndex = 205;
......@@ -519,7 +519,7 @@
"出库"});
this.cmbTrayType.Location = new System.Drawing.Point(223, 23);
this.cmbTrayType.Name = "cmbTrayType";
this.cmbTrayType.Size = new System.Drawing.Size(78, 25);
this.cmbTrayType.Size = new System.Drawing.Size(108, 25);
this.cmbTrayType.TabIndex = 204;
//
// label2
......@@ -542,7 +542,7 @@
//
this.btnUpdateTray.BackColor = System.Drawing.Color.White;
this.btnUpdateTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateTray.Location = new System.Drawing.Point(343, 92);
this.btnUpdateTray.Location = new System.Drawing.Point(223, 139);
this.btnUpdateTray.Name = "btnUpdateTray";
this.btnUpdateTray.Size = new System.Drawing.Size(105, 35);
this.btnUpdateTray.TabIndex = 192;
......@@ -553,7 +553,7 @@
// chbTray
//
this.chbTray.AutoSize = true;
this.chbTray.Location = new System.Drawing.Point(329, 32);
this.chbTray.Location = new System.Drawing.Point(290, 33);
this.chbTray.Name = "chbTray";
this.chbTray.Size = new System.Drawing.Size(99, 21);
this.chbTray.TabIndex = 278;
......@@ -565,7 +565,7 @@
//
this.btnClear.BackColor = System.Drawing.Color.White;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.Location = new System.Drawing.Point(187, 25);
this.btnClear.Location = new System.Drawing.Point(163, 25);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 35);
this.btnClear.TabIndex = 282;
......@@ -586,9 +586,9 @@
//
this.lblSelTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSelTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblSelTrayNum.Location = new System.Drawing.Point(6, 208);
this.lblSelTrayNum.Location = new System.Drawing.Point(11, 278);
this.lblSelTrayNum.Name = "lblSelTrayNum";
this.lblSelTrayNum.Size = new System.Drawing.Size(463, 92);
this.lblSelTrayNum.Size = new System.Drawing.Size(383, 165);
this.lblSelTrayNum.TabIndex = 276;
this.lblSelTrayNum.Text = "托盘编码：";
this.lblSelTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -597,16 +597,16 @@
//
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(10, 387);
this.lblMsg.Location = new System.Drawing.Point(557, 497);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(475, 196);
this.lblMsg.Size = new System.Drawing.Size(396, 95);
this.lblMsg.TabIndex = 279;
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(16, 353);
this.lblMoveInfo.Location = new System.Drawing.Point(579, 465);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(0, 17);
this.lblMoveInfo.TabIndex = 276;
......@@ -615,7 +615,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1060, 611);
this.ClientSize = new System.Drawing.Size(965, 611);
this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -45,10 +45,13 @@
this.btnInStoreTset = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.logBox = new System.Windows.Forms.RichTextBox();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.panel2 = new System.Windows.Forms.Panel();
this.panMove = new System.Windows.Forms.TableLayoutPanel();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.panel5 = new System.Windows.Forms.Panel();
this.panel1 = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label();
this.lblOpText = new System.Windows.Forms.Label();
......@@ -57,9 +60,6 @@
this.lblCID = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.panel5 = new System.Windows.Forms.Panel();
this.picLine = new System.Windows.Forms.PictureBox();
this.lblStatus = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label();
......@@ -124,13 +124,12 @@
this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabPage2.SuspendLayout();
this.panel2.SuspendLayout();
this.panMove.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabPage5.SuspendLayout();
this.panel5.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
......@@ -150,7 +149,7 @@
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1336, 674);
this.tabControl1.Size = new System.Drawing.Size(990, 634);
this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
//
......@@ -158,10 +157,11 @@
//
this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.pictureBox1);
this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1328, 641);
this.tabPage1.Size = new System.Drawing.Size(982, 601);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 运行日志 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -176,7 +176,7 @@
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Location = new System.Drawing.Point(5, 3);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(292, 630);
this.groupBox2.Size = new System.Drawing.Size(292, 436);
this.groupBox2.TabIndex = 200;
this.groupBox2.TabStop = false;
//
......@@ -206,9 +206,12 @@
//
// lblCardMsg
//
this.lblCardMsg.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblCardMsg.Location = new System.Drawing.Point(5, 135);
this.lblCardMsg.Name = "lblCardMsg";
this.lblCardMsg.Size = new System.Drawing.Size(279, 245);
this.lblCardMsg.Size = new System.Drawing.Size(279, 284);
this.lblCardMsg.TabIndex = 198;
//
// label2
......@@ -218,9 +221,9 @@
this.label2.ForeColor = System.Drawing.Color.Red;
this.label2.Location = new System.Drawing.Point(4, 94);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(224, 17);
this.label2.Size = new System.Drawing.Size(152, 17);
this.label2.TabIndex = 200;
this.label2.Text = "此处修改不保存到配置，软件重启即恢复";
this.label2.Text = "不保存到配置，重启即恢复";
//
// groupBox1
//
......@@ -233,9 +236,9 @@
this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(316, 25);
this.groupBox1.Location = new System.Drawing.Point(307, 22);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(885, 69);
this.groupBox1.Size = new System.Drawing.Size(660, 69);
this.groupBox1.TabIndex = 195;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓通信测试";
......@@ -244,7 +247,7 @@
// lblPosId
//
this.lblPosId.AutoSize = true;
this.lblPosId.Location = new System.Drawing.Point(366, 28);
this.lblPosId.Location = new System.Drawing.Point(267, 28);
this.lblPosId.Name = "lblPosId";
this.lblPosId.Size = new System.Drawing.Size(40, 20);
this.lblPosId.TabIndex = 197;
......@@ -254,16 +257,16 @@
//
this.btnUpdateStatus.BackColor = System.Drawing.Color.White;
this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateStatus.Location = new System.Drawing.Point(629, 21);
this.btnUpdateStatus.Location = new System.Drawing.Point(474, 21);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35);
this.btnUpdateStatus.Size = new System.Drawing.Size(176, 35);
this.btnUpdateStatus.TabIndex = 195;
this.btnUpdateStatus.Text = "更改为调试状态";
this.btnUpdateStatus.UseVisualStyleBackColor = false;
//
// txtPosId
//
this.txtPosId.Location = new System.Drawing.Point(426, 25);
this.txtPosId.Location = new System.Drawing.Point(308, 25);
this.txtPosId.Name = "txtPosId";
this.txtPosId.Size = new System.Drawing.Size(80, 26);
this.txtPosId.TabIndex = 196;
......@@ -272,7 +275,7 @@
//
this.cmbBoxIndex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbBoxIndex.FormattingEnabled = true;
this.cmbBoxIndex.Location = new System.Drawing.Point(272, 24);
this.cmbBoxIndex.Location = new System.Drawing.Point(181, 24);
this.cmbBoxIndex.Name = "cmbBoxIndex";
this.cmbBoxIndex.Size = new System.Drawing.Size(85, 28);
this.cmbBoxIndex.TabIndex = 195;
......@@ -281,9 +284,9 @@
//
this.btnInStoreTset.BackColor = System.Drawing.Color.White;
this.btnInStoreTset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStoreTset.Location = new System.Drawing.Point(515, 21);
this.btnInStoreTset.Location = new System.Drawing.Point(389, 21);
this.btnInStoreTset.Name = "btnInStoreTset";
this.btnInStoreTset.Size = new System.Drawing.Size(105, 35);
this.btnInStoreTset.Size = new System.Drawing.Size(84, 35);
this.btnInStoreTset.TabIndex = 194;
this.btnInStoreTset.Text = "入库测试";
this.btnInStoreTset.UseVisualStyleBackColor = false;
......@@ -293,9 +296,9 @@
//
this.button2.BackColor = System.Drawing.Color.White;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Location = new System.Drawing.Point(122, 21);
this.button2.Location = new System.Drawing.Point(96, 21);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(105, 35);
this.button2.Size = new System.Drawing.Size(84, 35);
this.button2.TabIndex = 193;
this.button2.Text = "停止服务";
this.button2.UseVisualStyleBackColor = false;
......@@ -307,12 +310,22 @@
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(11, 21);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(105, 35);
this.button1.Size = new System.Drawing.Size(84, 35);
this.button1.TabIndex = 192;
this.button1.Text = "启动服务";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// pictureBox1
//
this.pictureBox1.Location = new System.Drawing.Point(5, 445);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(141, 148);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 203;
this.pictureBox1.TabStop = false;
this.pictureBox1.Visible = false;
//
// logBox
//
this.logBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
......@@ -321,7 +334,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(302, 3);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1020, 630);
this.logBox.Size = new System.Drawing.Size(674, 590);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -331,7 +344,7 @@
this.tabPage2.Controls.Add(this.panel2);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1328, 641);
this.tabPage2.Size = new System.Drawing.Size(982, 601);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -342,32 +355,53 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1328, 641);
this.panel2.Size = new System.Drawing.Size(982, 601);
this.panel2.TabIndex = 98;
//
// panMove
//
this.panMove.ColumnCount = 6;
this.panMove.ColumnCount = 4;
this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.panMove.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
this.panMove.Controls.Add(this.panel1, 5, 2);
this.panMove.Controls.Add(this.pictureBox1, 1, 2);
this.panMove.Dock = System.Windows.Forms.DockStyle.Fill;
this.panMove.Location = new System.Drawing.Point(0, 0);
this.panMove.Name = "panMove";
this.panMove.RowCount = 3;
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.panMove.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F));
this.panMove.Size = new System.Drawing.Size(1328, 641);
this.panMove.Size = new System.Drawing.Size(982, 601);
this.panMove.TabIndex = 10;
//
// tabPage5
//
this.tabPage5.Controls.Add(this.panel5);
this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(982, 601);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "设备示意图";
this.tabPage5.UseVisualStyleBackColor = true;
//
// panel5
//
this.panel5.AutoScroll = true;
this.panel5.AutoSize = true;
this.panel5.Controls.Add(this.panel1);
this.panel5.Controls.Add(this.picLine);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(982, 601);
this.panel5.TabIndex = 108;
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.lblOpText);
this.panel1.Controls.Add(this.label1);
......@@ -375,9 +409,9 @@
this.panel1.Controls.Add(this.lblCID);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.label5);
this.panel1.Location = new System.Drawing.Point(1108, 387);
this.panel1.Location = new System.Drawing.Point(851, 434);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(128, 148);
this.panel1.Size = new System.Drawing.Size(128, 164);
this.panel1.TabIndex = 202;
//
// label3
......@@ -385,7 +419,7 @@
this.label3.BackColor = System.Drawing.Color.LightGray;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label3.Location = new System.Drawing.Point(7, 98);
this.label3.Location = new System.Drawing.Point(7, 126);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(109, 18);
this.label3.TabIndex = 202;
......@@ -396,18 +430,18 @@
this.lblOpText.BackColor = System.Drawing.Color.White;
this.lblOpText.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpText.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblOpText.Location = new System.Drawing.Point(7, 120);
this.lblOpText.Location = new System.Drawing.Point(7, 11);
this.lblOpText.Name = "lblOpText";
this.lblOpText.Size = new System.Drawing.Size(109, 18);
this.lblOpText.TabIndex = 201;
this.lblOpText.Text = "双击进入详情界面";
this.lblOpText.Text = "设备状态说明：";
//
// label1
//
this.label1.BackColor = System.Drawing.Color.LightBlue;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label1.Location = new System.Drawing.Point(7, 3);
this.label1.Location = new System.Drawing.Point(7, 31);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 18);
this.label1.TabIndex = 197;
......@@ -418,7 +452,7 @@
this.label7.BackColor = System.Drawing.Color.Red;
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label7.Location = new System.Drawing.Point(7, 79);
this.label7.Location = new System.Drawing.Point(7, 107);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(109, 18);
this.label7.TabIndex = 200;
......@@ -429,7 +463,7 @@
this.lblCID.BackColor = System.Drawing.Color.Orange;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblCID.Location = new System.Drawing.Point(7, 41);
this.lblCID.Location = new System.Drawing.Point(7, 69);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(109, 18);
this.lblCID.TabIndex = 95;
......@@ -440,7 +474,7 @@
this.label6.BackColor = System.Drawing.Color.LightCoral;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label6.Location = new System.Drawing.Point(7, 60);
this.label6.Location = new System.Drawing.Point(7, 88);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(109, 18);
this.label6.TabIndex = 199;
......@@ -451,50 +485,18 @@
this.label5.BackColor = System.Drawing.Color.LightGreen;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label5.Location = new System.Drawing.Point(7, 22);
this.label5.Location = new System.Drawing.Point(7, 50);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(109, 18);
this.label5.TabIndex = 198;
this.label5.Text = "绿色：忙碌中";
//
// pictureBox1
//
this.panMove.SetColumnSpan(this.pictureBox1, 3);
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Location = new System.Drawing.Point(224, 387);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(657, 251);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 203;
this.pictureBox1.TabStop = false;
//
// tabPage5
//
this.tabPage5.Controls.Add(this.panel5);
this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(1328, 641);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "设备示意图";
this.tabPage5.UseVisualStyleBackColor = true;
//
// panel5
//
this.panel5.AutoScroll = true;
this.panel5.AutoSize = true;
this.panel5.Controls.Add(this.picLine);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1328, 641);
this.panel5.TabIndex = 108;
//
// picLine
//
this.picLine.Dock = System.Windows.Forms.DockStyle.Fill;
this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(1328, 641);
this.picLine.Size = new System.Drawing.Size(982, 601);
this.picLine.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picLine.TabIndex = 107;
this.picLine.TabStop = false;
......@@ -519,7 +521,7 @@
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(348, 3);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(996, 77);
this.lblWarnMsg.Size = new System.Drawing.Size(650, 77);
this.lblWarnMsg.TabIndex = 96;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -783,9 +785,10 @@
this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1350, 29);
this.menuStrip1.Size = new System.Drawing.Size(1004, 29);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
this.menuStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.menuStrip1_ItemClicked);
//
// 运行参数ToolStripMenuItem
//
......@@ -939,7 +942,7 @@
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1350, 761);
this.ClientSize = new System.Drawing.Size(1004, 721);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblWarnMsg);
......@@ -961,14 +964,13 @@
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabPage2.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panMove.ResumeLayout(false);
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabPage5.ResumeLayout(false);
this.tabPage5.PerformLayout();
this.panel5.ResumeLayout(false);
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picLine)).EndInit();
this.contextMenuStrip1.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false);
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -54,7 +54,7 @@ namespace OnlineStore.AssemblyLine
this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true;
this.Cursor = Cursors.Default;
tabControl1.TabPages.Remove(tabPage5);
//tabControl1.TabPages.Remove(tabPage5);
timer1.Start();
}
......@@ -120,8 +120,8 @@ namespace OnlineStore.AssemblyLine
cmbBoxIndex.SelectedIndex = 0;
}
string opStr = "双击进入详情界面";
lblOpText.Text = opStr;
//string opStr = "双击进入详情界面";
//lblOpText.Text = opStr;
LogUtil.logBox = this.logBox;
lastLogTime = DateTime.Now.AddMinutes(-10);
......@@ -825,12 +825,12 @@ namespace OnlineStore.AssemblyLine
control.DoubleClick += Control_DoubleClick;
control.ContextMenuStrip = contextMenuStrip_control;
control.MouseEnter += Control_Click;
int row = num / 6;
int col = num % 6;
if (row > 1)
{
row = row + 1;
}
int row = num / 4;
int col = num % 4;
//if (row > 1)
//{
// row = row + 1;
//}
this.panMove.Controls.Add(control, col, row);
equipControls1.Add(equip.DeviceID, control);
......@@ -1124,5 +1124,10 @@ namespace OnlineStore.AssemblyLine
LineManager.DisGetWare = chbDisGetWare.Checked;
LogUtil.info("界面点击勾选：" + chbDisGetWare.Text + "=" + LineManager.DisGetWare);
}
private void menuStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
}
}
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -22,8 +22,7 @@
this.btnCloseAll = new System.Windows.Forms.Button();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.lblAddr = new System.Windows.Forms.Label();
this.btnOpenDo = new System.Windows.Forms.Button();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox();
......@@ -35,12 +34,10 @@
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupDO = new System.Windows.Forms.GroupBox();
this.ClampCylinder_Work = new System.Windows.Forms.Button();
this.BeforeAfterCylinder_After = new System.Windows.Forms.Button();
this.UpDownCylinder_Down = new System.Windows.Forms.Button();
this.TopCylinder_Down = new System.Windows.Forms.Button();
this.StopDown2 = new System.Windows.Forms.Button();
this.ClampCylinder_Relax = new System.Windows.Forms.Button();
this.StopDown1 = new System.Windows.Forms.Button();
this.BeforeAfterCylinder_Before = new System.Windows.Forms.Button();
this.TopCylinder_Up = new System.Windows.Forms.Button();
......@@ -48,6 +45,10 @@
this.lblThisSta = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.label7 = new System.Windows.Forms.Label();
this.txtPosId = new System.Windows.Forms.TextBox();
this.btnClear = new System.Windows.Forms.Button();
this.clampJawControl1 = new OnlineStore.AssemblyLine.useControl.ClampJawControl();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblInoutInfo = new System.Windows.Forms.Label();
......@@ -76,10 +77,6 @@
this.label4 = new System.Windows.Forms.Label();
this.btnP2 = new System.Windows.Forms.Button();
this.txtP2 = new System.Windows.Forms.TextBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.label7 = new System.Windows.Forms.Label();
this.txtPosId = new System.Windows.Forms.TextBox();
this.btnClear = new System.Windows.Forms.Button();
this.panBase.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
......@@ -87,29 +84,34 @@
this.groupDO.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupDetial.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox5.SuspendLayout();
this.SuspendLayout();
//
// panBase
//
this.panBase.Size = new System.Drawing.Size(1176, 50);
this.panBase.Size = new System.Drawing.Size(996, 50);
//
// btnExit
//
this.btnExit.Location = new System.Drawing.Point(1061, 4);
this.btnExit.Click += new System.EventHandler(this.btnClose_Click);
//
// chbDebug
//
this.chbDebug.Location = new System.Drawing.Point(565, 12);
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
this.chbDebug.Click += new System.EventHandler(this.chbDebug_CheckedChanged);
//
// lblStoreStatus
//
this.lblStoreStatus.Location = new System.Drawing.Point(741, 14);
//
// btnOutStore
//
this.btnOutStore.Location = new System.Drawing.Point(456, 4);
this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
//
// btnStart
......@@ -118,6 +120,7 @@
//
// btnInStore
//
this.btnInStore.Location = new System.Drawing.Point(347, 4);
this.btnInStore.Click += new System.EventHandler(this.btnInStore_Click);
//
// btnStop
......@@ -126,6 +129,7 @@
//
// chbMoveStop
//
this.chbMoveStop.Location = new System.Drawing.Point(653, 12);
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
//
// timer1
......@@ -138,8 +142,7 @@
this.groupBox1.Controls.Add(this.btnCloseAll);
this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.lblAddr);
this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.btnWriteSingleDO);
this.groupBox1.Controls.Add(this.txtWriteTime);
......@@ -147,9 +150,9 @@
this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.cmbWriteIO);
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(500, 176);
this.groupBox1.Location = new System.Drawing.Point(456, 178);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(373, 150);
this.groupBox1.Size = new System.Drawing.Size(288, 148);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -159,7 +162,7 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(242, 105);
this.btnCloseAll.Location = new System.Drawing.Point(18, 103);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(110, 34);
this.btnCloseAll.TabIndex = 259;
......@@ -171,54 +174,44 @@
//
this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(149, 63);
this.txtDOIndex.Location = new System.Drawing.Point(72, 40);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(40, 23);
this.txtDOIndex.TabIndex = 276;
this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false;
//
// txtDoName
//
this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(65, 63);
this.txtDoName.Location = new System.Drawing.Point(46, 40);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(27, 23);
this.txtDoName.TabIndex = 275;
this.txtDoName.Text = "0";
this.txtDoName.Visible = false;
//
// lblAddr
//
// 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(19, 66);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(35, 17);
this.label17.TabIndex = 274;
this.label17.Text = "设备:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(103, 66);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 273;
this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.AutoSize = true;
this.lblAddr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(227, 29);
this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(35, 17);
this.lblAddr.TabIndex = 274;
this.lblAddr.Text = "设备:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnOpenDo
//
this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(12, 105);
this.btnOpenDo.Location = new System.Drawing.Point(146, 60);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(110, 34);
this.btnOpenDo.TabIndex = 272;
......@@ -231,7 +224,7 @@
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(127, 105);
this.btnWriteSingleDO.Location = new System.Drawing.Point(146, 103);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(110, 34);
this.btnWriteSingleDO.TabIndex = 269;
......@@ -242,10 +235,10 @@
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(271, 63);
this.txtWriteTime.Location = new System.Drawing.Point(70, 66);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(40, 23);
this.txtWriteTime.Size = new System.Drawing.Size(58, 23);
this.txtWriteTime.TabIndex = 271;
this.txtWriteTime.Text = "0";
//
......@@ -254,7 +247,7 @@
this.label5.AutoSize = true;
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.Location = new System.Drawing.Point(200, 66);
this.label5.Location = new System.Drawing.Point(9, 69);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 270;
......@@ -264,7 +257,7 @@
// txtSlaveId
//
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(317, 63);
this.txtSlaveId.Location = new System.Drawing.Point(329, 67);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
......@@ -282,7 +275,7 @@
this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(12, 22);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(340, 28);
this.cmbWriteIO.Size = new System.Drawing.Size(210, 28);
this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
......@@ -293,9 +286,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 175);
this.groupBox4.Location = new System.Drawing.Point(232, 174);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 337);
this.groupBox4.Size = new System.Drawing.Size(220, 337);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -313,7 +306,7 @@
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.Size = new System.Drawing.Size(229, 317);
this.tableLayoutPanel2.Size = new System.Drawing.Size(209, 317);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -321,9 +314,9 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 175);
this.groupBox3.Location = new System.Drawing.Point(6, 174);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 337);
this.groupBox3.Size = new System.Drawing.Size(220, 337);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -341,43 +334,28 @@
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.Size = new System.Drawing.Size(229, 317);
this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 317);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupDO
//
this.groupDO.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupDO.Controls.Add(this.ClampCylinder_Work);
this.groupDO.Controls.Add(this.BeforeAfterCylinder_After);
this.groupDO.Controls.Add(this.UpDownCylinder_Down);
this.groupDO.Controls.Add(this.TopCylinder_Down);
this.groupDO.Controls.Add(this.StopDown2);
this.groupDO.Controls.Add(this.ClampCylinder_Relax);
this.groupDO.Controls.Add(this.StopDown1);
this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before);
this.groupDO.Controls.Add(this.TopCylinder_Up);
this.groupDO.Controls.Add(this.UpDownCylinder_Up);
this.groupDO.Location = new System.Drawing.Point(500, 329);
this.groupDO.Location = new System.Drawing.Point(456, 334);
this.groupDO.Name = "groupDO";
this.groupDO.Size = new System.Drawing.Size(652, 111);
this.groupDO.Size = new System.Drawing.Size(523, 111);
this.groupDO.TabIndex = 255;
this.groupDO.TabStop = false;
this.groupDO.Text = "IO操作测试";
//
// ClampCylinder_Work
//
this.ClampCylinder_Work.BackColor = System.Drawing.Color.White;
this.ClampCylinder_Work.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ClampCylinder_Work.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ClampCylinder_Work.Location = new System.Drawing.Point(520, 26);
this.ClampCylinder_Work.Name = "ClampCylinder_Work";
this.ClampCylinder_Work.Size = new System.Drawing.Size(120, 34);
this.ClampCylinder_Work.TabIndex = 262;
this.ClampCylinder_Work.Text = "夹料气缸夹紧";
this.ClampCylinder_Work.UseVisualStyleBackColor = false;
this.ClampCylinder_Work.Click += new System.EventHandler(this.ClampCylinder_Check_Click);
//
// BeforeAfterCylinder_After
//
this.BeforeAfterCylinder_After.BackColor = System.Drawing.Color.White;
......@@ -430,19 +408,6 @@
this.StopDown2.UseVisualStyleBackColor = false;
this.StopDown2.Click += new System.EventHandler(this.StopCheck2_Click);
//
// ClampCylinder_Relax
//
this.ClampCylinder_Relax.BackColor = System.Drawing.Color.White;
this.ClampCylinder_Relax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ClampCylinder_Relax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ClampCylinder_Relax.Location = new System.Drawing.Point(520, 66);
this.ClampCylinder_Relax.Name = "ClampCylinder_Relax";
this.ClampCylinder_Relax.Size = new System.Drawing.Size(120, 34);
this.ClampCylinder_Relax.TabIndex = 255;
this.ClampCylinder_Relax.Text = "夹料气缸放松";
this.ClampCylinder_Relax.UseVisualStyleBackColor = false;
this.ClampCylinder_Relax.Click += new System.EventHandler(this.ClampCylinder_Relax_Click);
//
// StopDown1
//
this.StopDown1.BackColor = System.Drawing.Color.White;
......@@ -504,7 +469,7 @@
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(199, 126);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(942, 28);
this.lblThisSta.Size = new System.Drawing.Size(769, 28);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -519,7 +484,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 56);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1173, 551);
this.tabControl1.Size = new System.Drawing.Size(993, 551);
this.tabControl1.TabIndex = 257;
//
// tabPage1
......@@ -534,16 +499,58 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1165, 521);
this.tabPage1.Size = new System.Drawing.Size(985, 521);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// groupBox5
//
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.label7);
this.groupBox5.Controls.Add(this.txtPosId);
this.groupBox5.Controls.Add(this.btnClear);
this.groupBox5.Location = new System.Drawing.Point(456, 448);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(523, 61);
this.groupBox5.TabIndex = 280;
this.groupBox5.TabStop = false;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(14, 28);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(47, 17);
this.label7.TabIndex = 284;
this.label7.Text = "库位号:";
//
// txtPosId
//
this.txtPosId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosId.Location = new System.Drawing.Point(72, 23);
this.txtPosId.Name = "txtPosId";
this.txtPosId.Size = new System.Drawing.Size(150, 26);
this.txtPosId.TabIndex = 283;
//
// btnClear
//
this.btnClear.BackColor = System.Drawing.Color.White;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.Location = new System.Drawing.Point(233, 19);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 35);
this.btnClear.TabIndex = 286;
this.btnClear.Text = "清空入库任务";
this.btnClear.UseVisualStyleBackColor = false;
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// clampJawControl1
//
this.clampJawControl1.Location = new System.Drawing.Point(876, 173);
this.clampJawControl1.Location = new System.Drawing.Point(751, 174);
this.clampJawControl1.Name = "clampJawControl1";
this.clampJawControl1.Size = new System.Drawing.Size(283, 159);
this.clampJawControl1.Size = new System.Drawing.Size(234, 158);
this.clampJawControl1.TabIndex = 279;
//
// groupBox6
......@@ -557,7 +564,7 @@
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(6, 6);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(1146, 166);
this.groupBox6.Size = new System.Drawing.Size(973, 166);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "当前状态";
......@@ -569,7 +576,7 @@
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green;
this.lblInoutInfo.Location = new System.Drawing.Point(2, 16);
this.lblInoutInfo.Name = "lblInoutInfo";
this.lblInoutInfo.Size = new System.Drawing.Size(1138, 23);
this.lblInoutInfo.Size = new System.Drawing.Size(965, 23);
this.lblInoutInfo.TabIndex = 281;
this.lblInoutInfo.Text = "当前出入库：";
//
......@@ -593,7 +600,7 @@
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(199, 44);
this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(942, 77);
this.lblInstoreList.Size = new System.Drawing.Size(769, 77);
this.lblInstoreList.TabIndex = 277;
//
// tabPage2
......@@ -604,7 +611,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1165, 521);
this.tabPage2.Size = new System.Drawing.Size(985, 521);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -619,9 +626,9 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(577, 254);
this.groupDetial.Location = new System.Drawing.Point(498, 254);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(581, 195);
this.groupDetial.Size = new System.Drawing.Size(482, 195);
this.groupDetial.TabIndex = 317;
this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置";
......@@ -630,9 +637,9 @@
//
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(108, 145);
this.btnDSave.Location = new System.Drawing.Point(40, 142);
this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(94, 34);
this.btnDSave.Size = new System.Drawing.Size(128, 34);
this.btnDSave.TabIndex = 322;
this.btnDSave.Text = "保存";
this.btnDSave.UseVisualStyleBackColor = true;
......@@ -643,11 +650,11 @@
this.label3.AutoSize = true;
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.Location = new System.Drawing.Point(9, 106);
this.label3.Location = new System.Drawing.Point(7, 106);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 17);
this.label3.Size = new System.Drawing.Size(70, 17);
this.label3.TabIndex = 321;
this.label3.Text = "升降轴P2位置：";
this.label3.Text = "升降轴P2：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtDP2
......@@ -656,7 +663,7 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(108, 100);
this.txtDP2.Location = new System.Drawing.Point(78, 100);
this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -669,7 +676,7 @@
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 20;
this.listDetitalP2.Location = new System.Drawing.Point(231, 22);
this.listDetitalP2.Location = new System.Drawing.Point(176, 22);
this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(270, 164);
this.listDetitalP2.TabIndex = 319;
......@@ -680,7 +687,7 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(108, 62);
this.cmbDHeight.Location = new System.Drawing.Point(78, 62);
this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(90, 28);
this.cmbDHeight.TabIndex = 318;
......@@ -691,7 +698,7 @@
this.label2.AutoSize = true;
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.Location = new System.Drawing.Point(9, 68);
this.label2.Location = new System.Drawing.Point(7, 68);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17);
this.label2.TabIndex = 317;
......@@ -703,7 +710,7 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(108, 24);
this.cmbDSize.Location = new System.Drawing.Point(78, 24);
this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(90, 28);
this.cmbDSize.TabIndex = 316;
......@@ -714,7 +721,7 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(9, 30);
this.label1.Location = new System.Drawing.Point(7, 30);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 315;
......@@ -723,9 +730,9 @@
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(3, 7);
this.axisMoveControl1.Location = new System.Drawing.Point(4, 7);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(567, 424);
this.axisMoveControl1.Size = new System.Drawing.Size(490, 403);
this.axisMoveControl1.TabIndex = 219;
//
// groupBox2
......@@ -741,31 +748,35 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnP2);
this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(577, 4);
this.groupBox2.Location = new System.Drawing.Point(498, 4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(581, 241);
this.groupBox2.Size = new System.Drawing.Size(482, 241);
this.groupBox2.TabIndex = 218;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置";
//
// lblP3List
//
this.lblP3List.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblP3List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP3List.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP3List.Location = new System.Drawing.Point(10, 193);
this.lblP3List.Name = "lblP3List";
this.lblP3List.Size = new System.Drawing.Size(560, 40);
this.lblP3List.Size = new System.Drawing.Size(464, 40);
this.lblP3List.TabIndex = 314;
this.lblP3List.Text = "P3列表：";
this.lblP3List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblP2
//
this.lblP2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP2.Location = new System.Drawing.Point(10, 148);
this.lblP2.Name = "lblP2";
this.lblP2.Size = new System.Drawing.Size(560, 40);
this.lblP2.Size = new System.Drawing.Size(464, 40);
this.lblP2.TabIndex = 313;
this.lblP2.Text = "P2列表：";
this.lblP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -777,10 +788,10 @@
this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.Color.Blue;
this.btnP3.Location = new System.Drawing.Point(275, 63);
this.btnP3.Location = new System.Drawing.Point(242, 63);
this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(154, 34);
this.btnP3.Size = new System.Drawing.Size(149, 34);
this.btnP3.TabIndex = 312;
this.btnP3.Text = "仓门取放点P3";
this.btnP3.UseVisualStyleBackColor = true;
......@@ -792,7 +803,7 @@
this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP3.Location = new System.Drawing.Point(441, 67);
this.txtP3.Location = new System.Drawing.Point(394, 67);
this.txtP3.MaxLength = 12;
this.txtP3.Name = "txtP3";
this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -804,9 +815,9 @@
//
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(275, 106);
this.btnSave.Location = new System.Drawing.Point(242, 104);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(154, 34);
this.btnSave.Size = new System.Drawing.Size(149, 34);
this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = true;
......@@ -818,7 +829,7 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(441, 26);
this.txtP1.Location = new System.Drawing.Point(394, 26);
this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -833,10 +844,10 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(275, 22);
this.btnMoveToP1.Location = new System.Drawing.Point(242, 22);
this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(154, 34);
this.btnMoveToP1.Size = new System.Drawing.Size(149, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
......@@ -847,9 +858,9 @@
this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(101, 25);
this.cmbSizeList.Location = new System.Drawing.Point(120, 25);
this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(152, 28);
this.cmbSizeList.Size = new System.Drawing.Size(118, 28);
this.cmbSizeList.TabIndex = 303;
this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged);
//
......@@ -858,7 +869,7 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(27, 32);
this.label4.Location = new System.Drawing.Point(29, 32);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 302;
......@@ -872,10 +883,10 @@
this.btnP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP2.ForeColor = System.Drawing.Color.Blue;
this.btnP2.Location = new System.Drawing.Point(13, 63);
this.btnP2.Location = new System.Drawing.Point(4, 63);
this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(154, 34);
this.btnP2.Size = new System.Drawing.Size(149, 34);
this.btnP2.TabIndex = 306;
this.btnP2.Text = "托盘移栽点P2";
this.btnP2.UseVisualStyleBackColor = true;
......@@ -887,7 +898,7 @@
this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP2.Location = new System.Drawing.Point(179, 67);
this.txtP2.Location = new System.Drawing.Point(157, 67);
this.txtP2.MaxLength = 12;
this.txtP2.Name = "txtP2";
this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -895,53 +906,11 @@
this.txtP2.TabIndex = 305;
this.txtP2.Text = "-1";
//
// groupBox5
//
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.label7);
this.groupBox5.Controls.Add(this.txtPosId);
this.groupBox5.Controls.Add(this.btnClear);
this.groupBox5.Location = new System.Drawing.Point(500, 443);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(652, 66);
this.groupBox5.TabIndex = 280;
this.groupBox5.TabStop = false;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(14, 28);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(47, 17);
this.label7.TabIndex = 284;
this.label7.Text = "库位号:";
//
// txtPosId
//
this.txtPosId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosId.Location = new System.Drawing.Point(72, 23);
this.txtPosId.Name = "txtPosId";
this.txtPosId.Size = new System.Drawing.Size(150, 26);
this.txtPosId.TabIndex = 283;
//
// btnClear
//
this.btnClear.BackColor = System.Drawing.Color.White;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.Location = new System.Drawing.Point(233, 19);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 35);
this.btnClear.TabIndex = 286;
this.btnClear.Text = "清空入库任务";
this.btnClear.UseVisualStyleBackColor = false;
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// FrmMoveEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1184, 611);
this.ClientSize = new System.Drawing.Size(1004, 611);
this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
......@@ -962,6 +931,8 @@
this.groupDO.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.tabPage2.ResumeLayout(false);
......@@ -969,8 +940,6 @@
this.groupDetial.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.ResumeLayout(false);
}
......@@ -986,7 +955,6 @@
private System.Windows.Forms.ComboBox cmbWriteIO;
private System.Windows.Forms.TextBox txtSlaveId;
private System.Windows.Forms.GroupBox groupDO;
private System.Windows.Forms.Button ClampCylinder_Relax;
private System.Windows.Forms.Button UpDownCylinder_Up;
private System.Windows.Forms.Button BeforeAfterCylinder_Before;
private System.Windows.Forms.Button TopCylinder_Up;
......@@ -1011,8 +979,7 @@
private System.Windows.Forms.Label lblInstoreList;
private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label lblAddr;
private System.Windows.Forms.Button btnOpenDo;
private System.Windows.Forms.Button btnWriteSingleDO;
private System.Windows.Forms.TextBox txtWriteTime;
......@@ -1029,7 +996,6 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button btnDSave;
private System.Windows.Forms.Label lblInoutInfo;
private System.Windows.Forms.Button ClampCylinder_Work;
private System.Windows.Forms.Button BeforeAfterCylinder_After;
private System.Windows.Forms.Button UpDownCylinder_Down;
private System.Windows.Forms.Button TopCylinder_Down;
......
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -266,6 +266,7 @@ namespace OnlineStore.AssemblyLine
txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP;
txtSlaveId.Text = io.SlaveID.ToString();
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue;
......
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png

21.1 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png

51.8 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/AssemblyLineClient/useControl/AxisMoveControl.Designer.cs
......@@ -63,23 +63,6 @@
this.lblAxPrfPos = new System.Windows.Forms.Label();
this.lblAxisPrfMode = new System.Windows.Forms.Label();
this.label50 = new System.Windows.Forms.Label();
this.btnComAlarmClear = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
this.txtHomeStatus = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.btnGetAlarm = new System.Windows.Forms.Button();
this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.txtLimit2 = new System.Windows.Forms.TextBox();
this.txtServoStatue = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.txtLimit1 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.txtHomeSingle = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btnAxisStop = new System.Windows.Forms.Button();
......@@ -105,12 +88,9 @@
this.txtAxisValue = new System.Windows.Forms.TextBox();
this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = new System.Windows.Forms.Label();
this.btnAxisVMove = new System.Windows.Forms.Button();
this.btnReadPosition = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupAxis.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
......@@ -122,16 +102,12 @@
this.groupAxis.Controls.Add(this.lblAxisType);
this.groupAxis.Controls.Add(this.lblStatus);
this.groupAxis.Controls.Add(this.groupBox2);
this.groupAxis.Controls.Add(this.btnComAlarmClear);
this.groupAxis.Controls.Add(this.groupBox1);
this.groupAxis.Controls.Add(this.panel1);
this.groupAxis.Controls.Add(this.lblServerOn);
this.groupAxis.Controls.Add(this.btnAxisVMove);
this.groupAxis.Controls.Add(this.btnReadPosition);
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, 4);
this.groupAxis.Location = new System.Drawing.Point(3, 3);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(716, 420);
this.groupAxis.Size = new System.Drawing.Size(478, 395);
this.groupAxis.TabIndex = 218;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
......@@ -187,11 +163,11 @@
this.groupBox2.Controls.Add(this.lblAxPrfPos);
this.groupBox2.Controls.Add(this.lblAxisPrfMode);
this.groupBox2.Controls.Add(this.label50);
this.groupBox2.Location = new System.Drawing.Point(9, 255);
this.groupBox2.Location = new System.Drawing.Point(7, 255);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
this.groupBox2.Size = new System.Drawing.Size(537, 133);
this.groupBox2.Size = new System.Drawing.Size(469, 133);
this.groupBox2.TabIndex = 304;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "轴状态监控";
......@@ -199,7 +175,7 @@
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(266, 110);
this.label7.Location = new System.Drawing.Point(249, 110);
this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(59, 17);
......@@ -209,7 +185,7 @@
// lblMaxLmt
//
this.lblMaxLmt.AutoSize = true;
this.lblMaxLmt.Location = new System.Drawing.Point(331, 110);
this.lblMaxLmt.Location = new System.Drawing.Point(314, 110);
this.lblMaxLmt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMaxLmt.Name = "lblMaxLmt";
this.lblMaxLmt.Size = new System.Drawing.Size(17, 17);
......@@ -219,7 +195,7 @@
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(133, 110);
this.label12.Location = new System.Drawing.Point(124, 110);
this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(59, 17);
......@@ -229,7 +205,7 @@
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(9, 110);
this.label13.Location = new System.Drawing.Point(6, 110);
this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(59, 17);
......@@ -239,7 +215,7 @@
// lblPosLmt
//
this.lblPosLmt.AutoSize = true;
this.lblPosLmt.Location = new System.Drawing.Point(72, 110);
this.lblPosLmt.Location = new System.Drawing.Point(69, 110);
this.lblPosLmt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblPosLmt.Name = "lblPosLmt";
this.lblPosLmt.Size = new System.Drawing.Size(17, 17);
......@@ -249,7 +225,7 @@
// lblNegLmt
//
this.lblNegLmt.AutoSize = true;
this.lblNegLmt.Location = new System.Drawing.Point(198, 110);
this.lblNegLmt.Location = new System.Drawing.Point(189, 110);
this.lblNegLmt.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblNegLmt.Name = "lblNegLmt";
this.lblNegLmt.Size = new System.Drawing.Size(17, 17);
......@@ -259,7 +235,7 @@
// lblAlarmcode
//
this.lblAlarmcode.AutoSize = true;
this.lblAlarmcode.Location = new System.Drawing.Point(422, 60);
this.lblAlarmcode.Location = new System.Drawing.Point(379, 60);
this.lblAlarmcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAlarmcode.Name = "lblAlarmcode";
this.lblAlarmcode.Size = new System.Drawing.Size(68, 17);
......@@ -270,7 +246,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(267, 85);
this.label4.Location = new System.Drawing.Point(250, 85);
this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 17);
......@@ -280,7 +256,7 @@
// lblhomeSts
//
this.lblhomeSts.AutoSize = true;
this.lblhomeSts.Location = new System.Drawing.Point(332, 85);
this.lblhomeSts.Location = new System.Drawing.Point(315, 85);
this.lblhomeSts.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblhomeSts.Name = "lblhomeSts";
this.lblhomeSts.Size = new System.Drawing.Size(17, 17);
......@@ -290,7 +266,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(422, 85);
this.label2.Location = new System.Drawing.Point(379, 85);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 17);
......@@ -301,7 +277,7 @@
// lblAxEncAcc
//
this.lblAxEncAcc.AutoSize = true;
this.lblAxEncAcc.Location = new System.Drawing.Point(499, 85);
this.lblAxEncAcc.Location = new System.Drawing.Point(447, 85);
this.lblAxEncAcc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncAcc.Name = "lblAxEncAcc";
this.lblAxEncAcc.Size = new System.Drawing.Size(17, 17);
......@@ -312,9 +288,9 @@
// lblINP
//
this.lblINP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblINP.Location = new System.Drawing.Point(414, 19);
this.lblINP.Location = new System.Drawing.Point(355, 19);
this.lblINP.Name = "lblINP";
this.lblINP.Size = new System.Drawing.Size(56, 30);
this.lblINP.Size = new System.Drawing.Size(49, 30);
this.lblINP.TabIndex = 10;
this.lblINP.Text = "到位";
this.lblINP.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -322,9 +298,9 @@
// lblBUSY
//
this.lblBUSY.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblBUSY.Location = new System.Drawing.Point(356, 19);
this.lblBUSY.Location = new System.Drawing.Point(305, 19);
this.lblBUSY.Name = "lblBUSY";
this.lblBUSY.Size = new System.Drawing.Size(56, 30);
this.lblBUSY.Size = new System.Drawing.Size(49, 30);
this.lblBUSY.TabIndex = 9;
this.lblBUSY.Text = "忙碌";
this.lblBUSY.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -332,9 +308,9 @@
// lblNEL
//
this.lblNEL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblNEL.Location = new System.Drawing.Point(298, 19);
this.lblNEL.Location = new System.Drawing.Point(255, 19);
this.lblNEL.Name = "lblNEL";
this.lblNEL.Size = new System.Drawing.Size(56, 30);
this.lblNEL.Size = new System.Drawing.Size(49, 30);
this.lblNEL.TabIndex = 8;
this.lblNEL.Text = "负极限";
this.lblNEL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -342,9 +318,9 @@
// lblORG
//
this.lblORG.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblORG.Location = new System.Drawing.Point(240, 19);
this.lblORG.Location = new System.Drawing.Point(205, 19);
this.lblORG.Name = "lblORG";
this.lblORG.Size = new System.Drawing.Size(56, 30);
this.lblORG.Size = new System.Drawing.Size(49, 30);
this.lblORG.TabIndex = 7;
this.lblORG.Text = "原点";
this.lblORG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -352,9 +328,9 @@
// lblPEL
//
this.lblPEL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblPEL.Location = new System.Drawing.Point(182, 19);
this.lblPEL.Location = new System.Drawing.Point(155, 19);
this.lblPEL.Name = "lblPEL";
this.lblPEL.Size = new System.Drawing.Size(56, 30);
this.lblPEL.Size = new System.Drawing.Size(49, 30);
this.lblPEL.TabIndex = 6;
this.lblPEL.Text = "正极限";
this.lblPEL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -362,9 +338,9 @@
// lblSvOn
//
this.lblSvOn.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblSvOn.Location = new System.Drawing.Point(8, 19);
this.lblSvOn.Location = new System.Drawing.Point(5, 19);
this.lblSvOn.Name = "lblSvOn";
this.lblSvOn.Size = new System.Drawing.Size(56, 30);
this.lblSvOn.Size = new System.Drawing.Size(49, 30);
this.lblSvOn.TabIndex = 5;
this.lblSvOn.Text = "伺服";
this.lblSvOn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -372,9 +348,9 @@
// lblEMG
//
this.lblEMG.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblEMG.Location = new System.Drawing.Point(124, 19);
this.lblEMG.Location = new System.Drawing.Point(105, 19);
this.lblEMG.Name = "lblEMG";
this.lblEMG.Size = new System.Drawing.Size(56, 30);
this.lblEMG.Size = new System.Drawing.Size(49, 30);
this.lblEMG.TabIndex = 4;
this.lblEMG.Text = "急停";
this.lblEMG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -382,9 +358,9 @@
// lblWARN
//
this.lblWARN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblWARN.Location = new System.Drawing.Point(472, 19);
this.lblWARN.Location = new System.Drawing.Point(405, 19);
this.lblWARN.Name = "lblWARN";
this.lblWARN.Size = new System.Drawing.Size(56, 30);
this.lblWARN.Size = new System.Drawing.Size(49, 30);
this.lblWARN.TabIndex = 3;
this.lblWARN.Text = "警告";
this.lblWARN.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -392,9 +368,9 @@
// lblALM
//
this.lblALM.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblALM.Location = new System.Drawing.Point(66, 19);
this.lblALM.Location = new System.Drawing.Point(55, 19);
this.lblALM.Name = "lblALM";
this.lblALM.Size = new System.Drawing.Size(56, 30);
this.lblALM.Size = new System.Drawing.Size(49, 30);
this.lblALM.TabIndex = 2;
this.lblALM.Text = "报警";
this.lblALM.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -402,7 +378,7 @@
// label53
//
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(134, 85);
this.label53.Location = new System.Drawing.Point(125, 85);
this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(59, 17);
......@@ -412,7 +388,7 @@
// label56
//
this.label56.AutoSize = true;
this.label56.Location = new System.Drawing.Point(10, 85);
this.label56.Location = new System.Drawing.Point(7, 85);
this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label56.Name = "label56";
this.label56.Size = new System.Drawing.Size(59, 17);
......@@ -422,7 +398,7 @@
// label55
//
this.label55.AutoSize = true;
this.label55.Location = new System.Drawing.Point(10, 60);
this.label55.Location = new System.Drawing.Point(7, 60);
this.label55.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label55.Name = "label55";
this.label55.Size = new System.Drawing.Size(59, 17);
......@@ -432,7 +408,7 @@
// label52
//
this.label52.AutoSize = true;
this.label52.Location = new System.Drawing.Point(134, 60);
this.label52.Location = new System.Drawing.Point(125, 60);
this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label52.Name = "label52";
this.label52.Size = new System.Drawing.Size(59, 17);
......@@ -442,7 +418,7 @@
// lblAxEncVel
//
this.lblAxEncVel.AutoSize = true;
this.lblAxEncVel.Location = new System.Drawing.Point(73, 85);
this.lblAxEncVel.Location = new System.Drawing.Point(70, 85);
this.lblAxEncVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncVel.Name = "lblAxEncVel";
this.lblAxEncVel.Size = new System.Drawing.Size(17, 17);
......@@ -452,7 +428,7 @@
// lblAxPrfVel
//
this.lblAxPrfVel.AutoSize = true;
this.lblAxPrfVel.Location = new System.Drawing.Point(199, 85);
this.lblAxPrfVel.Location = new System.Drawing.Point(190, 85);
this.lblAxPrfVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfVel.Name = "lblAxPrfVel";
this.lblAxPrfVel.Size = new System.Drawing.Size(17, 17);
......@@ -462,7 +438,7 @@
// lblAxEncPos
//
this.lblAxEncPos.AutoSize = true;
this.lblAxEncPos.Location = new System.Drawing.Point(73, 60);
this.lblAxEncPos.Location = new System.Drawing.Point(70, 60);
this.lblAxEncPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncPos.Name = "lblAxEncPos";
this.lblAxEncPos.Size = new System.Drawing.Size(17, 17);
......@@ -472,7 +448,7 @@
// lblAxPrfPos
//
this.lblAxPrfPos.AutoSize = true;
this.lblAxPrfPos.Location = new System.Drawing.Point(199, 60);
this.lblAxPrfPos.Location = new System.Drawing.Point(190, 60);
this.lblAxPrfPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfPos.Name = "lblAxPrfPos";
this.lblAxPrfPos.Size = new System.Drawing.Size(17, 17);
......@@ -482,7 +458,7 @@
// lblAxisPrfMode
//
this.lblAxisPrfMode.AutoSize = true;
this.lblAxisPrfMode.Location = new System.Drawing.Point(332, 60);
this.lblAxisPrfMode.Location = new System.Drawing.Point(315, 60);
this.lblAxisPrfMode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxisPrfMode.Name = "lblAxisPrfMode";
this.lblAxisPrfMode.Size = new System.Drawing.Size(17, 17);
......@@ -492,181 +468,13 @@
// label50
//
this.label50.AutoSize = true;
this.label50.Location = new System.Drawing.Point(267, 60);
this.label50.Location = new System.Drawing.Point(250, 60);
this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label50.Name = "label50";
this.label50.Size = new System.Drawing.Size(59, 17);
this.label50.TabIndex = 1;
this.label50.Text = "规划模式:";
//
// btnComAlarmClear
//
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(563, 297);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34);
this.btnComAlarmClear.TabIndex = 50;
this.btnComAlarmClear.Text = "清除报警";
this.btnComAlarmClear.UseVisualStyleBackColor = true;
this.btnComAlarmClear.Visible = false;
this.btnComAlarmClear.Click += new System.EventHandler(this.btnComAlarmClear_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.txtBusyStatus);
this.groupBox1.Controls.Add(this.label11);
this.groupBox1.Controls.Add(this.txtHomeStatus);
this.groupBox1.Controls.Add(this.label10);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label24);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.btnGetAlarm);
this.groupBox1.Controls.Add(this.txtAlarmStatus);
this.groupBox1.Controls.Add(this.txtLimit2);
this.groupBox1.Controls.Add(this.txtServoStatue);
this.groupBox1.Controls.Add(this.label22);
this.groupBox1.Controls.Add(this.txtLimit1);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.txtHomeSingle);
this.groupBox1.Location = new System.Drawing.Point(554, 14);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(154, 277);
this.groupBox1.TabIndex = 302;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "状态";
//
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(120, 80);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(6, 113);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(105, 17);
this.label11.TabIndex = 292;
this.label11.Text = "HOME-CMP状态:";
//
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(120, 110);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(45, 83);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 289;
this.label10.Text = "BUSY状态:";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(52, 53);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 17);
this.label3.TabIndex = 286;
this.label3.Text = "报警状态:";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(40, 203);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(71, 17);
this.label24.TabIndex = 316;
this.label24.Text = "负极限信号:";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(54, 23);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 17);
this.label5.TabIndex = 328;
this.label5.Text = "伺服状态:";
//
// btnGetAlarm
//
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Location = new System.Drawing.Point(35, 233);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(110, 34);
this.btnGetAlarm.TabIndex = 284;
this.btnGetAlarm.Text = "读报状态";
this.btnGetAlarm.UseVisualStyleBackColor = true;
this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click);
//
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(120, 50);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
//
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(120, 200);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313;
//
// txtServoStatue
//
this.txtServoStatue.Enabled = false;
this.txtServoStatue.Location = new System.Drawing.Point(120, 20);
this.txtServoStatue.Name = "txtServoStatue";
this.txtServoStatue.Size = new System.Drawing.Size(25, 23);
this.txtServoStatue.TabIndex = 327;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(40, 173);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(71, 17);
this.label22.TabIndex = 312;
this.label22.Text = "正极限信号:";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(120, 170);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(52, 143);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17);
this.label6.TabIndex = 300;
this.label6.Text = "原点信号:";
//
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(120, 140);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
//
// panel1
//
this.panel1.Controls.Add(this.linkLabel1);
......@@ -693,15 +501,15 @@
this.panel1.Controls.Add(this.txtAxisValue);
this.panel1.Controls.Add(this.txtAxisDeviceName);
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(7, 18);
this.panel1.Location = new System.Drawing.Point(5, 18);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(540, 237);
this.panel1.Size = new System.Drawing.Size(469, 237);
this.panel1.TabIndex = 219;
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(191, 146);
this.linkLabel1.Location = new System.Drawing.Point(184, 146);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(32, 17);
this.linkLabel1.TabIndex = 333;
......@@ -716,7 +524,7 @@
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(426, 46);
this.btnAxisStop.Location = new System.Drawing.Point(356, 46);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(110, 114);
......@@ -732,7 +540,7 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(306, 125);
this.btnAxisReturnHome.Location = new System.Drawing.Point(244, 125);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34);
......@@ -746,9 +554,9 @@
this.cmbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAxis.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAxis.FormattingEnabled = true;
this.cmbAxis.Location = new System.Drawing.Point(70, 9);
this.cmbAxis.Location = new System.Drawing.Point(57, 8);
this.cmbAxis.Name = "cmbAxis";
this.cmbAxis.Size = new System.Drawing.Size(227, 28);
this.cmbAxis.Size = new System.Drawing.Size(184, 28);
this.cmbAxis.TabIndex = 301;
this.cmbAxis.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
......@@ -757,7 +565,7 @@
this.btnDelMove.BackColor = System.Drawing.SystemColors.Control;
this.btnDelMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDelMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelMove.Location = new System.Drawing.Point(343, 180);
this.btnDelMove.Location = new System.Drawing.Point(303, 180);
this.btnDelMove.Name = "btnDelMove";
this.btnDelMove.Size = new System.Drawing.Size(140, 45);
this.btnDelMove.TabIndex = 332;
......@@ -773,7 +581,7 @@
this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(306, 5);
this.btnOpenAxis.Location = new System.Drawing.Point(244, 5);
this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(110, 34);
......@@ -785,7 +593,7 @@
// txtMiddleSpeed
//
this.txtMiddleSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleSpeed.Location = new System.Drawing.Point(84, 190);
this.txtMiddleSpeed.Location = new System.Drawing.Point(77, 190);
this.txtMiddleSpeed.MaxLength = 6;
this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(73, 26);
......@@ -799,7 +607,7 @@
this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(426, 5);
this.btnCloseAxis.Location = new System.Drawing.Point(356, 5);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(110, 34);
......@@ -813,7 +621,7 @@
this.btnAddMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAddMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAddMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddMove.Location = new System.Drawing.Point(194, 180);
this.btnAddMove.Location = new System.Drawing.Point(160, 180);
this.btnAddMove.Name = "btnAddMove";
this.btnAddMove.Size = new System.Drawing.Size(140, 45);
this.btnAddMove.TabIndex = 330;
......@@ -829,18 +637,18 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(206, 95);
this.txtASpeed.Location = new System.Drawing.Point(172, 94);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtASpeed.Size = new System.Drawing.Size(91, 26);
this.txtASpeed.Size = new System.Drawing.Size(69, 26);
this.txtASpeed.TabIndex = 251;
this.txtASpeed.Text = "200";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(19, 195);
this.label1.Location = new System.Drawing.Point(12, 195);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 329;
......@@ -852,7 +660,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(141, 100);
this.label47.Location = new System.Drawing.Point(107, 99);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(59, 17);
......@@ -864,7 +672,7 @@
//
this.label8.AutoSize = true;
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(17, 145);
this.label8.Location = new System.Drawing.Point(10, 145);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.TabIndex = 255;
......@@ -877,7 +685,7 @@
this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(306, 85);
this.btnAxisRMove.Location = new System.Drawing.Point(244, 85);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(110, 34);
......@@ -889,7 +697,7 @@
// txtAxisPosition
//
this.txtAxisPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisPosition.Location = new System.Drawing.Point(82, 140);
this.txtAxisPosition.Location = new System.Drawing.Point(75, 140);
this.txtAxisPosition.Name = "txtAxisPosition";
this.txtAxisPosition.ReadOnly = true;
this.txtAxisPosition.Size = new System.Drawing.Size(103, 26);
......@@ -902,7 +710,7 @@
this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(306, 45);
this.btnAxisAMove.Location = new System.Drawing.Point(244, 45);
this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(110, 34);
......@@ -916,7 +724,7 @@
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(9, 14);
this.label49.Location = new System.Drawing.Point(2, 14);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.TabIndex = 233;
......@@ -929,11 +737,11 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(206, 53);
this.txtAPosition.Location = new System.Drawing.Point(172, 52);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAPosition.Size = new System.Drawing.Size(91, 26);
this.txtAPosition.Size = new System.Drawing.Size(69, 26);
this.txtAPosition.TabIndex = 244;
this.txtAPosition.Text = "3000";
//
......@@ -942,7 +750,7 @@
this.label46.AutoSize = true;
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(25, 100);
this.label46.Location = new System.Drawing.Point(18, 100);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17);
this.label46.TabIndex = 239;
......@@ -955,7 +763,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(141, 58);
this.label48.Location = new System.Drawing.Point(107, 57);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(59, 17);
......@@ -968,7 +776,7 @@
this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(25, 58);
this.label45.Location = new System.Drawing.Point(18, 58);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(35, 17);
this.label45.TabIndex = 240;
......@@ -978,22 +786,22 @@
// txtAxisValue
//
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(70, 95);
this.txtAxisValue.Location = new System.Drawing.Point(57, 94);
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true;
this.txtAxisValue.Size = new System.Drawing.Size(68, 26);
this.txtAxisValue.Size = new System.Drawing.Size(41, 26);
this.txtAxisValue.TabIndex = 242;
this.txtAxisValue.Text = "0";
//
// txtAxisDeviceName
//
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(70, 53);
this.txtAxisDeviceName.Location = new System.Drawing.Point(57, 52);
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true;
this.txtAxisDeviceName.Size = new System.Drawing.Size(68, 26);
this.txtAxisDeviceName.Size = new System.Drawing.Size(41, 26);
this.txtAxisDeviceName.TabIndex = 241;
this.txtAxisDeviceName.Text = "0";
//
......@@ -1008,40 +816,6 @@
this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268;
//
// btnAxisVMove
//
this.btnAxisVMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisVMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisVMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(563, 337);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(110, 34);
this.btnAxisVMove.TabIndex = 249;
this.btnAxisVMove.Text = "匀速运动";
this.btnAxisVMove.UseVisualStyleBackColor = true;
this.btnAxisVMove.Visible = false;
this.btnAxisVMove.Click += new System.EventHandler(this.btnAxisVMove_Click);
//
// btnReadPosition
//
this.btnReadPosition.BackColor = System.Drawing.SystemColors.Control;
this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default;
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(563, 374);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(110, 34);
this.btnReadPosition.TabIndex = 278;
this.btnReadPosition.Text = "读取位置";
this.btnReadPosition.UseVisualStyleBackColor = true;
this.btnReadPosition.Visible = false;
this.btnReadPosition.Click += new System.EventHandler(this.btnReadPosition_Click);
//
// timer1
//
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
......@@ -1051,14 +825,12 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(731, 428);
this.Size = new System.Drawing.Size(486, 403);
this.Load += new System.EventHandler(this.AxisMoveControl_Load);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
......@@ -1069,16 +841,6 @@
private System.Windows.Forms.GroupBox groupAxis;
private System.Windows.Forms.ComboBox cmbAxis;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtHomeSingle;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox txtHomeStatus;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox txtBusyStatus;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtAlarmStatus;
private System.Windows.Forms.Button btnGetAlarm;
internal System.Windows.Forms.Button btnReadPosition;
private System.Windows.Forms.Label lblServerOn;
private System.Windows.Forms.Label label8;
internal System.Windows.Forms.Button btnOpenAxis;
......@@ -1086,11 +848,9 @@
private System.Windows.Forms.TextBox txtAxisPosition;
internal System.Windows.Forms.TextBox txtASpeed;
internal System.Windows.Forms.Label label47;
internal System.Windows.Forms.Button btnAxisVMove;
internal System.Windows.Forms.Button btnAxisRMove;
internal System.Windows.Forms.Button btnAxisReturnHome;
internal System.Windows.Forms.Button btnAxisAMove;
private System.Windows.Forms.Button btnComAlarmClear;
internal System.Windows.Forms.TextBox txtAPosition;
internal System.Windows.Forms.Label label48;
internal System.Windows.Forms.Button btnAxisStop;
......@@ -1099,18 +859,11 @@
private System.Windows.Forms.Label label45;
private System.Windows.Forms.Label label46;
private System.Windows.Forms.Label label49;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.TextBox txtLimit2;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.TextBox txtLimit1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox txtServoStatue;
private System.Windows.Forms.Button btnDelMove;
private System.Windows.Forms.TextBox txtMiddleSpeed;
private System.Windows.Forms.Button btnAddMove;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label lblhomeSts;
......
source/AssemblyLineClient/useControl/AxisMoveControl.cs
......@@ -52,13 +52,11 @@ namespace OnlineStore.AssemblyLine
this.IsHuiChuan = AxisManager.instance is HCAxisManager;
if (IsHuiChuan)
{
groupBox1.Visible = false;
groupBox2.Visible = true;
timer1.Start();
}
else
{
groupBox1.Visible = true;
groupBox2.Visible = false;
}
}
......@@ -133,18 +131,6 @@ namespace OnlineStore.AssemblyLine
}
}
private void btnGetAlarm_Click(object sender, EventArgs e)
{
this.txtAlarmStatus.Text = AxisManager.instance.GetAlarmStatus(PortName, SlvAddr).ToString();
this.txtBusyStatus.Text = AxisManager.instance.GetBusyStatus(PortName, SlvAddr).ToString();
this.txtHomeStatus.Text = AxisManager.instance.GetHomeEndStatus(PortName, SlvAddr).ToString();
this.txtHomeSingle.Text = AxisManager.instance.GetHomeSingle(PortName, SlvAddr).ToString();
this.txtLimit1.Text = AxisManager.instance.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
this.txtLimit2.Text = AxisManager.instance.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
txtServoStatue.Text = AxisManager.instance.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘";
}
private void btnReadPosition_Click(object sender, EventArgs e)
{
txtAxisPosition.Text = AxisManager.instance.GetActualtPosition(PortName, SlvAddr).ToString();
......@@ -182,22 +168,11 @@ namespace OnlineStore.AssemblyLine
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
btnAxisRMove.ForeColor = color;
btnAxisVMove.ForeColor = color;
btnAxisReturnHome.ForeColor = color;
btnAxisStop.ForeColor = color;
btnComAlarmClear.ForeColor = color;
btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color;
btnAddMove.ForeColor = color;
btnDelMove.ForeColor = color;
this.txtAlarmStatus.Text = "";
this.txtBusyStatus.Text = "";
this.txtHomeStatus.Text = "";
this.txtHomeSingle.Text = "";
this.txtLimit1.Text = "";
this.txtLimit2.Text = "";
txtServoStatue.Text = "";
}
}
private void AxisMove( int speed)
......
source/AssemblyLineClient/useControl/EquipControl.cs
......@@ -114,6 +114,11 @@ namespace OnlineStore.AssemblyLine
BoxInfo box = LineServer.GetBoxInfo(equip.DeviceID);
string online = "✘";
string str = "BOX";
if (equip.DeviceID.Equals(7))
{
str = "出料机构";
}
if (box != null)
{
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
......@@ -122,7 +127,7 @@ namespace OnlineStore.AssemblyLine
if (box.SAlarmType.Equals(LineAlarmType.None))
{
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
lblBox.Text = str+"[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
if (box.SRunStatus.Equals((int)LineRunStatus.Busy))
{
lblBox.BackColor = Color.LightGreen;
......@@ -134,20 +139,20 @@ namespace OnlineStore.AssemblyLine
}
else
{
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " "+box.SAlarmType+" " + box.ToShowStr();
lblBox.Text = str + "[" + box.CId.ToString() + "]：" + online + " "+box.SAlarmType+" " + box.ToShowStr();
lblBox.BackColor = Color.Red;
}
}
else
{
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
lblBox.Text = str + "[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
lblBox.BackColor = Color.Gray;
}
}
else
{
lblBox.Text = "BOX状态：" + online;
lblBox.Text = str + "状态：" + online;
lblBox.BackColor = Color.Gray;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!