Commit a9fb410f LN

界面调整

1 个父辈 7dd17650
......@@ -95,6 +95,32 @@ namespace DeviceLibrary
catch (Exception ex) { LogUtil.error("ShowColror " + color + ", " + lastState + "出错:" + ex.ToString()); }
}
public void ShowBlink(Color color, string lastState)
{
try
{
if (rGB_Controller == null || (!rgbLedInitOk))
{
return;
}
if (string.IsNullOrEmpty(lastS))
{
lastS = "show";
rGB_Controller.ShowColor(color);
}
else
{
lastS = "";
rGB_Controller.CloseLed();
}
lastColor = color.Name.ToString();
}
catch (Exception ex) { LogUtil.error("ShowColror " + color + ", " + lastState + "出错:" + ex.ToString()); }
}
public void ShowYellowLight(string s= "storeOut")
{
if (!lastColor.Equals("yellowL"))
......@@ -124,7 +150,7 @@ namespace DeviceLibrary
return;
}
// 红色: 急停,
//红色: 急停,
//紫色: 异常,
//蓝绿: 待机
//流动绿: 入库
......@@ -198,33 +224,37 @@ namespace DeviceLibrary
else if (scanCode)
{
//蓝色: 扫码检测
ShowColor(Color.Blue, "scanCode");
//ShowColor(Color.Blue, "scanCode");
ShowBlink(Color.Yellow, "scanCode");
}
else if (waitTake)
{
//暂停等待料盘拿走
//白色: 等待用户响应(等待取走盘等),
//蓝色: 扫码检测
ShowColor(Color.White, "waitTask");
//ShowColor(Color.White, "waitTask");
ShowBlink(Color.Yellow, "waitTask");
}
//出入库 绿闪 黄闪
else if (inOut)
{
////流动黄: 出库,
ShowYellowLight();
//ShowYellowLight();
ShowBlink(Color.Yellow, "inOut");
//lastS = "storeOut";
//LogUtil.info(Name + " ShowColor " + lastS + "=" + lastColor);
}
else if (inPut)
{
ShowGreenLight();
//ShowGreenLight();
ShowBlink(Color.Yellow, "InPut");
//lastS = "storeIn";
//LogUtil.info(Name + " ShowColor " + lastS + "=" + lastColor);
}
else if (hasAlarm)
{
//紫色: 异常,
ShowColor(Color.Purple, "hasAlarm");
ShowColor(Color.Red, "hasAlarm");
} //温度超限
//else if (IsTHoutRange())
......@@ -243,7 +273,8 @@ namespace DeviceLibrary
else
{
//待机 蓝绿
ShowColor(Color.FromArgb(0, 255, 64), "waiting");
//ShowColor(Color.FromArgb(0, 255, 64), "waiting");
ShowColor(Color.Green, "waiting");
}
}
}
......
......@@ -40,38 +40,38 @@ namespace TheMachineNView
this.lblSensor = new System.Windows.Forms.Label();
this.btnAxisRStop = new System.Windows.Forms.Button();
this.btnAxisRTest = new System.Windows.Forms.Button();
this.axisMoveControl1 = new AxisMoveControl();
this.configControl1 = new TheMachineNView.ConfigControl();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.axisMoveControl1 = new TheMachineNView.AxisMoveControl();
this.configControl1 = new TheMachineNView.ConfigControl();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.btnChangeColor);
this.panel1.Controls.Add(this.btnGree);
this.panel1.Controls.Add(this.btnYellow);
this.panel1.Controls.Add(this.lblLed);
this.panel1.Controls.Add(this.lblOkValue);
this.panel1.Controls.Add(this.lblSensor);
this.panel1.Controls.Add(this.btnAxisRStop);
this.panel1.Controls.Add(this.btnAxisRTest);
this.panel1.Controls.Add(this.lblLed);
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.axisMoveControl1);
this.panel1.Controls.Add(this.lblOkValue);
this.panel1.Controls.Add(this.configControl1);
this.panel1.Controls.Add(this.btnAxisRStop);
this.panel1.Controls.Add(this.btnGree);
this.panel1.Controls.Add(this.lblSensor);
this.panel1.Controls.Add(this.btnYellow);
this.panel1.Controls.Add(this.btnChangeColor);
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(1234, 924);
this.panel1.Size = new System.Drawing.Size(725, 815);
this.panel1.TabIndex = 2;
//
// button1
//
this.button1.Location = new System.Drawing.Point(211, 578);
this.button1.Location = new System.Drawing.Point(568, 208);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(155, 31);
this.button1.Size = new System.Drawing.Size(130, 31);
this.button1.TabIndex = 20;
this.button1.Text = "停止";
this.button1.UseVisualStyleBackColor = true;
......@@ -79,9 +79,9 @@ namespace TheMachineNView
//
// btnChangeColor
//
this.btnChangeColor.Location = new System.Drawing.Point(211, 541);
this.btnChangeColor.Location = new System.Drawing.Point(568, 171);
this.btnChangeColor.Name = "btnChangeColor";
this.btnChangeColor.Size = new System.Drawing.Size(155, 31);
this.btnChangeColor.Size = new System.Drawing.Size(130, 31);
this.btnChangeColor.TabIndex = 19;
this.btnChangeColor.Text = "切换颜色";
this.btnChangeColor.UseVisualStyleBackColor = true;
......@@ -89,9 +89,9 @@ namespace TheMachineNView
//
// btnGree
//
this.btnGree.Location = new System.Drawing.Point(25, 578);
this.btnGree.Location = new System.Drawing.Point(568, 134);
this.btnGree.Name = "btnGree";
this.btnGree.Size = new System.Drawing.Size(155, 31);
this.btnGree.Size = new System.Drawing.Size(130, 31);
this.btnGree.TabIndex = 18;
this.btnGree.Text = "流动绿";
this.btnGree.UseVisualStyleBackColor = true;
......@@ -99,9 +99,9 @@ namespace TheMachineNView
//
// btnYellow
//
this.btnYellow.Location = new System.Drawing.Point(25, 541);
this.btnYellow.Location = new System.Drawing.Point(568, 97);
this.btnYellow.Name = "btnYellow";
this.btnYellow.Size = new System.Drawing.Size(155, 31);
this.btnYellow.Size = new System.Drawing.Size(130, 31);
this.btnYellow.TabIndex = 17;
this.btnYellow.Text = "流动黄";
this.btnYellow.UseVisualStyleBackColor = true;
......@@ -109,36 +109,39 @@ namespace TheMachineNView
//
// lblLed
//
this.lblLed.AutoSize = true;
this.lblLed.Location = new System.Drawing.Point(23, 508);
this.lblLed.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblLed.Location = new System.Drawing.Point(569, 360);
this.lblLed.Name = "lblLed";
this.lblLed.Size = new System.Drawing.Size(41, 12);
this.lblLed.Size = new System.Drawing.Size(134, 44);
this.lblLed.TabIndex = 16;
this.lblLed.Text = "氛围灯";
//
// lblOkValue
//
this.lblOkValue.AutoSize = true;
this.lblOkValue.Location = new System.Drawing.Point(23, 482);
this.lblOkValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblOkValue.Location = new System.Drawing.Point(569, 310);
this.lblOkValue.Name = "lblOkValue";
this.lblOkValue.Size = new System.Drawing.Size(65, 12);
this.lblOkValue.Size = new System.Drawing.Size(134, 44);
this.lblOkValue.TabIndex = 15;
this.lblOkValue.Text = "压力传感器";
//
// lblSensor
//
this.lblSensor.AutoSize = true;
this.lblSensor.Location = new System.Drawing.Point(23, 456);
this.lblSensor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblSensor.Location = new System.Drawing.Point(569, 260);
this.lblSensor.Name = "lblSensor";
this.lblSensor.Size = new System.Drawing.Size(65, 12);
this.lblSensor.Size = new System.Drawing.Size(134, 44);
this.lblSensor.TabIndex = 14;
this.lblSensor.Text = "声波传感器";
//
// btnAxisRStop
//
this.btnAxisRStop.Location = new System.Drawing.Point(397, 495);
this.btnAxisRStop.Location = new System.Drawing.Point(568, 60);
this.btnAxisRStop.Name = "btnAxisRStop";
this.btnAxisRStop.Size = new System.Drawing.Size(155, 31);
this.btnAxisRStop.Size = new System.Drawing.Size(130, 31);
this.btnAxisRStop.TabIndex = 13;
this.btnAxisRStop.Text = "旋转轴停止";
this.btnAxisRStop.UseVisualStyleBackColor = true;
......@@ -146,14 +149,19 @@ namespace TheMachineNView
//
// btnAxisRTest
//
this.btnAxisRTest.Location = new System.Drawing.Point(397, 453);
this.btnAxisRTest.Location = new System.Drawing.Point(568, 18);
this.btnAxisRTest.Name = "btnAxisRTest";
this.btnAxisRTest.Size = new System.Drawing.Size(155, 31);
this.btnAxisRTest.Size = new System.Drawing.Size(130, 31);
this.btnAxisRTest.TabIndex = 12;
this.btnAxisRTest.Text = "旋转轴循环";
this.btnAxisRTest.UseVisualStyleBackColor = true;
this.btnAxisRTest.Click += new System.EventHandler(this.button2_Click);
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(3, 3);
......@@ -164,18 +172,17 @@ namespace TheMachineNView
//
// configControl1
//
this.configControl1.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.configControl1.AutoScroll = true;
this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3);
this.configControl1.Location = new System.Drawing.Point(6, 453);
this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(647, 688);
this.configControl1.Size = new System.Drawing.Size(712, 314);
this.configControl1.TabIndex = 1;
this.configControl1.Tag = "not";
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// AxisControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -183,10 +190,9 @@ namespace TheMachineNView
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("新宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "AxisControl";
this.Size = new System.Drawing.Size(1234, 924);
this.Size = new System.Drawing.Size(725, 815);
this.Load += new System.EventHandler(this.AxisControl_Load);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
}
......
......@@ -55,10 +55,10 @@ namespace TheMachineNView
this.btn_IgnoreX09 = new System.Windows.Forms.Button();
this.btn_PauseBuzzer = new System.Windows.Forms.Button();
this.tabMonitor = new System.Windows.Forms.TabPage();
this.panelVideo = new System.Windows.Forms.Panel();
this.listView1 = new System.Windows.Forms.ListView();
this.btn_stop = new System.Windows.Forms.Button();
this.btn_run = new System.Windows.Forms.Button();
this.panelVideo = new System.Windows.Forms.Panel();
this.menuStrip1.SuspendLayout();
this.tabc.SuspendLayout();
this.tabP1.SuspendLayout();
......@@ -79,7 +79,7 @@ namespace TheMachineNView
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
this.menuStrip1.Size = new System.Drawing.Size(1008, 35);
this.menuStrip1.Size = new System.Drawing.Size(781, 29);
this.menuStrip1.TabIndex = 0;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -93,14 +93,14 @@ namespace TheMachineNView
this.退出ToolStripMenuItem});
this.设备操作ToolStripMenuItem.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.设备操作ToolStripMenuItem.Name = "设备操作ToolStripMenuItem";
this.设备操作ToolStripMenuItem.Size = new System.Drawing.Size(106, 31);
this.设备操作ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.设备操作ToolStripMenuItem.Text = "设备操作";
//
// 启用调试模式ToolStripMenuItem
//
this.启用调试模式ToolStripMenuItem.Enabled = false;
this.启用调试模式ToolStripMenuItem.Name = "启用调试模式ToolStripMenuItem";
this.启用调试模式ToolStripMenuItem.Size = new System.Drawing.Size(238, 32);
this.启用调试模式ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.启用调试模式ToolStripMenuItem.Tag = "not";
this.启用调试模式ToolStripMenuItem.Text = "启用配置模式";
this.启用调试模式ToolStripMenuItem.Click += new System.EventHandler(this.启用调试模式ToolStripMenuItem_Click);
......@@ -108,24 +108,24 @@ namespace TheMachineNView
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(235, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(189, 6);
//
// 二维码识别调试ToolStripMenuItem
//
this.二维码识别调试ToolStripMenuItem.Name = "二维码识别调试ToolStripMenuItem";
this.二维码识别调试ToolStripMenuItem.Size = new System.Drawing.Size(238, 32);
this.二维码识别调试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.二维码识别调试ToolStripMenuItem.Text = "二维码识别调试";
this.二维码识别调试ToolStripMenuItem.Click += new System.EventHandler(this.二维码识别调试ToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(235, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(189, 6);
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(238, 32);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
......@@ -137,13 +137,13 @@ namespace TheMachineNView
this.englishToolStripMenuItem});
this.语言toolStripMenuItem.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.语言toolStripMenuItem.Name = "语言toolStripMenuItem";
this.语言toolStripMenuItem.Size = new System.Drawing.Size(66, 31);
this.语言toolStripMenuItem.Size = new System.Drawing.Size(54, 25);
this.语言toolStripMenuItem.Text = "语言";
//
// 简体中文ToolStripMenuItem
//
this.简体中文ToolStripMenuItem.Name = "简体中文ToolStripMenuItem";
this.简体中文ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.简体中文ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.简体中文ToolStripMenuItem.Tag = "not";
this.简体中文ToolStripMenuItem.Text = "简体中文";
this.简体中文ToolStripMenuItem.Click += new System.EventHandler(this.简体中文ToolStripMenuItem_Click);
......@@ -151,7 +151,7 @@ namespace TheMachineNView
// 日本语ToolStripMenuItem
//
this.日本语ToolStripMenuItem.Name = "日本语ToolStripMenuItem";
this.日本语ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.日本语ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.日本语ToolStripMenuItem.Tag = "not";
this.日本语ToolStripMenuItem.Text = "日本語";
this.日本语ToolStripMenuItem.Click += new System.EventHandler(this.日本语ToolStripMenuItem_Click);
......@@ -159,7 +159,7 @@ namespace TheMachineNView
// englishToolStripMenuItem
//
this.englishToolStripMenuItem.Name = "englishToolStripMenuItem";
this.englishToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.englishToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.englishToolStripMenuItem.Tag = "not";
this.englishToolStripMenuItem.Text = "English";
this.englishToolStripMenuItem.Click += new System.EventHandler(this.englishToolStripMenuItem_Click);
......@@ -168,7 +168,7 @@ namespace TheMachineNView
//
this.关于ToolStripMenuItem.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
this.关于ToolStripMenuItem.Name = "关于ToolStripMenuItem";
this.关于ToolStripMenuItem.Size = new System.Drawing.Size(66, 31);
this.关于ToolStripMenuItem.Size = new System.Drawing.Size(54, 25);
this.关于ToolStripMenuItem.Text = "关于";
this.关于ToolStripMenuItem.Click += new System.EventHandler(this.关于ToolStripMenuItem_Click);
//
......@@ -180,19 +180,19 @@ namespace TheMachineNView
this.tabc.Controls.Add(this.tabP1);
this.tabc.Controls.Add(this.tabMonitor);
this.tabc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabc.Location = new System.Drawing.Point(0, 119);
this.tabc.Location = new System.Drawing.Point(7, 155);
this.tabc.Name = "tabc";
this.tabc.SelectedIndex = 0;
this.tabc.Size = new System.Drawing.Size(1008, 600);
this.tabc.Size = new System.Drawing.Size(770, 664);
this.tabc.TabIndex = 1;
this.tabc.SelectedIndexChanged += new System.EventHandler(this.tabc_SelectedIndexChanged);
//
// tabP1
//
this.tabP1.Controls.Add(this.pnl);
this.tabP1.Location = new System.Drawing.Point(4, 36);
this.tabP1.Location = new System.Drawing.Point(4, 30);
this.tabP1.Name = "tabP1";
this.tabP1.Size = new System.Drawing.Size(1000, 560);
this.tabP1.Size = new System.Drawing.Size(762, 630);
this.tabP1.TabIndex = 0;
this.tabP1.Text = "信息";
this.tabP1.UseVisualStyleBackColor = true;
......@@ -201,7 +201,9 @@ namespace TheMachineNView
//
this.pnl.Controls.Add(this.groupBox1);
this.pnl.Controls.Add(this.btn_releasestring);
this.pnl.Controls.Add(this.btn_stop);
this.pnl.Controls.Add(this.cb_IgnoreSafecheck);
this.pnl.Controls.Add(this.btn_run);
this.pnl.Controls.Add(this.pictureBox2);
this.pnl.Controls.Add(this.cb_IgnoreGratingSignal);
this.pnl.Controls.Add(this.cb_EnableBuzzer);
......@@ -210,15 +212,15 @@ namespace TheMachineNView
this.pnl.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnl.Location = new System.Drawing.Point(0, 0);
this.pnl.Name = "pnl";
this.pnl.Size = new System.Drawing.Size(1000, 560);
this.pnl.Size = new System.Drawing.Size(762, 630);
this.pnl.TabIndex = 273;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.stateView);
this.groupBox1.Location = new System.Drawing.Point(3, 4);
this.groupBox1.Location = new System.Drawing.Point(3, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(598, 248);
this.groupBox1.Size = new System.Drawing.Size(757, 200);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "运行状态";
......@@ -229,16 +231,16 @@ namespace TheMachineNView
this.stateView.Dock = System.Windows.Forms.DockStyle.Fill;
this.stateView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.stateView.HideSelection = false;
this.stateView.Location = new System.Drawing.Point(3, 30);
this.stateView.Location = new System.Drawing.Point(3, 25);
this.stateView.MultiSelect = false;
this.stateView.Name = "stateView";
this.stateView.Size = new System.Drawing.Size(592, 215);
this.stateView.Size = new System.Drawing.Size(751, 172);
this.stateView.TabIndex = 0;
this.stateView.UseCompatibleStateImageBehavior = false;
//
// btn_releasestring
//
this.btn_releasestring.Location = new System.Drawing.Point(607, 212);
this.btn_releasestring.Location = new System.Drawing.Point(14, 481);
this.btn_releasestring.Name = "btn_releasestring";
this.btn_releasestring.Size = new System.Drawing.Size(301, 40);
this.btn_releasestring.TabIndex = 272;
......@@ -250,9 +252,9 @@ namespace TheMachineNView
// cb_IgnoreSafecheck
//
this.cb_IgnoreSafecheck.AutoSize = true;
this.cb_IgnoreSafecheck.Location = new System.Drawing.Point(607, 47);
this.cb_IgnoreSafecheck.Location = new System.Drawing.Point(14, 316);
this.cb_IgnoreSafecheck.Name = "cb_IgnoreSafecheck";
this.cb_IgnoreSafecheck.Size = new System.Drawing.Size(268, 31);
this.cb_IgnoreSafecheck.Size = new System.Drawing.Size(215, 25);
this.cb_IgnoreSafecheck.TabIndex = 2;
this.cb_IgnoreSafecheck.Text = "忽略安全检查(含安全光栅)";
this.cb_IgnoreSafecheck.UseVisualStyleBackColor = true;
......@@ -262,9 +264,9 @@ namespace TheMachineNView
// pictureBox2
//
this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox2.Location = new System.Drawing.Point(8, 269);
this.pictureBox2.Location = new System.Drawing.Point(373, 209);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(436, 271);
this.pictureBox2.Size = new System.Drawing.Size(384, 338);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 270;
this.pictureBox2.TabStop = false;
......@@ -275,9 +277,9 @@ namespace TheMachineNView
// cb_IgnoreGratingSignal
//
this.cb_IgnoreGratingSignal.AutoSize = true;
this.cb_IgnoreGratingSignal.Location = new System.Drawing.Point(607, 78);
this.cb_IgnoreGratingSignal.Location = new System.Drawing.Point(14, 347);
this.cb_IgnoreGratingSignal.Name = "cb_IgnoreGratingSignal";
this.cb_IgnoreGratingSignal.Size = new System.Drawing.Size(154, 31);
this.cb_IgnoreGratingSignal.Size = new System.Drawing.Size(125, 25);
this.cb_IgnoreGratingSignal.TabIndex = 2;
this.cb_IgnoreGratingSignal.Text = "忽略安全光栅";
this.cb_IgnoreGratingSignal.UseVisualStyleBackColor = true;
......@@ -287,9 +289,9 @@ namespace TheMachineNView
// cb_EnableBuzzer
//
this.cb_EnableBuzzer.AutoSize = true;
this.cb_EnableBuzzer.Location = new System.Drawing.Point(607, 16);
this.cb_EnableBuzzer.Location = new System.Drawing.Point(14, 285);
this.cb_EnableBuzzer.Name = "cb_EnableBuzzer";
this.cb_EnableBuzzer.Size = new System.Drawing.Size(134, 31);
this.cb_EnableBuzzer.Size = new System.Drawing.Size(109, 25);
this.cb_EnableBuzzer.TabIndex = 5;
this.cb_EnableBuzzer.Text = "使用蜂鸣器";
this.cb_EnableBuzzer.UseVisualStyleBackColor = true;
......@@ -298,7 +300,7 @@ namespace TheMachineNView
// btn_IgnoreX09
//
this.btn_IgnoreX09.BackColor = System.Drawing.Color.OrangeRed;
this.btn_IgnoreX09.Location = new System.Drawing.Point(607, 155);
this.btn_IgnoreX09.Location = new System.Drawing.Point(14, 424);
this.btn_IgnoreX09.Name = "btn_IgnoreX09";
this.btn_IgnoreX09.Size = new System.Drawing.Size(301, 40);
this.btn_IgnoreX09.TabIndex = 6;
......@@ -310,7 +312,7 @@ namespace TheMachineNView
// btn_PauseBuzzer
//
this.btn_PauseBuzzer.BackColor = System.Drawing.Color.OrangeRed;
this.btn_PauseBuzzer.Location = new System.Drawing.Point(607, 109);
this.btn_PauseBuzzer.Location = new System.Drawing.Point(14, 378);
this.btn_PauseBuzzer.Name = "btn_PauseBuzzer";
this.btn_PauseBuzzer.Size = new System.Drawing.Size(301, 40);
this.btn_PauseBuzzer.TabIndex = 6;
......@@ -322,13 +324,21 @@ namespace TheMachineNView
// tabMonitor
//
this.tabMonitor.Controls.Add(this.panelVideo);
this.tabMonitor.Location = new System.Drawing.Point(4, 36);
this.tabMonitor.Location = new System.Drawing.Point(4, 30);
this.tabMonitor.Name = "tabMonitor";
this.tabMonitor.Size = new System.Drawing.Size(1000, 560);
this.tabMonitor.Size = new System.Drawing.Size(1179, 666);
this.tabMonitor.TabIndex = 1;
this.tabMonitor.Text = "监控";
this.tabMonitor.UseVisualStyleBackColor = true;
//
// panelVideo
//
this.panelVideo.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelVideo.Location = new System.Drawing.Point(0, 0);
this.panelVideo.Name = "panelVideo";
this.panelVideo.Size = new System.Drawing.Size(1179, 666);
this.panelVideo.TabIndex = 276;
//
// listView1
//
this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
......@@ -336,11 +346,11 @@ namespace TheMachineNView
this.listView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(328, 0);
this.listView1.Location = new System.Drawing.Point(11, 32);
this.listView1.MultiSelect = false;
this.listView1.Name = "listView1";
this.listView1.ShowGroups = false;
this.listView1.Size = new System.Drawing.Size(680, 118);
this.listView1.Size = new System.Drawing.Size(766, 117);
this.listView1.TabIndex = 2;
this.listView1.UseCompatibleStateImageBehavior = false;
//
......@@ -348,9 +358,9 @@ namespace TheMachineNView
//
this.btn_stop.Enabled = false;
this.btn_stop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_stop.Location = new System.Drawing.Point(154, 42);
this.btn_stop.Location = new System.Drawing.Point(129, 213);
this.btn_stop.Name = "btn_stop";
this.btn_stop.Size = new System.Drawing.Size(105, 55);
this.btn_stop.Size = new System.Drawing.Size(116, 45);
this.btn_stop.TabIndex = 3;
this.btn_stop.Text = "停止";
this.btn_stop.UseVisualStyleBackColor = true;
......@@ -359,40 +369,31 @@ namespace TheMachineNView
// btn_run
//
this.btn_run.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_run.Location = new System.Drawing.Point(25, 42);
this.btn_run.Location = new System.Drawing.Point(10, 213);
this.btn_run.Name = "btn_run";
this.btn_run.Size = new System.Drawing.Size(105, 55);
this.btn_run.Size = new System.Drawing.Size(116, 45);
this.btn_run.TabIndex = 4;
this.btn_run.Tag = "not";
this.btn_run.Text = "启动";
this.btn_run.UseVisualStyleBackColor = true;
this.btn_run.Click += new System.EventHandler(this.btn_run_Click);
//
// panelVideo
//
this.panelVideo.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelVideo.Location = new System.Drawing.Point(0, 0);
this.panelVideo.Name = "panelVideo";
this.panelVideo.Size = new System.Drawing.Size(1000, 560);
this.panelVideo.TabIndex = 276;
//
// Form1
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 17F);
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1008, 719);
this.ClientSize = new System.Drawing.Size(781, 819);
this.Controls.Add(this.tabc);
this.Controls.Add(this.listView1);
this.Controls.Add(this.btn_stop);
this.Controls.Add(this.btn_run);
this.Controls.Add(this.menuStrip1);
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.MainMenuStrip = this.menuStrip1;
this.Name = "Form1";
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Name = "FrmMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Form1";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.Form1_Load);
this.Shown += new System.EventHandler(this.Form1_Shown);
this.menuStrip1.ResumeLayout(false);
......
......@@ -32,23 +32,23 @@ namespace TheMachineNView
this.btn_linerun = new System.Windows.Forms.Button();
this.btn_linerev = new System.Windows.Forms.Button();
this.btn_linestop = new System.Windows.Forms.Button();
this.cylinderButton5 = new TheMachineNView.CylinderButton();
this.cylinderButton4 = new TheMachineNView.CylinderButton();
this.cylinderButton2 = new TheMachineNView.CylinderButton();
this.cylinderButton7 = new TheMachineNView.CylinderButton();
this.cylinderButton6 = new TheMachineNView.CylinderButton();
this.ioControl1 = new TheMachineNView.IOControl();
this.btn_flipopen = new System.Windows.Forms.Button();
this.btn_flipclose = new System.Windows.Forms.Button();
this.btn_stringdooropen = new System.Windows.Forms.Button();
this.btn_stringdoorclose = new System.Windows.Forms.Button();
this.btn_ngdooropen = new System.Windows.Forms.Button();
this.btn_ngdoorclose = new System.Windows.Forms.Button();
this.cylinderButton5 = new TheMachineNView.CylinderButton();
this.cylinderButton4 = new TheMachineNView.CylinderButton();
this.cylinderButton2 = new TheMachineNView.CylinderButton();
this.cylinderButton7 = new TheMachineNView.CylinderButton();
this.cylinderButton6 = new TheMachineNView.CylinderButton();
this.ioControl1 = new TheMachineNView.IOControl();
this.SuspendLayout();
//
// btn_linerun
//
this.btn_linerun.Location = new System.Drawing.Point(566, 368);
this.btn_linerun.Location = new System.Drawing.Point(378, 148);
this.btn_linerun.Name = "btn_linerun";
this.btn_linerun.Size = new System.Drawing.Size(113, 32);
this.btn_linerun.TabIndex = 2;
......@@ -58,7 +58,7 @@ namespace TheMachineNView
//
// btn_linerev
//
this.btn_linerev.Location = new System.Drawing.Point(685, 368);
this.btn_linerev.Location = new System.Drawing.Point(497, 148);
this.btn_linerev.Name = "btn_linerev";
this.btn_linerev.Size = new System.Drawing.Size(105, 32);
this.btn_linerev.TabIndex = 2;
......@@ -68,7 +68,7 @@ namespace TheMachineNView
//
// btn_linestop
//
this.btn_linestop.Location = new System.Drawing.Point(566, 406);
this.btn_linestop.Location = new System.Drawing.Point(378, 186);
this.btn_linestop.Name = "btn_linestop";
this.btn_linestop.Size = new System.Drawing.Size(224, 32);
this.btn_linestop.TabIndex = 2;
......@@ -76,13 +76,73 @@ namespace TheMachineNView
this.btn_linestop.UseVisualStyleBackColor = true;
this.btn_linestop.Click += new System.EventHandler(this.btn_linestop_Click);
//
// btn_flipopen
//
this.btn_flipopen.Location = new System.Drawing.Point(378, 224);
this.btn_flipopen.Name = "btn_flipopen";
this.btn_flipopen.Size = new System.Drawing.Size(113, 32);
this.btn_flipopen.TabIndex = 3;
this.btn_flipopen.Text = "翻版托盘打开";
this.btn_flipopen.UseVisualStyleBackColor = true;
this.btn_flipopen.Click += new System.EventHandler(this.btn_flipopen_Click);
//
// btn_flipclose
//
this.btn_flipclose.Location = new System.Drawing.Point(497, 224);
this.btn_flipclose.Name = "btn_flipclose";
this.btn_flipclose.Size = new System.Drawing.Size(105, 32);
this.btn_flipclose.TabIndex = 3;
this.btn_flipclose.Text = "翻版托盘合拢";
this.btn_flipclose.UseVisualStyleBackColor = true;
this.btn_flipclose.Click += new System.EventHandler(this.btn_flipclose_Click);
//
// btn_stringdooropen
//
this.btn_stringdooropen.Location = new System.Drawing.Point(378, 262);
this.btn_stringdooropen.Name = "btn_stringdooropen";
this.btn_stringdooropen.Size = new System.Drawing.Size(113, 32);
this.btn_stringdooropen.TabIndex = 3;
this.btn_stringdooropen.Text = "折叠门打开";
this.btn_stringdooropen.UseVisualStyleBackColor = true;
this.btn_stringdooropen.Click += new System.EventHandler(this.btn_stringdooropen_Click);
//
// btn_stringdoorclose
//
this.btn_stringdoorclose.Location = new System.Drawing.Point(497, 262);
this.btn_stringdoorclose.Name = "btn_stringdoorclose";
this.btn_stringdoorclose.Size = new System.Drawing.Size(105, 32);
this.btn_stringdoorclose.TabIndex = 3;
this.btn_stringdoorclose.Text = "折叠门关闭";
this.btn_stringdoorclose.UseVisualStyleBackColor = true;
this.btn_stringdoorclose.Click += new System.EventHandler(this.btn_stringdoorclose_Click);
//
// btn_ngdooropen
//
this.btn_ngdooropen.Location = new System.Drawing.Point(378, 111);
this.btn_ngdooropen.Name = "btn_ngdooropen";
this.btn_ngdooropen.Size = new System.Drawing.Size(113, 32);
this.btn_ngdooropen.TabIndex = 2;
this.btn_ngdooropen.Text = "单料门打开";
this.btn_ngdooropen.UseVisualStyleBackColor = true;
this.btn_ngdooropen.Click += new System.EventHandler(this.btn_ngdooropen_Click);
//
// btn_ngdoorclose
//
this.btn_ngdoorclose.Location = new System.Drawing.Point(497, 111);
this.btn_ngdoorclose.Name = "btn_ngdoorclose";
this.btn_ngdoorclose.Size = new System.Drawing.Size(105, 32);
this.btn_ngdoorclose.TabIndex = 2;
this.btn_ngdoorclose.Text = "单料门关闭";
this.btn_ngdoorclose.UseVisualStyleBackColor = true;
this.btn_ngdoorclose.Click += new System.EventHandler(this.btn_ngdoorclose_Click);
//
// cylinderButton5
//
this.cylinderButton5.BackColor = System.Drawing.Color.White;
this.cylinderButton5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton5.IO_HIGH = "StringPosChecker_Work";
this.cylinderButton5.IO_LOW = "StringPosChecker_Home";
this.cylinderButton5.Location = new System.Drawing.Point(566, 293);
this.cylinderButton5.Location = new System.Drawing.Point(68, 262);
this.cylinderButton5.Name = "cylinderButton5";
this.cylinderButton5.Size = new System.Drawing.Size(224, 32);
this.cylinderButton5.TabIndex = 1;
......@@ -96,7 +156,7 @@ namespace TheMachineNView
this.cylinderButton4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton4.IO_HIGH = "Clamping_Work";
this.cylinderButton4.IO_LOW = "Clamping_Relax";
this.cylinderButton4.Location = new System.Drawing.Point(566, 255);
this.cylinderButton4.Location = new System.Drawing.Point(68, 224);
this.cylinderButton4.Name = "cylinderButton4";
this.cylinderButton4.Size = new System.Drawing.Size(224, 32);
this.cylinderButton4.TabIndex = 1;
......@@ -110,7 +170,7 @@ namespace TheMachineNView
this.cylinderButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton2.IO_HIGH = "StringFix_Top";
this.cylinderButton2.IO_LOW = "StringFix_Bottom";
this.cylinderButton2.Location = new System.Drawing.Point(566, 217);
this.cylinderButton2.Location = new System.Drawing.Point(68, 186);
this.cylinderButton2.Name = "cylinderButton2";
this.cylinderButton2.Size = new System.Drawing.Size(224, 32);
this.cylinderButton2.TabIndex = 1;
......@@ -124,7 +184,7 @@ namespace TheMachineNView
this.cylinderButton7.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton7.IO_HIGH = "Device_Led";
this.cylinderButton7.IO_LOW = "";
this.cylinderButton7.Location = new System.Drawing.Point(566, 142);
this.cylinderButton7.Location = new System.Drawing.Point(68, 111);
this.cylinderButton7.Name = "cylinderButton7";
this.cylinderButton7.Size = new System.Drawing.Size(224, 32);
this.cylinderButton7.TabIndex = 1;
......@@ -138,7 +198,7 @@ namespace TheMachineNView
this.cylinderButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton6.IO_HIGH = "Camera_Led";
this.cylinderButton6.IO_LOW = "";
this.cylinderButton6.Location = new System.Drawing.Point(566, 179);
this.cylinderButton6.Location = new System.Drawing.Point(68, 148);
this.cylinderButton6.Name = "cylinderButton6";
this.cylinderButton6.Size = new System.Drawing.Size(224, 32);
this.cylinderButton6.TabIndex = 1;
......@@ -148,79 +208,22 @@ namespace TheMachineNView
//
// ioControl1
//
this.ioControl1.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.ioControl1.BackColor = System.Drawing.Color.White;
this.ioControl1.Config = null;
this.ioControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ioControl1.Location = new System.Drawing.Point(0, 0);
this.ioControl1.Location = new System.Drawing.Point(3, 0);
this.ioControl1.Name = "ioControl1";
this.ioControl1.Size = new System.Drawing.Size(975, 539);
this.ioControl1.Size = new System.Drawing.Size(695, 673);
this.ioControl1.TabIndex = 0;
this.ioControl1.Tag = "not";
this.ioControl1.Load += new System.EventHandler(this.ioControl1_Load);
//
// btn_flipopen
//
this.btn_flipopen.Location = new System.Drawing.Point(566, 444);
this.btn_flipopen.Name = "btn_flipopen";
this.btn_flipopen.Size = new System.Drawing.Size(113, 32);
this.btn_flipopen.TabIndex = 3;
this.btn_flipopen.Text = "翻版托盘打开";
this.btn_flipopen.UseVisualStyleBackColor = true;
this.btn_flipopen.Click += new System.EventHandler(this.btn_flipopen_Click);
//
// btn_flipclose
//
this.btn_flipclose.Location = new System.Drawing.Point(685, 444);
this.btn_flipclose.Name = "btn_flipclose";
this.btn_flipclose.Size = new System.Drawing.Size(105, 32);
this.btn_flipclose.TabIndex = 3;
this.btn_flipclose.Text = "翻版托盘合拢";
this.btn_flipclose.UseVisualStyleBackColor = true;
this.btn_flipclose.Click += new System.EventHandler(this.btn_flipclose_Click);
//
// btn_stringdooropen
//
this.btn_stringdooropen.Location = new System.Drawing.Point(566, 482);
this.btn_stringdooropen.Name = "btn_stringdooropen";
this.btn_stringdooropen.Size = new System.Drawing.Size(113, 32);
this.btn_stringdooropen.TabIndex = 3;
this.btn_stringdooropen.Text = "折叠门打开";
this.btn_stringdooropen.UseVisualStyleBackColor = true;
this.btn_stringdooropen.Click += new System.EventHandler(this.btn_stringdooropen_Click);
//
// btn_stringdoorclose
//
this.btn_stringdoorclose.Location = new System.Drawing.Point(685, 482);
this.btn_stringdoorclose.Name = "btn_stringdoorclose";
this.btn_stringdoorclose.Size = new System.Drawing.Size(105, 32);
this.btn_stringdoorclose.TabIndex = 3;
this.btn_stringdoorclose.Text = "折叠门关闭";
this.btn_stringdoorclose.UseVisualStyleBackColor = true;
this.btn_stringdoorclose.Click += new System.EventHandler(this.btn_stringdoorclose_Click);
//
// btn_ngdooropen
//
this.btn_ngdooropen.Location = new System.Drawing.Point(566, 331);
this.btn_ngdooropen.Name = "btn_ngdooropen";
this.btn_ngdooropen.Size = new System.Drawing.Size(113, 32);
this.btn_ngdooropen.TabIndex = 2;
this.btn_ngdooropen.Text = "单料门打开";
this.btn_ngdooropen.UseVisualStyleBackColor = true;
this.btn_ngdooropen.Click += new System.EventHandler(this.btn_ngdooropen_Click);
//
// btn_ngdoorclose
//
this.btn_ngdoorclose.Location = new System.Drawing.Point(685, 331);
this.btn_ngdoorclose.Name = "btn_ngdoorclose";
this.btn_ngdoorclose.Size = new System.Drawing.Size(105, 32);
this.btn_ngdoorclose.TabIndex = 2;
this.btn_ngdoorclose.Text = "单料门关闭";
this.btn_ngdoorclose.UseVisualStyleBackColor = true;
this.btn_ngdoorclose.Click += new System.EventHandler(this.btn_ngdoorclose_Click);
//
// IOControls
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScroll = true;
this.Controls.Add(this.btn_stringdoorclose);
this.Controls.Add(this.btn_stringdooropen);
this.Controls.Add(this.btn_flipclose);
......@@ -238,7 +241,7 @@ namespace TheMachineNView
this.Controls.Add(this.ioControl1);
this.Font = new System.Drawing.Font("新宋体", 9F);
this.Name = "IOControls";
this.Size = new System.Drawing.Size(975, 539);
this.Size = new System.Drawing.Size(699, 679);
this.ResumeLayout(false);
}
......
......@@ -94,7 +94,7 @@ namespace TheMachineNView
this.tp.Controls.Add(this.lbl_hmdstate, 0, 4);
this.tp.Controls.Add(this.cb_usefixpos, 0, 6);
this.tp.Controls.Add(this.chbAutoRun, 0, 7);
this.tp.Location = new System.Drawing.Point(3, 3);
this.tp.Location = new System.Drawing.Point(8, 3);
this.tp.Name = "tp";
this.tp.RowCount = 9;
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
......@@ -123,7 +123,7 @@ namespace TheMachineNView
//
// button1
//
this.button1.Location = new System.Drawing.Point(903, 101);
this.button1.Location = new System.Drawing.Point(475, 636);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(102, 48);
this.button1.TabIndex = 7;
......@@ -136,16 +136,16 @@ namespace TheMachineNView
//
this.uC_LedConfig1.AutoScroll = true;
this.uC_LedConfig1.Config = null;
this.uC_LedConfig1.Location = new System.Drawing.Point(4, 263);
this.uC_LedConfig1.Location = new System.Drawing.Point(0, 203);
this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(859, 440);
this.uC_LedConfig1.Size = new System.Drawing.Size(694, 427);
this.uC_LedConfig1.TabIndex = 9;
this.uC_LedConfig1.Tag = "not";
//
// uC_SetUserPassword1
//
this.uC_SetUserPassword1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uC_SetUserPassword1.Location = new System.Drawing.Point(481, 1);
this.uC_SetUserPassword1.Location = new System.Drawing.Point(5, 654);
this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5);
this.uC_SetUserPassword1.Name = "uC_SetUserPassword1";
this.uC_SetUserPassword1.Size = new System.Drawing.Size(393, 237);
......@@ -161,7 +161,7 @@ namespace TheMachineNView
this.Controls.Add(this.button1);
this.Controls.Add(this.tp);
this.Name = "SettingControl";
this.Size = new System.Drawing.Size(1024, 740);
this.Size = new System.Drawing.Size(700, 908);
this.Load += new System.EventHandler(this.SettingControl_Load);
this.tp.ResumeLayout(false);
this.tp.PerformLayout();
......
......@@ -136,12 +136,6 @@
<Compile Include="SettingControl.Designer.cs">
<DependentUpon>SettingControl.cs</DependentUpon>
</Compile>
<Compile Include="UC\frmHSVdebug.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UC\frmHSVdebug.Designer.cs">
<DependentUpon>frmHSVdebug.cs</DependentUpon>
</Compile>
<Compile Include="UC\FrmPassCheck.cs">
<SubType>Form</SubType>
</Compile>
......@@ -234,9 +228,6 @@
<EmbeddedResource Include="SettingControl.resx">
<DependentUpon>SettingControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UC\frmHSVdebug.resx">
<DependentUpon>frmHSVdebug.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UC\FrmPassCheck.resx">
<DependentUpon>FrmPassCheck.cs</DependentUpon>
</EmbeddedResource>
......@@ -329,6 +320,7 @@
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>start $(TargetDir)</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -71,6 +71,10 @@ namespace TheMachineNView
tableLayoutPanel1.SuspendLayout();
int maxrow = tableLayoutPanel1.Height / 34;
if (tableLayoutPanel1.Width < 800)
{
maxrow = 999;
}
tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear();
//this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType., 26));
......
......@@ -52,13 +52,14 @@ namespace TheMachineNView
this.tableLayoutPanel1.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.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 6;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
......@@ -80,12 +81,12 @@ namespace TheMachineNView
//
// ConfigControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScroll = true;
this.Controls.Add(this.btnSavePos);
this.Controls.Add(this.groupBox3);
this.Name = "ConfigControl";
this.Size = new System.Drawing.Size(1096, 504);
this.Size = new System.Drawing.Size(636, 504);
this.Load += new System.EventHandler(this.ConfigControl_Load);
this.groupBox3.ResumeLayout(false);
this.ResumeLayout(false);
......
......@@ -54,12 +54,12 @@ namespace TheMachineNView
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 14);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
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(244, 340);
this.tableLayoutPanel1.Size = new System.Drawing.Size(310, 365);
this.tableLayoutPanel1.TabIndex = 102;
this.tableLayoutPanel1.Tag = "not";
//
......@@ -71,12 +71,12 @@ namespace TheMachineNView
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel2.Location = new System.Drawing.Point(7, 14);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
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(244, 340);
this.tableLayoutPanel2.Size = new System.Drawing.Size(310, 365);
this.tableLayoutPanel2.TabIndex = 103;
this.tableLayoutPanel2.Tag = "not";
//
......@@ -85,9 +85,9 @@ namespace TheMachineNView
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(262, 3);
this.groupBox4.Location = new System.Drawing.Point(348, 313);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(255, 360);
this.groupBox4.Size = new System.Drawing.Size(327, 394);
this.groupBox4.TabIndex = 110;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -97,7 +97,7 @@ namespace TheMachineNView
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(20, 85);
this.btnOpenDo.Location = new System.Drawing.Point(163, 51);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(125, 34);
this.btnOpenDo.TabIndex = 282;
......@@ -110,7 +110,7 @@ namespace TheMachineNView
this.btnCloseDO.BackColor = System.Drawing.Color.White;
this.btnCloseDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDO.Location = new System.Drawing.Point(156, 85);
this.btnCloseDO.Location = new System.Drawing.Point(299, 51);
this.btnCloseDO.Name = "btnCloseDO";
this.btnCloseDO.Size = new System.Drawing.Size(125, 34);
this.btnCloseDO.TabIndex = 281;
......@@ -123,7 +123,7 @@ namespace TheMachineNView
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(20, 57);
this.label14.Location = new System.Drawing.Point(316, 25);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 239;
......@@ -133,7 +133,7 @@ namespace TheMachineNView
// 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(219, 54);
this.txtWriteTime.Location = new System.Drawing.Point(515, 22);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(72, 23);
......@@ -146,7 +146,7 @@ namespace TheMachineNView
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(153, 57);
this.label5.Location = new System.Drawing.Point(449, 25);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237;
......@@ -174,9 +174,9 @@ namespace TheMachineNView
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(3, 3);
this.groupBox3.Location = new System.Drawing.Point(12, 313);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(255, 360);
this.groupBox3.Size = new System.Drawing.Size(327, 394);
this.groupBox3.TabIndex = 109;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -184,7 +184,7 @@ namespace TheMachineNView
// 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(58, 54);
this.txtDOIndex.Location = new System.Drawing.Point(354, 22);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(70, 23);
......@@ -194,8 +194,8 @@ namespace TheMachineNView
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.btnCloseDO);
this.groupBox1.Controls.Add(this.txtDOIndex);
......@@ -204,9 +204,9 @@ namespace TheMachineNView
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(521, 3);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(361, 360);
this.groupBox1.Size = new System.Drawing.Size(663, 295);
this.groupBox1.TabIndex = 111;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -214,11 +214,13 @@ namespace TheMachineNView
// IOControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScroll = true;
this.AutoSize = true;
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox1);
this.Name = "IOControl";
this.Size = new System.Drawing.Size(911, 366);
this.Size = new System.Drawing.Size(700, 714);
this.Load += new System.EventHandler(this.IOControl_Load);
this.groupBox4.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
......
......@@ -67,6 +67,10 @@ namespace TheMachineNView
tableLayoutPanel1.SuspendLayout();
int maxrow = tableLayoutPanel1.Height / 37;
if (tableLayoutPanel1.Width < 800)
{
maxrow = 999;
}
tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear();
//this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType., 26));
......
......@@ -52,20 +52,23 @@ namespace TheMachineNView
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.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.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 6;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 18);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.Size = new System.Drawing.Size(582, 277);
this.tableLayoutPanel1.Size = new System.Drawing.Size(577, 277);
this.tableLayoutPanel1.TabIndex = 102;
this.tableLayoutPanel1.Tag = "not";
//
......
......@@ -36,25 +36,28 @@ namespace TheMachineNView
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.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.tableLayoutPanel1.AutoSize = true;
this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
this.tableLayoutPanel1.ColumnCount = 4;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 33F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(537, 234);
this.tableLayoutPanel1.Size = new System.Drawing.Size(573, 312);
this.tableLayoutPanel1.TabIndex = 0;
//
// button_reset
//
this.button_reset.Location = new System.Drawing.Point(601, 3);
this.button_reset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button_reset.Location = new System.Drawing.Point(8, 321);
this.button_reset.Name = "button_reset";
this.button_reset.Size = new System.Drawing.Size(162, 34);
this.button_reset.TabIndex = 1;
......@@ -64,7 +67,8 @@ namespace TheMachineNView
//
// button_save
//
this.button_save.Location = new System.Drawing.Point(601, 72);
this.button_save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button_save.Location = new System.Drawing.Point(176, 321);
this.button_save.Name = "button_save";
this.button_save.Size = new System.Drawing.Size(162, 34);
this.button_save.TabIndex = 1;
......@@ -79,7 +83,7 @@ namespace TheMachineNView
this.Controls.Add(this.button_reset);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "UC_LedConfig";
this.Size = new System.Drawing.Size(859, 498);
this.Size = new System.Drawing.Size(585, 362);
this.ResumeLayout(false);
this.PerformLayout();
......
......@@ -33,6 +33,7 @@ namespace TheMachineNView
this.groupInout = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.cb_inoutdebugmode = new System.Windows.Forms.CheckBox();
this.cb_fixpos = new System.Windows.Forms.ComboBox();
this.cb_plateheight = new System.Windows.Forms.ComboBox();
this.btn_autoinout = new System.Windows.Forms.Button();
this.btnInStore = new System.Windows.Forms.Button();
......@@ -42,7 +43,6 @@ namespace TheMachineNView
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.label_verify = new System.Windows.Forms.Label();
this.cb_fixpos = new System.Windows.Forms.ComboBox();
this.storePosControl1 = new TheMachineNView.StorePosControl();
this.groupInout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
......@@ -50,15 +50,17 @@ namespace TheMachineNView
//
// groupInout
//
this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.groupInout.Controls.Add(this.label1);
this.groupInout.Controls.Add(this.cb_inoutdebugmode);
this.groupInout.Controls.Add(this.cb_fixpos);
this.groupInout.Controls.Add(this.cb_plateheight);
this.groupInout.Controls.Add(this.btn_autoinout);
this.groupInout.Controls.Add(this.btnInStore);
this.groupInout.Controls.Add(this.btnOutStore);
this.groupInout.Location = new System.Drawing.Point(2, 315);
this.groupInout.Location = new System.Drawing.Point(5, 316);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(257, 210);
this.groupInout.Size = new System.Drawing.Size(662, 105);
this.groupInout.TabIndex = 101;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -66,7 +68,7 @@ namespace TheMachineNView
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(19, 139);
this.label1.Location = new System.Drawing.Point(19, 70);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(47, 12);
this.label1.TabIndex = 228;
......@@ -75,7 +77,7 @@ namespace TheMachineNView
// cb_inoutdebugmode
//
this.cb_inoutdebugmode.AutoSize = true;
this.cb_inoutdebugmode.Location = new System.Drawing.Point(6, 20);
this.cb_inoutdebugmode.Location = new System.Drawing.Point(27, 30);
this.cb_inoutdebugmode.Name = "cb_inoutdebugmode";
this.cb_inoutdebugmode.Size = new System.Drawing.Size(108, 16);
this.cb_inoutdebugmode.TabIndex = 103;
......@@ -83,6 +85,17 @@ namespace TheMachineNView
this.cb_inoutdebugmode.UseVisualStyleBackColor = true;
this.cb_inoutdebugmode.CheckedChanged += new System.EventHandler(this.cb_inoutdebugmode_CheckedChanged);
//
// cb_fixpos
//
this.cb_fixpos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_fixpos.FormattingEnabled = true;
this.cb_fixpos.Location = new System.Drawing.Point(437, 28);
this.cb_fixpos.Name = "cb_fixpos";
this.cb_fixpos.Size = new System.Drawing.Size(121, 20);
this.cb_fixpos.TabIndex = 226;
this.cb_fixpos.Tag = "not";
this.cb_fixpos.SelectedIndexChanged += new System.EventHandler(this.cb_fixpos_SelectedIndexChanged);
//
// cb_plateheight
//
this.cb_plateheight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
......@@ -99,7 +112,7 @@ namespace TheMachineNView
"48",
"56",
"72"});
this.cb_plateheight.Location = new System.Drawing.Point(72, 136);
this.cb_plateheight.Location = new System.Drawing.Point(72, 66);
this.cb_plateheight.Name = "cb_plateheight";
this.cb_plateheight.Size = new System.Drawing.Size(54, 20);
this.cb_plateheight.TabIndex = 227;
......@@ -110,7 +123,7 @@ namespace TheMachineNView
this.btn_autoinout.Enabled = false;
this.btn_autoinout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_autoinout.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_autoinout.Location = new System.Drawing.Point(6, 162);
this.btn_autoinout.Location = new System.Drawing.Point(141, 60);
this.btn_autoinout.Name = "btn_autoinout";
this.btn_autoinout.Size = new System.Drawing.Size(173, 32);
this.btn_autoinout.TabIndex = 102;
......@@ -124,7 +137,7 @@ namespace TheMachineNView
this.btnInStore.Enabled = false;
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(6, 42);
this.btnInStore.Location = new System.Drawing.Point(141, 22);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(117, 32);
this.btnInStore.TabIndex = 102;
......@@ -138,7 +151,7 @@ namespace TheMachineNView
this.btnOutStore.Enabled = false;
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(6, 80);
this.btnOutStore.Location = new System.Drawing.Point(272, 22);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(117, 32);
this.btnOutStore.TabIndex = 101;
......@@ -148,17 +161,19 @@ namespace TheMachineNView
//
// label_size
//
this.label_size.Location = new System.Drawing.Point(382, 321);
this.label_size.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label_size.Location = new System.Drawing.Point(258, 433);
this.label_size.Name = "label_size";
this.label_size.Size = new System.Drawing.Size(57, 10);
this.label_size.Size = new System.Drawing.Size(62, 11);
this.label_size.TabIndex = 224;
this.label_size.Tag = "not";
//
// cmbPosition
//
this.cmbPosition.Location = new System.Drawing.Point(445, 321);
this.cmbPosition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.cmbPosition.Location = new System.Drawing.Point(350, 432);
this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(104, 11);
this.cmbPosition.Size = new System.Drawing.Size(109, 12);
this.cmbPosition.TabIndex = 224;
this.cmbPosition.Tag = "not";
//
......@@ -173,12 +188,14 @@ namespace TheMachineNView
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.AllowUserToResizeColumns = false;
this.dataGridView1.AllowUserToResizeRows = false;
this.dataGridView1.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.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Top;
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
this.dataGridView1.EnableHeadersVisualStyles = false;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Location = new System.Drawing.Point(2, 0);
this.dataGridView1.MultiSelect = false;
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
......@@ -190,39 +207,30 @@ namespace TheMachineNView
this.dataGridView1.ShowCellToolTips = false;
this.dataGridView1.ShowEditingIcon = false;
this.dataGridView1.ShowRowErrors = false;
this.dataGridView1.Size = new System.Drawing.Size(981, 308);
this.dataGridView1.Size = new System.Drawing.Size(676, 312);
this.dataGridView1.TabIndex = 103;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
//
// label_verify
//
this.label_verify.Location = new System.Drawing.Point(654, 320);
this.label_verify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label_verify.Location = new System.Drawing.Point(486, 432);
this.label_verify.Name = "label_verify";
this.label_verify.Size = new System.Drawing.Size(104, 11);
this.label_verify.Size = new System.Drawing.Size(109, 12);
this.label_verify.TabIndex = 224;
this.label_verify.Tag = "not";
this.label_verify.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// cb_fixpos
//
this.cb_fixpos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_fixpos.FormattingEnabled = true;
this.cb_fixpos.Location = new System.Drawing.Point(276, 489);
this.cb_fixpos.Name = "cb_fixpos";
this.cb_fixpos.Size = new System.Drawing.Size(121, 20);
this.cb_fixpos.TabIndex = 226;
this.cb_fixpos.Tag = "not";
this.cb_fixpos.SelectedIndexChanged += new System.EventHandler(this.cb_fixpos_SelectedIndexChanged);
//
// storePosControl1
//
this.storePosControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.storePosControl1.Config = null;
this.storePosControl1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.storePosControl1.Location = new System.Drawing.Point(266, 315);
this.storePosControl1.Location = new System.Drawing.Point(4, 428);
this.storePosControl1.Margin = new System.Windows.Forms.Padding(4);
this.storePosControl1.Name = "storePosControl1";
this.storePosControl1.Size = new System.Drawing.Size(503, 210);
this.storePosControl1.Size = new System.Drawing.Size(667, 280);
this.storePosControl1.TabIndex = 225;
this.storePosControl1.Tag = "";
//
......@@ -230,16 +238,15 @@ namespace TheMachineNView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.cb_fixpos);
this.Controls.Add(this.label_verify);
this.Controls.Add(this.cmbPosition);
this.Controls.Add(this.label_size);
this.Controls.Add(this.label_verify);
this.Controls.Add(this.storePosControl1);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.groupInout);
this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "uc_boxdebug";
this.Size = new System.Drawing.Size(981, 785);
this.Size = new System.Drawing.Size(681, 721);
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
......
......@@ -76,14 +76,14 @@
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(6, 5);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(992, 707);
this.groupBox6.Size = new System.Drawing.Size(740, 707);
this.groupBox6.TabIndex = 250;
this.groupBox6.TabStop = false;
//
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.txtLOffset);
this.groupBox2.Controls.Add(this.label5);
this.groupBox2.Controls.Add(this.txtHOffset);
......@@ -92,7 +92,6 @@
this.groupBox2.Controls.Add(this.txtSpeed);
this.groupBox2.Controls.Add(this.label8);
this.groupBox2.Controls.Add(this.txtFileName);
this.groupBox2.Controls.Add(this.ioStatusControl1);
this.groupBox2.Controls.Add(this.btnAbsMove);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label7);
......@@ -100,9 +99,9 @@
this.groupBox2.Controls.Add(this.txtActualPosition);
this.groupBox2.Controls.Add(this.label13);
this.groupBox2.Controls.Add(this.btnSdStop);
this.groupBox2.Location = new System.Drawing.Point(9, 170);
this.groupBox2.Location = new System.Drawing.Point(9, 150);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(458, 470);
this.groupBox2.Size = new System.Drawing.Size(724, 283);
this.groupBox2.TabIndex = 283;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "位置信息";
......@@ -110,7 +109,7 @@
// txtLOffset
//
this.txtLOffset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtLOffset.Location = new System.Drawing.Point(184, 110);
this.txtLOffset.Location = new System.Drawing.Point(184, 102);
this.txtLOffset.MaxLength = 30;
this.txtLOffset.Name = "txtLOffset";
this.txtLOffset.Size = new System.Drawing.Size(121, 26);
......@@ -121,7 +120,7 @@
// label5
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(6, 113);
this.label5.Location = new System.Drawing.Point(6, 105);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(173, 20);
this.label5.TabIndex = 284;
......@@ -131,7 +130,7 @@
// txtHOffset
//
this.txtHOffset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHOffset.Location = new System.Drawing.Point(184, 78);
this.txtHOffset.Location = new System.Drawing.Point(184, 70);
this.txtHOffset.MaxLength = 30;
this.txtHOffset.Name = "txtHOffset";
this.txtHOffset.Size = new System.Drawing.Size(121, 26);
......@@ -142,7 +141,7 @@
// label4
//
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(6, 81);
this.label4.Location = new System.Drawing.Point(6, 73);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(173, 20);
this.label4.TabIndex = 282;
......@@ -163,7 +162,7 @@
// txtSpeed
//
this.txtSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpeed.Location = new System.Drawing.Point(184, 227);
this.txtSpeed.Location = new System.Drawing.Point(184, 146);
this.txtSpeed.MaxLength = 30;
this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(121, 26);
......@@ -174,7 +173,7 @@
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(6, 230);
this.label8.Location = new System.Drawing.Point(6, 149);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(173, 20);
this.label8.TabIndex = 84;
......@@ -197,16 +196,16 @@
this.ioStatusControl1.IOName = "检测信号";
this.ioStatusControl1.IOValue = 0;
this.ioStatusControl1.isCanClick = false;
this.ioStatusControl1.Location = new System.Drawing.Point(38, 401);
this.ioStatusControl1.Location = new System.Drawing.Point(421, 89);
this.ioStatusControl1.Margin = new System.Windows.Forms.Padding(4);
this.ioStatusControl1.Name = "ioStatusControl1";
this.ioStatusControl1.Size = new System.Drawing.Size(267, 61);
this.ioStatusControl1.Size = new System.Drawing.Size(267, 31);
this.ioStatusControl1.TabIndex = 279;
//
// btnAbsMove
//
this.btnAbsMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAbsMove.Location = new System.Drawing.Point(312, 222);
this.btnAbsMove.Location = new System.Drawing.Point(312, 141);
this.btnAbsMove.Name = "btnAbsMove";
this.btnAbsMove.Size = new System.Drawing.Size(132, 36);
this.btnAbsMove.TabIndex = 88;
......@@ -227,7 +226,7 @@
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(6, 332);
this.label7.Location = new System.Drawing.Point(6, 234);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(173, 20);
this.label7.TabIndex = 271;
......@@ -237,7 +236,7 @@
// txtPosition
//
this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosition.Location = new System.Drawing.Point(184, 265);
this.txtPosition.Location = new System.Drawing.Point(184, 186);
this.txtPosition.MaxLength = 30;
this.txtPosition.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(121, 26);
......@@ -249,7 +248,7 @@
//
this.txtActualPosition.Enabled = false;
this.txtActualPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtActualPosition.Location = new System.Drawing.Point(184, 329);
this.txtActualPosition.Location = new System.Drawing.Point(184, 231);
this.txtActualPosition.MaxLength = 30;
this.txtActualPosition.Name = "txtActualPosition";
this.txtActualPosition.Size = new System.Drawing.Size(121, 26);
......@@ -259,7 +258,7 @@
// label13
//
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.Location = new System.Drawing.Point(6, 268);
this.label13.Location = new System.Drawing.Point(6, 189);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(173, 20);
this.label13.TabIndex = 90;
......@@ -269,7 +268,7 @@
// btnSdStop
//
this.btnSdStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSdStop.Location = new System.Drawing.Point(312, 260);
this.btnSdStop.Location = new System.Drawing.Point(312, 181);
this.btnSdStop.Name = "btnSdStop";
this.btnSdStop.Size = new System.Drawing.Size(132, 36);
this.btnSdStop.TabIndex = 257;
......@@ -279,15 +278,18 @@
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.label_servosts);
this.groupBox1.Controls.Add(this.btnHomeMove);
this.groupBox1.Controls.Add(this.btnServoOn);
this.groupBox1.Controls.Add(this.btnServoOff);
this.groupBox1.Controls.Add(this.txtIOIndex);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.ioStatusControl1);
this.groupBox1.Location = new System.Drawing.Point(9, 13);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(458, 151);
this.groupBox1.Size = new System.Drawing.Size(724, 131);
this.groupBox1.TabIndex = 282;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "设备信息";
......@@ -295,7 +297,7 @@
// label_servosts
//
this.label_servosts.AutoSize = true;
this.label_servosts.Location = new System.Drawing.Point(8, 82);
this.label_servosts.Location = new System.Drawing.Point(18, 66);
this.label_servosts.Name = "label_servosts";
this.label_servosts.Size = new System.Drawing.Size(89, 17);
this.label_servosts.TabIndex = 276;
......@@ -338,7 +340,7 @@
//
this.txtIOIndex.Enabled = false;
this.txtIOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtIOIndex.Location = new System.Drawing.Point(141, 119);
this.txtIOIndex.Location = new System.Drawing.Point(141, 94);
this.txtIOIndex.MaxLength = 30;
this.txtIOIndex.Name = "txtIOIndex";
this.txtIOIndex.Size = new System.Drawing.Size(164, 26);
......@@ -349,7 +351,7 @@
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(13, 122);
this.label2.Location = new System.Drawing.Point(13, 97);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(122, 20);
this.label2.TabIndex = 274;
......@@ -359,7 +361,7 @@
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.Location = new System.Drawing.Point(822, 665);
this.btnExit.Location = new System.Drawing.Point(602, 664);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(132, 36);
this.btnExit.TabIndex = 281;
......@@ -370,7 +372,7 @@
// btnClear
//
this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClear.Location = new System.Drawing.Point(675, 665);
this.btnClear.Location = new System.Drawing.Point(455, 664);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(132, 36);
this.btnClear.TabIndex = 106;
......@@ -384,9 +386,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
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(473, 20);
this.logBox.Location = new System.Drawing.Point(9, 439);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(510, 642);
this.logBox.Size = new System.Drawing.Size(724, 219);
this.logBox.TabIndex = 105;
this.logBox.Tag = "not";
this.logBox.Text = "";
......@@ -399,7 +401,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1004, 719);
this.ClientSize = new System.Drawing.Size(752, 719);
this.Controls.Add(this.groupBox6);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Margin = new System.Windows.Forms.Padding(4);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!