Skip to content

刘韬 / SO20031_TinStorage

转到一个项目
切换导航栏
切换导航栏固定状态
Commit bc895e37 由 刘韬
选项

1

1 个父辈 ec715035
内嵌 并排
正在显示 15 个修改的文件 包含 474 行增加 和 304 行删除
DeviceLibrary/DeviceLibrary.csproj
...@@ -48,8 +48,9 @@ ...@@ -48,8 +48,9 @@
<Reference Include="ConfigHelper"> <Reference Include="ConfigHelper">
<HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath> <HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
</Reference> </Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
<HintPath>..\..\RC1271-DUOStore\dll\halcondotnet.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\TheMachine\bin\Debug\halcondotnet.dll</HintPath>
</Reference> </Reference>
<Reference Include="HuichuanLibrary"> <Reference Include="HuichuanLibrary">
<HintPath>..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath> <HintPath>..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
......
DeviceLibrary/DeviceLibrary/CodeManager.cs
...@@ -151,7 +151,7 @@ namespace DeviceLibrary ...@@ -151,7 +151,7 @@ namespace DeviceLibrary
LogUtil.error("加载HIK相机出错：" + ex.ToString()); LogUtil.error("加载HIK相机出错：" + ex.ToString());
} }
} }
string[] names = Camera._cam.Name; string[] names = Camera._cam?.Name;
if (names != null) if (names != null)
......
DeviceLibrary/theMachine/MainMachine_Labeling.cs
...@@ -294,8 +294,8 @@ namespace DeviceLibrary ...@@ -294,8 +294,8 @@ namespace DeviceLibrary
case MoveStep.Labeling14_1: case MoveStep.Labeling14_1:
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling15); LabelingMoveInfo.NextMoveStep(MoveStep.Labeling15);
IOMove(IO_Type.Label_Vacuum, IO_VALUE.HIGH); IOMove(IO_Type.Label_Vacuum, IO_VALUE.HIGH);
if (Setting_Init.Module_No.Val==Module_SO.SO20031) //if (Setting_Init.Module_No.Val==Module_SO.SO20031)
IOMove(IO_Type.Label_PasteBlow, IO_VALUE.HIGH); // IOMove(IO_Type.Label_PasteBlow, IO_VALUE.HIGH);
CylinderMove(LabelingMoveInfo, IO_Type.Labeling_Down, IO_Type.Labeling_Up, IO_VALUE.LOW); CylinderMove(LabelingMoveInfo, IO_Type.Labeling_Down, IO_Type.Labeling_Up, IO_VALUE.LOW);
//LabelingMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); //LabelingMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
......
DeviceLibrary/theMachine/MainMachine_Store.cs
...@@ -60,7 +60,7 @@ namespace DeviceLibrary ...@@ -60,7 +60,7 @@ namespace DeviceLibrary
// return; // return;
//} //}
LabelingMoveInfo.MoveParam.IsNg = true; LabelingMoveInfo.MoveParam.IsNg = true;
LabelingMoveInfo.MoveParam.NgMsg = "重置前物料正在贴标,NG处理"; LabelingMoveInfo.MoveParam.NgMsg = crc.GetString("Res0182.e64e34d1","重置前物料正在贴标,NG处理");
StoreMoveInfo.NextMoveStep(MoveStep.StoreIn03); StoreMoveInfo.NextMoveStep(MoveStep.StoreIn03);
//if (!string.IsNullOrEmpty(Setting_Init.Runtime_FromPosid)) //if (!string.IsNullOrEmpty(Setting_Init.Runtime_FromPosid))
//{ //{
...@@ -240,7 +240,7 @@ namespace DeviceLibrary ...@@ -240,7 +240,7 @@ namespace DeviceLibrary
if (!boxTransport.IsComplateOrFree) if (!boxTransport.IsComplateOrFree)
break; break;
Setting_Init.Runtime_Step = Runtime_StepE.None; Setting_Init.Runtime_Step = Runtime_StepE.None;
if (StoreMoveInfo.MoveParam.usedCount == 0 && !Setting_Init.Device_Disable_RFID_Check) if (StoreMoveInfo.MoveParam.usedCount == 0 && !Setting_Init.Device_Disable_RFID_Check || Setting_Init.Module_No.Val == Module_SO.SO21637)
{ {
if (StoreMoveInfo.MoveParam.RFID.Length > 16) if (StoreMoveInfo.MoveParam.RFID.Length > 16)
StoreMoveInfo.MoveParam.RFID = StoreMoveInfo.MoveParam.RFID.Substring(0, 16); StoreMoveInfo.MoveParam.RFID = StoreMoveInfo.MoveParam.RFID.Substring(0, 16);
......
DeviceLibrary/theMachine/RobotManage.cs
...@@ -128,8 +128,15 @@ namespace DeviceLibrary ...@@ -128,8 +128,15 @@ namespace DeviceLibrary
IsLoadOk = false; IsLoadOk = false;
msg += crc.GetString("Res0117","找不到库位配置文件:") + StoragePostionFile + "\n"; msg += crc.GetString("Res0117","找不到库位配置文件:") + StoragePostionFile + "\n";
} }
try
{
CodeManager.LoadConfig(); CodeManager.LoadConfig();
CodeManager.CameraScan(CodeManager.hikNameList); CodeManager.CameraScan(CodeManager.hikNameList);
}
catch (Exception ex) {
IsLoadOk = false;
msg += ex.Message + "\n";
}
//mainMachine.ScanCode(); //mainMachine.ScanCode();
......
TheMachine/AxisControl.Designer.cs
...@@ -29,7 +29,7 @@ namespace TheMachine ...@@ -29,7 +29,7 @@ namespace TheMachine
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.FlowLayoutPanel();
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl(); this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.configControl1 = new TheMachine.ConfigControl(); this.configControl1 = new TheMachine.ConfigControl();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
...@@ -58,10 +58,10 @@ namespace TheMachine ...@@ -58,10 +58,10 @@ namespace TheMachine
// configControl1 // configControl1
// //
this.configControl1.Config = null; this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3); this.configControl1.Location = new System.Drawing.Point(569, 4);
this.configControl1.Margin = new System.Windows.Forms.Padding(4); this.configControl1.Margin = new System.Windows.Forms.Padding(4);
this.configControl1.Name = "configControl1"; this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(647, 627); this.configControl1.Size = new System.Drawing.Size(647, 353);
this.configControl1.TabIndex = 1; this.configControl1.TabIndex = 1;
this.configControl1.Tag = "not"; this.configControl1.Tag = "not";
// //
...@@ -83,6 +83,6 @@ namespace TheMachine ...@@ -83,6 +83,6 @@ namespace TheMachine
private DeviceLibrary.AxisMoveControl axisMoveControl1; private DeviceLibrary.AxisMoveControl axisMoveControl1;
private ConfigControl configControl1; private ConfigControl configControl1;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.FlowLayoutPanel panel1;
} }
} }
TheMachine/Form1.Designer.cs
...@@ -43,24 +43,27 @@ namespace TheMachine ...@@ -43,24 +43,27 @@ namespace TheMachine
this.关于ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.关于ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabc = new System.Windows.Forms.TabControl(); this.tabc = new System.Windows.Forms.TabControl();
this.tabP1 = new System.Windows.Forms.TabPage(); this.tabP1 = new System.Windows.Forms.TabPage();
this.pnl = new System.Windows.Forms.Panel(); this.pnl = new System.Windows.Forms.FlowLayoutPanel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.NgInfoView = new System.Windows.Forms.ListView();
this.cb_cycledemo = new System.Windows.Forms.CheckBox();
this.btn_printsafedoorunlock = new System.Windows.Forms.Button();
this.btn_rightsafedoorunlock = new System.Windows.Forms.Button();
this.btn_leftsafedoorunlock = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.btn_entrylock = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.stateView = new System.Windows.Forms.ListView(); this.stateView = new System.Windows.Forms.ListView();
this.panr1 = new System.Windows.Forms.Panel();
this.panel1 = new System.Windows.Forms.Panel();
this.cb_IgnoreSafecheck = new System.Windows.Forms.CheckBox(); this.cb_IgnoreSafecheck = new System.Windows.Forms.CheckBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.cb_EnableBuzzer = new System.Windows.Forms.CheckBox(); this.cb_EnableBuzzer = new System.Windows.Forms.CheckBox();
this.btn_IgnoreX09 = new System.Windows.Forms.Button();
this.btn_PauseBuzzer = new System.Windows.Forms.Button(); this.btn_PauseBuzzer = new System.Windows.Forms.Button();
this.btn_IgnoreX09 = new System.Windows.Forms.Button();
this.pnlcontrol = new System.Windows.Forms.Panel();
this.btn_entrylock = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.cb_cycledemo = new System.Windows.Forms.CheckBox();
this.btn_leftsafedoorunlock = new System.Windows.Forms.Button();
this.btn_printsafedoorunlock = new System.Windows.Forms.Button();
this.btn_rightsafedoorunlock = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.NgInfoView = new System.Windows.Forms.ListView();
this.listView1 = new System.Windows.Forms.ListView(); this.listView1 = new System.Windows.Forms.ListView();
this.btn_stop = new System.Windows.Forms.Button(); this.btn_stop = new System.Windows.Forms.Button();
this.btn_run = new System.Windows.Forms.Button(); this.btn_run = new System.Windows.Forms.Button();
...@@ -68,10 +71,13 @@ namespace TheMachine ...@@ -68,10 +71,13 @@ namespace TheMachine
this.tabc.SuspendLayout(); this.tabc.SuspendLayout();
this.tabP1.SuspendLayout(); this.tabP1.SuspendLayout();
this.pnl.SuspendLayout(); this.pnl.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panr1.SuspendLayout();
this.panel1.SuspendLayout();
this.pnlcontrol.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.groupBox2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// menuStrip1 // menuStrip1
...@@ -178,7 +184,7 @@ namespace TheMachine ...@@ -178,7 +184,7 @@ namespace TheMachine
this.tabc.Location = new System.Drawing.Point(0, 119); this.tabc.Location = new System.Drawing.Point(0, 119);
this.tabc.Name = "tabc"; this.tabc.Name = "tabc";
this.tabc.SelectedIndex = 0; this.tabc.SelectedIndex = 0;
this.tabc.Size = new System.Drawing.Size(1008, 610); this.tabc.Size = new System.Drawing.Size(1008, 1049);
this.tabc.TabIndex = 1; this.tabc.TabIndex = 1;
// //
// tabP1 // tabP1
...@@ -186,145 +192,29 @@ namespace TheMachine ...@@ -186,145 +192,29 @@ namespace TheMachine
this.tabP1.Controls.Add(this.pnl); this.tabP1.Controls.Add(this.pnl);
this.tabP1.Location = new System.Drawing.Point(4, 30); this.tabP1.Location = new System.Drawing.Point(4, 30);
this.tabP1.Name = "tabP1"; this.tabP1.Name = "tabP1";
this.tabP1.Size = new System.Drawing.Size(1000, 576); this.tabP1.Size = new System.Drawing.Size(1000, 1015);
this.tabP1.TabIndex = 0; this.tabP1.TabIndex = 0;
this.tabP1.Text = "信息"; this.tabP1.Text = "信息";
this.tabP1.UseVisualStyleBackColor = true; this.tabP1.UseVisualStyleBackColor = true;
// //
// pnl // pnl
// //
this.pnl.Controls.Add(this.groupBox2);
this.pnl.Controls.Add(this.cb_cycledemo);
this.pnl.Controls.Add(this.btn_printsafedoorunlock);
this.pnl.Controls.Add(this.btn_rightsafedoorunlock);
this.pnl.Controls.Add(this.btn_leftsafedoorunlock);
this.pnl.Controls.Add(this.button3);
this.pnl.Controls.Add(this.button4);
this.pnl.Controls.Add(this.btn_entrylock);
this.pnl.Controls.Add(this.groupBox1); this.pnl.Controls.Add(this.groupBox1);
this.pnl.Controls.Add(this.cb_IgnoreSafecheck); this.pnl.Controls.Add(this.panr1);
this.pnl.Controls.Add(this.pictureBox2); this.pnl.Controls.Add(this.pnlcontrol);
this.pnl.Controls.Add(this.pictureBox1); this.pnl.Controls.Add(this.pictureBox1);
this.pnl.Controls.Add(this.cb_EnableBuzzer); this.pnl.Controls.Add(this.pictureBox2);
this.pnl.Controls.Add(this.btn_IgnoreX09); this.pnl.Controls.Add(this.groupBox2);
this.pnl.Controls.Add(this.btn_PauseBuzzer);
this.pnl.Dock = System.Windows.Forms.DockStyle.Fill; this.pnl.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnl.Location = new System.Drawing.Point(0, 0); this.pnl.Location = new System.Drawing.Point(0, 0);
this.pnl.Name = "pnl"; this.pnl.Name = "pnl";
this.pnl.Size = new System.Drawing.Size(1000, 576); this.pnl.Size = new System.Drawing.Size(1000, 1015);
this.pnl.TabIndex = 273; this.pnl.TabIndex = 273;
// //
// groupBox2
//
this.groupBox2.Controls.Add(this.NgInfoView);
this.groupBox2.Location = new System.Drawing.Point(171, 494);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(598, 244);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "NG信息";
this.groupBox2.Visible = false;
//
// NgInfoView
//
this.NgInfoView.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.NgInfoView.Dock = System.Windows.Forms.DockStyle.Fill;
this.NgInfoView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.NgInfoView.HideSelection = false;
this.NgInfoView.Location = new System.Drawing.Point(3, 25);
this.NgInfoView.MultiSelect = false;
this.NgInfoView.Name = "NgInfoView";
this.NgInfoView.Size = new System.Drawing.Size(592, 216);
this.NgInfoView.TabIndex = 0;
this.NgInfoView.UseCompatibleStateImageBehavior = false;
//
// cb_cycledemo
//
this.cb_cycledemo.AutoSize = true;
this.cb_cycledemo.Location = new System.Drawing.Point(808, 482);
this.cb_cycledemo.Name = "cb_cycledemo";
this.cb_cycledemo.Size = new System.Drawing.Size(125, 25);
this.cb_cycledemo.TabIndex = 278;
this.cb_cycledemo.Text = "出库循环测试";
this.cb_cycledemo.UseVisualStyleBackColor = true;
this.cb_cycledemo.CheckedChanged += new System.EventHandler(this.cb_cycledemo_CheckedChanged);
//
// btn_printsafedoorunlock
//
this.btn_printsafedoorunlock.BackColor = System.Drawing.Color.White;
this.btn_printsafedoorunlock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_printsafedoorunlock.Location = new System.Drawing.Point(769, 393);
this.btn_printsafedoorunlock.Name = "btn_printsafedoorunlock";
this.btn_printsafedoorunlock.Size = new System.Drawing.Size(139, 56);
this.btn_printsafedoorunlock.TabIndex = 277;
this.btn_printsafedoorunlock.Text = "打印维护门解锁";
this.btn_printsafedoorunlock.UseVisualStyleBackColor = false;
this.btn_printsafedoorunlock.Click += new System.EventHandler(this.button2_Click_2);
//
// btn_rightsafedoorunlock
//
this.btn_rightsafedoorunlock.BackColor = System.Drawing.Color.White;
this.btn_rightsafedoorunlock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_rightsafedoorunlock.Location = new System.Drawing.Point(769, 331);
this.btn_rightsafedoorunlock.Name = "btn_rightsafedoorunlock";
this.btn_rightsafedoorunlock.Size = new System.Drawing.Size(139, 56);
this.btn_rightsafedoorunlock.TabIndex = 275;
this.btn_rightsafedoorunlock.Text = "右侧防护门解锁";
this.btn_rightsafedoorunlock.UseVisualStyleBackColor = false;
this.btn_rightsafedoorunlock.Click += new System.EventHandler(this.button2_Click_1);
//
// btn_leftsafedoorunlock
//
this.btn_leftsafedoorunlock.BackColor = System.Drawing.Color.White;
this.btn_leftsafedoorunlock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_leftsafedoorunlock.Location = new System.Drawing.Point(769, 270);
this.btn_leftsafedoorunlock.Name = "btn_leftsafedoorunlock";
this.btn_leftsafedoorunlock.Size = new System.Drawing.Size(139, 55);
this.btn_leftsafedoorunlock.TabIndex = 276;
this.btn_leftsafedoorunlock.Text = "左侧防护门解锁";
this.btn_leftsafedoorunlock.UseVisualStyleBackColor = false;
this.btn_leftsafedoorunlock.Click += new System.EventHandler(this.button5_Click_1);
//
// button3
//
this.button3.BackColor = System.Drawing.Color.White;
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button3.Location = new System.Drawing.Point(32, 393);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(139, 56);
this.button3.TabIndex = 273;
this.button3.Text = "出库门解锁";
this.button3.UseVisualStyleBackColor = false;
this.button3.Click += new System.EventHandler(this.button3_Click_1);
//
// button4
//
this.button4.BackColor = System.Drawing.Color.White;
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Location = new System.Drawing.Point(32, 332);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(139, 55);
this.button4.TabIndex = 274;
this.button4.Text = "入库门解锁";
this.button4.UseVisualStyleBackColor = false;
this.button4.Click += new System.EventHandler(this.button4_Click_1);
//
// btn_entrylock
//
this.btn_entrylock.BackColor = System.Drawing.Color.White;
this.btn_entrylock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_entrylock.Location = new System.Drawing.Point(32, 270);
this.btn_entrylock.Name = "btn_entrylock";
this.btn_entrylock.Size = new System.Drawing.Size(139, 55);
this.btn_entrylock.TabIndex = 272;
this.btn_entrylock.Text = "入库门上锁";
this.btn_entrylock.UseVisualStyleBackColor = false;
this.btn_entrylock.Click += new System.EventHandler(this.button2_Click);
//
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.stateView); 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.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(598, 244); this.groupBox1.Size = new System.Drawing.Size(598, 244);
this.groupBox1.TabIndex = 1; this.groupBox1.TabIndex = 1;
...@@ -344,10 +234,30 @@ namespace TheMachine ...@@ -344,10 +234,30 @@ namespace TheMachine
this.stateView.TabIndex = 0; this.stateView.TabIndex = 0;
this.stateView.UseCompatibleStateImageBehavior = false; this.stateView.UseCompatibleStateImageBehavior = false;
// //
// panr1
//
this.panr1.AutoSize = true;
this.panr1.Controls.Add(this.panel1);
this.panr1.Controls.Add(this.btn_PauseBuzzer);
this.panr1.Controls.Add(this.btn_IgnoreX09);
this.panr1.Location = new System.Drawing.Point(607, 3);
this.panr1.Name = "panr1";
this.panr1.Size = new System.Drawing.Size(385, 185);
this.panr1.TabIndex = 279;
//
// panel1
//
this.panel1.Controls.Add(this.cb_IgnoreSafecheck);
this.panel1.Controls.Add(this.cb_EnableBuzzer);
this.panel1.Location = new System.Drawing.Point(3, 3);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(379, 65);
this.panel1.TabIndex = 7;
//
// cb_IgnoreSafecheck // cb_IgnoreSafecheck
// //
this.cb_IgnoreSafecheck.AutoSize = true; this.cb_IgnoreSafecheck.AutoSize = true;
this.cb_IgnoreSafecheck.Location = new System.Drawing.Point(607, 47); this.cb_IgnoreSafecheck.Location = new System.Drawing.Point(3, 34);
this.cb_IgnoreSafecheck.Name = "cb_IgnoreSafecheck"; this.cb_IgnoreSafecheck.Name = "cb_IgnoreSafecheck";
this.cb_IgnoreSafecheck.Size = new System.Drawing.Size(125, 25); this.cb_IgnoreSafecheck.Size = new System.Drawing.Size(125, 25);
this.cb_IgnoreSafecheck.TabIndex = 2; this.cb_IgnoreSafecheck.TabIndex = 2;
...@@ -356,36 +266,10 @@ namespace TheMachine ...@@ -356,36 +266,10 @@ namespace TheMachine
this.cb_IgnoreSafecheck.Visible = false; this.cb_IgnoreSafecheck.Visible = false;
this.cb_IgnoreSafecheck.CheckedChanged += new System.EventHandler(this.cb_IgnoreSafecheck_CheckedChanged); this.cb_IgnoreSafecheck.CheckedChanged += new System.EventHandler(this.cb_IgnoreSafecheck_CheckedChanged);
// //
// pictureBox2
//
this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox2.Location = new System.Drawing.Point(472, 297);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(436, 271);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 270;
this.pictureBox2.TabStop = false;
this.pictureBox2.Visible = false;
this.pictureBox2.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
//
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox1.Location = new System.Drawing.Point(0, 297);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(451, 271);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 271;
this.pictureBox1.TabStop = false;
this.pictureBox1.Visible = false;
this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
//
// cb_EnableBuzzer // cb_EnableBuzzer
// //
this.cb_EnableBuzzer.AutoSize = true; this.cb_EnableBuzzer.AutoSize = true;
this.cb_EnableBuzzer.Location = new System.Drawing.Point(607, 16); this.cb_EnableBuzzer.Location = new System.Drawing.Point(3, 3);
this.cb_EnableBuzzer.Name = "cb_EnableBuzzer"; this.cb_EnableBuzzer.Name = "cb_EnableBuzzer";
this.cb_EnableBuzzer.Size = new System.Drawing.Size(109, 25); this.cb_EnableBuzzer.Size = new System.Drawing.Size(109, 25);
this.cb_EnableBuzzer.TabIndex = 5; this.cb_EnableBuzzer.TabIndex = 5;
...@@ -393,10 +277,22 @@ namespace TheMachine ...@@ -393,10 +277,22 @@ namespace TheMachine
this.cb_EnableBuzzer.UseVisualStyleBackColor = true; this.cb_EnableBuzzer.UseVisualStyleBackColor = true;
this.cb_EnableBuzzer.CheckedChanged += new System.EventHandler(this.cb_EnableBuzzer_CheckedChanged); this.cb_EnableBuzzer.CheckedChanged += new System.EventHandler(this.cb_EnableBuzzer_CheckedChanged);
// //
// btn_PauseBuzzer
//
this.btn_PauseBuzzer.BackColor = System.Drawing.Color.OrangeRed;
this.btn_PauseBuzzer.Location = new System.Drawing.Point(3, 96);
this.btn_PauseBuzzer.Name = "btn_PauseBuzzer";
this.btn_PauseBuzzer.Size = new System.Drawing.Size(301, 40);
this.btn_PauseBuzzer.TabIndex = 6;
this.btn_PauseBuzzer.Text = "本次暂停警报器响声";
this.btn_PauseBuzzer.UseVisualStyleBackColor = false;
this.btn_PauseBuzzer.Visible = false;
this.btn_PauseBuzzer.Click += new System.EventHandler(this.btn_PauseBuzzer_Click);
//
// btn_IgnoreX09 // btn_IgnoreX09
// //
this.btn_IgnoreX09.BackColor = System.Drawing.Color.OrangeRed; 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(3, 142);
this.btn_IgnoreX09.Name = "btn_IgnoreX09"; this.btn_IgnoreX09.Name = "btn_IgnoreX09";
this.btn_IgnoreX09.Size = new System.Drawing.Size(301, 40); this.btn_IgnoreX09.Size = new System.Drawing.Size(301, 40);
this.btn_IgnoreX09.TabIndex = 6; this.btn_IgnoreX09.TabIndex = 6;
...@@ -405,17 +301,152 @@ namespace TheMachine ...@@ -405,17 +301,152 @@ namespace TheMachine
this.btn_IgnoreX09.Visible = false; this.btn_IgnoreX09.Visible = false;
this.btn_IgnoreX09.Click += new System.EventHandler(this.btn_IgnoreX09_Click); this.btn_IgnoreX09.Click += new System.EventHandler(this.btn_IgnoreX09_Click);
// //
// btn_PauseBuzzer // pnlcontrol
// //
this.btn_PauseBuzzer.BackColor = System.Drawing.Color.OrangeRed; this.pnlcontrol.Controls.Add(this.btn_entrylock);
this.btn_PauseBuzzer.Location = new System.Drawing.Point(607, 109); this.pnlcontrol.Controls.Add(this.button4);
this.btn_PauseBuzzer.Name = "btn_PauseBuzzer"; this.pnlcontrol.Controls.Add(this.button3);
this.btn_PauseBuzzer.Size = new System.Drawing.Size(301, 40); this.pnlcontrol.Controls.Add(this.cb_cycledemo);
this.btn_PauseBuzzer.TabIndex = 6; this.pnlcontrol.Controls.Add(this.btn_leftsafedoorunlock);
this.btn_PauseBuzzer.Text = "本次暂停警报器响声"; this.pnlcontrol.Controls.Add(this.btn_printsafedoorunlock);
this.btn_PauseBuzzer.UseVisualStyleBackColor = false; this.pnlcontrol.Controls.Add(this.btn_rightsafedoorunlock);
this.btn_PauseBuzzer.Visible = false; this.pnlcontrol.Location = new System.Drawing.Point(3, 253);
this.btn_PauseBuzzer.Click += new System.EventHandler(this.btn_PauseBuzzer_Click); this.pnlcontrol.Name = "pnlcontrol";
this.pnlcontrol.Size = new System.Drawing.Size(595, 256);
this.pnlcontrol.TabIndex = 280;
//
// btn_entrylock
//
this.btn_entrylock.BackColor = System.Drawing.Color.White;
this.btn_entrylock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_entrylock.Location = new System.Drawing.Point(18, 14);
this.btn_entrylock.Name = "btn_entrylock";
this.btn_entrylock.Size = new System.Drawing.Size(139, 55);
this.btn_entrylock.TabIndex = 272;
this.btn_entrylock.Text = "入库门上锁";
this.btn_entrylock.UseVisualStyleBackColor = false;
this.btn_entrylock.Click += new System.EventHandler(this.button2_Click);
//
// button4
//
this.button4.BackColor = System.Drawing.Color.White;
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Location = new System.Drawing.Point(18, 76);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(139, 55);
this.button4.TabIndex = 274;
this.button4.Text = "入库门解锁";
this.button4.UseVisualStyleBackColor = false;
this.button4.Click += new System.EventHandler(this.button4_Click_1);
//
// button3
//
this.button3.BackColor = System.Drawing.Color.White;
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button3.Location = new System.Drawing.Point(18, 137);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(139, 56);
this.button3.TabIndex = 273;
this.button3.Text = "出库门解锁";
this.button3.UseVisualStyleBackColor = false;
this.button3.Click += new System.EventHandler(this.button3_Click_1);
//
// cb_cycledemo
//
this.cb_cycledemo.AutoSize = true;
this.cb_cycledemo.Location = new System.Drawing.Point(18, 211);
this.cb_cycledemo.Name = "cb_cycledemo";
this.cb_cycledemo.Size = new System.Drawing.Size(125, 25);
this.cb_cycledemo.TabIndex = 278;
this.cb_cycledemo.Text = "出库循环测试";
this.cb_cycledemo.UseVisualStyleBackColor = true;
this.cb_cycledemo.CheckedChanged += new System.EventHandler(this.cb_cycledemo_CheckedChanged);
//
// btn_leftsafedoorunlock
//
this.btn_leftsafedoorunlock.BackColor = System.Drawing.Color.White;
this.btn_leftsafedoorunlock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_leftsafedoorunlock.Location = new System.Drawing.Point(438, 14);
this.btn_leftsafedoorunlock.Name = "btn_leftsafedoorunlock";
this.btn_leftsafedoorunlock.Size = new System.Drawing.Size(139, 55);
this.btn_leftsafedoorunlock.TabIndex = 276;
this.btn_leftsafedoorunlock.Text = "左侧防护门解锁";
this.btn_leftsafedoorunlock.UseVisualStyleBackColor = false;
this.btn_leftsafedoorunlock.Click += new System.EventHandler(this.button5_Click_1);
//
// btn_printsafedoorunlock
//
this.btn_printsafedoorunlock.BackColor = System.Drawing.Color.White;
this.btn_printsafedoorunlock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_printsafedoorunlock.Location = new System.Drawing.Point(438, 137);
this.btn_printsafedoorunlock.Name = "btn_printsafedoorunlock";
this.btn_printsafedoorunlock.Size = new System.Drawing.Size(139, 56);
this.btn_printsafedoorunlock.TabIndex = 277;
this.btn_printsafedoorunlock.Text = "打印维护门解锁";
this.btn_printsafedoorunlock.UseVisualStyleBackColor = false;
this.btn_printsafedoorunlock.Click += new System.EventHandler(this.button2_Click_2);
//
// btn_rightsafedoorunlock
//
this.btn_rightsafedoorunlock.BackColor = System.Drawing.Color.White;
this.btn_rightsafedoorunlock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_rightsafedoorunlock.Location = new System.Drawing.Point(438, 75);
this.btn_rightsafedoorunlock.Name = "btn_rightsafedoorunlock";
this.btn_rightsafedoorunlock.Size = new System.Drawing.Size(139, 56);
this.btn_rightsafedoorunlock.TabIndex = 275;
this.btn_rightsafedoorunlock.Text = "右侧防护门解锁";
this.btn_rightsafedoorunlock.UseVisualStyleBackColor = false;
this.btn_rightsafedoorunlock.Click += new System.EventHandler(this.button2_Click_1);
//
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox1.Location = new System.Drawing.Point(3, 515);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(451, 271);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 271;
this.pictureBox1.TabStop = false;
this.pictureBox1.Visible = false;
this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
//
// pictureBox2
//
this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox2.Location = new System.Drawing.Point(460, 515);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(436, 271);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 270;
this.pictureBox2.TabStop = false;
this.pictureBox2.Visible = false;
this.pictureBox2.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
//
// groupBox2
//
this.groupBox2.Controls.Add(this.NgInfoView);
this.groupBox2.Location = new System.Drawing.Point(3, 792);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(598, 244);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "NG信息";
this.groupBox2.Visible = false;
//
// NgInfoView
//
this.NgInfoView.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.NgInfoView.Dock = System.Windows.Forms.DockStyle.Fill;
this.NgInfoView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.NgInfoView.HideSelection = false;
this.NgInfoView.Location = new System.Drawing.Point(3, 25);
this.NgInfoView.MultiSelect = false;
this.NgInfoView.Name = "NgInfoView";
this.NgInfoView.Size = new System.Drawing.Size(592, 216);
this.NgInfoView.TabIndex = 0;
this.NgInfoView.UseCompatibleStateImageBehavior = false;
// //
// listView1 // listView1
// //
...@@ -460,7 +491,7 @@ namespace TheMachine ...@@ -460,7 +491,7 @@ namespace TheMachine
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1008, 729); this.ClientSize = new System.Drawing.Size(1008, 1168);
this.Controls.Add(this.tabc); this.Controls.Add(this.tabc);
this.Controls.Add(this.listView1); this.Controls.Add(this.listView1);
this.Controls.Add(this.btn_stop); this.Controls.Add(this.btn_stop);
...@@ -480,10 +511,15 @@ namespace TheMachine ...@@ -480,10 +511,15 @@ namespace TheMachine
this.tabP1.ResumeLayout(false); this.tabP1.ResumeLayout(false);
this.pnl.ResumeLayout(false); this.pnl.ResumeLayout(false);
this.pnl.PerformLayout(); this.pnl.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.panr1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.pnlcontrol.ResumeLayout(false);
this.pnlcontrol.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.groupBox2.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -512,7 +548,7 @@ namespace TheMachine ...@@ -512,7 +548,7 @@ namespace TheMachine
private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Button btn_IgnoreX09; private System.Windows.Forms.Button btn_IgnoreX09;
private System.Windows.Forms.Panel pnl; private System.Windows.Forms.FlowLayoutPanel pnl;
private System.Windows.Forms.ToolStripMenuItem 语言toolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 语言toolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 简体中文ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 简体中文ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem englishToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem englishToolStripMenuItem;
...@@ -525,6 +561,9 @@ namespace TheMachine ...@@ -525,6 +561,9 @@ namespace TheMachine
private System.Windows.Forms.CheckBox cb_cycledemo; private System.Windows.Forms.CheckBox cb_cycledemo;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.ListView NgInfoView; private System.Windows.Forms.ListView NgInfoView;
private System.Windows.Forms.Panel panr1;
private System.Windows.Forms.Panel pnlcontrol;
private System.Windows.Forms.Panel panel1;
} }
} }
TheMachine/Form1.cs
...@@ -95,10 +95,10 @@ namespace TheMachine ...@@ -95,10 +95,10 @@ namespace TheMachine
emptycol.Width = 0; emptycol.Width = 0;
ColumnHeader msgcol = new ColumnHeader(); ColumnHeader msgcol = new ColumnHeader();
msgcol.Text = crc.GetString("Res0001","信息"); msgcol.Text = crc.GetString("Res0001","信息");
msgcol.Width = 530; msgcol.Width = 800;
ColumnHeader timecol = new ColumnHeader(); ColumnHeader timecol = new ColumnHeader();
timecol.Text = crc.GetString("Res0002","时间"); timecol.Text = crc.GetString("Res0002","时间");
timecol.Width = 150; timecol.Width = 80;
listView1.Columns.Add(emptycol); listView1.Columns.Add(emptycol);
listView1.Columns.Add(timecol); listView1.Columns.Add(timecol);
listView1.Columns.Add(msgcol); listView1.Columns.Add(msgcol);
...@@ -420,7 +420,7 @@ namespace TheMachine ...@@ -420,7 +420,7 @@ namespace TheMachine
if (string.IsNullOrEmpty(msg.msgtxt) || msg.datetime==null) if (string.IsNullOrEmpty(msg.msgtxt) || msg.datetime==null)
continue; continue;
ListViewItem lvi = new ListViewItem(new string[] { "", msg.datetime.ToString(), msg.msgtxt }); ListViewItem lvi = new ListViewItem(new string[] { "", msg.datetime.ToString("HH:mm:ss"), msg.msgtxt });
if (msg.msgLevel == MsgLevel.info) if (msg.msgLevel == MsgLevel.info)
lvi.ForeColor = Color.DarkGreen; lvi.ForeColor = Color.DarkGreen;
else else
......
TheMachine/IOControls.Designer.cs
...@@ -51,13 +51,13 @@ namespace TheMachine ...@@ -51,13 +51,13 @@ namespace TheMachine
this.cylinderButton3 = new TheMachine.CylinderButton(); this.cylinderButton3 = new TheMachine.CylinderButton();
this.cylinderButton14 = new TheMachine.CylinderButton(); this.cylinderButton14 = new TheMachine.CylinderButton();
this.cylinderButton4 = new TheMachine.CylinderButton(); this.cylinderButton4 = new TheMachine.CylinderButton();
this.cylinderButton9 = new TheMachine.CylinderButton();
this.cylinderButton16 = new TheMachine.CylinderButton(); this.cylinderButton16 = new TheMachine.CylinderButton();
this.cylinderButton7 = new TheMachine.CylinderButton(); this.cylinderButton7 = new TheMachine.CylinderButton();
this.cylinderButton15 = new TheMachine.CylinderButton(); this.cylinderButton15 = new TheMachine.CylinderButton();
this.cylinderButton13 = new TheMachine.CylinderButton(); this.cylinderButton13 = new TheMachine.CylinderButton();
this.cylinderButton11 = new TheMachine.CylinderButton(); this.cylinderButton11 = new TheMachine.CylinderButton();
this.ioControl1 = new TheMachine.IOControl(); this.ioControl1 = new TheMachine.IOControl();
this.cylinderButton9 = new TheMachine.CylinderButton();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -370,6 +370,20 @@ namespace TheMachine ...@@ -370,6 +370,20 @@ namespace TheMachine
this.cylinderButton4.Text = "Entry_Drawer_Lock"; this.cylinderButton4.Text = "Entry_Drawer_Lock";
this.cylinderButton4.UseVisualStyleBackColor = false; this.cylinderButton4.UseVisualStyleBackColor = false;
// //
// cylinderButton9
//
this.cylinderButton9.BackColor = System.Drawing.Color.White;
this.cylinderButton9.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton9.IO_HIGH = "Label_PasteBlow";
this.cylinderButton9.IO_LOW = "";
this.cylinderButton9.Location = new System.Drawing.Point(739, 474);
this.cylinderButton9.Name = "cylinderButton9";
this.cylinderButton9.Size = new System.Drawing.Size(191, 35);
this.cylinderButton9.TabIndex = 1;
this.cylinderButton9.Tag = "not";
this.cylinderButton9.Text = "Label_PasteBlow";
this.cylinderButton9.UseVisualStyleBackColor = false;
//
// cylinderButton16 // cylinderButton16
// //
this.cylinderButton16.BackColor = System.Drawing.Color.White; this.cylinderButton16.BackColor = System.Drawing.Color.White;
...@@ -444,27 +458,14 @@ namespace TheMachine ...@@ -444,27 +458,14 @@ namespace TheMachine
// //
this.ioControl1.BackColor = System.Drawing.Color.White; this.ioControl1.BackColor = System.Drawing.Color.White;
this.ioControl1.Config = null; 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(0, 0);
this.ioControl1.Name = "ioControl1"; this.ioControl1.Name = "ioControl1";
this.ioControl1.Size = new System.Drawing.Size(975, 878); this.ioControl1.Size = new System.Drawing.Size(975, 881);
this.ioControl1.TabIndex = 0; this.ioControl1.TabIndex = 0;
this.ioControl1.Tag = "not"; this.ioControl1.Tag = "not";
this.ioControl1.Load += new System.EventHandler(this.ioControl1_Load); this.ioControl1.Load += new System.EventHandler(this.ioControl1_Load);
// //
// cylinderButton9
//
this.cylinderButton9.BackColor = System.Drawing.Color.White;
this.cylinderButton9.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton9.IO_HIGH = "Label_PasteBlow";
this.cylinderButton9.IO_LOW = "";
this.cylinderButton9.Location = new System.Drawing.Point(739, 474);
this.cylinderButton9.Name = "cylinderButton9";
this.cylinderButton9.Size = new System.Drawing.Size(191, 35);
this.cylinderButton9.TabIndex = 1;
this.cylinderButton9.Tag = "not";
this.cylinderButton9.Text = "Label_PasteBlow";
this.cylinderButton9.UseVisualStyleBackColor = false;
//
// IOControls // IOControls
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
TheMachine/IOControls.resx
...@@ -117,4 +117,94 @@ ...@@ -117,4 +117,94 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="btn_FlipEquip.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button10.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button9.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button8.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button7.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton8.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton10.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton12.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton14.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton9.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton16.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton7.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton15.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton13.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton11.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ioControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>
\ No newline at end of file \ No newline at end of file
TheMachine/SettingControl.Designer.cs
...@@ -33,24 +33,28 @@ namespace TheMachine ...@@ -33,24 +33,28 @@ namespace TheMachine
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage_set = new System.Windows.Forms.TabPage(); this.tabPage_set = new System.Windows.Forms.TabPage();
this.cb_labelingtestmoce = new System.Windows.Forms.CheckBox();
this.btn_testlabeling = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.btn_printertest = new System.Windows.Forms.Button(); this.btn_printertest = new System.Windows.Forms.Button();
this.btn_labeledit = new System.Windows.Forms.Button(); this.btn_labeledit = new System.Windows.Forms.Button();
this.cb_labelselect = new System.Windows.Forms.ComboBox(); this.cb_labelselect = new System.Windows.Forms.ComboBox();
this.uC_SetUserPassword1 = new TheMachine.UC_SetUserPassword();
this.tp = new System.Windows.Forms.TableLayoutPanel(); this.tp = new System.Windows.Forms.TableLayoutPanel();
this.lbl_Liquidstatus = new System.Windows.Forms.Label();
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.lbl_Liquidstatus = new System.Windows.Forms.Label();
this.tabPage_ledtower = new System.Windows.Forms.TabPage(); this.tabPage_ledtower = new System.Windows.Forms.TabPage();
this.btn_testlabeling = new System.Windows.Forms.Button();
this.cb_labelingtestmoce = new System.Windows.Forms.CheckBox();
this.uC_SetUserPassword1 = new TheMachine.UC_SetUserPassword();
this.uC_LedConfig1 = new TheMachine.UC.UC_LedConfig(); this.uC_LedConfig1 = new TheMachine.UC.UC_LedConfig();
this.panel1 = new System.Windows.Forms.Panel();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage_set.SuspendLayout(); this.tabPage_set.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.tp.SuspendLayout(); this.tp.SuspendLayout();
this.tabPage_ledtower.SuspendLayout(); this.tabPage_ledtower.SuspendLayout();
this.panel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -71,11 +75,7 @@ namespace TheMachine ...@@ -71,11 +75,7 @@ namespace TheMachine
// //
// tabPage_set // tabPage_set
// //
this.tabPage_set.Controls.Add(this.cb_labelingtestmoce); this.tabPage_set.Controls.Add(this.flowLayoutPanel1);
this.tabPage_set.Controls.Add(this.btn_testlabeling);
this.tabPage_set.Controls.Add(this.groupBox1);
this.tabPage_set.Controls.Add(this.uC_SetUserPassword1);
this.tabPage_set.Controls.Add(this.tp);
this.tabPage_set.Location = new System.Drawing.Point(4, 22); this.tabPage_set.Location = new System.Drawing.Point(4, 22);
this.tabPage_set.Name = "tabPage_set"; this.tabPage_set.Name = "tabPage_set";
this.tabPage_set.Padding = new System.Windows.Forms.Padding(3); this.tabPage_set.Padding = new System.Windows.Forms.Padding(3);
...@@ -85,13 +85,35 @@ namespace TheMachine ...@@ -85,13 +85,35 @@ namespace TheMachine
this.tabPage_set.UseVisualStyleBackColor = true; this.tabPage_set.UseVisualStyleBackColor = true;
this.tabPage_set.Click += new System.EventHandler(this.tabPage_set_Click); this.tabPage_set.Click += new System.EventHandler(this.tabPage_set_Click);
// //
// cb_labelingtestmoce
//
this.cb_labelingtestmoce.AutoSize = true;
this.cb_labelingtestmoce.Location = new System.Drawing.Point(6, 331);
this.cb_labelingtestmoce.Name = "cb_labelingtestmoce";
this.cb_labelingtestmoce.Size = new System.Drawing.Size(138, 16);
this.cb_labelingtestmoce.TabIndex = 14;
this.cb_labelingtestmoce.Text = "Labelling test mode";
this.cb_labelingtestmoce.UseVisualStyleBackColor = true;
this.cb_labelingtestmoce.CheckedChanged += new System.EventHandler(this.cb_labelingtestmoce_CheckedChanged);
//
// btn_testlabeling
//
this.btn_testlabeling.Enabled = false;
this.btn_testlabeling.Location = new System.Drawing.Point(6, 362);
this.btn_testlabeling.Name = "btn_testlabeling";
this.btn_testlabeling.Size = new System.Drawing.Size(201, 38);
this.btn_testlabeling.TabIndex = 13;
this.btn_testlabeling.Text = "Test the labeling once";
this.btn_testlabeling.UseVisualStyleBackColor = true;
this.btn_testlabeling.Click += new System.EventHandler(this.btn_testlabeling_Click);
//
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.btn_printertest); this.groupBox1.Controls.Add(this.btn_printertest);
this.groupBox1.Controls.Add(this.btn_labeledit); this.groupBox1.Controls.Add(this.btn_labeledit);
this.groupBox1.Controls.Add(this.cb_labelselect); this.groupBox1.Controls.Add(this.cb_labelselect);
this.groupBox1.Location = new System.Drawing.Point(18, 201); this.groupBox1.Location = new System.Drawing.Point(6, 186);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(340, 126); this.groupBox1.Size = new System.Drawing.Size(340, 126);
this.groupBox1.TabIndex = 12; this.groupBox1.TabIndex = 12;
...@@ -135,6 +157,15 @@ namespace TheMachine ...@@ -135,6 +157,15 @@ namespace TheMachine
this.cb_labelselect.Size = new System.Drawing.Size(198, 20); this.cb_labelselect.Size = new System.Drawing.Size(198, 20);
this.cb_labelselect.TabIndex = 0; this.cb_labelselect.TabIndex = 0;
// //
// 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(484, 5);
this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5);
this.uC_SetUserPassword1.Name = "uC_SetUserPassword1";
this.uC_SetUserPassword1.Size = new System.Drawing.Size(482, 309);
this.uC_SetUserPassword1.TabIndex = 7;
//
// tp // tp
// //
this.tp.AutoSize = true; this.tp.AutoSize = true;
...@@ -144,7 +175,7 @@ namespace TheMachine ...@@ -144,7 +175,7 @@ namespace TheMachine
this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tp.Controls.Add(this.chbAutoRun, 0, 7); this.tp.Controls.Add(this.chbAutoRun, 0, 7);
this.tp.Controls.Add(this.lbl_Liquidstatus, 0, 4); this.tp.Controls.Add(this.lbl_Liquidstatus, 0, 4);
this.tp.Location = new System.Drawing.Point(18, 18); this.tp.Location = new System.Drawing.Point(6, 13);
this.tp.Name = "tp"; this.tp.Name = "tp";
this.tp.RowCount = 9; this.tp.RowCount = 9;
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
...@@ -159,18 +190,6 @@ namespace TheMachine ...@@ -159,18 +190,6 @@ namespace TheMachine
this.tp.Size = new System.Drawing.Size(136, 68); this.tp.Size = new System.Drawing.Size(136, 68);
this.tp.TabIndex = 6; this.tp.TabIndex = 6;
// //
// lbl_Liquidstatus
//
this.lbl_Liquidstatus.AutoSize = true;
this.tp.SetColumnSpan(this.lbl_Liquidstatus, 2);
this.lbl_Liquidstatus.Location = new System.Drawing.Point(10, 10);
this.lbl_Liquidstatus.Margin = new System.Windows.Forms.Padding(10);
this.lbl_Liquidstatus.Name = "lbl_Liquidstatus";
this.lbl_Liquidstatus.Size = new System.Drawing.Size(53, 12);
this.lbl_Liquidstatus.TabIndex = 5;
this.lbl_Liquidstatus.Tag = "not";
this.lbl_Liquidstatus.Text = "当前状态";
//
// chbAutoRun // chbAutoRun
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
...@@ -183,6 +202,18 @@ namespace TheMachine ...@@ -183,6 +202,18 @@ namespace TheMachine
this.chbAutoRun.Text = "开机自启动"; this.chbAutoRun.Text = "开机自启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
// //
// lbl_Liquidstatus
//
this.lbl_Liquidstatus.AutoSize = true;
this.tp.SetColumnSpan(this.lbl_Liquidstatus, 2);
this.lbl_Liquidstatus.Location = new System.Drawing.Point(10, 10);
this.lbl_Liquidstatus.Margin = new System.Windows.Forms.Padding(10);
this.lbl_Liquidstatus.Name = "lbl_Liquidstatus";
this.lbl_Liquidstatus.Size = new System.Drawing.Size(53, 12);
this.lbl_Liquidstatus.TabIndex = 5;
this.lbl_Liquidstatus.Tag = "not";
this.lbl_Liquidstatus.Text = "当前状态";
//
// tabPage_ledtower // tabPage_ledtower
// //
this.tabPage_ledtower.Controls.Add(this.uC_LedConfig1); this.tabPage_ledtower.Controls.Add(this.uC_LedConfig1);
...@@ -194,37 +225,6 @@ namespace TheMachine ...@@ -194,37 +225,6 @@ namespace TheMachine
this.tabPage_ledtower.Text = "灯塔设置"; this.tabPage_ledtower.Text = "灯塔设置";
this.tabPage_ledtower.UseVisualStyleBackColor = true; this.tabPage_ledtower.UseVisualStyleBackColor = true;
// //
// btn_testlabeling
//
this.btn_testlabeling.Enabled = false;
this.btn_testlabeling.Location = new System.Drawing.Point(18, 377);
this.btn_testlabeling.Name = "btn_testlabeling";
this.btn_testlabeling.Size = new System.Drawing.Size(201, 38);
this.btn_testlabeling.TabIndex = 13;
this.btn_testlabeling.Text = "Test the labeling once";
this.btn_testlabeling.UseVisualStyleBackColor = true;
this.btn_testlabeling.Click += new System.EventHandler(this.btn_testlabeling_Click);
//
// cb_labelingtestmoce
//
this.cb_labelingtestmoce.AutoSize = true;
this.cb_labelingtestmoce.Location = new System.Drawing.Point(18, 346);
this.cb_labelingtestmoce.Name = "cb_labelingtestmoce";
this.cb_labelingtestmoce.Size = new System.Drawing.Size(138, 16);
this.cb_labelingtestmoce.TabIndex = 14;
this.cb_labelingtestmoce.Text = "Labelling test mode";
this.cb_labelingtestmoce.UseVisualStyleBackColor = true;
this.cb_labelingtestmoce.CheckedChanged += new System.EventHandler(this.cb_labelingtestmoce_CheckedChanged);
//
// 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(540, 18);
this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5);
this.uC_SetUserPassword1.Name = "uC_SetUserPassword1";
this.uC_SetUserPassword1.Size = new System.Drawing.Size(533, 596);
this.uC_SetUserPassword1.TabIndex = 7;
//
// uC_LedConfig1 // uC_LedConfig1
// //
this.uC_LedConfig1.Config = null; this.uC_LedConfig1.Config = null;
...@@ -235,6 +235,27 @@ namespace TheMachine ...@@ -235,6 +235,27 @@ namespace TheMachine
this.uC_LedConfig1.TabIndex = 7; this.uC_LedConfig1.TabIndex = 7;
this.uC_LedConfig1.Tag = "not"; this.uC_LedConfig1.Tag = "not";
// //
// panel1
//
this.panel1.Controls.Add(this.tp);
this.panel1.Controls.Add(this.cb_labelingtestmoce);
this.panel1.Controls.Add(this.groupBox1);
this.panel1.Controls.Add(this.btn_testlabeling);
this.panel1.Location = new System.Drawing.Point(3, 3);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(473, 460);
this.panel1.TabIndex = 15;
//
// flowLayoutPanel1
//
this.flowLayoutPanel1.Controls.Add(this.panel1);
this.flowLayoutPanel1.Controls.Add(this.uC_SetUserPassword1);
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(1010, 708);
this.flowLayoutPanel1.TabIndex = 16;
//
// SettingControl // SettingControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -244,11 +265,13 @@ namespace TheMachine ...@@ -244,11 +265,13 @@ namespace TheMachine
this.Load += new System.EventHandler(this.SettingControl_Load); this.Load += new System.EventHandler(this.SettingControl_Load);
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage_set.ResumeLayout(false); this.tabPage_set.ResumeLayout(false);
this.tabPage_set.PerformLayout();
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.tp.ResumeLayout(false); this.tp.ResumeLayout(false);
this.tp.PerformLayout(); this.tp.PerformLayout();
this.tabPage_ledtower.ResumeLayout(false); this.tabPage_ledtower.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.flowLayoutPanel1.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -270,5 +293,7 @@ namespace TheMachine ...@@ -270,5 +293,7 @@ namespace TheMachine
private System.Windows.Forms.Label lbl_Liquidstatus; private System.Windows.Forms.Label lbl_Liquidstatus;
private System.Windows.Forms.Button btn_testlabeling; private System.Windows.Forms.Button btn_testlabeling;
private System.Windows.Forms.CheckBox cb_labelingtestmoce; private System.Windows.Forms.CheckBox cb_labelingtestmoce;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
} }
} }
TheMachine/UC/IOControl.Designer.cs
...@@ -41,9 +41,11 @@ namespace TheMachine ...@@ -41,9 +41,11 @@ namespace TheMachine
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.txtDOIndex = new System.Windows.Forms.TextBox(); this.txtDOIndex = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.flp = new System.Windows.Forms.FlowLayoutPanel();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.flp.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// tableLayoutPanel1 // tableLayoutPanel1
...@@ -59,7 +61,7 @@ namespace TheMachine ...@@ -59,7 +61,7 @@ namespace TheMachine
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 340); this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 542);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
this.tableLayoutPanel1.Tag = "not"; this.tableLayoutPanel1.Tag = "not";
// //
...@@ -76,18 +78,16 @@ namespace TheMachine ...@@ -76,18 +78,16 @@ namespace TheMachine
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(244, 340); this.tableLayoutPanel2.Size = new System.Drawing.Size(264, 542);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
this.tableLayoutPanel2.Tag = "not"; this.tableLayoutPanel2.Tag = "not";
// //
// groupBox4 // 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.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(262, 3); this.groupBox4.Location = new System.Drawing.Point(264, 3);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(255, 360); this.groupBox4.Size = new System.Drawing.Size(275, 562);
this.groupBox4.TabIndex = 110; this.groupBox4.TabIndex = 110;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -171,12 +171,10 @@ namespace TheMachine ...@@ -171,12 +171,10 @@ namespace TheMachine
// //
// groupBox3 // groupBox3
// //
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.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(3, 3); this.groupBox3.Location = new System.Drawing.Point(3, 3);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(255, 360); this.groupBox3.Size = new System.Drawing.Size(255, 562);
this.groupBox3.TabIndex = 109; this.groupBox3.TabIndex = 109;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -194,8 +192,6 @@ namespace TheMachine ...@@ -194,8 +192,6 @@ namespace TheMachine
// //
// groupBox1 // 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.Controls.Add(this.btnOpenDo); this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.btnCloseDO); this.groupBox1.Controls.Add(this.btnCloseDO);
this.groupBox1.Controls.Add(this.txtDOIndex); this.groupBox1.Controls.Add(this.txtDOIndex);
...@@ -204,26 +200,36 @@ namespace TheMachine ...@@ -204,26 +200,36 @@ namespace TheMachine
this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.cmbWriteIO); 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.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(545, 3);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(361, 360); this.groupBox1.Size = new System.Drawing.Size(311, 562);
this.groupBox1.TabIndex = 111; this.groupBox1.TabIndex = 111;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
// //
// flp
//
this.flp.Controls.Add(this.groupBox3);
this.flp.Controls.Add(this.groupBox4);
this.flp.Controls.Add(this.groupBox1);
this.flp.Dock = System.Windows.Forms.DockStyle.Fill;
this.flp.Location = new System.Drawing.Point(0, 0);
this.flp.Name = "flp";
this.flp.Size = new System.Drawing.Size(931, 568);
this.flp.TabIndex = 112;
//
// IOControl // IOControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupBox4); this.Controls.Add(this.flp);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox1);
this.Name = "IOControl"; this.Name = "IOControl";
this.Size = new System.Drawing.Size(911, 366); this.Size = new System.Drawing.Size(931, 568);
this.Load += new System.EventHandler(this.IOControl_Load); this.Load += new System.EventHandler(this.IOControl_Load);
this.groupBox4.ResumeLayout(false); this.groupBox4.ResumeLayout(false);
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.flp.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -242,5 +248,6 @@ namespace TheMachine ...@@ -242,5 +248,6 @@ namespace TheMachine
private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.TextBox txtDOIndex; private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.FlowLayoutPanel flp;
} }
} }
TheMachine/UC/StorePosControl.designer.cs
...@@ -71,8 +71,8 @@ namespace TheMachine ...@@ -71,8 +71,8 @@ namespace TheMachine
// //
// btnSavePos // btnSavePos
// //
this.btnSavePos.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnSavePos.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnSavePos.Location = new System.Drawing.Point(424, 311); this.btnSavePos.Location = new System.Drawing.Point(4, 307);
this.btnSavePos.Margin = new System.Windows.Forms.Padding(4); this.btnSavePos.Margin = new System.Windows.Forms.Padding(4);
this.btnSavePos.Name = "btnSavePos"; this.btnSavePos.Name = "btnSavePos";
this.btnSavePos.Size = new System.Drawing.Size(170, 31); this.btnSavePos.Size = new System.Drawing.Size(170, 31);
......
TheMachine/UC/uc_boxdebug.Designer.cs
...@@ -31,6 +31,7 @@ namespace TheMachine ...@@ -31,6 +31,7 @@ namespace TheMachine
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
this.groupInout = new System.Windows.Forms.GroupBox(); this.groupInout = new System.Windows.Forms.GroupBox();
this.btn_autoinout = new System.Windows.Forms.Button();
this.cb_inoutdebugmode = new System.Windows.Forms.CheckBox(); this.cb_inoutdebugmode = new System.Windows.Forms.CheckBox();
this.btnInStore = new System.Windows.Forms.Button(); this.btnInStore = new System.Windows.Forms.Button();
this.btnOutStore = new System.Windows.Forms.Button(); this.btnOutStore = new System.Windows.Forms.Button();
...@@ -40,7 +41,6 @@ namespace TheMachine ...@@ -40,7 +41,6 @@ namespace TheMachine
this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.label_verify = new System.Windows.Forms.Label(); this.label_verify = new System.Windows.Forms.Label();
this.storePosControl1 = new TheMachine.StorePosControl(); this.storePosControl1 = new TheMachine.StorePosControl();
this.btn_autoinout = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
...@@ -59,6 +59,20 @@ namespace TheMachine ...@@ -59,6 +59,20 @@ namespace TheMachine
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
// //
// btn_autoinout
//
this.btn_autoinout.BackColor = System.Drawing.SystemColors.Control;
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.Name = "btn_autoinout";
this.btn_autoinout.Size = new System.Drawing.Size(173, 32);
this.btn_autoinout.TabIndex = 104;
this.btn_autoinout.Text = "自动库位测试";
this.btn_autoinout.UseVisualStyleBackColor = false;
this.btn_autoinout.Click += new System.EventHandler(this.btn_autoinout_Click);
//
// cb_inoutdebugmode // cb_inoutdebugmode
// //
this.cb_inoutdebugmode.AutoSize = true; this.cb_inoutdebugmode.AutoSize = true;
...@@ -163,30 +177,16 @@ namespace TheMachine ...@@ -163,30 +177,16 @@ namespace TheMachine
this.storePosControl1.Location = new System.Drawing.Point(266, 315); this.storePosControl1.Location = new System.Drawing.Point(266, 315);
this.storePosControl1.Margin = new System.Windows.Forms.Padding(4); this.storePosControl1.Margin = new System.Windows.Forms.Padding(4);
this.storePosControl1.Name = "storePosControl1"; this.storePosControl1.Name = "storePosControl1";
this.storePosControl1.Size = new System.Drawing.Size(711, 210); this.storePosControl1.Size = new System.Drawing.Size(693, 210);
this.storePosControl1.TabIndex = 227; this.storePosControl1.TabIndex = 227;
this.storePosControl1.Tag = "not"; this.storePosControl1.Tag = "not";
// //
// btn_autoinout
//
this.btn_autoinout.BackColor = System.Drawing.SystemColors.Control;
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.Name = "btn_autoinout";
this.btn_autoinout.Size = new System.Drawing.Size(173, 32);
this.btn_autoinout.TabIndex = 104;
this.btn_autoinout.Text = "自动库位测试";
this.btn_autoinout.UseVisualStyleBackColor = false;
this.btn_autoinout.Click += new System.EventHandler(this.btn_autoinout_Click);
//
// button1 // button1
// //
this.button1.BackColor = System.Drawing.SystemColors.Control; this.button1.BackColor = System.Drawing.SystemColors.Control;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(266, 488); this.button1.Location = new System.Drawing.Point(469, 488);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(173, 32); this.button1.Size = new System.Drawing.Size(173, 32);
this.button1.TabIndex = 105; this.button1.TabIndex = 105;
......
TheMachine/VisionStoreDetect.Designer.cs
...@@ -86,7 +86,7 @@ namespace TheMachine ...@@ -86,7 +86,7 @@ namespace TheMachine
// //
// TestALL // TestALL
// //
this.TestALL.Location = new System.Drawing.Point(741, 13); this.TestALL.Location = new System.Drawing.Point(3, 529);
this.TestALL.Name = "TestALL"; this.TestALL.Name = "TestALL";
this.TestALL.Size = new System.Drawing.Size(94, 35); this.TestALL.Size = new System.Drawing.Size(94, 35);
this.TestALL.TabIndex = 1; this.TestALL.TabIndex = 1;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!