Skip to content

李娜 / SO664-HCSingleStore

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

界面调整

1 个父辈 60a0a316
内嵌 并排
正在显示 3 个修改的文件 包含 176 行增加 和 185 行删除
source/HCSingleStore/FrmBox.Designer.cs
......@@ -33,6 +33,16 @@
this.btnAxisOn = new System.Windows.Forms.Button();
this.btnAxisP = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.button6 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.lblMoveEquipInfo = new System.Windows.Forms.Label();
this.btnCon = new System.Windows.Forms.Button();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.btnStartAutoCheck = new System.Windows.Forms.Button();
this.groupBox4 = new System.Windows.Forms.GroupBox();
......@@ -49,7 +59,6 @@
this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.lblTemp = new System.Windows.Forms.Label();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupInout = new System.Windows.Forms.GroupBox();
......@@ -95,10 +104,6 @@
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.btnCheckPos = new System.Windows.Forms.Button();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.button6 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.AutoCountClient.AxisMoveControl();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txt4Target = new System.Windows.Forms.TextBox();
......@@ -120,21 +125,16 @@
this.label1 = new System.Windows.Forms.Label();
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblMoveEquipInfo = new System.Windows.Forms.Label();
this.btnCon = new System.Windows.Forms.Button();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
this.groupInout.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// timer1
......@@ -144,10 +144,9 @@
//
// chbDebug
//
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(14, 83);
this.chbDebug.Location = new System.Drawing.Point(299, 20);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.TabIndex = 271;
......@@ -158,7 +157,7 @@
// btnStoreStop
//
this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStop.Location = new System.Drawing.Point(127, 24);
this.btnStoreStop.Location = new System.Drawing.Point(133, 13);
this.btnStoreStop.Name = "btnStoreStop";
this.btnStoreStop.Size = new System.Drawing.Size(116, 39);
this.btnStoreStop.TabIndex = 1;
......@@ -169,7 +168,7 @@
// btnStoreStart
//
this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStart.Location = new System.Drawing.Point(10, 24);
this.btnStoreStart.Location = new System.Drawing.Point(11, 13);
this.btnStoreStart.Name = "btnStoreStart";
this.btnStoreStart.Size = new System.Drawing.Size(116, 39);
this.btnStoreStart.TabIndex = 0;
......@@ -180,7 +179,7 @@
// btnUpdown
//
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Location = new System.Drawing.Point(591, 305);
this.btnUpdown.Location = new System.Drawing.Point(581, 220);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(118, 39);
this.btnUpdown.TabIndex = 14;
......@@ -191,7 +190,7 @@
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(720, 246);
this.btnAxisOff.Location = new System.Drawing.Point(710, 161);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(116, 39);
this.btnAxisOff.TabIndex = 11;
......@@ -202,7 +201,7 @@
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(591, 246);
this.btnAxisOn.Location = new System.Drawing.Point(581, 161);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(116, 39);
this.btnAxisOn.TabIndex = 10;
......@@ -213,7 +212,7 @@
// btnAxisP
//
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Location = new System.Drawing.Point(720, 305);
this.btnAxisP.Location = new System.Drawing.Point(710, 220);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(116, 39);
this.btnAxisP.TabIndex = 8;
......@@ -226,26 +225,147 @@
this.tabControl1.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.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Location = new System.Drawing.Point(4, 129);
this.tabControl1.Location = new System.Drawing.Point(4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1083, 518);
this.tabControl1.Size = new System.Drawing.Size(1083, 644);
this.tabControl1.TabIndex = 272;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Controls.Add(this.lblTemp);
this.tabPage2.Controls.Add(this.btnStoreStart);
this.tabPage2.Controls.Add(this.lblMoveEquipInfo);
this.tabPage2.Controls.Add(this.lblThisSta);
this.tabPage2.Controls.Add(this.btnCon);
this.tabPage2.Controls.Add(this.btnStoreStop);
this.tabPage2.Controls.Add(this.chbDebug);
this.tabPage2.Controls.Add(this.lblWarnMsg);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1075, 611);
this.tabPage2.TabIndex = 3;
this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true;
//
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(7, 524);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "流水线通信测试";
this.groupBox2.Visible = false;
//
// button6
//
this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button6.Location = new System.Drawing.Point(317, 32);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(100, 33);
this.button6.TabIndex = 275;
this.button6.Text = "发送";
this.button6.UseVisualStyleBackColor = true;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// button3
//
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button3.Location = new System.Drawing.Point(64, 31);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(100, 33);
this.button3.TabIndex = 273;
this.button3.Text = "连接";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// button5
//
this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button5.Location = new System.Drawing.Point(193, 32);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(100, 33);
this.button5.TabIndex = 274;
this.button5.Text = "停止";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// lblTemp
//
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(420, 22);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 275;
this.lblTemp.Text = "当前温度--，当前湿度--";
//
// lblMoveEquipInfo
//
this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(307, 76);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17);
this.lblMoveEquipInfo.TabIndex = 274;
this.lblMoveEquipInfo.Text = "移栽状态:不可出库";
//
// btnCon
//
this.btnCon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnCon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCon.Location = new System.Drawing.Point(885, 64);
this.btnCon.Name = "btnCon";
this.btnCon.Size = new System.Drawing.Size(175, 39);
this.btnCon.TabIndex = 273;
this.btnCon.Text = "忽略检测信号，继续出库";
this.btnCon.UseVisualStyleBackColor = true;
this.btnCon.Click += new System.EventHandler(this.btnCon_Click);
//
// lblWarnMsg
//
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(11, 124);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1049, 104);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblThisSta
//
this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(140, 76);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(56, 17);
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.btnStartAutoCheck);
this.tabPage3.Controls.Add(this.groupBox4);
this.tabPage3.Controls.Add(this.groupBox5);
this.tabPage3.Controls.Add(this.lblTemp);
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Controls.Add(this.groupInout);
this.tabPage3.Controls.Add(this.btnCheckPos);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1075, 485);
this.tabPage3.Size = new System.Drawing.Size(1075, 614);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位操作 ";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -255,9 +375,9 @@
this.btnStartAutoCheck.BackColor = System.Drawing.SystemColors.Control;
this.btnStartAutoCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartAutoCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAutoCheck.Location = new System.Drawing.Point(652, 414);
this.btnStartAutoCheck.Location = new System.Drawing.Point(649, 477);
this.btnStartAutoCheck.Name = "btnStartAutoCheck";
this.btnStartAutoCheck.Size = new System.Drawing.Size(105, 35);
this.btnStartAutoCheck.Size = new System.Drawing.Size(105, 38);
this.btnStartAutoCheck.TabIndex = 274;
this.btnStartAutoCheck.Text = "开始自动盘点";
this.btnStartAutoCheck.UseVisualStyleBackColor = false;
......@@ -265,8 +385,6 @@
//
// groupBox4
//
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.btnOpenDo);
this.groupBox4.Controls.Add(this.btnCloseDO);
this.groupBox4.Controls.Add(this.txtDOIndex);
......@@ -279,9 +397,9 @@
this.groupBox4.Controls.Add(this.label5);
this.groupBox4.Controls.Add(this.cmbWriteIO);
this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(532, 264);
this.groupBox4.Location = new System.Drawing.Point(532, 326);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(472, 126);
this.groupBox4.Size = new System.Drawing.Size(472, 132);
this.groupBox4.TabIndex = 108;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO写入";
......@@ -417,13 +535,11 @@
//
// groupBox5
//
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox5.Controls.Add(this.tableLayoutPanel2);
this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox5.Location = new System.Drawing.Point(775, 3);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(229, 249);
this.groupBox5.Size = new System.Drawing.Size(229, 317);
this.groupBox5.TabIndex = 107;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "DO列表";
......@@ -440,29 +556,16 @@
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(218, 229);
this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 297);
this.tableLayoutPanel2.TabIndex = 103;
//
// lblTemp
//
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(805, 424);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--，当前湿度--";
//
// groupBox6
//
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox6.Controls.Add(this.tableLayoutPanel1);
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(532, 3);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(229, 249);
this.groupBox6.Size = new System.Drawing.Size(229, 317);
this.groupBox6.TabIndex = 106;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "DI列表";
......@@ -479,7 +582,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(218, 229);
this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 297);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupInout
......@@ -530,7 +633,7 @@
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(3, 3);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(514, 453);
this.groupInout.Size = new System.Drawing.Size(514, 576);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -551,7 +654,7 @@
this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control;
this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(281, 67);
this.btnStartAuTo.Location = new System.Drawing.Point(392, 67);
this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(105, 38);
this.btnStartAuTo.TabIndex = 222;
......@@ -574,7 +677,7 @@
this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(392, 67);
this.btnSavePosition.Location = new System.Drawing.Point(392, 474);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(105, 38);
this.btnSavePosition.TabIndex = 217;
......@@ -807,7 +910,7 @@
this.cmbPosition.FormattingEnabled = true;
this.cmbPosition.Location = new System.Drawing.Point(7, 23);
this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(248, 28);
this.cmbPosition.Size = new System.Drawing.Size(268, 28);
this.cmbPosition.TabIndex = 174;
this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
//
......@@ -1168,9 +1271,9 @@
this.btnCheckPos.BackColor = System.Drawing.SystemColors.Control;
this.btnCheckPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCheckPos.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCheckPos.Location = new System.Drawing.Point(541, 414);
this.btnCheckPos.Location = new System.Drawing.Point(538, 477);
this.btnCheckPos.Name = "btnCheckPos";
this.btnCheckPos.Size = new System.Drawing.Size(105, 35);
this.btnCheckPos.Size = new System.Drawing.Size(105, 38);
this.btnCheckPos.TabIndex = 273;
this.btnCheckPos.Text = "盘点测试";
this.btnCheckPos.UseVisualStyleBackColor = false;
......@@ -1178,7 +1281,6 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Controls.Add(this.btnUpdown);
this.tabPage1.Controls.Add(this.groupBox1);
......@@ -1188,57 +1290,11 @@
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(1075, 488);
this.tabPage1.Size = new System.Drawing.Size(1075, 614);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(581, 153);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "流水线通信测试";
this.groupBox2.Visible = false;
//
// button6
//
this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button6.Location = new System.Drawing.Point(317, 32);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(100, 33);
this.button6.TabIndex = 275;
this.button6.Text = "发送";
this.button6.UseVisualStyleBackColor = true;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// button3
//
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button3.Location = new System.Drawing.Point(64, 31);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(100, 33);
this.button3.TabIndex = 273;
this.button3.Text = "连接";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// button5
//
this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button5.Location = new System.Drawing.Point(193, 32);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(100, 33);
this.button5.TabIndex = 274;
this.button5.Text = "停止";
this.button5.UseVisualStyleBackColor = true;
this.button5.Click += new System.EventHandler(this.button5_Click);
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(4, 6);
......@@ -1441,75 +1497,11 @@
this.label42.TabIndex = 24;
this.label42.Text = "规划位置:";
//
// groupBox3
//
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.lblMoveEquipInfo);
this.groupBox3.Controls.Add(this.btnCon);
this.groupBox3.Controls.Add(this.chbDebug);
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.btnStoreStop);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.btnStoreStart);
this.groupBox3.Location = new System.Drawing.Point(4, 2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(1083, 125);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
//
// lblMoveEquipInfo
//
this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(895, 35);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17);
this.lblMoveEquipInfo.TabIndex = 274;
this.lblMoveEquipInfo.Text = "移栽状态:不可出库";
//
// btnCon
//
this.btnCon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnCon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCon.Location = new System.Drawing.Point(902, 76);
this.btnCon.Name = "btnCon";
this.btnCon.Size = new System.Drawing.Size(175, 39);
this.btnCon.TabIndex = 273;
this.btnCon.Text = "忽略检测信号，继续出库";
this.btnCon.UseVisualStyleBackColor = true;
this.btnCon.Click += new System.EventHandler(this.btnCon_Click);
//
// lblWarnMsg
//
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(131, 68);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(765, 51);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblThisSta
//
this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(249, 35);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(56, 17);
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// FrmBox
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1089, 653);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.groupBox3);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
......@@ -1521,8 +1513,10 @@
this.Load += new System.EventHandler(this.FrmTest_Load);
this.Shown += new System.EventHandler(this.FrmStoreBox_Shown);
this.tabControl1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox5.ResumeLayout(false);
......@@ -1530,11 +1524,8 @@
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
this.tabPage1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.ResumeLayout(false);
}
......@@ -1601,8 +1592,6 @@
private System.Windows.Forms.TextBox txtUpdownTarget;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label lblWarnMsg;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.Label lblTemp;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.Button btnStoreStop;
......@@ -1642,6 +1631,8 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.Label lblTemp;
}
}
source/HCSingleStore/FrmBox.cs
......@@ -38,9 +38,8 @@ namespace OnlineStore.ACSingleStore
LoadStore();
chbDebug.Checked = boxBean.IsDebug;
this.ShowInTaskbar = true;
groupBox3.Text = "设备["+boxBean.CID+"]状态";
this.ShowInTaskbar = true;
tabPage2.Text = " 设备[" + boxBean.CID + "]状态 ";
this.Opacity = 1;
LoadOk = true;
......@@ -244,6 +243,13 @@ namespace OnlineStore.ACSingleStore
lblWarnMsg.Text = msg;
}
}
if (HuichuanLibrary.HCBoardManager.CardInitOk())
{
ReadA(boxBean.Config.Middle_Axis, lblActual1, lblTargetP1, lblTargetP1);
ReadA(boxBean.Config.UpDown_Axis, lblActual2, lblTargetP2, lblTargetP2);
ReadA(boxBean.Config.InOut_Axis, lblActual3, lblTargetP3, lblTargetP3);
ReadA(boxBean.Config.Comp_Axis, lblActual4, lblTargetP4, lblTargetP4);
}
if (boxBean.autoNext)
{
string msg = boxBean.autoMsg;
......@@ -261,13 +267,7 @@ namespace OnlineStore.ACSingleStore
}
}
catch (Exception ex) { }
if (AxisManager.UseHCBoard)
{
ReadA(boxBean.Config.Middle_Axis, lblActual1, lblTargetP1, lblTargetP1);
ReadA(boxBean.Config.UpDown_Axis, lblActual2, lblTargetP2, lblTargetP2);
ReadA(boxBean.Config.InOut_Axis, lblActual3, lblTargetP3, lblTargetP3);
ReadA(boxBean.Config.Comp_Axis, lblActual4, lblTargetP4, lblTargetP4);
}
}
else
{
......
source/HCSingleStore/FrmStore.cs
......@@ -68,7 +68,7 @@ namespace OnlineStore.ACSingleStore
{
FrmBox frm = new FrmBox();
frm.boxBean = box;
AddForm(box.Name, frm);
AddForm(box.Name+" ", frm);
}
LoadOk = true;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!