Skip to content

李娜 / Line-Smart-Workstation

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

工作界面调整

1 个父辈 c0f10589
内嵌 并排
正在显示 4 个修改的文件 包含 121 行增加 和 93 行删除
TSA-V/Properties/Resource.en-US.resx
......@@ -2713,7 +2713,7 @@
<data name = "SureDeleteSel" xml:space = "preserve"> <value> OK to delete the selected data？ </value> </data>
<data name = "FrmBomViewer_linkDelete_Text" xml:space = "preserve"> <value> Batch Delete </value> </data>
<data name = "Column_ISUpdate" xml:space = "preserve"> <value> modified </value> </data>
<data name = "FrmWork_groupHand_Text" xml:space = "preserve"> <value> hand gesture monitoring </value> </data>
<data name = "FrmWork_groupHand_Text" xml:space = "preserve"> <value> Hand gesture monitoring </value> </data>
<data name = "handWork" xml:space = "preserve"> <value> Assembling </value> </data>
<data name = "handCount" xml:space = "preserve"> <value> Number </value> </data>
<data name = "handTime" xml:space = "preserve"> <value> Total Time </value> </data>
......
TSA-V/workForm/FrmAOICheck.cs
......@@ -53,11 +53,31 @@ namespace TSA_V
this.Close();
return;
}
else
{
string currProjectName = BoardManager.CurrBoard.GetAoiFileName();
//string filePath = Application.StartupPath + @"\config\\AOIConfig" + currProjectName + "bmp";
string extension = Path.GetExtension(currProjectName);
string filename = currProjectName.Replace(extension, ".bmp");
ShowBaseImg(filename,"Base");
}
lblCurrWorkTime.Text = ResourceCulture.GetString("{0}秒后自动检测", "{0}秒后自动检测", waitSeconds.ToString());
修正ToolStripMenuItem.Text = ResourceCulture.GetString("FrmAOICheck_btnUpdateImg_Text", "修正");
// this.picResult.Image = CurrProject.standardImage;
}
private void ShowBaseImg(string filePath,string Text)
{
if (File.Exists(filePath))
{
var bmp = new Bitmap(filePath);
this.picResult.Image= Eyemlib.DeepClone(bmp);
bmp.Dispose();
}
}
private void FormStatus(bool open)
{
}
......
TSA-V/workForm/FrmTSAV.Designer.cs
......@@ -66,8 +66,8 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
this.btnCamera = new System.Windows.Forms.Button();
this.lblMsg = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.panPoint = new System.Windows.Forms.Panel();
this.picPoint = new System.Windows.Forms.PictureBox();
......@@ -79,6 +79,7 @@
this.lblHandInfo = new System.Windows.Forms.Label();
this.picHandsVideo = new System.Windows.Forms.PictureBox();
this.lblNotices = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.btnStartWorking = new System.Windows.Forms.Button();
this.btnGoHome = new System.Windows.Forms.Button();
this.btnPrePoint = new System.Windows.Forms.Button();
......@@ -98,7 +99,6 @@
this.系统ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lblBoardPoint = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -125,12 +125,12 @@
//
// btnIo
//
this.btnIo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnIo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(-2, 619);
this.btnIo.Location = new System.Drawing.Point(567, 583);
this.btnIo.Name = "btnIo";
this.btnIo.Size = new System.Drawing.Size(51, 30);
this.btnIo.TabIndex = 280;
......@@ -139,11 +139,11 @@
//
// btnCodeTest
//
this.btnCodeTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCodeTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(133, 557);
this.btnCodeTest.Location = new System.Drawing.Point(744, 583);
this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(120, 60);
this.btnCodeTest.TabIndex = 279;
......@@ -158,7 +158,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(515, 16);
this.btnWorkInfo.Location = new System.Drawing.Point(866, 583);
this.btnWorkInfo.Name = "btnWorkInfo";
this.btnWorkInfo.Size = new System.Drawing.Size(120, 60);
this.btnWorkInfo.TabIndex = 278;
......@@ -168,7 +168,6 @@
//
// 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);
......@@ -284,7 +283,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(335, 178);
this.btnTest.Location = new System.Drawing.Point(744, 583);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(120, 60);
this.btnTest.TabIndex = 272;
......@@ -295,11 +294,11 @@
//
// btnStart
//
this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(12, 557);
this.btnStart.Location = new System.Drawing.Point(988, 583);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(120, 60);
this.btnStart.TabIndex = 266;
......@@ -316,13 +315,11 @@
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.btnCamera);
this.groupBox1.Controls.Add(this.btnUpateCount);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.lblCount);
......@@ -330,11 +327,10 @@
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.label3);
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";
this.groupBox1.Size = new System.Drawing.Size(641, 237);
this.groupBox1.Size = new System.Drawing.Size(641, 175);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "组装信息：";
......@@ -355,7 +351,7 @@
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.Location = new System.Drawing.Point(167, 53);
this.lblPositionNum.Name = "lblPositionNum";
this.lblPositionNum.Size = new System.Drawing.Size(37, 20);
this.lblPositionNum.TabIndex = 8;
......@@ -366,7 +362,7 @@
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.Location = new System.Drawing.Point(168, 87);
this.lblComDes.Name = "lblComDes";
this.lblComDes.Size = new System.Drawing.Size(37, 20);
this.lblComDes.TabIndex = 3;
......@@ -377,7 +373,7 @@
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.Location = new System.Drawing.Point(223, 116);
this.lblComName.Name = "lblComName";
this.lblComName.Size = new System.Drawing.Size(37, 20);
this.lblComName.TabIndex = 2;
......@@ -389,7 +385,7 @@
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.Location = new System.Drawing.Point(468, 20);
this.lblPointName.Name = "lblPointName";
this.lblPointName.Size = new System.Drawing.Size(37, 20);
this.lblPointName.TabIndex = 1;
......@@ -400,7 +396,7 @@
this.lblStart.AutoSize = true;
this.lblStart.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStart.ForeColor = System.Drawing.Color.Olive;
this.lblStart.Location = new System.Drawing.Point(15, 207);
this.lblStart.Location = new System.Drawing.Point(16, 141);
this.lblStart.Name = "lblStart";
this.lblStart.Size = new System.Drawing.Size(314, 22);
this.lblStart.TabIndex = 283;
......@@ -412,7 +408,7 @@
this.lblLast.AutoSize = true;
this.lblLast.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLast.ForeColor = System.Drawing.Color.Olive;
this.lblLast.Location = new System.Drawing.Point(15, 208);
this.lblLast.Location = new System.Drawing.Point(16, 142);
this.lblLast.Name = "lblLast";
this.lblLast.Size = new System.Drawing.Size(282, 22);
this.lblLast.TabIndex = 282;
......@@ -423,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(323, 108);
this.btnCancel.Location = new System.Drawing.Point(522, 87);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(68, 43);
this.btnCancel.TabIndex = 281;
......@@ -436,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(254, 108);
this.btnSave.Location = new System.Drawing.Point(453, 87);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(68, 43);
this.btnSave.TabIndex = 280;
......@@ -450,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, 182);
this.lblComNotices.Location = new System.Drawing.Point(168, 116);
this.lblComNotices.Name = "lblComNotices";
this.lblComNotices.Size = new System.Drawing.Size(37, 20);
this.lblComNotices.TabIndex = 279;
......@@ -459,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, 116);
this.txtCount.Location = new System.Drawing.Point(485, 50);
this.txtCount.MaxLength = 6;
this.txtCount.Name = "txtCount";
this.txtCount.Size = new System.Drawing.Size(88, 26);
......@@ -471,7 +467,7 @@
this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(9, 20);
this.label6.Location = new System.Drawing.Point(9, 21);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(157, 19);
this.label6.TabIndex = 277;
......@@ -482,7 +478,7 @@
//
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(0, 187);
this.btnUpateCount.Location = new System.Drawing.Point(0, 131);
this.btnUpateCount.Name = "btnUpateCount";
this.btnUpateCount.Size = new System.Drawing.Size(117, 43);
this.btnUpateCount.TabIndex = 275;
......@@ -496,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, 120);
this.label5.Location = new System.Drawing.Point(329, 54);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(157, 19);
this.label5.TabIndex = 274;
......@@ -508,7 +504,7 @@
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, 119);
this.lblCount.Location = new System.Drawing.Point(487, 53);
this.lblCount.Name = "lblCount";
this.lblCount.Size = new System.Drawing.Size(37, 20);
this.lblCount.TabIndex = 273;
......@@ -520,7 +516,7 @@
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, 83);
this.label4.Location = new System.Drawing.Point(9, 54);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(157, 19);
this.label4.TabIndex = 7;
......@@ -532,7 +528,7 @@
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, 153);
this.label1.Location = new System.Drawing.Point(10, 87);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(157, 19);
this.label1.TabIndex = 6;
......@@ -544,7 +540,7 @@
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, 182);
this.label2.Location = new System.Drawing.Point(10, 116);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(157, 19);
this.label2.TabIndex = 5;
......@@ -556,30 +552,20 @@
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(9, 49);
this.label3.Location = new System.Drawing.Point(310, 21);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(157, 19);
this.label3.TabIndex = 4;
this.label3.Text = "名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblMsg
//
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 = "未开始工作";
//
// btnCamera
//
this.btnCamera.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
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(518, 172);
this.btnCamera.Location = new System.Drawing.Point(744, 583);
this.btnCamera.Name = "btnCamera";
this.btnCamera.Size = new System.Drawing.Size(120, 60);
this.btnCamera.TabIndex = 274;
......@@ -587,6 +573,18 @@
this.btnCamera.UseVisualStyleBackColor = false;
this.btnCamera.Click += new System.EventHandler(this.btnStopMove_Click);
//
// lblMsg
//
this.lblMsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
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(12, 618);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(68, 17);
this.lblMsg.TabIndex = 3;
this.lblMsg.Text = "未开始工作";
//
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
......@@ -595,7 +593,7 @@
this.groupBox2.Controls.Add(this.panPoint);
this.groupBox2.Location = new System.Drawing.Point(657, 2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(819, 646);
this.groupBox2.Size = new System.Drawing.Size(819, 572);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "局部图";
......@@ -606,9 +604,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panPoint.Controls.Add(this.picPoint);
this.panPoint.Location = new System.Drawing.Point(6, 17);
this.panPoint.Location = new System.Drawing.Point(6, 19);
this.panPoint.Name = "panPoint";
this.panPoint.Size = new System.Drawing.Size(808, 622);
this.panPoint.Size = new System.Drawing.Size(808, 550);
this.panPoint.TabIndex = 3;
//
// picPoint
......@@ -618,7 +616,7 @@
| 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(772, 577);
this.picPoint.Size = new System.Drawing.Size(772, 505);
this.picPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picPoint.TabIndex = 2;
this.picPoint.TabStop = false;
......@@ -628,9 +626,9 @@
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.Location = new System.Drawing.Point(1118, 339);
this.groupBoard.Name = "groupBoard";
this.groupBoard.Size = new System.Drawing.Size(433, 272);
this.groupBoard.Size = new System.Drawing.Size(356, 233);
this.groupBoard.TabIndex = 0;
this.groupBoard.TabStop = false;
//
......@@ -642,7 +640,7 @@
this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(5, 13);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(424, 251);
this.panBoard.Size = new System.Drawing.Size(347, 212);
this.panBoard.TabIndex = 3;
//
// picBoard
......@@ -652,7 +650,7 @@
| 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(421, 183);
this.picBoard.Size = new System.Drawing.Size(344, 144);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picBoard.TabIndex = 1;
this.picBoard.TabStop = false;
......@@ -663,9 +661,10 @@
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.Controls.Add(this.panel1);
this.groupHand.Location = new System.Drawing.Point(11, 275);
this.groupHand.Name = "groupHand";
this.groupHand.Size = new System.Drawing.Size(642, 219);
this.groupHand.Size = new System.Drawing.Size(642, 299);
this.groupHand.TabIndex = 4;
this.groupHand.TabStop = false;
this.groupHand.Text = "手势监控";
......@@ -678,7 +677,7 @@
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.Size = new System.Drawing.Size(636, 279);
this.panHand.TabIndex = 0;
//
// lblHandInfo
......@@ -686,7 +685,7 @@
this.lblHandInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblHandInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHandInfo.ForeColor = System.Drawing.Color.Cyan;
this.lblHandInfo.ForeColor = System.Drawing.Color.White;
this.lblHandInfo.Location = new System.Drawing.Point(3, 3);
this.lblHandInfo.Name = "lblHandInfo";
this.lblHandInfo.Size = new System.Drawing.Size(630, 23);
......@@ -699,7 +698,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.picHandsVideo.Location = new System.Drawing.Point(0, 29);
this.picHandsVideo.Name = "picHandsVideo";
this.picHandsVideo.Size = new System.Drawing.Size(636, 167);
this.picHandsVideo.Size = new System.Drawing.Size(636, 247);
this.picHandsVideo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picHandsVideo.TabIndex = 277;
this.picHandsVideo.TabStop = false;
......@@ -709,19 +708,28 @@
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(573, 3);
this.lblNotices.Location = new System.Drawing.Point(573, 83);
this.lblNotices.Name = "lblNotices";
this.lblNotices.Size = new System.Drawing.Size(60, 23);
this.lblNotices.TabIndex = 276;
this.lblNotices.Visible = false;
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.panel1.Location = new System.Drawing.Point(513, 299);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(28, 63);
this.panel1.TabIndex = 269;
this.panel1.Visible = false;
//
// btnStartWorking
//
this.btnStartWorking.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnStartWorking.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(133, 557);
this.btnStartWorking.Location = new System.Drawing.Point(866, 583);
this.btnStartWorking.Name = "btnStartWorking";
this.btnStartWorking.Size = new System.Drawing.Size(120, 60);
this.btnStartWorking.TabIndex = 263;
......@@ -731,11 +739,11 @@
//
// btnGoHome
//
this.btnGoHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnGoHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(133, 557);
this.btnGoHome.Location = new System.Drawing.Point(988, 583);
this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(120, 60);
this.btnGoHome.TabIndex = 273;
......@@ -745,11 +753,11 @@
//
// btnPrePoint
//
this.btnPrePoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnPrePoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(255, 557);
this.btnPrePoint.Location = new System.Drawing.Point(1111, 583);
this.btnPrePoint.Name = "btnPrePoint";
this.btnPrePoint.Size = new System.Drawing.Size(120, 60);
this.btnPrePoint.TabIndex = 272;
......@@ -759,11 +767,11 @@
//
// btnNextPoint
//
this.btnNextPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnNextPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(377, 557);
this.btnNextPoint.Location = new System.Drawing.Point(1233, 583);
this.btnNextPoint.Name = "btnNextPoint";
this.btnNextPoint.Size = new System.Drawing.Size(120, 60);
this.btnNextPoint.TabIndex = 271;
......@@ -773,11 +781,11 @@
//
// btnStop
//
this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
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(499, 557);
this.btnStop.Location = new System.Drawing.Point(1355, 583);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(120, 60);
this.btnStop.TabIndex = 270;
......@@ -891,40 +899,34 @@
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(50, 625);
this.lblBoardPoint.Location = new System.Drawing.Point(9, 590);
this.lblBoardPoint.Name = "lblBoardPoint";
this.lblBoardPoint.Size = new System.Drawing.Size(603, 23);
this.lblBoardPoint.Size = new System.Drawing.Size(609, 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.Location = new System.Drawing.Point(628, 554);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(28, 63);
this.panel1.TabIndex = 269;
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, 652);
this.Controls.Add(this.btnStartWorking);
this.Controls.Add(this.groupBoard);
this.Controls.Add(this.btnWorkInfo);
this.Controls.Add(this.btnStartWorking);
this.Controls.Add(this.groupHand);
this.Controls.Add(this.btnCodeTest);
this.Controls.Add(this.btnIo);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.btnStart);
this.Controls.Add(this.btnTest);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnGoHome);
this.Controls.Add(this.btnPrePoint);
this.Controls.Add(this.btnNextPoint);
this.Controls.Add(this.btnStop);
this.Controls.Add(this.lblBoardPoint);
this.Controls.Add(this.panel1);
this.Controls.Add(this.btnCamera);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.lblMsg);
this.Controls.Add(this.menuStrip1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
......
TSA-V/workForm/FrmTSAV.cs
......@@ -250,6 +250,7 @@ namespace TSA_V
if (!str.Equals(""))
{
lblMsg.Text = ResourceCulture.GetString(ResourceCulture.StartError, "启动失败") + "：" + str;
lblMsg.ForeColor = Color.Red;
LogUtil.error("启动失败：" + str);
needShowMsg += ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str;
//MessageBox.Show(ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str);
......@@ -310,6 +311,7 @@ namespace TSA_V
}
FormStatus();
lblMsg.Text = TSAVBean.GetShowMsg();
lblMsg.ForeColor = Color.Red;
if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{
......@@ -415,7 +417,7 @@ namespace TSA_V
}
private void FormStatus()
{
btnSave.Visible = false ;
btnSave.Visible = txtCount.Visible ;
btnGoHome.Visible = true;
if (TSAVBean.Status <= (TSAVStatus.Wait))
{
......@@ -489,15 +491,15 @@ namespace TSA_V
{
SetSkin(this);
//lblMsg.ForeColor = Color.Red;
lblNotices.ForeColor = Color.Red;
label2.ForeColor = Color.Red;
lblComNotices.ForeColor = Color.Red;
BoardInfo board = BoardManager.CurrBoard;
label3.ForeColor = Color.Red;
this.lblPointName.ForeColor = Color.Red;
label4.ForeColor = Color.Red;
lblPositionNum.ForeColor = Color.Red;
lblNotices.ForeColor = Color.White;
label2.ForeColor = Color.White;
lblComNotices.ForeColor = Color.White;
label3.ForeColor = Color.White;
this.lblPointName.ForeColor = Color.White;
label4.ForeColor = Color.White;
lblPositionNum.ForeColor = Color.White;
BoardInfo board = BoardManager.CurrBoard;
display.SetPic(picBoard, panBoard);
if (board != null)
{
......@@ -779,6 +781,8 @@ namespace TSA_V
lblStart.Visible = false;
lblLast.Visible = false;
}
this.lblLast.ForeColor = System.Drawing.Color.Olive;
this.lblStart.ForeColor = System.Drawing.Color.Olive;
if (leftCount > 0)
{
lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg, "当前：第{0}步，剩余{1}步", (preIndex + 1).ToString(), leftCount);
......@@ -921,6 +925,8 @@ namespace TSA_V
lblLast.Visible = false;
}
this.lblLast.ForeColor = System.Drawing.Color.Olive;
this.lblStart.ForeColor = System.Drawing.Color.Olive;
if (leftCount > 0)
{
lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg, "当前：第{0}步，剩余{1}步", (preIndex + 1).ToString(), leftCount);
......@@ -1196,7 +1202,7 @@ namespace TSA_V
}
string curr = (HandRecordManager.currHasPoint ? ResourceCulture.GetString("handWork","组装中" ):"");
lblHandInfo.ForeColor = Color.Cyan;
//lblHandInfo.ForeColor = Color.Cyan;
lblHandInfo.Text = $"{ResourceCulture.GetString("handCount","次数")}: {HandRecordManager.recordCount},\t" +
$" {ResourceCulture.GetString("handTime", "总时长")}:{FormUtil.GetSpanStr(HandRecordManager.recordSpan)} \t {curr}";
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!