Skip to content

李娜 / Line-Smart-Workstation

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

界面调整

1 个父辈 3faecd08
内嵌 并排
正在显示 5 个修改的文件 包含 263 行增加 和 187 行删除
Common/Setting_NInit.cs
......@@ -82,7 +82,9 @@ namespace TSA_V.Common
[MyConfigComment("侧挡气缸是否先移动")]
public static MyConfig<bool> Device_SideCylinderMoveFirst =true;
[MyConfigComment("离线编程模式，自动进入过板模式")]
public static MyConfig<bool> Device_AutoGuoBan = false ;
public static MyConfig<bool> Device_AutoGuoBan = false;
[MyConfigComment("是否启用手势监控")]
public static MyConfig<bool> Device_HandsVideo= false ;
......
TSA-V/Properties/Resource.zh-CN.resx
......@@ -2176,7 +2176,7 @@
<value>元器件数量不足，请及时补充</value>
</data>
<data name="FrmDeviceConfig_groupBox3_Text" xml:space="preserve">
<value>数据上传测试</value>
<value>HTTP接口测试</value>
</data>
<data name="FrmDeviceConfig_btnTest_Text" xml:space="preserve">
<value>发送数据测试</value>
......@@ -2644,11 +2644,11 @@
<data name = "Type13" xml:space = "preserve"> <value> 极性_左下方 </value> </data>
<data name = "Type14" xml:space = "preserve"> <value> 极性_右下方 </value> </data>
<data name = "FrmBoardInfo_btnColorChange_Text" xml:space = "preserve"> <value> 投影颜色 </value> </data>
<data name = "FrmBoardInfo_btnCalibrate_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "FrmBoardInfo_btnCalibrate_Text" xml:space = "preserve"> <value> 校准 </value> </data>
<data name = "CalMsg1" xml:space = "preserve"> <value> 第一步：请将光标移动至如图示电路板左上角位置，确认后点击设置按钮 </value> </data>
<data name = "FrmCalibrate_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "FrmCalibrate_Text" xml:space = "preserve"> <value> 校准 </value> </data>
<data name = "FrmCalibrate_groupBox2_Text" xml:space = "preserve"> <value> 图示 </value> </data>
<data name = "FrmCalibrate_groupBox1_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "FrmCalibrate_groupBox1_Text" xml:space = "preserve"> <value> 校准 </value> </data>
<data name = "FrmCalibrate_btnExit_Text" xml:space = "preserve"> <value> 退出 </value> </data>
<data name = "FrmCalibrate_btnCal_Text" xml:space = "preserve"> <value> 开始校准 </value> </data>
<data name = "FrmCalibrate_btnRightBottom_Text" xml:space = "preserve"> <value> 设置为右下角位置 </value> </data>
......@@ -2700,7 +2700,7 @@
<data name = "FrmDeviceConfig_chbDisBottomCylinder_Text" xml:space = "preserve"> <value> 禁用底部气缸 </value> </data>
<data name = "FrmAddBoard_chbShowText_Text" xml:space = "preserve"> <value> 默认设置位号为投影文字 </value> </data>
<data name = "FrmAddBoard_groupBox4_Text" xml:space = "preserve"> <value> 点位默认设置 </value> </data>
<data name = "FrmAddBoard_label10_Text" xml:space = "preserve"> <value> 宽度→： </value> </data>
<data name = "FrmAddBoard_label10_Text" xml:space = "preserve"> <value> 宽→： </value> </data>
<data name = "FrmAddBoard_rdbData_Text" xml:space = "preserve"> <value> 数据表上传 </value> </data>
<data name = "FrmBoardInfo_linkDis_Text" xml:space = "preserve"> <value> 批量禁用 </value> </data>
<data name = "FrmBoardInfo_linkEnable_Text" xml:space = "preserve"> <value> 批量启用 </value> </data>
......
TSA-V/workForm/FrmTSAV.Designer.cs
......@@ -47,6 +47,11 @@
this.btnTest = new System.Windows.Forms.Button();
this.btnStart = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPartNum = new System.Windows.Forms.Label();
this.lblPositionNum = new System.Windows.Forms.Label();
this.lblComDes = new System.Windows.Forms.Label();
this.lblComName = new System.Windows.Forms.Label();
this.lblPointName = new System.Windows.Forms.Label();
this.lblStart = new System.Windows.Forms.Label();
this.lblLast = new System.Windows.Forms.Label();
this.btnCancel = new System.Windows.Forms.Button();
......@@ -54,25 +59,24 @@
this.lblComNotices = new System.Windows.Forms.Label();
this.txtCount = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.lblPartNum = new System.Windows.Forms.Label();
this.btnUpateCount = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
this.lblCount = new System.Windows.Forms.Label();
this.lblPositionNum = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.lblComDes = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.lblComName = new System.Windows.Forms.Label();
this.lblPointName = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
this.btnCamera = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.panPoint = new System.Windows.Forms.Panel();
this.picPoint = new System.Windows.Forms.PictureBox();
this.gbBoardInfo = new System.Windows.Forms.GroupBox();
this.groupBoard = new System.Windows.Forms.GroupBox();
this.panBoard = new System.Windows.Forms.Panel();
this.picBoard = new System.Windows.Forms.PictureBox();
this.btnCamera = new System.Windows.Forms.Button();
this.groupHand = new System.Windows.Forms.GroupBox();
this.panHand = new System.Windows.Forms.Panel();
this.lblNotices = new System.Windows.Forms.Label();
this.btnStartWorking = new System.Windows.Forms.Button();
this.btnGoHome = new System.Windows.Forms.Button();
this.btnPrePoint = new System.Windows.Forms.Button();
......@@ -91,20 +95,19 @@
this.料格编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.系统ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lblNotices = new System.Windows.Forms.Label();
this.lblBoardPoint = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.lblMsg = new System.Windows.Forms.Label();
this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panPoint.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picPoint)).BeginInit();
this.gbBoardInfo.SuspendLayout();
this.groupBoard.SuspendLayout();
this.panBoard.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picBoard)).BeginInit();
this.groupHand.SuspendLayout();
this.panHand.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// timer
......@@ -119,12 +122,12 @@
//
// btnIo
//
this.btnIo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnIo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnIo.BackColor = System.Drawing.SystemColors.WindowFrame;
this.btnIo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnIo.FlatAppearance.BorderSize = 0;
this.btnIo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIo.Location = new System.Drawing.Point(1426, 766);
this.btnIo.Location = new System.Drawing.Point(-2, 619);
this.btnIo.Name = "btnIo";
this.btnIo.Size = new System.Drawing.Size(51, 30);
this.btnIo.TabIndex = 280;
......@@ -133,11 +136,11 @@
//
// btnCodeTest
//
this.btnCodeTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCodeTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCodeTest.BackColor = System.Drawing.SystemColors.Control;
this.btnCodeTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCodeTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCodeTest.Location = new System.Drawing.Point(489, 705);
this.btnCodeTest.Location = new System.Drawing.Point(133, 557);
this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(120, 60);
this.btnCodeTest.TabIndex = 279;
......@@ -152,7 +155,7 @@
this.btnWorkInfo.BackColor = System.Drawing.SystemColors.Control;
this.btnWorkInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWorkInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWorkInfo.Location = new System.Drawing.Point(733, 705);
this.btnWorkInfo.Location = new System.Drawing.Point(515, 16);
this.btnWorkInfo.Name = "btnWorkInfo";
this.btnWorkInfo.Size = new System.Drawing.Size(120, 60);
this.btnWorkInfo.TabIndex = 278;
......@@ -162,6 +165,7 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.btnWorkInfo);
this.groupBox3.Controls.Add(this.lblGuoBan);
this.groupBox3.Controls.Add(this.lblPause);
this.groupBox3.Controls.Add(this.label8);
......@@ -186,7 +190,7 @@
this.lblGuoBan.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblGuoBan.Location = new System.Drawing.Point(13, 17);
this.lblGuoBan.Name = "lblGuoBan";
this.lblGuoBan.Size = new System.Drawing.Size(616, 64);
this.lblGuoBan.Size = new System.Drawing.Size(625, 64);
this.lblGuoBan.TabIndex = 285;
this.lblGuoBan.Text = "过板模式";
this.lblGuoBan.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -277,7 +281,7 @@
this.btnTest.BackColor = System.Drawing.SystemColors.Control;
this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTest.Location = new System.Drawing.Point(733, 705);
this.btnTest.Location = new System.Drawing.Point(335, 178);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(120, 60);
this.btnTest.TabIndex = 272;
......@@ -288,11 +292,11 @@
//
// btnStart
//
this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnStart.BackColor = System.Drawing.SystemColors.Control;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(855, 705);
this.btnStart.Location = new System.Drawing.Point(11, 557);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(120, 60);
this.btnStart.TabIndex = 266;
......@@ -302,25 +306,27 @@
//
// groupBox1
//
this.groupBox1.Controls.Add(this.lblPartNum);
this.groupBox1.Controls.Add(this.lblPositionNum);
this.groupBox1.Controls.Add(this.lblComDes);
this.groupBox1.Controls.Add(this.lblComName);
this.groupBox1.Controls.Add(this.lblPointName);
this.groupBox1.Controls.Add(this.lblStart);
this.groupBox1.Controls.Add(this.lblLast);
this.groupBox1.Controls.Add(this.btnTest);
this.groupBox1.Controls.Add(this.btnCancel);
this.groupBox1.Controls.Add(this.btnSave);
this.groupBox1.Controls.Add(this.lblComNotices);
this.groupBox1.Controls.Add(this.txtCount);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.lblPartNum);
this.groupBox1.Controls.Add(this.btnUpateCount);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.lblCount);
this.groupBox1.Controls.Add(this.lblPositionNum);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.lblComDes);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.lblComName);
this.groupBox1.Controls.Add(this.lblPointName);
this.groupBox1.Controls.Add(this.lblMsg);
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(12, 94);
this.groupBox1.Name = "groupBox1";
......@@ -329,6 +335,62 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "组装信息：";
//
// lblPartNum
//
this.lblPartNum.AutoSize = true;
this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPartNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPartNum.Location = new System.Drawing.Point(167, 20);
this.lblPartNum.Name = "lblPartNum";
this.lblPartNum.Size = new System.Drawing.Size(37, 20);
this.lblPartNum.TabIndex = 276;
this.lblPartNum.Text = "暂无";
//
// lblPositionNum
//
this.lblPositionNum.AutoSize = true;
this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPositionNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPositionNum.Location = new System.Drawing.Point(167, 83);
this.lblPositionNum.Name = "lblPositionNum";
this.lblPositionNum.Size = new System.Drawing.Size(37, 20);
this.lblPositionNum.TabIndex = 8;
this.lblPositionNum.Text = "暂无";
//
// lblComDes
//
this.lblComDes.AutoSize = true;
this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComDes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComDes.Location = new System.Drawing.Point(167, 153);
this.lblComDes.Name = "lblComDes";
this.lblComDes.Size = new System.Drawing.Size(37, 20);
this.lblComDes.TabIndex = 3;
this.lblComDes.Text = "暂无";
//
// lblComName
//
this.lblComName.AutoSize = true;
this.lblComName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComName.Location = new System.Drawing.Point(222, 182);
this.lblComName.Name = "lblComName";
this.lblComName.Size = new System.Drawing.Size(37, 20);
this.lblComName.TabIndex = 2;
this.lblComName.Text = "暂无";
this.lblComName.Visible = false;
//
// lblPointName
//
this.lblPointName.AutoSize = true;
this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPointName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPointName.Location = new System.Drawing.Point(167, 49);
this.lblPointName.Name = "lblPointName";
this.lblPointName.Size = new System.Drawing.Size(37, 20);
this.lblPointName.TabIndex = 1;
this.lblPointName.Text = "暂无";
//
// lblStart
//
this.lblStart.AutoSize = true;
......@@ -357,7 +419,7 @@
//
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(333, 67);
this.btnCancel.Location = new System.Drawing.Point(323, 108);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(68, 43);
this.btnCancel.TabIndex = 281;
......@@ -370,7 +432,7 @@
//
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(259, 67);
this.btnSave.Location = new System.Drawing.Point(254, 108);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(68, 43);
this.btnSave.TabIndex = 280;
......@@ -384,7 +446,7 @@
this.lblComNotices.AutoSize = true;
this.lblComNotices.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComNotices.ForeColor = System.Drawing.Color.Red;
this.lblComNotices.Location = new System.Drawing.Point(167, 165);
this.lblComNotices.Location = new System.Drawing.Point(167, 182);
this.lblComNotices.Name = "lblComNotices";
this.lblComNotices.Size = new System.Drawing.Size(37, 20);
this.lblComNotices.TabIndex = 279;
......@@ -393,7 +455,7 @@
// txtCount
//
this.txtCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCount.Location = new System.Drawing.Point(165, 74);
this.txtCount.Location = new System.Drawing.Point(165, 116);
this.txtCount.MaxLength = 6;
this.txtCount.Name = "txtCount";
this.txtCount.Size = new System.Drawing.Size(88, 26);
......@@ -412,22 +474,11 @@
this.label6.Text = "位号:";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblPartNum
//
this.lblPartNum.AutoSize = true;
this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPartNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPartNum.Location = new System.Drawing.Point(167, 20);
this.lblPartNum.Name = "lblPartNum";
this.lblPartNum.Size = new System.Drawing.Size(37, 20);
this.lblPartNum.TabIndex = 276;
this.lblPartNum.Text = "暂无";
//
// btnUpateCount
//
this.btnUpateCount.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpateCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpateCount.Location = new System.Drawing.Point(226, 153);
this.btnUpateCount.Location = new System.Drawing.Point(0, 187);
this.btnUpateCount.Name = "btnUpateCount";
this.btnUpateCount.Size = new System.Drawing.Size(117, 43);
this.btnUpateCount.TabIndex = 275;
......@@ -441,7 +492,7 @@
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(9, 78);
this.label5.Location = new System.Drawing.Point(9, 120);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(157, 19);
this.label5.TabIndex = 274;
......@@ -453,30 +504,19 @@
this.lblCount.AutoSize = true;
this.lblCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCount.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblCount.Location = new System.Drawing.Point(167, 78);
this.lblCount.Location = new System.Drawing.Point(167, 119);
this.lblCount.Name = "lblCount";
this.lblCount.Size = new System.Drawing.Size(37, 20);
this.lblCount.TabIndex = 273;
this.lblCount.Text = "暂无";
this.lblCount.DoubleClick += new System.EventHandler(this.lblCount_DoubleClick);
//
// lblPositionNum
//
this.lblPositionNum.AutoSize = true;
this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPositionNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPositionNum.Location = new System.Drawing.Point(167, 107);
this.lblPositionNum.Name = "lblPositionNum";
this.lblPositionNum.Size = new System.Drawing.Size(37, 20);
this.lblPositionNum.TabIndex = 8;
this.lblPositionNum.Text = "暂无";
//
// label4
//
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(9, 107);
this.label4.Location = new System.Drawing.Point(9, 83);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(157, 19);
this.label4.TabIndex = 7;
......@@ -488,30 +528,19 @@
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(9, 136);
this.label1.Location = new System.Drawing.Point(9, 153);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(157, 19);
this.label1.TabIndex = 6;
this.label1.Text = "描述：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblComDes
//
this.lblComDes.AutoSize = true;
this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComDes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComDes.Location = new System.Drawing.Point(167, 136);
this.lblComDes.Name = "lblComDes";
this.lblComDes.Size = new System.Drawing.Size(37, 20);
this.lblComDes.TabIndex = 3;
this.lblComDes.Text = "暂无";
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Red;
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(9, 165);
this.label2.Location = new System.Drawing.Point(9, 182);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(157, 19);
this.label2.TabIndex = 5;
......@@ -530,28 +559,29 @@
this.label3.Text = "名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblComName
// lblMsg
//
this.lblComName.AutoSize = true;
this.lblComName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComName.Location = new System.Drawing.Point(410, 165);
this.lblComName.Name = "lblComName";
this.lblComName.Size = new System.Drawing.Size(37, 20);
this.lblComName.TabIndex = 2;
this.lblComName.Text = "暂无";
this.lblComName.Visible = false;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(395, 18);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(240, 176);
this.lblMsg.TabIndex = 3;
this.lblMsg.Text = "未开始工作";
//
// lblPointName
// btnCamera
//
this.lblPointName.AutoSize = true;
this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPointName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPointName.Location = new System.Drawing.Point(167, 49);
this.lblPointName.Name = "lblPointName";
this.lblPointName.Size = new System.Drawing.Size(37, 20);
this.lblPointName.TabIndex = 1;
this.lblPointName.Text = "暂无";
this.btnCamera.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCamera.BackColor = System.Drawing.SystemColors.Control;
this.btnCamera.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamera.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamera.Location = new System.Drawing.Point(133, 557);
this.btnCamera.Name = "btnCamera";
this.btnCamera.Size = new System.Drawing.Size(120, 60);
this.btnCamera.TabIndex = 274;
this.btnCamera.Text = "AOI检测";
this.btnCamera.UseVisualStyleBackColor = false;
this.btnCamera.Click += new System.EventHandler(this.btnStopMove_Click);
//
// groupBox2
//
......@@ -559,9 +589,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.panPoint);
this.groupBox2.Location = new System.Drawing.Point(659, 2);
this.groupBox2.Location = new System.Drawing.Point(657, 2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(808, 697);
this.groupBox2.Size = new System.Drawing.Size(819, 646);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "局部图";
......@@ -574,7 +604,7 @@
this.panPoint.Controls.Add(this.picPoint);
this.panPoint.Location = new System.Drawing.Point(6, 17);
this.panPoint.Name = "panPoint";
this.panPoint.Size = new System.Drawing.Size(797, 673);
this.panPoint.Size = new System.Drawing.Size(808, 622);
this.panPoint.TabIndex = 3;
//
// picPoint
......@@ -584,23 +614,21 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.picPoint.Location = new System.Drawing.Point(0, 0);
this.picPoint.Name = "picPoint";
this.picPoint.Size = new System.Drawing.Size(761, 628);
this.picPoint.Size = new System.Drawing.Size(772, 577);
this.picPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picPoint.TabIndex = 2;
this.picPoint.TabStop = false;
//
// gbBoardInfo
// groupBoard
//
this.gbBoardInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.gbBoardInfo.Controls.Add(this.panBoard);
this.gbBoardInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.gbBoardInfo.Location = new System.Drawing.Point(12, 346);
this.gbBoardInfo.Name = "gbBoardInfo";
this.gbBoardInfo.Size = new System.Drawing.Size(641, 354);
this.gbBoardInfo.TabIndex = 0;
this.gbBoardInfo.TabStop = false;
this.gbBoardInfo.Text = "全局图(粉色表示已完成；橘色表示未开始；红色表示实时位置)";
this.groupBoard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.groupBoard.Controls.Add(this.panBoard);
this.groupBoard.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBoard.Location = new System.Drawing.Point(1031, 304);
this.groupBoard.Name = "groupBoard";
this.groupBoard.Size = new System.Drawing.Size(433, 272);
this.groupBoard.TabIndex = 0;
this.groupBoard.TabStop = false;
//
// panBoard
//
......@@ -608,9 +636,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(6, 18);
this.panBoard.Location = new System.Drawing.Point(5, 13);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(630, 329);
this.panBoard.Size = new System.Drawing.Size(424, 251);
this.panBoard.TabIndex = 3;
//
// picBoard
......@@ -620,32 +648,51 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.picBoard.Location = new System.Drawing.Point(1, 3);
this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(627, 261);
this.picBoard.Size = new System.Drawing.Size(421, 183);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picBoard.TabIndex = 1;
this.picBoard.TabStop = false;
this.picBoard.SizeChanged += new System.EventHandler(this.picBoard_SizeChanged);
//
// btnCamera
// groupHand
//
this.btnCamera.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCamera.BackColor = System.Drawing.SystemColors.Control;
this.btnCamera.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamera.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamera.Location = new System.Drawing.Point(611, 705);
this.btnCamera.Name = "btnCamera";
this.btnCamera.Size = new System.Drawing.Size(120, 60);
this.btnCamera.TabIndex = 274;
this.btnCamera.Text = "AOI检测";
this.btnCamera.UseVisualStyleBackColor = false;
this.btnCamera.Click += new System.EventHandler(this.btnStopMove_Click);
this.groupHand.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupHand.Controls.Add(this.panHand);
this.groupHand.Location = new System.Drawing.Point(11, 332);
this.groupHand.Name = "groupHand";
this.groupHand.Size = new System.Drawing.Size(642, 219);
this.groupHand.TabIndex = 4;
this.groupHand.TabStop = false;
this.groupHand.Text = "手势监控";
//
// panHand
//
this.panHand.Controls.Add(this.lblNotices);
this.panHand.Dock = System.Windows.Forms.DockStyle.Fill;
this.panHand.Location = new System.Drawing.Point(3, 17);
this.panHand.Name = "panHand";
this.panHand.Size = new System.Drawing.Size(636, 199);
this.panHand.TabIndex = 0;
//
// lblNotices
//
this.lblNotices.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblNotices.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblNotices.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblNotices.Location = new System.Drawing.Point(15, 13);
this.lblNotices.Name = "lblNotices";
this.lblNotices.Size = new System.Drawing.Size(568, 23);
this.lblNotices.TabIndex = 276;
this.lblNotices.Visible = false;
//
// btnStartWorking
//
this.btnStartWorking.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnStartWorking.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnStartWorking.BackColor = System.Drawing.SystemColors.Control;
this.btnStartWorking.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartWorking.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.btnStartWorking.Location = new System.Drawing.Point(977, 705);
this.btnStartWorking.Location = new System.Drawing.Point(133, 557);
this.btnStartWorking.Name = "btnStartWorking";
this.btnStartWorking.Size = new System.Drawing.Size(120, 60);
this.btnStartWorking.TabIndex = 263;
......@@ -655,11 +702,11 @@
//
// btnGoHome
//
this.btnGoHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnGoHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnGoHome.BackColor = System.Drawing.SystemColors.Control;
this.btnGoHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGoHome.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGoHome.Location = new System.Drawing.Point(855, 705);
this.btnGoHome.Location = new System.Drawing.Point(133, 556);
this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(120, 60);
this.btnGoHome.TabIndex = 273;
......@@ -669,11 +716,11 @@
//
// btnPrePoint
//
this.btnPrePoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnPrePoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnPrePoint.BackColor = System.Drawing.SystemColors.Control;
this.btnPrePoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPrePoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPrePoint.Location = new System.Drawing.Point(1099, 705);
this.btnPrePoint.Location = new System.Drawing.Point(255, 557);
this.btnPrePoint.Name = "btnPrePoint";
this.btnPrePoint.Size = new System.Drawing.Size(120, 60);
this.btnPrePoint.TabIndex = 272;
......@@ -683,11 +730,11 @@
//
// btnNextPoint
//
this.btnNextPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnNextPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnNextPoint.BackColor = System.Drawing.SystemColors.Control;
this.btnNextPoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNextPoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNextPoint.Location = new System.Drawing.Point(1221, 705);
this.btnNextPoint.Location = new System.Drawing.Point(377, 557);
this.btnNextPoint.Name = "btnNextPoint";
this.btnNextPoint.Size = new System.Drawing.Size(120, 60);
this.btnNextPoint.TabIndex = 271;
......@@ -697,11 +744,11 @@
//
// btnStop
//
this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnStop.BackColor = System.Drawing.SystemColors.Control;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(1343, 705);
this.btnStop.Location = new System.Drawing.Point(499, 557);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(120, 60);
this.btnStop.TabIndex = 270;
......@@ -810,70 +857,47 @@
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
this.退出ToolStripMenuItem.Text = "退出";
//
// lblNotices
//
this.lblNotices.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblNotices.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblNotices.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblNotices.Location = new System.Drawing.Point(15, 765);
this.lblNotices.Name = "lblNotices";
this.lblNotices.Size = new System.Drawing.Size(568, 23);
this.lblNotices.TabIndex = 276;
//
// lblBoardPoint
//
this.lblBoardPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblBoardPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBoardPoint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblBoardPoint.Location = new System.Drawing.Point(15, 738);
this.lblBoardPoint.Location = new System.Drawing.Point(50, 625);
this.lblBoardPoint.Name = "lblBoardPoint";
this.lblBoardPoint.Size = new System.Drawing.Size(568, 23);
this.lblBoardPoint.Size = new System.Drawing.Size(603, 23);
this.lblBoardPoint.TabIndex = 272;
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.panel1.Controls.Add(this.lblMsg);
this.panel1.Location = new System.Drawing.Point(12, 702);
this.panel1.Location = new System.Drawing.Point(628, 554);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(568, 63);
this.panel1.Size = new System.Drawing.Size(28, 63);
this.panel1.TabIndex = 269;
//
// lblMsg
//
this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(4, 5);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(68, 17);
this.lblMsg.TabIndex = 3;
this.lblMsg.Text = "未开始工作";
this.panel1.Visible = false;
//
// FrmWork
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1479, 797);
this.Controls.Add(this.btnIo);
this.ClientSize = new System.Drawing.Size(1479, 652);
this.Controls.Add(this.groupBoard);
this.Controls.Add(this.groupHand);
this.Controls.Add(this.btnCodeTest);
this.Controls.Add(this.btnWorkInfo);
this.Controls.Add(this.btnIo);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.btnTest);
this.Controls.Add(this.btnStart);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.gbBoardInfo);
this.Controls.Add(this.btnCamera);
this.Controls.Add(this.btnStartWorking);
this.Controls.Add(this.btnGoHome);
this.Controls.Add(this.btnPrePoint);
this.Controls.Add(this.btnNextPoint);
this.Controls.Add(this.btnStop);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.lblNotices);
this.Controls.Add(this.lblBoardPoint);
this.Controls.Add(this.btnCamera);
this.Controls.Add(this.panel1);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.menuStrip1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
......@@ -891,13 +915,13 @@
this.groupBox2.ResumeLayout(false);
this.panPoint.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picPoint)).EndInit();
this.gbBoardInfo.ResumeLayout(false);
this.groupBoard.ResumeLayout(false);
this.panBoard.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picBoard)).EndInit();
this.groupHand.ResumeLayout(false);
this.panHand.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -905,7 +929,7 @@
#endregion
private System.Windows.Forms.GroupBox gbBoardInfo;
private System.Windows.Forms.GroupBox groupBoard;
private System.Windows.Forms.Panel panBoard;
private System.Windows.Forms.PictureBox picBoard;
private System.Windows.Forms.Timer timer;
......@@ -970,5 +994,7 @@
private System.Windows.Forms.Button btnIo;
private System.Windows.Forms.Label lblPause;
private System.Windows.Forms.Label lblGuoBan;
private System.Windows.Forms.GroupBox groupHand;
private System.Windows.Forms.Panel panHand;
}
}
\ No newline at end of file
TSA-V/workForm/FrmTSAV.cs
using System;
using System.Drawing;
using System.Windows.Forms;
using MetroFramework.Forms;
using TSA_V.DeviceLibrary;
using TSA_V.Common;
using System.Timers;
using log4net;
using System.Reflection;
using System.IO;
using System.Threading;
using System.Collections.Generic;
using TSA_V.LoadCSVLibrary;
using PUSICANLibrary;
using System.Runtime.InteropServices;
using AOI;
using System.Threading.Tasks;
using System.Net.Http;
using System.Linq;
using System.Configuration;
namespace TSA_V
{
......@@ -35,9 +26,12 @@ namespace TSA_V
private BoardInfo board = BoardManager.CurrBoard;
private PointDisplay display = new PointDisplay();
private List<SMTPointInfo> workSmtList = new List<SMTPointInfo>();
private string needShowMsg = "";
private void FrmWelding_Load(object sender, EventArgs e)
{
FormProcess();
btnCamera.Visible = TSAVBean.IsNeedAOI;
TSAVBean.Work.WorkType = 1;
LanguageProcess();
......@@ -113,7 +107,8 @@ namespace TSA_V
if (CurrProject == null)
{
LogUtil.info("没有读取到AOI,结束,IsNeedAOI=true！");
MessageBox.Show(ResourceCulture.GetString("加载AOI失败"));
needShowMsg+= ResourceCulture.GetString("加载AOI失败")+"\r\n";
//MessageBox.Show(ResourceCulture.GetString("加载AOI失败"));
//this.Close();
}
}
......@@ -142,6 +137,26 @@ namespace TSA_V
// StatusClient.instance.SendNew(Color.Green, TSAVBean.Name + "进入待机状态");
}
private void FormProcess()
{
if (Setting_NInit.Device_HandsVideo)
{
groupHand.Visible = true;
groupBoard.Visible = true;
}
else
{
groupHand.Visible = false;
groupBoard.Visible = true;
groupBoard.Location = new Point(groupHand.Location.X, groupHand.Location.Y);
groupBoard.Size = new Size(groupHand.Width, groupHand.Height);
this.groupBoard.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
}
}
private AOI.AoiProject CurrProject = null;
private void LoadAoi()
{
......@@ -234,7 +249,8 @@ namespace TSA_V
{
lblMsg.Text = ResourceCulture.GetString(ResourceCulture.StartError, "启动失败") + "：" + str;
LogUtil.error("启动失败：" + str);
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str);
needShowMsg += ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str;
//MessageBox.Show(ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str);
}
}
timer.Start();
......@@ -244,6 +260,7 @@ namespace TSA_V
private Dictionary<int, double> pointXMap = new Dictionary<int, double>();
private Dictionary<int, double> pointYMap = new Dictionary<int, double>();
private Bitmap bitmap = null;
private bool isFirstLoad = true ;
private void loadPictureBoxSize(BoardInfo board)
{
display.LoadWorkFromPoint(board, smtPoint, true);
......@@ -395,7 +412,7 @@ namespace TSA_V
}
private void FormStatus()
{
btnSave.Visible = true;
btnSave.Visible = false ;
btnGoHome.Visible = true;
if (TSAVBean.Status <= (TSAVStatus.Wait))
{
......@@ -481,6 +498,12 @@ namespace TSA_V
display.SetPic(picBoard, panBoard);
if (board != null)
{
if (isFirstLoad&&Setting_NInit.Device_HandsVideo)
{
display.SetPicSize(board);
updateGroupSize();
isFirstLoad = false;
}
loadPictureBoxSize(board);
StartRun();
}
......@@ -489,6 +512,11 @@ namespace TSA_V
LogUtil.info(Name + " Shown end ");
WriteStateStr();
if (needShowMsg != "")
{
MessageBox.Show(needShowMsg);
}
}
catch (Exception ex)
{
......@@ -1079,14 +1107,15 @@ namespace TSA_V
private void WriteStateStr()
{
return;
//全局图(粉色表示已完成；橘色表示未开始；红色表示实时位置) 12, 327
//Graphics g = e.Graphics;
Graphics g= gbBoardInfo.CreateGraphics();
Graphics g= groupBoard.CreateGraphics();
Font f = new Font("微软雅黑", 10.5F);
string end = ResourceCulture.GetString(ResourceCulture.State_End, "已完成");
string notStart = ResourceCulture.GetString(ResourceCulture.State_NotStart, "未开始");
string postion = ResourceCulture.GetString(ResourceCulture.State_Postiion, "实时位置");
int width = gbBoardInfo.Size.Width;
int width = groupBoard.Size.Width;
g.DrawString(end, f, Brushes.HotPink, width-260, 0);
g.DrawString(notStart, f, Brushes.Orange, width-160, 0);
g.DrawString(postion, f, Brushes.Red, width-80, 0);
......@@ -1108,5 +1137,19 @@ namespace TSA_V
ShowUpdateCount(true);
}
}
private void picBoard_SizeChanged(object sender, EventArgs e)
{
}
private void updateGroupSize()
{
if (groupBoard.Size.Width > picBoard.Width && groupBoard.Size.Height > picBoard.Height)
{
groupBoard.Size = new Size(picBoard.Width + 6, picBoard.Height + 6);
groupBoard.Location = new Point(groupBox2.Location.X + groupBox2.Width - groupBoard.Width, groupBox2.Location.Y + groupBox2.Height - groupBoard.Height);
}
}
}
}
TSA-V/workForm/PointDisplay.cs
......@@ -42,8 +42,13 @@ namespace TSA_V
// picBoard.MouseWheel += picBoard_MouseWheel;
}
private void SetPicSize()
public void SetPicSize(BoardInfo board = null)
{
if (board != null)
{
this.Width = board.boardWidth;
this.Height = board.boardLength;
}
int xishu = 100;
picBoard.Width = Width * xishu;
picBoard.Height = Height * xishu;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!