Skip to content

李娜 / Line-Smart-Workstation

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

界面优化

1 个父辈 475f05a1
内嵌 并排
正在显示 46 个修改的文件 包含 1039 行增加 和 511 行删除
DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
...@@ -109,7 +109,8 @@ namespace TSA_V.DeviceLibrary ...@@ -109,7 +109,8 @@ namespace TSA_V.DeviceLibrary
bool conRes = aioBox.Connect(); bool conRes = aioBox.Connect();
LogUtil.info("开始连接：" + logName + "：" + conRes.ToString()); LogUtil.info("开始连接：" + logName + "：" + conRes.ToString());
AIOMap.Add(ioIp, aioBox); if (!AIOMap.ContainsKey(ioIp))
AIOMap.Add(ioIp, aioBox);
Thread.Sleep(5); Thread.Sleep(5);
//读取所有的DO //读取所有的DO
ReadAllDI(ioIp, 0); ReadAllDI(ioIp, 0);
......
TSA-V/AOIManager.cs
...@@ -49,21 +49,16 @@ namespace TSA_V ...@@ -49,21 +49,16 @@ namespace TSA_V
FileList.Remove(DefaultName); FileList.Remove(DefaultName);
FileList.Insert(0, DefaultName); FileList.Insert(0, DefaultName);
} }
cmbAoiFile.DataSource = null; if (cmbAoiFile != null)
cmbAoiFile.DataSource = FileList;
//if (FileList.Count > 0)
//{
// cmbAoiFile.SelectedIndex = 0;
//}
int index = AOIManager.FileList.IndexOf(DefaultName);
if (index >= 0)
{ {
cmbAoiFile.SelectedIndex = index; cmbAoiFile.DataSource = null;
cmbAoiFile.DataSource = FileList;
int index = AOIManager.FileList.IndexOf(DefaultName);
if (index >= 0)
{
cmbAoiFile.SelectedIndex = index;
}
} }
//else
//{
// cmbAoiFile.SelectedIndex = 0;
//}
} }
catch (Exception ex) catch (Exception ex)
{ {
......
TSA-V/App.config
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</layout> </layout>
</appender> </appender>
<logger name="defaultAppender"> <logger name="defaultAppender">
<level value="Info" /> <level value="All" />
<appender-ref ref="defaultAppender" /> <appender-ref ref="defaultAppender" />
</logger> </logger>
<logger name="MetcalLogAppender"> <logger name="MetcalLogAppender">
......
TSA-V/FrmAddBoard.Designer.cs
...@@ -64,7 +64,9 @@ ...@@ -64,7 +64,9 @@
this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.xyMoveControl1 = new UserFromControl.ProjectorControl(); this.xyMoveControl1 = new UserFromControl.ProjectorControl();
this.openFileDialogCsv = new System.Windows.Forms.OpenFileDialog(); this.openFileDialogCsv = new System.Windows.Forms.OpenFileDialog();
this.groupBox_new = new System.Windows.Forms.GroupBox();
this.groupBoxSelCom.SuspendLayout(); this.groupBoxSelCom.SuspendLayout();
this.groupBox_new.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -75,7 +77,7 @@ ...@@ -75,7 +77,7 @@
// txtCode // txtCode
// //
this.txtCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCode.Location = new System.Drawing.Point(177, 60); this.txtCode.Location = new System.Drawing.Point(126, 58);
this.txtCode.MaxLength = 40; this.txtCode.MaxLength = 40;
this.txtCode.Name = "txtCode"; this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(220, 26); this.txtCode.Size = new System.Drawing.Size(220, 26);
...@@ -84,9 +86,9 @@ ...@@ -84,9 +86,9 @@
// label6 // label6
// //
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(14, 64); this.label6.Location = new System.Drawing.Point(3, 62);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(158, 20); this.label6.Size = new System.Drawing.Size(118, 20);
this.label6.TabIndex = 286; this.label6.TabIndex = 286;
this.label6.Text = "条码："; this.label6.Text = "条码：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -95,7 +97,7 @@ ...@@ -95,7 +97,7 @@
// //
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(423, 656); this.btnCancel.Location = new System.Drawing.Point(420, 677);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(120, 45); this.btnCancel.Size = new System.Drawing.Size(120, 45);
this.btnCancel.TabIndex = 285; this.btnCancel.TabIndex = 285;
...@@ -107,7 +109,7 @@ ...@@ -107,7 +109,7 @@
// //
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(294, 656); this.btnStart.Location = new System.Drawing.Point(291, 677);
this.btnStart.Name = "btnStart"; this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(120, 45); this.btnStart.Size = new System.Drawing.Size(120, 45);
this.btnStart.TabIndex = 284; this.btnStart.TabIndex = 284;
...@@ -119,7 +121,7 @@ ...@@ -119,7 +121,7 @@
// //
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(165, 656); this.btnSave.Location = new System.Drawing.Point(162, 677);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(120, 45); this.btnSave.Size = new System.Drawing.Size(120, 45);
this.btnSave.TabIndex = 283; this.btnSave.TabIndex = 283;
...@@ -130,9 +132,9 @@ ...@@ -130,9 +132,9 @@
// label5 // label5
// //
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(400, 23); this.label5.Location = new System.Drawing.Point(6, 135);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(124, 20); this.label5.Size = new System.Drawing.Size(118, 20);
this.label5.TabIndex = 282; this.label5.TabIndex = 282;
this.label5.Text = "宽度↑："; this.label5.Text = "宽度↑：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -140,9 +142,9 @@ ...@@ -140,9 +142,9 @@
// label4 // label4
// //
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(400, 63); this.label4.Location = new System.Drawing.Point(6, 175);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(124, 20); this.label4.Size = new System.Drawing.Size(118, 20);
this.label4.TabIndex = 281; this.label4.TabIndex = 281;
this.label4.Text = "长度→："; this.label4.Text = "长度→：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -150,7 +152,7 @@ ...@@ -150,7 +152,7 @@
// txtBoardL // txtBoardL
// //
this.txtBoardL.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBoardL.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardL.Location = new System.Drawing.Point(526, 60); this.txtBoardL.Location = new System.Drawing.Point(126, 172);
this.txtBoardL.MaxLength = 8; this.txtBoardL.MaxLength = 8;
this.txtBoardL.Name = "txtBoardL"; this.txtBoardL.Name = "txtBoardL";
this.txtBoardL.Size = new System.Drawing.Size(70, 26); this.txtBoardL.Size = new System.Drawing.Size(70, 26);
...@@ -159,7 +161,7 @@ ...@@ -159,7 +161,7 @@
// txtBoardW // txtBoardW
// //
this.txtBoardW.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBoardW.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardW.Location = new System.Drawing.Point(526, 21); this.txtBoardW.Location = new System.Drawing.Point(126, 133);
this.txtBoardW.MaxLength = 8; this.txtBoardW.MaxLength = 8;
this.txtBoardW.Name = "txtBoardW"; this.txtBoardW.Name = "txtBoardW";
this.txtBoardW.Size = new System.Drawing.Size(70, 26); this.txtBoardW.Size = new System.Drawing.Size(70, 26);
...@@ -169,7 +171,7 @@ ...@@ -169,7 +171,7 @@
// //
this.label25.AutoSize = true; this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label25.Location = new System.Drawing.Point(603, 63); this.label25.Location = new System.Drawing.Point(203, 175);
this.label25.Name = "label25"; this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(30, 17); this.label25.Size = new System.Drawing.Size(30, 17);
this.label25.TabIndex = 280; this.label25.TabIndex = 280;
...@@ -179,7 +181,7 @@ ...@@ -179,7 +181,7 @@
// //
this.label24.AutoSize = true; this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.Location = new System.Drawing.Point(603, 27); this.label24.Location = new System.Drawing.Point(203, 139);
this.label24.Name = "label24"; this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17); this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 279; this.label24.TabIndex = 279;
...@@ -201,19 +203,19 @@ ...@@ -201,19 +203,19 @@
// txtImagePath // txtImagePath
// //
this.txtImagePath.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtImagePath.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtImagePath.Location = new System.Drawing.Point(177, 141); this.txtImagePath.Location = new System.Drawing.Point(126, 244);
this.txtImagePath.MaxLength = 20; this.txtImagePath.MaxLength = 20;
this.txtImagePath.Multiline = true; this.txtImagePath.Multiline = true;
this.txtImagePath.Name = "txtImagePath"; this.txtImagePath.Name = "txtImagePath";
this.txtImagePath.Size = new System.Drawing.Size(343, 48); this.txtImagePath.Size = new System.Drawing.Size(220, 48);
this.txtImagePath.TabIndex = 74; this.txtImagePath.TabIndex = 74;
// //
// label1 // label1
// //
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(14, 145); this.label1.Location = new System.Drawing.Point(3, 248);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(158, 20); this.label1.Size = new System.Drawing.Size(118, 20);
this.label1.TabIndex = 73; this.label1.TabIndex = 73;
this.label1.Text = "导入图片："; this.label1.Text = "导入图片：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -234,7 +236,7 @@ ...@@ -234,7 +236,7 @@
this.cmbBomList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbBomList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbBomList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbBomList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbBomList.FormattingEnabled = true; this.cmbBomList.FormattingEnabled = true;
this.cmbBomList.Location = new System.Drawing.Point(145, 74); this.cmbBomList.Location = new System.Drawing.Point(30, 204);
this.cmbBomList.Name = "cmbBomList"; this.cmbBomList.Name = "cmbBomList";
this.cmbBomList.Size = new System.Drawing.Size(220, 28); this.cmbBomList.Size = new System.Drawing.Size(220, 28);
this.cmbBomList.TabIndex = 71; this.cmbBomList.TabIndex = 71;
...@@ -242,7 +244,7 @@ ...@@ -242,7 +244,7 @@
// txtBoardName // txtBoardName
// //
this.txtBoardName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBoardName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardName.Location = new System.Drawing.Point(177, 21); this.txtBoardName.Location = new System.Drawing.Point(126, 19);
this.txtBoardName.MaxLength = 20; this.txtBoardName.MaxLength = 20;
this.txtBoardName.Name = "txtBoardName"; this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(220, 26); this.txtBoardName.Size = new System.Drawing.Size(220, 26);
...@@ -251,9 +253,9 @@ ...@@ -251,9 +253,9 @@
// label2 // label2
// //
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(14, 23); this.label2.Location = new System.Drawing.Point(3, 21);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(158, 20); this.label2.Size = new System.Drawing.Size(118, 20);
this.label2.TabIndex = 3; this.label2.TabIndex = 3;
this.label2.Text = "程序名称："; this.label2.Text = "程序名称：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -261,9 +263,9 @@ ...@@ -261,9 +263,9 @@
// label8 // label8
// //
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(14, 105); this.label8.Location = new System.Drawing.Point(3, 103);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(158, 20); this.label8.Size = new System.Drawing.Size(118, 20);
this.label8.TabIndex = 290; this.label8.TabIndex = 290;
this.label8.Text = "坐标原点位置："; this.label8.Text = "坐标原点位置：";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -278,7 +280,7 @@ ...@@ -278,7 +280,7 @@
"左下角", "左下角",
"右上角", "右上角",
"右下角"}); "右下角"});
this.cmbOrgType.Location = new System.Drawing.Point(177, 99); this.cmbOrgType.Location = new System.Drawing.Point(126, 97);
this.cmbOrgType.Name = "cmbOrgType"; this.cmbOrgType.Name = "cmbOrgType";
this.cmbOrgType.Size = new System.Drawing.Size(220, 28); this.cmbOrgType.Size = new System.Drawing.Size(220, 28);
this.cmbOrgType.TabIndex = 289; this.cmbOrgType.TabIndex = 289;
...@@ -289,7 +291,7 @@ ...@@ -289,7 +291,7 @@
this.chbSort.Checked = true; this.chbSort.Checked = true;
this.chbSort.CheckState = System.Windows.Forms.CheckState.Checked; this.chbSort.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbSort.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbSort.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbSort.Location = new System.Drawing.Point(184, 623); this.chbSort.Location = new System.Drawing.Point(181, 644);
this.chbSort.Name = "chbSort"; this.chbSort.Name = "chbSort";
this.chbSort.Size = new System.Drawing.Size(75, 21); this.chbSort.Size = new System.Drawing.Size(75, 21);
this.chbSort.TabIndex = 291; this.chbSort.TabIndex = 291;
...@@ -299,9 +301,9 @@ ...@@ -299,9 +301,9 @@
// lblWidth // lblWidth
// //
this.lblWidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWidth.Location = new System.Drawing.Point(400, 101); this.lblWidth.Location = new System.Drawing.Point(6, 213);
this.lblWidth.Name = "lblWidth"; this.lblWidth.Name = "lblWidth";
this.lblWidth.Size = new System.Drawing.Size(124, 20); this.lblWidth.Size = new System.Drawing.Size(118, 20);
this.lblWidth.TabIndex = 294; this.lblWidth.TabIndex = 294;
this.lblWidth.Text = "线体宽度："; this.lblWidth.Text = "线体宽度：";
this.lblWidth.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblWidth.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -309,7 +311,7 @@ ...@@ -309,7 +311,7 @@
// txtLineWidth // txtLineWidth
// //
this.txtLineWidth.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtLineWidth.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtLineWidth.Location = new System.Drawing.Point(526, 97); this.txtLineWidth.Location = new System.Drawing.Point(126, 209);
this.txtLineWidth.MaxLength = 8; this.txtLineWidth.MaxLength = 8;
this.txtLineWidth.Name = "txtLineWidth"; this.txtLineWidth.Name = "txtLineWidth";
this.txtLineWidth.Size = new System.Drawing.Size(70, 26); this.txtLineWidth.Size = new System.Drawing.Size(70, 26);
...@@ -319,7 +321,7 @@ ...@@ -319,7 +321,7 @@
// //
this.label9.AutoSize = true; this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(603, 103); this.label9.Location = new System.Drawing.Point(203, 215);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(30, 17); this.label9.Size = new System.Drawing.Size(30, 17);
this.label9.TabIndex = 293; this.label9.TabIndex = 293;
...@@ -328,11 +330,11 @@ ...@@ -328,11 +330,11 @@
// txtCsvFileName // txtCsvFileName
// //
this.txtCsvFileName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCsvFileName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCsvFileName.Location = new System.Drawing.Point(145, 28); this.txtCsvFileName.Location = new System.Drawing.Point(30, 64);
this.txtCsvFileName.MaxLength = 20; this.txtCsvFileName.MaxLength = 20;
this.txtCsvFileName.Multiline = true; this.txtCsvFileName.Multiline = true;
this.txtCsvFileName.Name = "txtCsvFileName"; this.txtCsvFileName.Name = "txtCsvFileName";
this.txtCsvFileName.Size = new System.Drawing.Size(419, 48); this.txtCsvFileName.Size = new System.Drawing.Size(220, 55);
this.txtCsvFileName.TabIndex = 297; this.txtCsvFileName.TabIndex = 297;
// //
// groupBoxSelCom // groupBoxSelCom
...@@ -344,9 +346,9 @@ ...@@ -344,9 +346,9 @@
this.groupBoxSelCom.Controls.Add(this.cmbBomList); this.groupBoxSelCom.Controls.Add(this.cmbBomList);
this.groupBoxSelCom.Controls.Add(this.txtCsvFileName); this.groupBoxSelCom.Controls.Add(this.txtCsvFileName);
this.groupBoxSelCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBoxSelCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBoxSelCom.Location = new System.Drawing.Point(39, 195); this.groupBoxSelCom.Location = new System.Drawing.Point(390, 12);
this.groupBoxSelCom.Name = "groupBoxSelCom"; this.groupBoxSelCom.Name = "groupBoxSelCom";
this.groupBoxSelCom.Size = new System.Drawing.Size(599, 122); this.groupBoxSelCom.Size = new System.Drawing.Size(273, 317);
this.groupBoxSelCom.TabIndex = 298; this.groupBoxSelCom.TabIndex = 298;
this.groupBoxSelCom.TabStop = false; this.groupBoxSelCom.TabStop = false;
this.groupBoxSelCom.Text = "请选择元器件库"; this.groupBoxSelCom.Text = "请选择元器件库";
...@@ -354,7 +356,7 @@ ...@@ -354,7 +356,7 @@
// likSelCsvFile // likSelCsvFile
// //
this.likSelCsvFile.AutoSize = true; this.likSelCsvFile.AutoSize = true;
this.likSelCsvFile.Location = new System.Drawing.Point(347, 90); this.likSelCsvFile.Location = new System.Drawing.Point(27, 122);
this.likSelCsvFile.Name = "likSelCsvFile"; this.likSelCsvFile.Name = "likSelCsvFile";
this.likSelCsvFile.Size = new System.Drawing.Size(56, 17); this.likSelCsvFile.Size = new System.Drawing.Size(56, 17);
this.likSelCsvFile.TabIndex = 301; this.likSelCsvFile.TabIndex = 301;
...@@ -365,7 +367,7 @@ ...@@ -365,7 +367,7 @@
// likDownFile // likDownFile
// //
this.likDownFile.AutoSize = true; this.likDownFile.AutoSize = true;
this.likDownFile.Location = new System.Drawing.Point(458, 90); this.likDownFile.Location = new System.Drawing.Point(26, 143);
this.likDownFile.Name = "likDownFile"; this.likDownFile.Name = "likDownFile";
this.likDownFile.Size = new System.Drawing.Size(56, 17); this.likDownFile.Size = new System.Drawing.Size(56, 17);
this.likDownFile.TabIndex = 300; this.likDownFile.TabIndex = 300;
...@@ -390,7 +392,7 @@ ...@@ -390,7 +392,7 @@
// rdbSelCom // rdbSelCom
// //
this.rdbSelCom.AutoSize = true; this.rdbSelCom.AutoSize = true;
this.rdbSelCom.Location = new System.Drawing.Point(7, 76); this.rdbSelCom.Location = new System.Drawing.Point(7, 177);
this.rdbSelCom.Name = "rdbSelCom"; this.rdbSelCom.Name = "rdbSelCom";
this.rdbSelCom.Size = new System.Drawing.Size(98, 21); this.rdbSelCom.Size = new System.Drawing.Size(98, 21);
this.rdbSelCom.TabIndex = 298; this.rdbSelCom.TabIndex = 298;
...@@ -402,7 +404,7 @@ ...@@ -402,7 +404,7 @@
// linkLabel1 // linkLabel1
// //
this.linkLabel1.AutoSize = true; this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(526, 153); this.linkLabel1.Location = new System.Drawing.Point(124, 297);
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(53, 12); this.linkLabel1.Size = new System.Drawing.Size(53, 12);
this.linkLabel1.TabIndex = 302; this.linkLabel1.TabIndex = 302;
...@@ -415,53 +417,65 @@ ...@@ -415,53 +417,65 @@
this.xyMoveControl1.BackColor = System.Drawing.Color.White; this.xyMoveControl1.BackColor = System.Drawing.Color.White;
this.xyMoveControl1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.xyMoveControl1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.xyMoveControl1.GroupName = "坐标"; this.xyMoveControl1.GroupName = "坐标";
this.xyMoveControl1.Location = new System.Drawing.Point(74, 319); this.xyMoveControl1.Location = new System.Drawing.Point(16, 335);
this.xyMoveControl1.Name = "xyMoveControl1"; this.xyMoveControl1.Name = "xyMoveControl1";
this.xyMoveControl1.PenWidth = 2; this.xyMoveControl1.PenWidth = 2;
this.xyMoveControl1.PointSizeX = 1; this.xyMoveControl1.PointSizeX = 1;
this.xyMoveControl1.PointSizeY = 1; this.xyMoveControl1.PointSizeY = 1;
this.xyMoveControl1.PointType = 1; this.xyMoveControl1.PointType = 1;
this.xyMoveControl1.ShowText = ""; this.xyMoveControl1.ShowText = "";
this.xyMoveControl1.Size = new System.Drawing.Size(548, 303); this.xyMoveControl1.Size = new System.Drawing.Size(654, 303);
this.xyMoveControl1.TabIndex = 287; this.xyMoveControl1.TabIndex = 287;
this.xyMoveControl1.XValue = 1D; this.xyMoveControl1.XValue = 1D;
this.xyMoveControl1.YValue = 1D; this.xyMoveControl1.YValue = 1D;
// //
// groupBox_new
//
this.groupBox_new.Controls.Add(this.cmbOrgType);
this.groupBox_new.Controls.Add(this.linkLabel1);
this.groupBox_new.Controls.Add(this.label2);
this.groupBox_new.Controls.Add(this.txtBoardName);
this.groupBox_new.Controls.Add(this.lblWidth);
this.groupBox_new.Controls.Add(this.label6);
this.groupBox_new.Controls.Add(this.txtLineWidth);
this.groupBox_new.Controls.Add(this.label9);
this.groupBox_new.Controls.Add(this.txtCode);
this.groupBox_new.Controls.Add(this.label8);
this.groupBox_new.Controls.Add(this.txtImagePath);
this.groupBox_new.Controls.Add(this.label1);
this.groupBox_new.Controls.Add(this.label24);
this.groupBox_new.Controls.Add(this.label25);
this.groupBox_new.Controls.Add(this.txtBoardW);
this.groupBox_new.Controls.Add(this.txtBoardL);
this.groupBox_new.Controls.Add(this.label5);
this.groupBox_new.Controls.Add(this.label4);
this.groupBox_new.Location = new System.Drawing.Point(21, 12);
this.groupBox_new.Name = "groupBox_new";
this.groupBox_new.Size = new System.Drawing.Size(363, 317);
this.groupBox_new.TabIndex = 303;
this.groupBox_new.TabStop = false;
this.groupBox_new.Text = "程序";
//
// FrmAddBoard // FrmAddBoard
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(686, 728); this.ClientSize = new System.Drawing.Size(688, 778);
this.Controls.Add(this.linkLabel1); this.Controls.Add(this.groupBox_new);
this.Controls.Add(this.groupBoxSelCom); this.Controls.Add(this.groupBoxSelCom);
this.Controls.Add(this.lblWidth);
this.Controls.Add(this.txtLineWidth);
this.Controls.Add(this.label9);
this.Controls.Add(this.chbSort); this.Controls.Add(this.chbSort);
this.Controls.Add(this.label8);
this.Controls.Add(this.cmbOrgType);
this.Controls.Add(this.xyMoveControl1); this.Controls.Add(this.xyMoveControl1);
this.Controls.Add(this.txtCode);
this.Controls.Add(this.label6);
this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnStart); this.Controls.Add(this.btnStart);
this.Controls.Add(this.btnSave); this.Controls.Add(this.btnSave);
this.Controls.Add(this.label5);
this.Controls.Add(this.label4);
this.Controls.Add(this.txtBoardL);
this.Controls.Add(this.txtBoardW);
this.Controls.Add(this.label25);
this.Controls.Add(this.label24);
this.Controls.Add(this.btnOpenFile); this.Controls.Add(this.btnOpenFile);
this.Controls.Add(this.txtImagePath);
this.Controls.Add(this.label1);
this.Controls.Add(this.txtBoardName);
this.Controls.Add(this.label2);
this.Controls.Add(this.label3); this.Controls.Add(this.label3);
this.Name = "FrmAddBoard"; this.Name = "FrmAddBoard";
this.Text = "新增程序"; this.Text = "新增程序";
this.Load += new System.EventHandler(this.FrmAddBoard_Load); this.Load += new System.EventHandler(this.FrmAddBoard_Load);
this.groupBoxSelCom.ResumeLayout(false); this.groupBoxSelCom.ResumeLayout(false);
this.groupBoxSelCom.PerformLayout(); this.groupBoxSelCom.PerformLayout();
this.groupBox_new.ResumeLayout(false);
this.groupBox_new.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -504,5 +518,6 @@ ...@@ -504,5 +518,6 @@
private System.Windows.Forms.RadioButton rdbSelCom; private System.Windows.Forms.RadioButton rdbSelCom;
private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.OpenFileDialog openFileDialogCsv; private System.Windows.Forms.OpenFileDialog openFileDialogCsv;
private System.Windows.Forms.GroupBox groupBox_new;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmBase.cs
...@@ -3,6 +3,7 @@ using System; ...@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
...@@ -74,8 +75,93 @@ namespace TSA_V ...@@ -74,8 +75,93 @@ namespace TSA_V
private void FrmBase_Load(object sender, EventArgs e) private void FrmBase_Load(object sender, EventArgs e)
{ {
ImageManager.frm_背景图 = global::TSA_V.Properties.Resources.背景图dark;
ProcessUI(this);
} }
void ProcessUI(Control partentControl)
{
if (IsDesignMode())
return;
if (partentControl is FrmLogin || partentControl is FrmMenu || partentControl is FrmMaintenance)
{
partentControl.BackgroundImage = global::TSA_V.Properties.Resources.背景图dark;
}
if (partentControl is Form)
{
if ((partentControl as Form).WindowState == FormWindowState.Maximized)
{
(partentControl as Form).FormBorderStyle = FormBorderStyle.FixedSingle;
(partentControl as Form).WindowState = FormWindowState.Maximized;
//(partentControl as Form).Resize += FrmBase_Resize;
(partentControl as Form).Move += FrmBase_Resize;
}
(partentControl as Form).Icon = global::TSA_V.Properties.Resources.neo_station1;
(partentControl as Form).AutoScaleMode = AutoScaleMode.None;
}
partentControl.BackColor = Color.Black;//Color.FromArgb(53, 67, 88);
partentControl.ForeColor = Color.White;
foreach (Control con in partentControl.Controls)
{
con.BackColor = Color.Black; //Color.FromArgb(53, 67, 88);
con.ForeColor = Color.White;
if (con is ComboBox)
{
//(con as ComboBox).DrawMode = DrawMode.OwnerDrawVariable;
}
if (con is ComboBox || con is TextBox)
{
//con.BackColor = Color.Black;//Color.FromArgb(160, 165, 172);
//con.ForeColor = Color.White; //Color.FromArgb(0, 0, 40); ;
con.BackColor = Color.White;//Color.FromArgb(160, 165, 172);
con.ForeColor = Color.Black; //Color.FromArgb(0, 0, 40); ;
}
if (con is LinkLabel)
{
(con as LinkLabel).LinkColor = Color.White;
}
if (con is DataGridView)
{
con.ForeColor = Color.Black;
continue;
}
if (con.Controls.Count > 0)
{
ProcessUI(con);
}
}
}
private void FrmBase_Resize(object sender, EventArgs e)
{
(sender as Form).Width = Screen.PrimaryScreen.WorkingArea.Width;
(sender as Form).Height = Screen.PrimaryScreen.WorkingArea.Height;
//(sender as Form).WindowState = FormWindowState.Maximized;
}
public static bool IsDesignMode()
{
bool returnFlag = false;
if (Process.GetCurrentProcess().ProcessName == "devenv")
{
returnFlag = true;
}
return returnFlag;
}
/// <summary> /// <summary>
/// 引用user32.dll动态链接库（windows api）， /// 引用user32.dll动态链接库（windows api），
/// 使用库中定义 API：SetCursorPos /// 使用库中定义 API：SetCursorPos
......
TSA-V/FrmBoardInfo.Designer.cs
...@@ -42,27 +42,38 @@ ...@@ -42,27 +42,38 @@
this.删除ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.删除ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.上升ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.上升ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.下降ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.下降ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.禁用ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.全局ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.全部启用ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.全部禁用ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.自动排序ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
this.dataGridViewImageColumn2 = new System.Windows.Forms.DataGridViewImageColumn(); this.dataGridViewImageColumn2 = new System.Windows.Forms.DataGridViewImageColumn();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.llblAllUSel = new System.Windows.Forms.LinkLabel();
this.llblAllSel = new System.Windows.Forms.LinkLabel();
this.btnOpenFile = new System.Windows.Forms.Button(); this.btnOpenFile = new System.Windows.Forms.Button();
this.btnCheck = new System.Windows.Forms.Button(); this.btnCheck = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblLineW = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
this.txtLineWidth = new System.Windows.Forms.TextBox();
this.lbllinews = new System.Windows.Forms.Label();
this.label122 = new System.Windows.Forms.Label(); this.label122 = new System.Windows.Forms.Label();
this.btnUpdate = new System.Windows.Forms.Button(); this.btnUpdate = new System.Windows.Forms.Button();
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.txtXUpdate = new System.Windows.Forms.TextBox(); this.txtXUpdate = new System.Windows.Forms.TextBox();
this.txtYUpdate = new System.Windows.Forms.TextBox(); this.txtYUpdate = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.txtBoardW = new System.Windows.Forms.TextBox();
this.txtBoardL = new System.Windows.Forms.TextBox();
this.label25 = new System.Windows.Forms.Label();
this.chbNormal = new System.Windows.Forms.CheckBox(); this.chbNormal = new System.Windows.Forms.CheckBox();
this.lblMousePosition = new System.Windows.Forms.Label(); this.lblMousePosition = new System.Windows.Forms.Label();
this.chbShowName = new System.Windows.Forms.CheckBox(); this.chbShowName = new System.Windows.Forms.CheckBox();
this.btnSort = new System.Windows.Forms.Button();
this.焊点列表 = new System.Windows.Forms.GroupBox(); this.焊点列表 = new System.Windows.Forms.GroupBox();
this.dgvList = new System.Windows.Forms.DataGridView(); this.dgvList = new System.Windows.Forms.DataGridView();
this.Column_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
...@@ -96,24 +107,16 @@ ...@@ -96,24 +107,16 @@
this.panBoard = new System.Windows.Forms.Panel(); this.panBoard = new System.Windows.Forms.Panel();
this.picBoard = new System.Windows.Forms.PictureBox(); this.picBoard = new System.Windows.Forms.PictureBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblLineW = new System.Windows.Forms.Label();
this.txtLineWidth = new System.Windows.Forms.TextBox();
this.lbllinews = new System.Windows.Forms.Label();
this.btnConfigAOI = new System.Windows.Forms.Button(); this.btnConfigAOI = new System.Windows.Forms.Button();
this.lblAoi = new System.Windows.Forms.Label(); this.lblAoi = new System.Windows.Forms.Label();
this.cmbAOIFile = new System.Windows.Forms.ComboBox(); this.cmbAOIFile = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
this.txtCode = new System.Windows.Forms.TextBox(); this.txtCode = new System.Windows.Forms.TextBox();
this.txtBoardName = new System.Windows.Forms.TextBox(); this.txtBoardName = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.txtBoardL = new System.Windows.Forms.TextBox();
this.txtBoardW = new System.Windows.Forms.TextBox();
this.label25 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.contextMenuStrip2.SuspendLayout(); this.contextMenuStrip2.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
...@@ -163,45 +166,85 @@ ...@@ -163,45 +166,85 @@
this.详情ToolStripMenuItem, this.详情ToolStripMenuItem,
this.删除ToolStripMenuItem, this.删除ToolStripMenuItem,
this.上升ToolStripMenuItem, this.上升ToolStripMenuItem,
this.下降ToolStripMenuItem}); this.下降ToolStripMenuItem,
this.禁用ToolStripMenuItem,
this.全局ToolStripMenuItem});
this.contextMenuStrip2.Name = "contextMenuStrip2"; this.contextMenuStrip2.Name = "contextMenuStrip2";
this.contextMenuStrip2.Size = new System.Drawing.Size(125, 114); this.contextMenuStrip2.Size = new System.Drawing.Size(130, 158);
// //
// 测试位置ToolStripMenuItem // 测试位置ToolStripMenuItem
// //
this.测试位置ToolStripMenuItem.Name = "测试位置ToolStripMenuItem"; this.测试位置ToolStripMenuItem.Name = "测试位置ToolStripMenuItem";
this.测试位置ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.测试位置ToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.测试位置ToolStripMenuItem.Text = "移动测试"; this.测试位置ToolStripMenuItem.Text = "移动测试";
this.测试位置ToolStripMenuItem.Click += new System.EventHandler(this.测试位置ToolStripMenuItem_Click); this.测试位置ToolStripMenuItem.Click += new System.EventHandler(this.测试位置ToolStripMenuItem_Click);
// //
// 详情ToolStripMenuItem // 详情ToolStripMenuItem
// //
this.详情ToolStripMenuItem.Name = "详情ToolStripMenuItem"; this.详情ToolStripMenuItem.Name = "详情ToolStripMenuItem";
this.详情ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.详情ToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.详情ToolStripMenuItem.Text = "详情"; this.详情ToolStripMenuItem.Text = "详情";
this.详情ToolStripMenuItem.Click += new System.EventHandler(this.详情ToolStripMenuItem_Click); this.详情ToolStripMenuItem.Click += new System.EventHandler(this.详情ToolStripMenuItem_Click);
// //
// 删除ToolStripMenuItem // 删除ToolStripMenuItem
// //
this.删除ToolStripMenuItem.Name = "删除ToolStripMenuItem"; this.删除ToolStripMenuItem.Name = "删除ToolStripMenuItem";
this.删除ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.删除ToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.删除ToolStripMenuItem.Text = "删除"; this.删除ToolStripMenuItem.Text = "删除";
this.删除ToolStripMenuItem.Click += new System.EventHandler(this.删除ToolStripMenuItem_Click); this.删除ToolStripMenuItem.Click += new System.EventHandler(this.删除ToolStripMenuItem_Click);
// //
// 上升ToolStripMenuItem // 上升ToolStripMenuItem
// //
this.上升ToolStripMenuItem.Name = "上升ToolStripMenuItem"; this.上升ToolStripMenuItem.Name = "上升ToolStripMenuItem";
this.上升ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.上升ToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.上升ToolStripMenuItem.Text = "上升"; this.上升ToolStripMenuItem.Text = "上升";
this.上升ToolStripMenuItem.Click += new System.EventHandler(this.上升ToolStripMenuItem_Click); this.上升ToolStripMenuItem.Click += new System.EventHandler(this.上升ToolStripMenuItem_Click);
// //
// 下降ToolStripMenuItem // 下降ToolStripMenuItem
// //
this.下降ToolStripMenuItem.Name = "下降ToolStripMenuItem"; this.下降ToolStripMenuItem.Name = "下降ToolStripMenuItem";
this.下降ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.下降ToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.下降ToolStripMenuItem.Text = "下降"; this.下降ToolStripMenuItem.Text = "下降";
this.下降ToolStripMenuItem.Click += new System.EventHandler(this.下降ToolStripMenuItem_Click); this.下降ToolStripMenuItem.Click += new System.EventHandler(this.下降ToolStripMenuItem_Click);
// //
// 禁用ToolStripMenuItem
//
this.禁用ToolStripMenuItem.Name = "禁用ToolStripMenuItem";
this.禁用ToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.禁用ToolStripMenuItem.Text = "禁用/启用";
this.禁用ToolStripMenuItem.Click += new System.EventHandler(this.禁用ToolStripMenuItem_Click);
//
// 全局ToolStripMenuItem
//
this.全局ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.全部启用ToolStripMenuItem,
this.全部禁用ToolStripMenuItem,
this.自动排序ToolStripMenuItem});
this.全局ToolStripMenuItem.Name = "全局ToolStripMenuItem";
this.全局ToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.全局ToolStripMenuItem.Text = "全局";
//
// 全部启用ToolStripMenuItem
//
this.全部启用ToolStripMenuItem.Name = "全部启用ToolStripMenuItem";
this.全部启用ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.全部启用ToolStripMenuItem.Text = "全部启用";
this.全部启用ToolStripMenuItem.Click += new System.EventHandler(this.全部启用ToolStripMenuItem_Click);
//
// 全部禁用ToolStripMenuItem
//
this.全部禁用ToolStripMenuItem.Name = "全部禁用ToolStripMenuItem";
this.全部禁用ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.全部禁用ToolStripMenuItem.Text = "全部禁用";
this.全部禁用ToolStripMenuItem.Click += new System.EventHandler(this.全部禁用ToolStripMenuItem_Click);
//
// 自动排序ToolStripMenuItem
//
this.自动排序ToolStripMenuItem.Name = "自动排序ToolStripMenuItem";
this.自动排序ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.自动排序ToolStripMenuItem.Text = "自动排序";
this.自动排序ToolStripMenuItem.Click += new System.EventHandler(this.自动排序ToolStripMenuItem_Click);
//
// timer1 // timer1
// //
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
...@@ -226,59 +269,33 @@ ...@@ -226,59 +269,33 @@
// panel1 // panel1
// //
this.panel1.AutoScroll = true; this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.llblAllUSel);
this.panel1.Controls.Add(this.llblAllSel);
this.panel1.Controls.Add(this.btnOpenFile); this.panel1.Controls.Add(this.btnOpenFile);
this.panel1.Controls.Add(this.btnCheck); this.panel1.Controls.Add(this.btnCheck);
this.panel1.Controls.Add(this.groupBox2); this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.chbNormal); this.panel1.Controls.Add(this.chbNormal);
this.panel1.Controls.Add(this.lblMousePosition); this.panel1.Controls.Add(this.lblMousePosition);
this.panel1.Controls.Add(this.chbShowName); this.panel1.Controls.Add(this.chbShowName);
this.panel1.Controls.Add(this.btnSort);
this.panel1.Controls.Add(this.焊点列表); this.panel1.Controls.Add(this.焊点列表);
this.panel1.Controls.Add(this.btnSetOrigin); this.panel1.Controls.Add(this.btnSetOrigin);
this.panel1.Controls.Add(this.panel3); this.panel1.Controls.Add(this.panel3);
this.panel1.Controls.Add(this.groupBox1); this.panel1.Controls.Add(this.groupBox1);
this.panel1.Controls.Add(this.button1); this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.btnSave); this.panel1.Controls.Add(this.btnSave);
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1549, 701); this.panel1.Size = new System.Drawing.Size(1344, 701);
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
// //
// llblAllUSel
//
this.llblAllUSel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.llblAllUSel.AutoSize = true;
this.llblAllUSel.Location = new System.Drawing.Point(146, 645);
this.llblAllUSel.Name = "llblAllUSel";
this.llblAllUSel.Size = new System.Drawing.Size(53, 12);
this.llblAllUSel.TabIndex = 293;
this.llblAllUSel.TabStop = true;
this.llblAllUSel.Text = "全部禁用";
this.llblAllUSel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.llblAllUSel_LinkClicked);
//
// llblAllSel
//
this.llblAllSel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.llblAllSel.AutoSize = true;
this.llblAllSel.Location = new System.Drawing.Point(23, 645);
this.llblAllSel.Name = "llblAllSel";
this.llblAllSel.Size = new System.Drawing.Size(53, 12);
this.llblAllSel.TabIndex = 292;
this.llblAllSel.TabStop = true;
this.llblAllSel.Text = "全部启用";
this.llblAllSel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.llblAllSel_LinkClicked);
//
// btnOpenFile // btnOpenFile
// //
this.btnOpenFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnOpenFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOpenFile.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenFile.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenFile.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenFile.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenFile.Location = new System.Drawing.Point(1410, 663); this.btnOpenFile.Location = new System.Drawing.Point(1212, 644);
this.btnOpenFile.Name = "btnOpenFile"; this.btnOpenFile.Name = "btnOpenFile";
this.btnOpenFile.Size = new System.Drawing.Size(120, 31); this.btnOpenFile.Size = new System.Drawing.Size(120, 45);
this.btnOpenFile.TabIndex = 260; this.btnOpenFile.TabIndex = 260;
this.btnOpenFile.Text = "更改图片"; this.btnOpenFile.Text = "更改图片";
this.btnOpenFile.UseVisualStyleBackColor = true; this.btnOpenFile.UseVisualStyleBackColor = true;
...@@ -289,7 +306,7 @@ ...@@ -289,7 +306,7 @@
this.btnCheck.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCheck.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCheck.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCheck.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCheck.Location = new System.Drawing.Point(470, 644); this.btnCheck.Location = new System.Drawing.Point(6, 639);
this.btnCheck.Name = "btnCheck"; this.btnCheck.Name = "btnCheck";
this.btnCheck.Size = new System.Drawing.Size(120, 45); this.btnCheck.Size = new System.Drawing.Size(120, 45);
this.btnCheck.TabIndex = 291; this.btnCheck.TabIndex = 291;
...@@ -301,37 +318,75 @@ ...@@ -301,37 +318,75 @@
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.lblLineW);
this.groupBox2.Controls.Add(this.label8); this.groupBox2.Controls.Add(this.label8);
this.groupBox2.Controls.Add(this.txtLineWidth);
this.groupBox2.Controls.Add(this.lbllinews);
this.groupBox2.Controls.Add(this.label122); this.groupBox2.Controls.Add(this.label122);
this.groupBox2.Controls.Add(this.btnUpdate); this.groupBox2.Controls.Add(this.btnUpdate);
this.groupBox2.Controls.Add(this.label9); this.groupBox2.Controls.Add(this.label9);
this.groupBox2.Controls.Add(this.txtXUpdate); this.groupBox2.Controls.Add(this.txtXUpdate);
this.groupBox2.Controls.Add(this.txtYUpdate); this.groupBox2.Controls.Add(this.txtYUpdate);
this.groupBox2.Controls.Add(this.label5);
this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.label10);
this.groupBox2.Location = new System.Drawing.Point(888, 80); this.groupBox2.Controls.Add(this.label24);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.txtBoardW);
this.groupBox2.Controls.Add(this.txtBoardL);
this.groupBox2.Controls.Add(this.label25);
this.groupBox2.Location = new System.Drawing.Point(634, 3);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(653, 103); this.groupBox2.Size = new System.Drawing.Size(698, 99);
this.groupBox2.TabIndex = 290; this.groupBox2.TabIndex = 290;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "图片信息"; this.groupBox2.Text = "图片信息";
// //
// lblLineW
//
this.lblLineW.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLineW.Location = new System.Drawing.Point(489, 25);
this.lblLineW.Name = "lblLineW";
this.lblLineW.Size = new System.Drawing.Size(80, 20);
this.lblLineW.TabIndex = 297;
this.lblLineW.Text = "线体宽度：";
this.lblLineW.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label8 // label8
// //
this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label8.AutoSize = true; this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(266, 71); this.label8.Location = new System.Drawing.Point(447, 65);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(30, 17); this.label8.Size = new System.Drawing.Size(30, 17);
this.label8.TabIndex = 286; this.label8.TabIndex = 286;
this.label8.Text = "mm"; this.label8.Text = "mm";
// //
// txtLineWidth
//
this.txtLineWidth.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtLineWidth.Location = new System.Drawing.Point(573, 21);
this.txtLineWidth.MaxLength = 8;
this.txtLineWidth.Name = "txtLineWidth";
this.txtLineWidth.Size = new System.Drawing.Size(70, 29);
this.txtLineWidth.TabIndex = 295;
//
// lbllinews
//
this.lbllinews.AutoSize = true;
this.lbllinews.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbllinews.Location = new System.Drawing.Point(646, 27);
this.lbllinews.Name = "lbllinews";
this.lbllinews.Size = new System.Drawing.Size(30, 17);
this.lbllinews.TabIndex = 296;
this.lbllinews.Text = "mm";
//
// label122 // label122
// //
this.label122.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label122.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label122.AutoSize = true; this.label122.AutoSize = true;
this.label122.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label122.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label122.Location = new System.Drawing.Point(266, 28); this.label122.Location = new System.Drawing.Point(447, 27);
this.label122.Name = "label122"; this.label122.Name = "label122";
this.label122.Size = new System.Drawing.Size(30, 17); this.label122.Size = new System.Drawing.Size(30, 17);
this.label122.TabIndex = 285; this.label122.TabIndex = 285;
...@@ -341,9 +396,9 @@ ...@@ -341,9 +396,9 @@
// //
this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdate.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdate.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdate.Location = new System.Drawing.Point(307, 31); this.btnUpdate.Location = new System.Drawing.Point(569, 56);
this.btnUpdate.Name = "btnUpdate"; this.btnUpdate.Name = "btnUpdate";
this.btnUpdate.Size = new System.Drawing.Size(102, 45); this.btnUpdate.Size = new System.Drawing.Size(102, 35);
this.btnUpdate.TabIndex = 284; this.btnUpdate.TabIndex = 284;
this.btnUpdate.Text = "更新"; this.btnUpdate.Text = "更新";
this.btnUpdate.UseVisualStyleBackColor = false; this.btnUpdate.UseVisualStyleBackColor = false;
...@@ -351,9 +406,9 @@ ...@@ -351,9 +406,9 @@
// //
// label9 // label9
// //
this.label9.Location = new System.Drawing.Point(29, 28); this.label9.Location = new System.Drawing.Point(215, 27);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(134, 17); this.label9.Size = new System.Drawing.Size(129, 17);
this.label9.TabIndex = 280; this.label9.TabIndex = 280;
this.label9.Text = "X轴偏移量→："; this.label9.Text = "X轴偏移量→：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -361,7 +416,7 @@ ...@@ -361,7 +416,7 @@
// txtXUpdate // txtXUpdate
// //
this.txtXUpdate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtXUpdate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtXUpdate.Location = new System.Drawing.Point(169, 21); this.txtXUpdate.Location = new System.Drawing.Point(350, 21);
this.txtXUpdate.MaxLength = 12; this.txtXUpdate.MaxLength = 12;
this.txtXUpdate.Name = "txtXUpdate"; this.txtXUpdate.Name = "txtXUpdate";
this.txtXUpdate.Size = new System.Drawing.Size(89, 29); this.txtXUpdate.Size = new System.Drawing.Size(89, 29);
...@@ -371,29 +426,85 @@ ...@@ -371,29 +426,85 @@
// txtYUpdate // txtYUpdate
// //
this.txtYUpdate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtYUpdate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtYUpdate.Location = new System.Drawing.Point(169, 63); this.txtYUpdate.Location = new System.Drawing.Point(350, 59);
this.txtYUpdate.MaxLength = 12; this.txtYUpdate.MaxLength = 12;
this.txtYUpdate.Name = "txtYUpdate"; this.txtYUpdate.Name = "txtYUpdate";
this.txtYUpdate.Size = new System.Drawing.Size(89, 29); this.txtYUpdate.Size = new System.Drawing.Size(89, 29);
this.txtYUpdate.TabIndex = 283; this.txtYUpdate.TabIndex = 283;
this.txtYUpdate.Text = "0"; this.txtYUpdate.Text = "0";
// //
// label5
//
this.label5.Location = new System.Drawing.Point(8, 27);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(114, 17);
this.label5.TabIndex = 276;
this.label5.Text = "宽度↑";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label10 // label10
// //
this.label10.Location = new System.Drawing.Point(29, 71); this.label10.Location = new System.Drawing.Point(215, 65);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(133, 17); this.label10.Size = new System.Drawing.Size(128, 17);
this.label10.TabIndex = 282; this.label10.TabIndex = 282;
this.label10.Text = "Y轴偏移量↓："; this.label10.Text = "Y轴偏移量↓：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(192, 29);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(17, 12);
this.label24.TabIndex = 36;
this.label24.Text = "mm";
//
// label3
//
this.label3.Location = new System.Drawing.Point(8, 65);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(114, 17);
this.label3.TabIndex = 275;
this.label3.Text = "长度→";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtBoardW
//
this.txtBoardW.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardW.Location = new System.Drawing.Point(128, 21);
this.txtBoardW.MaxLength = 8;
this.txtBoardW.Name = "txtBoardW";
this.txtBoardW.Size = new System.Drawing.Size(60, 29);
this.txtBoardW.TabIndex = 4;
this.txtBoardW.TextChanged += new System.EventHandler(this.txtBoardLength_TextChanged);
//
// txtBoardL
//
this.txtBoardL.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardL.Location = new System.Drawing.Point(128, 59);
this.txtBoardL.MaxLength = 8;
this.txtBoardL.Name = "txtBoardL";
this.txtBoardL.Size = new System.Drawing.Size(60, 29);
this.txtBoardL.TabIndex = 6;
this.txtBoardL.TextChanged += new System.EventHandler(this.txtBoardWidth_TextChanged);
//
// label25
//
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(192, 67);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(17, 12);
this.label25.TabIndex = 37;
this.label25.Text = "mm";
//
// chbNormal // chbNormal
// //
this.chbNormal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chbNormal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.chbNormal.AutoSize = true; this.chbNormal.AutoSize = true;
this.chbNormal.Checked = true; this.chbNormal.Checked = true;
this.chbNormal.CheckState = System.Windows.Forms.CheckState.Checked; this.chbNormal.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbNormal.Location = new System.Drawing.Point(864, 666); this.chbNormal.Location = new System.Drawing.Point(654, 657);
this.chbNormal.Name = "chbNormal"; this.chbNormal.Name = "chbNormal";
this.chbNormal.Size = new System.Drawing.Size(84, 16); this.chbNormal.Size = new System.Drawing.Size(84, 16);
this.chbNormal.TabIndex = 281; this.chbNormal.TabIndex = 281;
...@@ -405,7 +516,7 @@ ...@@ -405,7 +516,7 @@
// //
this.lblMousePosition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblMousePosition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblMousePosition.AutoSize = true; this.lblMousePosition.AutoSize = true;
this.lblMousePosition.Location = new System.Drawing.Point(1191, 668); this.lblMousePosition.Location = new System.Drawing.Point(931, 659);
this.lblMousePosition.Name = "lblMousePosition"; this.lblMousePosition.Name = "lblMousePosition";
this.lblMousePosition.Size = new System.Drawing.Size(35, 12); this.lblMousePosition.Size = new System.Drawing.Size(35, 12);
this.lblMousePosition.TabIndex = 287; this.lblMousePosition.TabIndex = 287;
...@@ -417,7 +528,7 @@ ...@@ -417,7 +528,7 @@
this.chbShowName.AutoSize = true; this.chbShowName.AutoSize = true;
this.chbShowName.Checked = true; this.chbShowName.Checked = true;
this.chbShowName.CheckState = System.Windows.Forms.CheckState.Checked; this.chbShowName.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbShowName.Location = new System.Drawing.Point(1005, 666); this.chbShowName.Location = new System.Drawing.Point(795, 657);
this.chbShowName.Name = "chbShowName"; this.chbShowName.Name = "chbShowName";
this.chbShowName.Size = new System.Drawing.Size(72, 16); this.chbShowName.Size = new System.Drawing.Size(72, 16);
this.chbShowName.TabIndex = 280; this.chbShowName.TabIndex = 280;
...@@ -425,27 +536,14 @@ ...@@ -425,27 +536,14 @@
this.chbShowName.UseVisualStyleBackColor = true; this.chbShowName.UseVisualStyleBackColor = true;
this.chbShowName.CheckedChanged += new System.EventHandler(this.chbShowName_CheckedChanged); this.chbShowName.CheckedChanged += new System.EventHandler(this.chbShowName_CheckedChanged);
// //
// btnSort
//
this.btnSort.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnSort.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSort.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSort.Location = new System.Drawing.Point(348, 644);
this.btnSort.Name = "btnSort";
this.btnSort.Size = new System.Drawing.Size(120, 45);
this.btnSort.TabIndex = 289;
this.btnSort.Text = "自动排序";
this.btnSort.UseVisualStyleBackColor = true;
this.btnSort.Click += new System.EventHandler(this.btnSort_Click);
//
// 焊点列表 // 焊点列表
// //
this.焊点列表.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.焊点列表.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.焊点列表.Controls.Add(this.dgvList); this.焊点列表.Controls.Add(this.dgvList);
this.焊点列表.Location = new System.Drawing.Point(4, 79); this.焊点列表.Location = new System.Drawing.Point(4, 108);
this.焊点列表.Name = "焊点列表"; this.焊点列表.Name = "焊点列表";
this.焊点列表.Size = new System.Drawing.Size(876, 554); this.焊点列表.Size = new System.Drawing.Size(624, 525);
this.焊点列表.TabIndex = 286; this.焊点列表.TabIndex = 286;
this.焊点列表.TabStop = false; this.焊点列表.TabStop = false;
this.焊点列表.Text = "组装信息(使用键盘上的上下键可更改选中行)"; this.焊点列表.Text = "组装信息(使用键盘上的上下键可更改选中行)";
...@@ -493,7 +591,7 @@ ...@@ -493,7 +591,7 @@
this.dgvList.RowHeadersWidth = 30; this.dgvList.RowHeadersWidth = 30;
this.dgvList.RowTemplate.Height = 23; this.dgvList.RowTemplate.Height = 23;
this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvList.Size = new System.Drawing.Size(868, 528); this.dgvList.Size = new System.Drawing.Size(616, 499);
this.dgvList.TabIndex = 31; this.dgvList.TabIndex = 31;
this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown); this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown);
...@@ -753,21 +851,19 @@ ...@@ -753,21 +851,19 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panel3.Controls.Add(this.panBoard); this.panel3.Controls.Add(this.panBoard);
this.panel3.Location = new System.Drawing.Point(888, 187); this.panel3.Location = new System.Drawing.Point(646, 123);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(652, 473); this.panel3.Size = new System.Drawing.Size(688, 510);
this.panel3.TabIndex = 277; this.panel3.TabIndex = 277;
// //
// panBoard // panBoard
// //
this.panBoard.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panBoard.AutoScroll = true; this.panBoard.AutoScroll = true;
this.panBoard.Controls.Add(this.picBoard); this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(3, 3); this.panBoard.Dock = System.Windows.Forms.DockStyle.Fill;
this.panBoard.Location = new System.Drawing.Point(0, 0);
this.panBoard.Name = "panBoard"; this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(639, 467); this.panBoard.Size = new System.Drawing.Size(688, 510);
this.panBoard.TabIndex = 261; this.panBoard.TabIndex = 261;
// //
// picBoard // picBoard
...@@ -785,78 +881,39 @@ ...@@ -785,78 +881,39 @@
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.lblLineW);
this.groupBox1.Controls.Add(this.txtLineWidth);
this.groupBox1.Controls.Add(this.lbllinews);
this.groupBox1.Controls.Add(this.btnConfigAOI); this.groupBox1.Controls.Add(this.btnConfigAOI);
this.groupBox1.Controls.Add(this.lblAoi); this.groupBox1.Controls.Add(this.lblAoi);
this.groupBox1.Controls.Add(this.cmbAOIFile); this.groupBox1.Controls.Add(this.cmbAOIFile);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txtCode); this.groupBox1.Controls.Add(this.txtCode);
this.groupBox1.Controls.Add(this.txtBoardName); this.groupBox1.Controls.Add(this.txtBoardName);
this.groupBox1.Controls.Add(this.label14); this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtBoardL);
this.groupBox1.Controls.Add(this.txtBoardW);
this.groupBox1.Controls.Add(this.label25);
this.groupBox1.Controls.Add(this.label24);
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(3, 3); this.groupBox1.Location = new System.Drawing.Point(3, 3);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(1541, 70); this.groupBox1.Size = new System.Drawing.Size(625, 99);
this.groupBox1.TabIndex = 20; this.groupBox1.TabIndex = 20;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "程序基本信息"; this.groupBox1.Text = "程序基本信息";
// //
// lblLineW
//
this.lblLineW.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLineW.Location = new System.Drawing.Point(882, 27);
this.lblLineW.Name = "lblLineW";
this.lblLineW.Size = new System.Drawing.Size(80, 20);
this.lblLineW.TabIndex = 297;
this.lblLineW.Text = "线体宽度：";
this.lblLineW.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtLineWidth
//
this.txtLineWidth.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtLineWidth.Location = new System.Drawing.Point(966, 23);
this.txtLineWidth.MaxLength = 8;
this.txtLineWidth.Name = "txtLineWidth";
this.txtLineWidth.Size = new System.Drawing.Size(70, 29);
this.txtLineWidth.TabIndex = 295;
//
// lbllinews
//
this.lbllinews.AutoSize = true;
this.lbllinews.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbllinews.Location = new System.Drawing.Point(1040, 29);
this.lbllinews.Name = "lbllinews";
this.lbllinews.Size = new System.Drawing.Size(30, 17);
this.lbllinews.TabIndex = 296;
this.lbllinews.Text = "mm";
//
// btnConfigAOI // btnConfigAOI
// //
this.btnConfigAOI.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnConfigAOI.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnConfigAOI.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnConfigAOI.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnConfigAOI.Location = new System.Drawing.Point(1424, 15); this.btnConfigAOI.Location = new System.Drawing.Point(454, 58);
this.btnConfigAOI.Name = "btnConfigAOI"; this.btnConfigAOI.Name = "btnConfigAOI";
this.btnConfigAOI.Size = new System.Drawing.Size(100, 45); this.btnConfigAOI.Size = new System.Drawing.Size(100, 30);
this.btnConfigAOI.TabIndex = 284; this.btnConfigAOI.TabIndex = 284;
this.btnConfigAOI.Text = "配置AOI"; this.btnConfigAOI.Text = "配置AOI";
this.btnConfigAOI.UseVisualStyleBackColor = true; this.btnConfigAOI.UseVisualStyleBackColor = true;
this.btnConfigAOI.Visible = false;
this.btnConfigAOI.Click += new System.EventHandler(this.btnConfigAOI_Click); this.btnConfigAOI.Click += new System.EventHandler(this.btnConfigAOI_Click);
// //
// lblAoi // lblAoi
// //
this.lblAoi.Location = new System.Drawing.Point(1074, 26); this.lblAoi.Location = new System.Drawing.Point(9, 60);
this.lblAoi.Name = "lblAoi"; this.lblAoi.Name = "lblAoi";
this.lblAoi.Size = new System.Drawing.Size(112, 22); this.lblAoi.Size = new System.Drawing.Size(104, 22);
this.lblAoi.TabIndex = 283; this.lblAoi.TabIndex = 283;
this.lblAoi.Text = "AOI程序："; this.lblAoi.Text = "AOI程序：";
this.lblAoi.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAoi.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -866,24 +923,15 @@ ...@@ -866,24 +923,15 @@
this.cmbAOIFile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbAOIFile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAOIFile.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbAOIFile.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAOIFile.FormattingEnabled = true; this.cmbAOIFile.FormattingEnabled = true;
this.cmbAOIFile.Location = new System.Drawing.Point(1190, 23); this.cmbAOIFile.Location = new System.Drawing.Point(117, 60);
this.cmbAOIFile.Name = "cmbAOIFile"; this.cmbAOIFile.Name = "cmbAOIFile";
this.cmbAOIFile.Size = new System.Drawing.Size(230, 28); this.cmbAOIFile.Size = new System.Drawing.Size(230, 28);
this.cmbAOIFile.TabIndex = 282; this.cmbAOIFile.TabIndex = 282;
// //
// label5
//
this.label5.Location = new System.Drawing.Point(528, 29);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(75, 17);
this.label5.TabIndex = 276;
this.label5.Text = "宽度↑";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtCode // txtCode
// //
this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCode.Location = new System.Drawing.Point(344, 23); this.txtCode.Location = new System.Drawing.Point(374, 23);
this.txtCode.MaxLength = 40; this.txtCode.MaxLength = 40;
this.txtCode.Name = "txtCode"; this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(180, 29); this.txtCode.Size = new System.Drawing.Size(180, 29);
...@@ -892,7 +940,7 @@ ...@@ -892,7 +940,7 @@
// txtBoardName // txtBoardName
// //
this.txtBoardName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBoardName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardName.Location = new System.Drawing.Point(87, 23); this.txtBoardName.Location = new System.Drawing.Point(117, 23);
this.txtBoardName.MaxLength = 20; this.txtBoardName.MaxLength = 20;
this.txtBoardName.Name = "txtBoardName"; this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(180, 29); this.txtBoardName.Size = new System.Drawing.Size(180, 29);
...@@ -900,75 +948,28 @@ ...@@ -900,75 +948,28 @@
// //
// label14 // label14
// //
this.label14.Location = new System.Drawing.Point(271, 26); this.label14.Location = new System.Drawing.Point(301, 26);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(69, 22); this.label14.Size = new System.Drawing.Size(69, 22);
this.label14.TabIndex = 9; this.label14.TabIndex = 9;
this.label14.Text = "条码："; this.label14.Text = "条码：";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label3
//
this.label3.Location = new System.Drawing.Point(705, 29);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(75, 17);
this.label3.TabIndex = 275;
this.label3.Text = "长度→";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2 // label2
// //
this.label2.Location = new System.Drawing.Point(5, 29); this.label2.Location = new System.Drawing.Point(35, 29);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(78, 17); this.label2.Size = new System.Drawing.Size(78, 17);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
this.label2.Text = "名称"; this.label2.Text = "名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtBoardL
//
this.txtBoardL.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardL.Location = new System.Drawing.Point(784, 23);
this.txtBoardL.MaxLength = 8;
this.txtBoardL.Name = "txtBoardL";
this.txtBoardL.Size = new System.Drawing.Size(60, 29);
this.txtBoardL.TabIndex = 6;
this.txtBoardL.TextChanged += new System.EventHandler(this.txtBoardWidth_TextChanged);
//
// txtBoardW
//
this.txtBoardW.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardW.Location = new System.Drawing.Point(607, 23);
this.txtBoardW.MaxLength = 8;
this.txtBoardW.Name = "txtBoardW";
this.txtBoardW.Size = new System.Drawing.Size(60, 29);
this.txtBoardW.TabIndex = 4;
this.txtBoardW.TextChanged += new System.EventHandler(this.txtBoardLength_TextChanged);
//
// label25
//
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(848, 29);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(30, 17);
this.label25.TabIndex = 37;
this.label25.Text = "mm";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(671, 29);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 36;
this.label24.Text = "mm";
//
// button1 // button1
// //
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(714, 644); this.button1.Location = new System.Drawing.Point(508, 639);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(120, 45); this.button1.Size = new System.Drawing.Size(120, 45);
this.button1.TabIndex = 41; this.button1.TabIndex = 41;
...@@ -981,7 +982,7 @@ ...@@ -981,7 +982,7 @@
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(592, 644); this.btnSave.Location = new System.Drawing.Point(386, 639);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(120, 45); this.btnSave.Size = new System.Drawing.Size(120, 45);
this.btnSave.TabIndex = 40; this.btnSave.TabIndex = 40;
...@@ -989,12 +990,26 @@ ...@@ -989,12 +990,26 @@
this.btnSave.UseVisualStyleBackColor = true; this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click); this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
// //
// panel2
//
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel2.BackColor = System.Drawing.Color.Black;
this.panel2.BackgroundImage = global::TSA_V.Properties.Resources.axisbg;
this.panel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.panel2.Location = new System.Drawing.Point(631, 106);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(703, 525);
this.panel2.TabIndex = 292;
//
// FrmBoardInfo // FrmBoardInfo
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1549, 701); this.ClientSize = new System.Drawing.Size(1344, 701);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmBoardInfo"; this.Name = "FrmBoardInfo";
this.Text = "新增程序"; this.Text = "新增程序";
...@@ -1059,7 +1074,6 @@ ...@@ -1059,7 +1074,6 @@
private System.Windows.Forms.Label lblMousePosition; private System.Windows.Forms.Label lblMousePosition;
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.Button btnSort;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btnUpdate; private System.Windows.Forms.Button btnUpdate;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
...@@ -1077,8 +1091,6 @@ ...@@ -1077,8 +1091,6 @@
private System.Windows.Forms.Label lblLineW; private System.Windows.Forms.Label lblLineW;
private System.Windows.Forms.TextBox txtLineWidth; private System.Windows.Forms.TextBox txtLineWidth;
private System.Windows.Forms.Label lbllinews; private System.Windows.Forms.Label lbllinews;
private System.Windows.Forms.LinkLabel llblAllUSel;
private System.Windows.Forms.LinkLabel llblAllSel;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_pointNum; private System.Windows.Forms.DataGridViewTextBoxColumn Column_pointNum;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_PartNum; private System.Windows.Forms.DataGridViewTextBoxColumn Column_PartNum;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name;
...@@ -1106,5 +1118,11 @@ ...@@ -1106,5 +1118,11 @@
private System.Windows.Forms.DataGridViewLinkColumn Column_Up; private System.Windows.Forms.DataGridViewLinkColumn Column_Up;
private System.Windows.Forms.DataGridViewLinkColumn Column_Down; private System.Windows.Forms.DataGridViewLinkColumn Column_Down;
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 全部启用ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 全部禁用ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 自动排序ToolStripMenuItem;
private System.Windows.Forms.Panel panel2;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmBoardInfo.cs
...@@ -111,6 +111,11 @@ namespace TSA_V ...@@ -111,6 +111,11 @@ namespace TSA_V
this.详情ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情"); this.详情ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情");
this.测试位置ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试"); this.测试位置ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.更新为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_UpdateN, "更新为组装位置"); this.更新为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_UpdateN, "更新为组装位置");
this.禁用ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用/启用"); ;
this.全局ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Global, "全局");
this.全部启用ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_EnableAll, "全部启用"); ;
this.全部禁用ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_DisableAll, "全部禁用"); ;
this.自动排序ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_AutoSort, "自动排序"); ;
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0) if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
{ {
int rowIndex = dgvList.SelectedRows[0].Index; int rowIndex = dgvList.SelectedRows[0].Index;
...@@ -140,12 +145,16 @@ namespace TSA_V ...@@ -140,12 +145,16 @@ namespace TSA_V
this.Column_MoveTest.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试"); this.Column_MoveTest.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.Column_MoveTest.Text = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试"); this.Column_MoveTest.Text = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.Column_MoveTest.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试"); this.Column_MoveTest.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.Column_MoveTest.Visible = false;
this.Column_btnDetail.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情"); this.Column_btnDetail.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情");
this.Column_btnDetail.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情"); this.Column_btnDetail.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情");
this.Column_btnDetail.Visible = false;
this.Column_Del.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除"); this.Column_Del.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Del.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除"); this.Column_Del.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Del.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除"); this.Column_Del.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Del.Visible = false;
this.Column_Up.Visible = false;
this.Column_Down.Visible = false;
//this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升"); //this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Up.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升"); //this.Column_Up.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Up.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升"); //this.Column_Up.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
...@@ -153,8 +162,11 @@ namespace TSA_V ...@@ -153,8 +162,11 @@ namespace TSA_V
//this.Column_Down.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降"); //this.Column_Down.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
//this.Column_Down.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降"); //this.Column_Down.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点"); this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点");
this.Column_CheckOK.Visible = false;
this.Column_disable.Visible = false;
this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用"); this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用");
this.Column_Notes.HeaderText = ResourceCulture.GetString("注意事项", "注意事项"); this.Column_Notes.HeaderText = ResourceCulture.GetString("注意事项", "注意事项");
this.Column_Notes.Width = 140;
this.新增ToolStripMenuItem.Text = ResourceCulture.GetString("新增组装点", "新增组装点"); this.新增ToolStripMenuItem.Text = ResourceCulture.GetString("新增组装点", "新增组装点");
} }
private void FrmBoardInfo_Load(object sender, EventArgs e) private void FrmBoardInfo_Load(object sender, EventArgs e)
...@@ -165,7 +177,7 @@ namespace TSA_V ...@@ -165,7 +177,7 @@ namespace TSA_V
lblAoi.Visible = TSAVBean.IsNeedAOI; lblAoi.Visible = TSAVBean.IsNeedAOI;
cmbAOIFile.Visible = TSAVBean.IsNeedAOI; cmbAOIFile.Visible = TSAVBean.IsNeedAOI;
btnConfigAOI.Visible = TSAVBean.IsNeedAOI; //btnConfigAOI.Visible = TSAVBean.IsNeedAOI;
int count = dgvList.Columns.Count; int count = dgvList.Columns.Count;
for(int i = 0; i < count; i++) for(int i = 0; i < count; i++)
...@@ -302,6 +314,7 @@ namespace TSA_V ...@@ -302,6 +314,7 @@ namespace TSA_V
view.Cells[Column_PenWidth.Index].Value = point.PenWidth; view.Cells[Column_PenWidth.Index].Value = point.PenWidth;
view.Cells[Column_ShowText.Index].Value = point.ShowText; view.Cells[Column_ShowText.Index].Value = point.ShowText;
view.Cells[Column_disable.Index].Value = point.Disable; view.Cells[Column_disable.Index].Value = point.Disable;
if (updateBoardInfo != null) if (updateBoardInfo != null)
{ {
ComponetInfo com = CSVBomManager.GetCom(updateBoardInfo.bomName, point); ComponetInfo com = CSVBomManager.GetCom(updateBoardInfo.bomName, point);
...@@ -310,18 +323,22 @@ namespace TSA_V ...@@ -310,18 +323,22 @@ namespace TSA_V
view.Cells[Column_Notes.Index].Value = com.Notes; view.Cells[Column_Notes.Index].Value = com.Notes;
} }
} }
if (point.CheckOK)
view.DefaultCellStyle.ForeColor = Color.Black;
view.DefaultCellStyle.BackColor = Color.White;
if (point.Disable)
{ {
view.DefaultCellStyle.ForeColor = Color.Red; view.DefaultCellStyle.ForeColor = Color.Gray;
view.DefaultCellStyle.BackColor = Color.LightGray;
} }
else if (point.CheckOK)
{ {
view.DefaultCellStyle.ForeColor = Color.Red;
view.DefaultCellStyle.ForeColor = Color.Black;
} }
return view; return view;
} }
private bool isRun = false; private bool isRun = false;
private bool IsProcess = false; private bool IsProcess = false;
private void timer_Elapsed(object sender, EventArgs e) private void timer_Elapsed(object sender, EventArgs e)
...@@ -1047,7 +1064,18 @@ namespace TSA_V ...@@ -1047,7 +1064,18 @@ namespace TSA_V
//liUpdateTime_LinkClicked(null, null); //liUpdateTime_LinkClicked(null, null);
} }
} }
private void 禁用ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
{
var row = dgvList.SelectedRows[0];
SMTPointInfo point = getRowPointInfo(row);
point.Disable = !point.Disable;
//dgvList.SelectedRows[0].Cells[Column_disable.Index].Value = true;
setPointInfo(row, point);
//liUpdateTime_LinkClicked(null, null);
}
}
private void 更新坐标ToolStripMenuItem_Click(object sender, EventArgs e) private void 更新坐标ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0) if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
...@@ -1190,7 +1218,9 @@ namespace TSA_V ...@@ -1190,7 +1218,9 @@ namespace TSA_V
{ {
selIndex = preIndex + 1; selIndex = preIndex + 1;
} }
FrmSelectPoint frm = new FrmSelectPoint(pointList, selIndex);
var ls = pointList.Select((point) => { return point.TagNo + "-" + point.PN; }).ToList();
FrmSelectPoint frm = new FrmSelectPoint(ResourceCulture.GetString(ResourceCulture.smtpoint_select, "请选择组件"), ls, selIndex);
DialogResult result = frm.ShowDialog(); DialogResult result = frm.ShowDialog();
if (result.Equals(DialogResult.OK)) if (result.Equals(DialogResult.OK))
{ {
...@@ -1385,6 +1415,66 @@ namespace TSA_V ...@@ -1385,6 +1415,66 @@ namespace TSA_V
AddNewPoint(x, y, NodeX, NodeY); AddNewPoint(x, y, NodeX, NodeY);
} }
private void 全部启用ToolStripMenuItem_Click(object sender, EventArgs e)
{
int cout = dgvList.Rows.Count;
for (int i = 0; i < cout; i++)
{
dgvList.Rows[i].Cells[this.Column_disable.Name].Value = false;
}
}
private void 全部禁用ToolStripMenuItem_Click(object sender, EventArgs e)
{
int cout = dgvList.Rows.Count;
for (int i = 0; i < cout; i++)
{
dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true;
}
}
private void 自动排序ToolStripMenuItem_Click(object sender, EventArgs e)
{
//根据XY排序
List<SMTPointInfo> allSmt = allPointInfo();
dgvList.Rows.Clear();
//List<SMTPointInfo> newList = (from m in allSmt orderby m.PositionX ascending, m.PositionY ascending select m).ToList<SMTPointInfo>();
List<LoadCSVLibrary.ComponetInfo> list = CSVBomManager.GetComList(updateBoardInfo.bomName);
if (list == null && list.Count <= 0)
{
LogUtil.info("未找到元器件库列表【" + updateBoardInfo.bomName + "】");
return;
}
List<SMTPointInfo> newList = new List<SMTPointInfo>();
List<string> names = new List<string>();
foreach (ComponetInfo com in list)
{
List<SMTPointInfo> smts = (from m in allSmt where m.TagNo.Equals(com.TagNo) select m).ToList<SMTPointInfo>();
if (smts.Count > 0)
{
newList.Add(smts[0]);
}
names.Add(com.TagNo);
}
foreach (SMTPointInfo s in allSmt)
{
if (!names.Contains(s.TagNo))
{
newList.Add(s);
}
}
//List<SMTPointInfo> newList = (from m in allSmt orderby m.PartNum ascending select m).ToList<SMTPointInfo>();
foreach (SMTPointInfo point in newList)
{
if (point != null)
{
dgvList.Rows.Add(setPointInfo(null, point));
}
}
}
private void llblAllUSel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void llblAllUSel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{ {
int cout = dgvList.Rows.Count; int cout = dgvList.Rows.Count;
......
TSA-V/FrmBoardList.Designer.cs
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1247, 626); this.panel1.Size = new System.Drawing.Size(1247, 485);
this.panel1.TabIndex = 2; this.panel1.TabIndex = 2;
// //
// groupBox2 // groupBox2
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox2.Location = new System.Drawing.Point(8, 82); this.groupBox2.Location = new System.Drawing.Point(8, 82);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(1230, 531); this.groupBox2.Size = new System.Drawing.Size(1230, 390);
this.groupBox2.TabIndex = 1; this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "程序信息"; this.groupBox2.Text = "程序信息";
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
this.listPoint.Location = new System.Drawing.Point(10, 140); this.listPoint.Location = new System.Drawing.Point(10, 140);
this.listPoint.MultiSelect = false; this.listPoint.MultiSelect = false;
this.listPoint.Name = "listPoint"; this.listPoint.Name = "listPoint";
this.listPoint.Size = new System.Drawing.Size(421, 376); this.listPoint.Size = new System.Drawing.Size(421, 235);
this.listPoint.TabIndex = 34; this.listPoint.TabIndex = 34;
this.listPoint.UseCompatibleStateImageBehavior = false; this.listPoint.UseCompatibleStateImageBehavior = false;
this.listPoint.View = System.Windows.Forms.View.Details; this.listPoint.View = System.Windows.Forms.View.Details;
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
this.panBoard.Controls.Add(this.picBoard); this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(437, 19); this.panBoard.Location = new System.Drawing.Point(437, 19);
this.panBoard.Name = "panBoard"; this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(780, 499); this.panBoard.Size = new System.Drawing.Size(780, 358);
this.panBoard.TabIndex = 10; this.panBoard.TabIndex = 10;
// //
// picBoard // picBoard
...@@ -294,19 +294,20 @@ ...@@ -294,19 +294,20 @@
// //
this.btnBeiliao.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBeiliao.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBeiliao.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBeiliao.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBeiliao.Location = new System.Drawing.Point(757, 15); this.btnBeiliao.Location = new System.Drawing.Point(1108, 15);
this.btnBeiliao.Name = "btnBeiliao"; this.btnBeiliao.Name = "btnBeiliao";
this.btnBeiliao.Size = new System.Drawing.Size(109, 45); this.btnBeiliao.Size = new System.Drawing.Size(109, 45);
this.btnBeiliao.TabIndex = 9; this.btnBeiliao.TabIndex = 9;
this.btnBeiliao.Text = "备料"; this.btnBeiliao.Text = "备料";
this.btnBeiliao.UseVisualStyleBackColor = true; this.btnBeiliao.UseVisualStyleBackColor = true;
this.btnBeiliao.Visible = false;
this.btnBeiliao.Click += new System.EventHandler(this.btnBeiliao_Click); this.btnBeiliao.Click += new System.EventHandler(this.btnBeiliao_Click);
// //
// btnImport // btnImport
// //
this.btnImport.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnImport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnImport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnImport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnImport.Location = new System.Drawing.Point(871, 15); this.btnImport.Location = new System.Drawing.Point(756, 15);
this.btnImport.Name = "btnImport"; this.btnImport.Name = "btnImport";
this.btnImport.Size = new System.Drawing.Size(109, 45); this.btnImport.Size = new System.Drawing.Size(109, 45);
this.btnImport.TabIndex = 8; this.btnImport.TabIndex = 8;
...@@ -318,7 +319,7 @@ ...@@ -318,7 +319,7 @@
// //
this.btnExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnExport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExport.Location = new System.Drawing.Point(985, 15); this.btnExport.Location = new System.Drawing.Point(870, 15);
this.btnExport.Name = "btnExport"; this.btnExport.Name = "btnExport";
this.btnExport.Size = new System.Drawing.Size(109, 45); this.btnExport.Size = new System.Drawing.Size(109, 45);
this.btnExport.TabIndex = 7; this.btnExport.TabIndex = 7;
...@@ -328,10 +329,9 @@ ...@@ -328,10 +329,9 @@
// //
// btnBack // btnBack
// //
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(1097, 15); this.btnBack.Location = new System.Drawing.Point(982, 15);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(109, 45); this.btnBack.Size = new System.Drawing.Size(109, 45);
this.btnBack.TabIndex = 6; this.btnBack.TabIndex = 6;
...@@ -401,14 +401,14 @@ ...@@ -401,14 +401,14 @@
// //
// FrmBoardList // FrmBoardList
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true; this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(1247, 626); this.ClientSize = new System.Drawing.Size(1247, 485);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmBoardList"; this.Name = "FrmBoardList";
this.Text = "程序配置"; this.Text = "程序编辑";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBoardList_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBoardList_FormClosing);
this.Load += new System.EventHandler(this.FrmBoard_Load); this.Load += new System.EventHandler(this.FrmBoard_Load);
......
TSA-V/FrmBoardList.resx
...@@ -120,9 +120,6 @@ ...@@ -120,9 +120,6 @@
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
TSA-V/FrmHistory.cs
...@@ -10,7 +10,7 @@ using System.Windows.Forms; ...@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace TSA_V namespace TSA_V
{ {
public partial class FrmHistory : Form public partial class FrmHistory : FrmBase
{ {
public FrmHistory() public FrmHistory()
{ {
......
TSA-V/FrmLogin.Designer.cs
...@@ -36,14 +36,16 @@ namespace TSA_V ...@@ -36,14 +36,16 @@ namespace TSA_V
this.TxtPassword = new System.Windows.Forms.TextBox(); this.TxtPassword = new System.Windows.Forms.TextBox();
this.BtnLogin = new System.Windows.Forms.Button(); this.BtnLogin = new System.Windows.Forms.Button();
this.BtnExit = new System.Windows.Forms.Button(); this.BtnExit = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
// //
this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("微软雅黑", 12F); this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.label1.Location = new System.Drawing.Point(108, 94); this.label1.Location = new System.Drawing.Point(106, 105);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(95, 21); this.label1.Size = new System.Drawing.Size(95, 21);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
...@@ -54,7 +56,7 @@ namespace TSA_V ...@@ -54,7 +56,7 @@ namespace TSA_V
// //
this.TxtUsername.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TxtUsername.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TxtUsername.ImeMode = System.Windows.Forms.ImeMode.Disable; this.TxtUsername.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.TxtUsername.Location = new System.Drawing.Point(209, 91); this.TxtUsername.Location = new System.Drawing.Point(207, 102);
this.TxtUsername.Name = "TxtUsername"; this.TxtUsername.Name = "TxtUsername";
this.TxtUsername.Size = new System.Drawing.Size(179, 33); this.TxtUsername.Size = new System.Drawing.Size(179, 33);
this.TxtUsername.TabIndex = 1; this.TxtUsername.TabIndex = 1;
...@@ -64,7 +66,7 @@ namespace TSA_V ...@@ -64,7 +66,7 @@ namespace TSA_V
// //
this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("微软雅黑", 12F); this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
this.label2.Location = new System.Drawing.Point(108, 149); this.label2.Location = new System.Drawing.Point(106, 160);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(95, 21); this.label2.Size = new System.Drawing.Size(95, 21);
this.label2.TabIndex = 2; this.label2.TabIndex = 2;
...@@ -74,7 +76,7 @@ namespace TSA_V ...@@ -74,7 +76,7 @@ namespace TSA_V
// TxtPassword // TxtPassword
// //
this.TxtPassword.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TxtPassword.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TxtPassword.Location = new System.Drawing.Point(209, 146); this.TxtPassword.Location = new System.Drawing.Point(207, 157);
this.TxtPassword.Name = "TxtPassword"; this.TxtPassword.Name = "TxtPassword";
this.TxtPassword.PasswordChar = '*'; this.TxtPassword.PasswordChar = '*';
this.TxtPassword.Size = new System.Drawing.Size(179, 33); this.TxtPassword.Size = new System.Drawing.Size(179, 33);
...@@ -85,7 +87,7 @@ namespace TSA_V ...@@ -85,7 +87,7 @@ namespace TSA_V
// //
this.BtnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.BtnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnLogin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.BtnLogin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BtnLogin.Location = new System.Drawing.Point(146, 217); this.BtnLogin.Location = new System.Drawing.Point(142, 221);
this.BtnLogin.Name = "BtnLogin"; this.BtnLogin.Name = "BtnLogin";
this.BtnLogin.Size = new System.Drawing.Size(120, 45); this.BtnLogin.Size = new System.Drawing.Size(120, 45);
this.BtnLogin.TabIndex = 4; this.BtnLogin.TabIndex = 4;
...@@ -98,7 +100,7 @@ namespace TSA_V ...@@ -98,7 +100,7 @@ namespace TSA_V
this.BtnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.BtnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.BtnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.BtnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnExit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.BtnExit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BtnExit.Location = new System.Drawing.Point(272, 217); this.BtnExit.Location = new System.Drawing.Point(268, 221);
this.BtnExit.Name = "BtnExit"; this.BtnExit.Name = "BtnExit";
this.BtnExit.Size = new System.Drawing.Size(120, 45); this.BtnExit.Size = new System.Drawing.Size(120, 45);
this.BtnExit.TabIndex = 5; this.BtnExit.TabIndex = 5;
...@@ -106,21 +108,28 @@ namespace TSA_V ...@@ -106,21 +108,28 @@ namespace TSA_V
this.BtnExit.UseVisualStyleBackColor = true; this.BtnExit.UseVisualStyleBackColor = true;
this.BtnExit.Click += new System.EventHandler(this.BtnExit_Click); this.BtnExit.Click += new System.EventHandler(this.BtnExit_Click);
// //
// button1 // pictureBox1
// //
this.button1.BackColor = System.Drawing.Color.Transparent; this.pictureBox1.Image = global::TSA_V.Properties.Resources.NEO_STATION;
this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.button1.Enabled = false; this.pictureBox1.Name = "pictureBox1";
this.button1.FlatAppearance.BorderSize = 0; this.pictureBox1.Size = new System.Drawing.Size(50, 50);
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.button1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.pictureBox1.TabIndex = 27;
this.button1.ForeColor = System.Drawing.Color.Black; this.pictureBox1.TabStop = false;
this.button1.Location = new System.Drawing.Point(12, 12); //
this.button1.Name = "button1"; // label3
this.button1.Size = new System.Drawing.Size(235, 30); //
this.button1.TabIndex = 14; this.label3.BackColor = System.Drawing.Color.Transparent;
this.button1.Text = "Smart Workstation"; this.label3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button1.UseVisualStyleBackColor = true; this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label3.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.Black;
this.label3.Location = new System.Drawing.Point(68, 24);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(200, 30);
this.label3.TabIndex = 26;
this.label3.Text = "Neo Station";
// //
// FrmLogin // FrmLogin
// //
...@@ -132,7 +141,8 @@ namespace TSA_V ...@@ -132,7 +141,8 @@ namespace TSA_V
this.CancelButton = this.BtnExit; this.CancelButton = this.BtnExit;
this.ClientSize = new System.Drawing.Size(533, 310); this.ClientSize = new System.Drawing.Size(533, 310);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.button1); this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label3);
this.Controls.Add(this.BtnExit); this.Controls.Add(this.BtnExit);
this.Controls.Add(this.BtnLogin); this.Controls.Add(this.BtnLogin);
this.Controls.Add(this.TxtPassword); this.Controls.Add(this.TxtPassword);
...@@ -143,6 +153,7 @@ namespace TSA_V ...@@ -143,6 +153,7 @@ namespace TSA_V
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmLogin"; this.Name = "FrmLogin";
this.Text = "登录"; this.Text = "登录";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -156,6 +167,7 @@ namespace TSA_V ...@@ -156,6 +167,7 @@ namespace TSA_V
private System.Windows.Forms.TextBox TxtPassword; private System.Windows.Forms.TextBox TxtPassword;
private System.Windows.Forms.Button BtnLogin; private System.Windows.Forms.Button BtnLogin;
private System.Windows.Forms.Button BtnExit; private System.Windows.Forms.Button BtnExit;
private System.Windows.Forms.Button button1; private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label3;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmMaintenance.Designer.cs
...@@ -37,9 +37,11 @@ ...@@ -37,9 +37,11 @@
this.btnDebug = new System.Windows.Forms.Button(); this.btnDebug = new System.Windows.Forms.Button();
this.btnPwdUpdate = new System.Windows.Forms.Button(); this.btnPwdUpdate = new System.Windows.Forms.Button();
this.btnWidthC = new System.Windows.Forms.Button(); this.btnWidthC = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.LblUserName = new System.Windows.Forms.Label(); this.LblUserName = new System.Windows.Forms.Label();
this.lblVersion = new System.Windows.Forms.Label(); this.lblVersion = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// button1 // button1
...@@ -170,22 +172,6 @@ ...@@ -170,22 +172,6 @@
this.btnWidthC.UseVisualStyleBackColor = false; this.btnWidthC.UseVisualStyleBackColor = false;
this.btnWidthC.Click += new System.EventHandler(this.btnWidthC_Click); this.btnWidthC.Click += new System.EventHandler(this.btnWidthC_Click);
// //
// button2
//
this.button2.BackColor = System.Drawing.Color.Transparent;
this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button2.Enabled = false;
this.button2.FlatAppearance.BorderSize = 0;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.ForeColor = System.Drawing.Color.Black;
this.button2.Location = new System.Drawing.Point(23, 23);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(200, 30);
this.button2.TabIndex = 21;
this.button2.Text = "Neo Station";
this.button2.UseVisualStyleBackColor = true;
//
// LblUserName // LblUserName
// //
this.LblUserName.AutoSize = true; this.LblUserName.AutoSize = true;
...@@ -206,6 +192,29 @@ ...@@ -206,6 +192,29 @@
this.lblVersion.TabIndex = 22; this.lblVersion.TabIndex = 22;
this.lblVersion.Text = "版本号 1.1.2"; this.lblVersion.Text = "版本号 1.1.2";
// //
// pictureBox1
//
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NEO_STATION;
this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 25;
this.pictureBox1.TabStop = false;
//
// label1
//
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.label1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
this.label1.Location = new System.Drawing.Point(68, 24);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(200, 30);
this.label1.TabIndex = 24;
this.label1.Text = "Neo Station";
//
// FrmMaintenance // FrmMaintenance
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -213,9 +222,10 @@ ...@@ -213,9 +222,10 @@
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(861, 453); this.ClientSize = new System.Drawing.Size(861, 453);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label1);
this.Controls.Add(this.LblUserName); this.Controls.Add(this.LblUserName);
this.Controls.Add(this.lblVersion); this.Controls.Add(this.lblVersion);
this.Controls.Add(this.button2);
this.Controls.Add(this.btnWidthC); this.Controls.Add(this.btnWidthC);
this.Controls.Add(this.btnPwdUpdate); this.Controls.Add(this.btnPwdUpdate);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
...@@ -231,6 +241,7 @@ ...@@ -231,6 +241,7 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMaintenance_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMaintenance_FormClosing);
this.Load += new System.EventHandler(this.FrmMaintenance_Load); this.Load += new System.EventHandler(this.FrmMaintenance_Load);
this.Shown += new System.EventHandler(this.FrmMaintenance_Shown); this.Shown += new System.EventHandler(this.FrmMaintenance_Shown);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -246,8 +257,9 @@ ...@@ -246,8 +257,9 @@
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btnPwdUpdate; private System.Windows.Forms.Button btnPwdUpdate;
private System.Windows.Forms.Button btnWidthC; private System.Windows.Forms.Button btnWidthC;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label LblUserName; private System.Windows.Forms.Label LblUserName;
private System.Windows.Forms.Label lblVersion; private System.Windows.Forms.Label lblVersion;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label1;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmMenu.Designer.cs
...@@ -36,6 +36,7 @@ namespace TSA_V ...@@ -36,6 +36,7 @@ namespace TSA_V
this.btnExit = new System.Windows.Forms.Button(); this.btnExit = new System.Windows.Forms.Button();
this.btnWork = new System.Windows.Forms.Button(); this.btnWork = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.lblMsg = new System.Windows.Forms.Label(); this.lblMsg = new System.Windows.Forms.Label();
this.btnHistory = new System.Windows.Forms.Button(); this.btnHistory = new System.Windows.Forms.Button();
this.LblUserName = new System.Windows.Forms.Label(); this.LblUserName = new System.Windows.Forms.Label();
...@@ -43,11 +44,14 @@ namespace TSA_V ...@@ -43,11 +44,14 @@ namespace TSA_V
this.lblWaitTime = new System.Windows.Forms.Label(); this.lblWaitTime = new System.Windows.Forms.Label();
this.btnCloseLed = new System.Windows.Forms.Button(); this.btnCloseLed = new System.Windows.Forms.Button();
this.btnOpenLed = new System.Windows.Forms.Button(); this.btnOpenLed = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Label();
this.btnReplenish = new System.Windows.Forms.Button();
this.btnMaintenance = new System.Windows.Forms.Button(); this.btnMaintenance = new System.Windows.Forms.Button();
this.btnCom = new System.Windows.Forms.Button(); this.btnCom = new System.Windows.Forms.Button();
this.btnAOI = new System.Windows.Forms.Button();
this.btnProduct = new System.Windows.Forms.Button(); this.btnProduct = new System.Windows.Forms.Button();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -60,7 +64,7 @@ namespace TSA_V ...@@ -60,7 +64,7 @@ namespace TSA_V
this.lblVersion.AutoSize = true; this.lblVersion.AutoSize = true;
this.lblVersion.BackColor = System.Drawing.Color.Transparent; this.lblVersion.BackColor = System.Drawing.Color.Transparent;
this.lblVersion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblVersion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblVersion.Location = new System.Drawing.Point(6, 435); this.lblVersion.Location = new System.Drawing.Point(9, 520);
this.lblVersion.Name = "lblVersion"; this.lblVersion.Name = "lblVersion";
this.lblVersion.Size = new System.Drawing.Size(75, 17); this.lblVersion.Size = new System.Drawing.Size(75, 17);
this.lblVersion.TabIndex = 11; this.lblVersion.TabIndex = 11;
...@@ -69,12 +73,13 @@ namespace TSA_V ...@@ -69,12 +73,13 @@ namespace TSA_V
// btnExit // btnExit
// //
this.btnExit.BackColor = System.Drawing.Color.Transparent; this.btnExit.BackColor = System.Drawing.Color.Transparent;
this.btnExit.BackgroundImage = global::TSA_V.Properties.Resources.退出;
this.btnExit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btnExit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btnExit.FlatAppearance.BorderSize = 0; this.btnExit.FlatAppearance.BorderSize = 0;
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnExit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExit.ForeColor = System.Drawing.Color.White; this.btnExit.ForeColor = System.Drawing.Color.White;
this.btnExit.Location = new System.Drawing.Point(725, 20); this.btnExit.Location = new System.Drawing.Point(760, 12);
this.btnExit.Name = "btnExit"; this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(89, 37); this.btnExit.Size = new System.Drawing.Size(89, 37);
this.btnExit.TabIndex = 9; this.btnExit.TabIndex = 9;
...@@ -90,16 +95,20 @@ namespace TSA_V ...@@ -90,16 +95,20 @@ namespace TSA_V
this.btnWork.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnWork.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWork.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWork.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWork.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.btnWork.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
this.btnWork.Location = new System.Drawing.Point(213, 107); this.btnWork.Location = new System.Drawing.Point(87, 107);
this.btnWork.Name = "btnWork"; this.btnWork.Name = "btnWork";
this.btnWork.Size = new System.Drawing.Size(191, 261); this.btnWork.Size = new System.Drawing.Size(261, 312);
this.btnWork.TabIndex = 0; this.btnWork.TabIndex = 0;
this.btnWork.UseVisualStyleBackColor = false; this.btnWork.UseVisualStyleBackColor = false;
this.btnWork.Click += new System.EventHandler(this.btnWork_Click); this.btnWork.Click += new System.EventHandler(this.btnWork_Click);
// //
// panel1 // panel1
// //
this.panel1.BackColor = System.Drawing.Color.Transparent;
this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel1.Controls.Add(this.btnWork);
this.panel1.Controls.Add(this.btnExit);
this.panel1.Controls.Add(this.pictureBox1);
this.panel1.Controls.Add(this.lblMsg); this.panel1.Controls.Add(this.lblMsg);
this.panel1.Controls.Add(this.btnHistory); this.panel1.Controls.Add(this.btnHistory);
this.panel1.Controls.Add(this.LblUserName); this.panel1.Controls.Add(this.LblUserName);
...@@ -109,19 +118,32 @@ namespace TSA_V ...@@ -109,19 +118,32 @@ namespace TSA_V
this.panel1.Controls.Add(this.btnCloseLed); this.panel1.Controls.Add(this.btnCloseLed);
this.panel1.Controls.Add(this.btnOpenLed); this.panel1.Controls.Add(this.btnOpenLed);
this.panel1.Controls.Add(this.button1); this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.btnReplenish);
this.panel1.Controls.Add(this.btnMaintenance); this.panel1.Controls.Add(this.btnMaintenance);
this.panel1.Controls.Add(this.btnCom); this.panel1.Controls.Add(this.btnCom);
this.panel1.Controls.Add(this.btnAOI);
this.panel1.Controls.Add(this.btnProduct); this.panel1.Controls.Add(this.btnProduct);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(861, 453); this.panel1.Size = new System.Drawing.Size(909, 546);
this.panel1.TabIndex = 14; this.panel1.TabIndex = 14;
// //
// pictureBox1
//
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NEO_STATION;
this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 22;
this.pictureBox1.TabStop = false;
//
// lblMsg // lblMsg
// //
this.lblMsg.BackColor = System.Drawing.Color.Transparent; this.lblMsg.BackColor = System.Drawing.Color.Transparent;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.Location = new System.Drawing.Point(213, 384); this.lblMsg.Location = new System.Drawing.Point(261, 477);
this.lblMsg.Name = "lblMsg"; this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(636, 60); this.lblMsg.Size = new System.Drawing.Size(636, 60);
this.lblMsg.TabIndex = 21; this.lblMsg.TabIndex = 21;
...@@ -137,9 +159,9 @@ namespace TSA_V ...@@ -137,9 +159,9 @@ namespace TSA_V
this.btnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHistory.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnHistory.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHistory.ForeColor = System.Drawing.Color.White; this.btnHistory.ForeColor = System.Drawing.Color.White;
this.btnHistory.Location = new System.Drawing.Point(412, 195); this.btnHistory.Location = new System.Drawing.Point(354, 319);
this.btnHistory.Name = "btnHistory"; this.btnHistory.Name = "btnHistory";
this.btnHistory.Size = new System.Drawing.Size(222, 81); this.btnHistory.Size = new System.Drawing.Size(180, 100);
this.btnHistory.TabIndex = 20; this.btnHistory.TabIndex = 20;
this.btnHistory.UseVisualStyleBackColor = false; this.btnHistory.UseVisualStyleBackColor = false;
this.btnHistory.Click += new System.EventHandler(this.BtnHistory_Click); this.btnHistory.Click += new System.EventHandler(this.BtnHistory_Click);
...@@ -149,7 +171,7 @@ namespace TSA_V ...@@ -149,7 +171,7 @@ namespace TSA_V
this.LblUserName.AutoSize = true; this.LblUserName.AutoSize = true;
this.LblUserName.BackColor = System.Drawing.Color.Transparent; this.LblUserName.BackColor = System.Drawing.Color.Transparent;
this.LblUserName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.LblUserName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblUserName.Location = new System.Drawing.Point(615, 32); this.LblUserName.Location = new System.Drawing.Point(637, 33);
this.LblUserName.Name = "LblUserName"; this.LblUserName.Name = "LblUserName";
this.LblUserName.Size = new System.Drawing.Size(43, 17); this.LblUserName.Size = new System.Drawing.Size(43, 17);
this.LblUserName.TabIndex = 18; this.LblUserName.TabIndex = 18;
...@@ -158,7 +180,7 @@ namespace TSA_V ...@@ -158,7 +180,7 @@ namespace TSA_V
// btnScreenTest // btnScreenTest
// //
this.btnScreenTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnScreenTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScreenTest.Location = new System.Drawing.Point(640, 131); this.btnScreenTest.Location = new System.Drawing.Point(745, 107);
this.btnScreenTest.Name = "btnScreenTest"; this.btnScreenTest.Name = "btnScreenTest";
this.btnScreenTest.Size = new System.Drawing.Size(104, 40); this.btnScreenTest.Size = new System.Drawing.Size(104, 40);
this.btnScreenTest.TabIndex = 17; this.btnScreenTest.TabIndex = 17;
...@@ -186,7 +208,7 @@ namespace TSA_V ...@@ -186,7 +208,7 @@ namespace TSA_V
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.ForeColor = System.Drawing.Color.White; this.btnCloseLed.ForeColor = System.Drawing.Color.White;
this.btnCloseLed.Location = new System.Drawing.Point(640, 287); this.btnCloseLed.Location = new System.Drawing.Point(742, 287);
this.btnCloseLed.Name = "btnCloseLed"; this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(107, 81); this.btnCloseLed.Size = new System.Drawing.Size(107, 81);
this.btnCloseLed.TabIndex = 15; this.btnCloseLed.TabIndex = 15;
...@@ -203,7 +225,7 @@ namespace TSA_V ...@@ -203,7 +225,7 @@ namespace TSA_V
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.ForeColor = System.Drawing.Color.White; this.btnOpenLed.ForeColor = System.Drawing.Color.White;
this.btnOpenLed.Location = new System.Drawing.Point(640, 287); this.btnOpenLed.Location = new System.Drawing.Point(745, 200);
this.btnOpenLed.Name = "btnOpenLed"; this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(107, 81); this.btnOpenLed.Size = new System.Drawing.Size(107, 81);
this.btnOpenLed.TabIndex = 14; this.btnOpenLed.TabIndex = 14;
...@@ -214,17 +236,30 @@ namespace TSA_V ...@@ -214,17 +236,30 @@ namespace TSA_V
// //
this.button1.BackColor = System.Drawing.Color.Transparent; this.button1.BackColor = System.Drawing.Color.Transparent;
this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button1.Enabled = false;
this.button1.FlatAppearance.BorderSize = 0;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.ForeColor = System.Drawing.Color.Black; this.button1.ForeColor = System.Drawing.Color.Black;
this.button1.Location = new System.Drawing.Point(23, 23); this.button1.Location = new System.Drawing.Point(68, 24);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(200, 30); this.button1.Size = new System.Drawing.Size(200, 30);
this.button1.TabIndex = 13; this.button1.TabIndex = 13;
this.button1.Text = "Neo Station"; this.button1.Text = "Neo Station";
this.button1.UseVisualStyleBackColor = true; //
// btnReplenish
//
this.btnReplenish.BackColor = System.Drawing.Color.Transparent;
this.btnReplenish.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnReplenish.BackgroundImage")));
this.btnReplenish.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnReplenish.FlatAppearance.BorderSize = 0;
this.btnReplenish.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReplenish.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReplenish.ForeColor = System.Drawing.Color.White;
this.btnReplenish.Location = new System.Drawing.Point(540, 213);
this.btnReplenish.Name = "btnReplenish";
this.btnReplenish.Size = new System.Drawing.Size(180, 100);
this.btnReplenish.TabIndex = 8;
this.btnReplenish.UseVisualStyleBackColor = false;
this.btnReplenish.Click += new System.EventHandler(this.btnReplenish_Click);
// //
// btnMaintenance // btnMaintenance
// //
...@@ -235,9 +270,9 @@ namespace TSA_V ...@@ -235,9 +270,9 @@ namespace TSA_V
this.btnMaintenance.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMaintenance.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMaintenance.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMaintenance.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMaintenance.ForeColor = System.Drawing.Color.White; this.btnMaintenance.ForeColor = System.Drawing.Color.White;
this.btnMaintenance.Location = new System.Drawing.Point(414, 287); this.btnMaintenance.Location = new System.Drawing.Point(540, 107);
this.btnMaintenance.Name = "btnMaintenance"; this.btnMaintenance.Name = "btnMaintenance";
this.btnMaintenance.Size = new System.Drawing.Size(107, 81); this.btnMaintenance.Size = new System.Drawing.Size(180, 100);
this.btnMaintenance.TabIndex = 8; this.btnMaintenance.TabIndex = 8;
this.btnMaintenance.UseVisualStyleBackColor = false; this.btnMaintenance.UseVisualStyleBackColor = false;
this.btnMaintenance.Click += new System.EventHandler(this.btnMaintenance_Click); this.btnMaintenance.Click += new System.EventHandler(this.btnMaintenance_Click);
...@@ -251,13 +286,29 @@ namespace TSA_V ...@@ -251,13 +286,29 @@ namespace TSA_V
this.btnCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCom.ForeColor = System.Drawing.Color.White; this.btnCom.ForeColor = System.Drawing.Color.White;
this.btnCom.Location = new System.Drawing.Point(527, 287); this.btnCom.Location = new System.Drawing.Point(540, 319);
this.btnCom.Name = "btnCom"; this.btnCom.Name = "btnCom";
this.btnCom.Size = new System.Drawing.Size(107, 81); this.btnCom.Size = new System.Drawing.Size(180, 100);
this.btnCom.TabIndex = 5; this.btnCom.TabIndex = 5;
this.btnCom.UseVisualStyleBackColor = false; this.btnCom.UseVisualStyleBackColor = false;
this.btnCom.Click += new System.EventHandler(this.btnCom_Click); this.btnCom.Click += new System.EventHandler(this.btnCom_Click);
// //
// btnAOI
//
this.btnAOI.BackColor = System.Drawing.Color.Transparent;
this.btnAOI.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnAOI.BackgroundImage")));
this.btnAOI.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnAOI.FlatAppearance.BorderSize = 0;
this.btnAOI.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAOI.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAOI.ForeColor = System.Drawing.Color.White;
this.btnAOI.Location = new System.Drawing.Point(354, 213);
this.btnAOI.Name = "btnAOI";
this.btnAOI.Size = new System.Drawing.Size(180, 100);
this.btnAOI.TabIndex = 1;
this.btnAOI.UseVisualStyleBackColor = false;
this.btnAOI.Click += new System.EventHandler(this.btnAOI_Click);
//
// btnProduct // btnProduct
// //
this.btnProduct.BackColor = System.Drawing.Color.Transparent; this.btnProduct.BackColor = System.Drawing.Color.Transparent;
...@@ -267,9 +318,9 @@ namespace TSA_V ...@@ -267,9 +318,9 @@ namespace TSA_V
this.btnProduct.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnProduct.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnProduct.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnProduct.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnProduct.ForeColor = System.Drawing.Color.White; this.btnProduct.ForeColor = System.Drawing.Color.White;
this.btnProduct.Location = new System.Drawing.Point(412, 107); this.btnProduct.Location = new System.Drawing.Point(354, 107);
this.btnProduct.Name = "btnProduct"; this.btnProduct.Name = "btnProduct";
this.btnProduct.Size = new System.Drawing.Size(222, 81); this.btnProduct.Size = new System.Drawing.Size(180, 100);
this.btnProduct.TabIndex = 1; this.btnProduct.TabIndex = 1;
this.btnProduct.UseVisualStyleBackColor = false; this.btnProduct.UseVisualStyleBackColor = false;
this.btnProduct.Click += new System.EventHandler(this.btnProduct_Click); this.btnProduct.Click += new System.EventHandler(this.btnProduct_Click);
...@@ -280,10 +331,8 @@ namespace TSA_V ...@@ -280,10 +331,8 @@ namespace TSA_V
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = global::TSA_V.Properties.Resources.背景; this.BackgroundImage = global::TSA_V.Properties.Resources.背景;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(861, 453); this.ClientSize = new System.Drawing.Size(909, 546);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.btnExit);
this.Controls.Add(this.btnWork);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.DoubleBuffered = true; this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
...@@ -295,6 +344,7 @@ namespace TSA_V ...@@ -295,6 +344,7 @@ namespace TSA_V
this.SizeChanged += new System.EventHandler(this.FrmMenu_SizeChanged); this.SizeChanged += new System.EventHandler(this.FrmMenu_SizeChanged);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -308,7 +358,7 @@ namespace TSA_V ...@@ -308,7 +358,7 @@ namespace TSA_V
private System.Windows.Forms.Button btnExit; private System.Windows.Forms.Button btnExit;
private System.Windows.Forms.Label lblVersion; private System.Windows.Forms.Label lblVersion;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Label button1;
private System.Windows.Forms.Button btnCloseLed; private System.Windows.Forms.Button btnCloseLed;
private System.Windows.Forms.Button btnOpenLed; private System.Windows.Forms.Button btnOpenLed;
private System.Windows.Forms.Label lblWaitTime; private System.Windows.Forms.Label lblWaitTime;
...@@ -317,5 +367,8 @@ namespace TSA_V ...@@ -317,5 +367,8 @@ namespace TSA_V
private System.Windows.Forms.Button btnHistory; private System.Windows.Forms.Button btnHistory;
private System.Windows.Forms.Label LblUserName; private System.Windows.Forms.Label LblUserName;
private System.Windows.Forms.Label lblMsg; private System.Windows.Forms.Label lblMsg;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Button btnReplenish;
private System.Windows.Forms.Button btnAOI;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmMenu.cs
...@@ -149,7 +149,7 @@ namespace TSA_V ...@@ -149,7 +149,7 @@ namespace TSA_V
try try
{ {
AccAOI.camera.CameraManager.LoadCamera(); AccAOI.camera.CameraManager.LoadCamera();
LogUtil.info("加载到相机：" + AccAOI.camera.CameraManager.cName); LogUtil.info("加载到相机：" + string.Join(";",AccAOI.camera.CameraManager.hikNameList.ToArray()));
this.Focus(); this.Focus();
SetMouseAtCenterScreen(); SetMouseAtCenterScreen();
} }
...@@ -174,6 +174,8 @@ namespace TSA_V ...@@ -174,6 +174,8 @@ namespace TSA_V
this.btnOpenLed.BackgroundImage = ImageManager.Menu_US_打开光源; this.btnOpenLed.BackgroundImage = ImageManager.Menu_US_打开光源;
this.btnCloseLed.BackgroundImage = ImageManager.Menu_US_关闭光源; this.btnCloseLed.BackgroundImage = ImageManager.Menu_US_关闭光源;
this.btnHistory.BackgroundImage = ImageManager.Main_US_历史记录; this.btnHistory.BackgroundImage = ImageManager.Main_US_历史记录;
this.btnAOI.BackgroundImage = ImageManager.Menu_US_光学检测;
this.btnReplenish.BackgroundImage = ImageManager.Menu_US_补料;
} }
else else
{ {
...@@ -187,6 +189,8 @@ namespace TSA_V ...@@ -187,6 +189,8 @@ namespace TSA_V
this.btnOpenLed.BackgroundImage = ImageManager.Menu_打开光源; this.btnOpenLed.BackgroundImage = ImageManager.Menu_打开光源;
this.btnCloseLed.BackgroundImage = ImageManager.Menu_关闭光源; this.btnCloseLed.BackgroundImage = ImageManager.Menu_关闭光源;
this.btnHistory.BackgroundImage = ImageManager.Main_历史记录; this.btnHistory.BackgroundImage = ImageManager.Main_历史记录;
this.btnAOI.BackgroundImage = ImageManager.Menu_光学检测;
this.btnReplenish.BackgroundImage = ImageManager.Menu_补料;
} }
} }
...@@ -373,5 +377,74 @@ namespace TSA_V ...@@ -373,5 +377,74 @@ namespace TSA_V
//FrmHistory frm = new FrmHistory(); //FrmHistory frm = new FrmHistory();
//frm.ShowDialog(); //frm.ShowDialog();
} }
private void btnAOI_Click(object sender, EventArgs e)
{
//AccAOI.FrmAoiSetting frmAoiSetting = new FrmAoiSetting();
//frmAoiSetting.Show();
string createnew = ResourceCulture.GetString(ResourceCulture.CreateNew, "新建");
AOIManager.LoadAOIFile(null, "");
List<string> listb = new List<string>(AOIManager.FileList);
listb.Insert(0, createnew);
FrmSelectPoint frma = new FrmSelectPoint(ResourceCulture.GetString("FrmBoardSelect_Text", "请选择AOI"), listb, listb.Count>1?1:0);
DialogResult result = frma.ShowDialog();
if (result.Equals(DialogResult.OK))
{
string aoiName = listb[frma.SelectIndex];
string path = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.AOIFileConfig);
string fileName = "";
if (!aoiName.Equals(""))
{
fileName = path + aoiName;
}
AccAOI.AOIResourceCulture.SetCurrentCulture(ResourceCulture.CurrLanguage);
if (aoiName == createnew)
fileName = "";
FrmAoiSetting frm = new FrmAoiSetting(fileName, null, path);
frm.ShowDialog();
}
}
private void btnReplenish_Click(object sender, EventArgs e)
{
List<BoardInfo> listb = new List<BoardInfo>(BoardManager.boardList);
var ls = listb.Select((point) => { return point.boardName; }).ToList();
FrmSelectPoint frma = new FrmSelectPoint(ResourceCulture.GetString("FrmBoardSelect_Text", "请选择程序"), ls, 0);
DialogResult result = frma.ShowDialog();
if (result.Equals(DialogResult.OK))
{
BoardInfo board = listb[frma.SelectIndex];
List<ComponetInfo> allList = CSVBomManager.GetComList(board.bomName);
List<SMTPointInfo> plist = (from m in board.smtList where m.Disable.Equals(false) select m).ToList();
List<ComponetInfo> list = new List<ComponetInfo>();
foreach (ComponetInfo p in allList)
{
List<SMTPointInfo> hasList = new List<SMTPointInfo>();
if (String.IsNullOrEmpty(p.TagNo))
{
hasList = (from m in plist where m.PN.Equals(p.PN) select m).ToList();
}
else
{
hasList = (from m in plist where m.TagNo.Equals(p.TagNo) select m).ToList();
}
if (hasList.Count > 0)
{
list.Add(p);
}
}
list = (from m in list orderby m.PN ascending select m).ToList();
FrmBoardPutCom frm = new FrmBoardPutCom();
if (frm.SetOperateInfo(board, board.bomName, list))
{
this.Visible = false;
frm.ShowDialog();
this.Visible = true;
}
}
}
} }
} }
TSA-V/FrmMenu.resx
此文件的差异太大，无法显示。
TSA-V/FrmSelectPoint.cs
...@@ -14,14 +14,16 @@ namespace TSA_V ...@@ -14,14 +14,16 @@ namespace TSA_V
public partial class FrmSelectPoint : FrmBase public partial class FrmSelectPoint : FrmBase
{ {
private List<SMTPointInfo> pointList = new List<SMTPointInfo>(); private List<string> pointList = new List<string>();
public int SelectIndex = -1; public int SelectIndex = -1;
public int defaultIndex = 0; public int defaultIndex = 0;
public FrmSelectPoint(List<SMTPointInfo> pointList,int Index) string Title;
public FrmSelectPoint(string title,List<string> pointList,int Index)
{ {
this.pointList = pointList; this.pointList = pointList;
InitializeComponent(); InitializeComponent();
defaultIndex = Index; defaultIndex = Index;
Title = title;
} }
private FrmSelectPoint( ) private FrmSelectPoint( )
{ {
...@@ -43,9 +45,9 @@ namespace TSA_V ...@@ -43,9 +45,9 @@ namespace TSA_V
{ {
LanguageProcess(); LanguageProcess();
this.cmbPointList.Items.Clear(); this.cmbPointList.Items.Clear();
foreach (SMTPointInfo point in pointList) foreach (var point in pointList)
{ {
cmbPointList.Items.Add(point.TagNo + "-" + point.PN); cmbPointList.Items.Add(point.ToString());
} }
if (cmbPointList.Items.Count > 0) if (cmbPointList.Items.Count > 0)
{ {
...@@ -56,7 +58,7 @@ namespace TSA_V ...@@ -56,7 +58,7 @@ namespace TSA_V
cmbPointList.SelectedIndex = defaultIndex; cmbPointList.SelectedIndex = defaultIndex;
} }
} }
Text = Title;
} }
private void cmbPointList_SelectedIndexChanged(object sender, EventArgs e) private void cmbPointList_SelectedIndexChanged(object sender, EventArgs e)
......
TSA-V/ImageManager.cs
...@@ -31,6 +31,8 @@ namespace TSA_V ...@@ -31,6 +31,8 @@ namespace TSA_V
public static Image Menu_自动焊接; public static Image Menu_自动焊接;
public static Image Menu_退出; public static Image Menu_退出;
public static Image Menu_标题; public static Image Menu_标题;
public static Image Menu_光学检测;
public static Image Menu_补料;
public static Image Main_历史记录; public static Image Main_历史记录;
public static Image Main_US_历史记录; public static Image Main_US_历史记录;
...@@ -53,6 +55,9 @@ namespace TSA_V ...@@ -53,6 +55,9 @@ namespace TSA_V
public static Image Menu_US_自动焊接; public static Image Menu_US_自动焊接;
public static Image Menu_US_退出; public static Image Menu_US_退出;
public static Image Menu_US_标题; public static Image Menu_US_标题;
public static Image Menu_US_光学检测;
public static Image Menu_US_补料;
/// <summary> /// <summary>
/// 是否已经初始化过了 /// 是否已经初始化过了
/// </summary> /// </summary>
...@@ -81,33 +86,35 @@ namespace TSA_V ...@@ -81,33 +86,35 @@ namespace TSA_V
{ {
IsInit = true; IsInit = true;
Ok = GetImage(Application.StartupPath + "\\image\\ok.png"); Ok = GetImage(Application.StartupPath + "\\image\\ok.png");
Main_元器件 = GetImage(Application.StartupPath + "\\image\\CN\\元器件信息.jpg"); Main_元器件 = GetImage(Application.StartupPath + "\\image\\CN\\元器件.png");
Main_程序编辑 = GetImage(Application.StartupPath + "\\image\\CN\\程序编辑.jpg"); Main_程序编辑 = GetImage(Application.StartupPath + "\\image\\CN\\装配程序.png");
Main_开始工作 = GetImage(Application.StartupPath + "\\image\\CN\\开始工作.jpg"); Main_开始工作 = GetImage(Application.StartupPath + "\\image\\CN\\开始工作.png");
Main_设备配置 = GetImage(Application.StartupPath + "\\image\\CN\\设备配置.jpg"); Main_设备配置 = GetImage(Application.StartupPath + "\\image\\CN\\设置.png");
Main_统计系统 = GetImage(Application.StartupPath + "\\image\\CN\\统计系统.jpg"); //Main_统计系统 = GetImage(Application.StartupPath + "\\image\\CN\\统计系统.jpg");
frm_背景图 = GetImage(Application.StartupPath + "\\image\\背景图.png"); //frm_背景图 = GetImage(Application.StartupPath + "\\image\\背景图.png");
Main_退出 = GetImage(Application.StartupPath + "\\image\\CN\\退出.jpg"); Main_退出 = GetImage(Application.StartupPath + "\\image\\CN\\退出.png");
Main_智能工作站 = GetImage(Application.StartupPath + "\\image\\CN\\智能工作站.jpg"); Main_智能工作站 = GetImage(Application.StartupPath + "\\image\\CN\\智能工作站.jpg");
Menu_焊接 = GetImage(Application.StartupPath + "\\image\\CN\\焊接.gif"); //Menu_焊接 = GetImage(Application.StartupPath + "\\image\\CN\\焊接.gif");
Menu_检测 = GetImage(Application.StartupPath + "\\image\\CN\\检测.gif"); //Menu_检测 = GetImage(Application.StartupPath + "\\image\\CN\\检测.gif");
Menu_组装 = GetImage(Application.StartupPath + "\\image\\CN\\组装.gif"); //Menu_组装 = GetImage(Application.StartupPath + "\\image\\CN\\组装.gif");
Menu_自动焊接 = GetImage(Application.StartupPath + "\\image\\CN\\自动焊接.gif"); //Menu_自动焊接 = GetImage(Application.StartupPath + "\\image\\CN\\自动焊接.gif");
Menu_退出 = GetImage(Application.StartupPath + "\\image\\CN\\退出2.jpg"); Menu_退出 = Main_退出;// GetImage(Application.StartupPath + "\\image\\CN\\退出2.jpg");
Menu_标题 = GetImage(Application.StartupPath + "\\image\\CN\\标题.jpg"); //Menu_标题 = GetImage(Application.StartupPath + "\\image\\CN\\标题.jpg");
Main_MOSCOT = GetImage(Application.StartupPath + "\\image\\CN\\MOSCOT.jpg"); //Main_MOSCOT = GetImage(Application.StartupPath + "\\image\\CN\\MOSCOT.jpg");
Menu_打开光源 = GetImage(Application.StartupPath + "\\image\\CN\\打开光源.jpg"); //Menu_打开光源 = GetImage(Application.StartupPath + "\\image\\CN\\打开光源.jpg");
Menu_关闭光源 = GetImage(Application.StartupPath + "\\image\\CN\\关闭光源.jpg"); //Menu_关闭光源 = GetImage(Application.StartupPath + "\\image\\CN\\关闭光源.jpg");
Main_历史记录=GetImage(Application.StartupPath+ "\\image\\CN\\历史记录.gif"); Main_历史记录=GetImage(Application.StartupPath+ "\\image\\CN\\历史记录.png");
Menu_光学检测=GetImage(Application.StartupPath+ "\\image\\CN\\光学检测.png");
Menu_补料=GetImage(Application.StartupPath+ "\\image\\CN\\补料.png");
Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\元器件信息.gif");
Main_US_程序编辑 = GetImage(Application.StartupPath + "\\image\\US\\程序编辑.gif");
Main_US_开始工作 = GetImage(Application.StartupPath + "\\image\\US\\开始工作.gif"); Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\Component Lib.png");
Main_US_设备配置 = GetImage(Application.StartupPath + "\\image\\US\\设备配置.gif"); Main_US_程序编辑 = GetImage(Application.StartupPath + "\\image\\US\\Program.png");
Main_US_开始工作 = GetImage(Application.StartupPath + "\\image\\US\\Star.png");
Main_US_设备配置 = GetImage(Application.StartupPath + "\\image\\US\\Configuration.png");
Main_US_统计系统 = GetImage(Application.StartupPath + "\\image\\US\\统计系统.gif"); Main_US_统计系统 = GetImage(Application.StartupPath + "\\image\\US\\统计系统.gif");
Main_US_退出 = GetImage(Application.StartupPath + "\\image\\US\\退出.gif"); Main_US_退出 = GetImage(Application.StartupPath + "\\image\\US\\Exit.png");
Main_US_智能工作站 = GetImage(Application.StartupPath + "\\image\\US\\智能工作站.gif"); Main_US_智能工作站 = GetImage(Application.StartupPath + "\\image\\US\\智能工作站.gif");
Menu_US_焊接 = GetImage(Application.StartupPath + "\\image\\US\\焊接.gif"); Menu_US_焊接 = GetImage(Application.StartupPath + "\\image\\US\\焊接.gif");
Menu_US_检测 = GetImage(Application.StartupPath + "\\image\\US\\检测.gif"); Menu_US_检测 = GetImage(Application.StartupPath + "\\image\\US\\检测.gif");
...@@ -118,7 +125,9 @@ namespace TSA_V ...@@ -118,7 +125,9 @@ namespace TSA_V
Main_US_MOSCOT = GetImage(Application.StartupPath + "\\image\\US\\MOSCOT.png"); Main_US_MOSCOT = GetImage(Application.StartupPath + "\\image\\US\\MOSCOT.png");
Menu_US_打开光源 = GetImage(Application.StartupPath + "\\image\\US\\打开光源.gif"); Menu_US_打开光源 = GetImage(Application.StartupPath + "\\image\\US\\打开光源.gif");
Menu_US_关闭光源 = GetImage(Application.StartupPath + "\\image\\US\\关闭光源.gif"); Menu_US_关闭光源 = GetImage(Application.StartupPath + "\\image\\US\\关闭光源.gif");
Main_US_历史记录 = GetImage(Application.StartupPath + "\\image\\US\\历史记录.gif"); Main_US_历史记录 = GetImage(Application.StartupPath + "\\image\\US\\History.png");
Menu_US_光学检测 = GetImage(Application.StartupPath+ "\\image\\US\\AOI.png");
Menu_US_补料 = GetImage(Application.StartupPath+ "\\image\\US\\Replenish.png");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
TSA-V/Properties/Resource.en-US.resx
...@@ -424,10 +424,10 @@ ...@@ -424,10 +424,10 @@
<value>Save</value> <value>Save</value>
</data> </data>
<data name="FrmAddBoard_label5_Text" xml:space="preserve"> <data name="FrmAddBoard_label5_Text" xml:space="preserve">
<value>WIDTH↑</value> <value>Y-AXIS Length ↑</value>
</data> </data>
<data name="FrmAddBoard_label4_Text" xml:space="preserve"> <data name="FrmAddBoard_label4_Text" xml:space="preserve">
<value>LENGTH→</value> <value>X-AXIS Length →</value>
</data> </data>
<data name="FrmAddBoard_label25_Text" xml:space="preserve"> <data name="FrmAddBoard_label25_Text" xml:space="preserve">
<value>mm</value> <value>mm</value>
...@@ -514,13 +514,13 @@ ...@@ -514,13 +514,13 @@
<value>Information</value> <value>Information</value>
</data> </data>
<data name="FrmBoardInfo_label5_Text" xml:space="preserve"> <data name="FrmBoardInfo_label5_Text" xml:space="preserve">
<value>WIDTH↑</value> <value>Y-AXIS Length ↑</value>
</data> </data>
<data name="FrmBoardInfo_label14_Text" xml:space="preserve"> <data name="FrmBoardInfo_label14_Text" xml:space="preserve">
<value>MA.CODE</value> <value>MA.CODE</value>
</data> </data>
<data name="FrmBoardInfo_label3_Text" xml:space="preserve"> <data name="FrmBoardInfo_label3_Text" xml:space="preserve">
<value>LENGTH→</value> <value>X-AXIS Length →</value>
</data> </data>
<data name="FrmBoardInfo_label2_Text" xml:space="preserve"> <data name="FrmBoardInfo_label2_Text" xml:space="preserve">
<value>NAME</value> <value>NAME</value>
...@@ -586,16 +586,16 @@ ...@@ -586,16 +586,16 @@
<value>NAME</value> <value>NAME</value>
</data> </data>
<data name="FrmPointInfo_btnCancel_Text" xml:space="preserve"> <data name="FrmPointInfo_btnCancel_Text" xml:space="preserve">
<value> CANCLE</value> <value>CANCEL</value>
</data> </data>
<data name="FrmPointInfo_btnSave_Text" xml:space="preserve"> <data name="FrmPointInfo_btnSave_Text" xml:space="preserve">
<value>Save</value> <value>Save</value>
</data> </data>
<data name="FrmSelectPoint_Text" xml:space="preserve"> <data name="smtpoint_select" xml:space="preserve">
<value>COMPONENT SELECTION</value> <value>COMPONENT SELECTION</value>
</data> </data>
<data name="FrmSelectPoint_btnCancel_Text" xml:space="preserve"> <data name="FrmSelectPoint_btnCancel_Text" xml:space="preserve">
<value>CANCLE</value> <value>CANCEL</value>
</data> </data>
<data name="FrmSelectPoint_btnOk_Text" xml:space="preserve"> <data name="FrmSelectPoint_btnOk_Text" xml:space="preserve">
<value>OK</value> <value>OK</value>
...@@ -1430,7 +1430,7 @@ ...@@ -1430,7 +1430,7 @@
<value>DESCRIPTION</value> <value>DESCRIPTION</value>
</data> </data>
<data name="Col_Name" xml:space="preserve"> <data name="Col_Name" xml:space="preserve">
<value>Comp Name</value> <value>Comp name</value>
</data> </data>
<data name="Col_NCheck" xml:space="preserve"> <data name="Col_NCheck" xml:space="preserve">
<value>CHECK</value> <value>CHECK</value>
...@@ -1445,7 +1445,7 @@ ...@@ -1445,7 +1445,7 @@
<value>WELD </value> <value>WELD </value>
</data> </data>
<data name="Col_Position" xml:space="preserve"> <data name="Col_Position" xml:space="preserve">
<value>position</value> <value>Position</value>
</data> </data>
<data name="Col_UpdateP" xml:space="preserve"> <data name="Col_UpdateP" xml:space="preserve">
<value>UPDATE POSITION</value> <value>UPDATE POSITION</value>
...@@ -2012,7 +2012,7 @@ ...@@ -2012,7 +2012,7 @@
<value>reference picture</value> <value>reference picture</value>
</data> </data>
<data name="FrmAOICheck_label2_Text" xml:space="preserve"> <data name="FrmAOICheck_label2_Text" xml:space="preserve">
<value>effect picture</value> <value>Effect picture</value>
</data> </data>
<data name="FrmPwd_btnBack_Text" xml:space="preserve"> <data name="FrmPwd_btnBack_Text" xml:space="preserve">
<value>back</value> <value>back</value>
...@@ -2035,9 +2035,6 @@ ...@@ -2035,9 +2035,6 @@
<data name="FrmUpdatePwd_btnBack_Text" xml:space="preserve"> <data name="FrmUpdatePwd_btnBack_Text" xml:space="preserve">
<value>back</value> <value>back</value>
</data> </data>
<data name="FrmUpdatePwd_btnNext_Text" xml:space="preserve">
<value>confirm</value>
</data>
<data name="FrmUpdatePwd_label1_Text" xml:space="preserve"> <data name="FrmUpdatePwd_label1_Text" xml:space="preserve">
<value>old password ：</value> <value>old password ：</value>
</data> </data>
...@@ -2207,7 +2204,7 @@ ...@@ -2207,7 +2204,7 @@
<value>Neo Station</value> <value>Neo Station</value>
</data> </data>
<data name="FrmLogin_label1_Text" xml:space="preserve"> <data name="FrmLogin_label1_Text" xml:space="preserve">
<value>UserName</value> <value>User Name</value>
</data> </data>
<data name="FrmLogin_label2_Text" xml:space="preserve"> <data name="FrmLogin_label2_Text" xml:space="preserve">
<value>Password</value> <value>Password</value>
...@@ -2252,16 +2249,16 @@ ...@@ -2252,16 +2249,16 @@
<value>width ↑</value> <value>width ↑</value>
</data> </data>
<data name="长度" xml:space="preserve"> <data name="长度" xml:space="preserve">
<value>length→</value> <value>Length→</value>
</data> </data>
<data name="结果" xml:space="preserve"> <data name="结果" xml:space="preserve">
<value>result</value> <value>result</value>
</data> </data>
<data name="用户" xml:space="preserve"> <data name="用户" xml:space="preserve">
<value>username</value> <value>User Name</value>
</data> </data>
<data name="时间" xml:space="preserve"> <data name="时间" xml:space="preserve">
<value>creat time</value> <value>Creat time</value>
</data> </data>
<data name="位号" xml:space="preserve"> <data name="位号" xml:space="preserve">
<value>tag number</value> <value>tag number</value>
...@@ -2279,19 +2276,19 @@ ...@@ -2279,19 +2276,19 @@
<value> Failed to add user </value> <value> Failed to add user </value>
</data> </data>
<data name="退出" xml:space="preserve"> <data name="退出" xml:space="preserve">
<value> exit </value> <value> Exit </value>
</data> </data>
<data name="增加" xml:space="preserve"> <data name="增加" xml:space="preserve">
<value> add </value> <value> Add </value>
</data> </data>
<data name="修改" xml:space="preserve"> <data name="修改" xml:space="preserve">
<value> modify </value> <value> Modify </value>
</data> </data>
<data name="删除" xml:space="preserve"> <data name="删除" xml:space="preserve">
<value> delete </value> <value> Delete </value>
</data> </data>
<data name="用户名" xml:space="preserve"> <data name="用户名" xml:space="preserve">
<value> username </value> <value> User Name </value>
</data> </data>
<data name="密码" xml:space="preserve"> <data name="密码" xml:space="preserve">
<value> password </value> <value> password </value>
...@@ -2300,7 +2297,7 @@ ...@@ -2300,7 +2297,7 @@
<value> Permission </value> <value> Permission </value>
</data> </data>
<data name="用户管理" xml:space="preserve"> <data name="用户管理" xml:space="preserve">
<value> user management </value> <value> User management </value>
</data> </data>
<data name="确认删除用户" xml:space="preserve"> <data name="确认删除用户" xml:space="preserve">
<value> Confirm to delete user </value> <value> Confirm to delete user </value>
...@@ -2363,7 +2360,7 @@ ...@@ -2363,7 +2360,7 @@
<value> To enable all </value> <value> To enable all </value>
</data> </data>
<data name="ItemText_Disable" xml:space="preserve"> <data name="ItemText_Disable" xml:space="preserve">
<value>Disable</value> <value>Disable/Enable</value>
</data> </data>
<data name="FrmDeviceConfig_chbDisSideCylinder_Text" xml:space="preserve"> <data name="FrmDeviceConfig_chbDisSideCylinder_Text" xml:space="preserve">
<value> Disable the side brake cylinder </value> <value> Disable the side brake cylinder </value>
...@@ -2413,38 +2410,93 @@ ...@@ -2413,38 +2410,93 @@
<data name="注意事项" xml:space="preserve"> <data name="注意事项" xml:space="preserve">
<value>Notice</value> <value>Notice</value>
</data> </data>
<data name = "FrmAddBoard_lblWidth_Text" xml:space = "preserve"> <value>Conveyor：</value> </data> <data name="FrmAddBoard_lblWidth_Text" xml:space="preserve">
<data name = "FrmBoardSelect_chbWorkSingleStart_Text" xml:space = "preserve"> <value> Work Area </value> </data> <value>Conveyor：</value>
<data name = "FrmPointInfo_lblName_Text" xml:space = "preserve"> <value> Text： </value> </data> </data>
<data name="FrmBoardSelect_chbWorkSingleStart_Text" xml:space="preserve">
<value> Work Area </value>
<data name = "FrmBoardList_btnBeiliao_Text" xml:space = "preserve"> <value> COMPONENT PREPARATION </value> </data> </data>
<data name = "FrmBoardPutCom_label2_Text" xml:space = "preserve"> <value> MATERIAL CODE： </value> </data> <data name="FrmPointInfo_lblName_Text" xml:space="preserve">
<data name = "FrmBoardPutCom_btnSaveCount_Text" xml:space = "preserve"> <value> SAVE </value> </data> <value> Text： </value>
<data name = "FrmBoardPutCom_label5_Text" xml:space = "preserve"> <value> DESCRIBE： </value> </data> </data>
<data name = "FrmBoardPutCom_label4_Text" xml:space = "preserve"> <value> MATERIAL CODE： </value> </data> <data name="FrmBoardList_btnBeiliao_Text" xml:space="preserve">
<data name = "FrmBoardPutCom_label1_Text" xml:space = "preserve"> <value> PLATE POSITION： </value> </data> <value> COMPONENT PREPARATION </value>
<data name = "FrmBoardPutCom_label3_Text" xml:space = "preserve"> <value> NUMBER： </value> </data> </data>
<data name = "FrmBoardPutCom_btnCancel_Text" xml:space = "preserve"> <value> END </value> </data> <data name="FrmBoardPutCom_label2_Text" xml:space="preserve">
<data name = "FrmBoardPutCom_btnNext_Text" xml:space = "preserve"> <value> NEXT </value> </data> <value> MATERIAL CODE： </value>
<data name = "FrmBoardPutCom_btnPre_Text" xml:space = "preserve"> <value> PREVIOUS </value> </data> </data>
<data name="FrmBoardPutCom_btnSaveCount_Text" xml:space="preserve">
<data name = "UploadFile" xml:space = "preserve"> <value> Please upload the program file </value> </data> <value> SAVE </value>
<data name = "CanotDelCom" xml:space = "preserve"> <value> The component is in use and cannot be deleted </value> </data> </data>
<data name = "SureImportPosition" xml:space = "preserve"> <value> The component [{0}] is configured with multiple locations [{1}], whether it is determined to import ？ </value> </data> <data name="FrmBoardPutCom_label5_Text" xml:space="preserve">
<data name = "ComExists" xml:space = "preserve"> <value> The component already exists </value> </data> <value> DESCRIBE： </value>
<data name = "SureImportPn" xml:space = "preserve"> <value> Location [{0}] Configure multiple components [{1}], determine whether to import？ </value> </data> </data>
<data name = "BLText" xml:space = "preserve"> <value> Program [{0}] component library [{1}] is preparing materials </value> </data> <data name="FrmBoardPutCom_label4_Text" xml:space="preserve">
<data name = "Move" xml:space = "preserve"> <value> moving </value> </data> <value> MATERIAL CODE： </value>
<data name = "Inplace" xml:space = "preserve"> <value> Already in place </value> </data> </data>
<data name = "新增组装点" xml:space = "preserve"> <value> New assembly point </value> </data> <data name="FrmBoardPutCom_label1_Text" xml:space="preserve">
<data name = "FrmAddBoard_linkLabel1_Text" xml:space = "preserve"> <value> Select file </value> </data> <value> PLATE POSITION： </value>
<data name = "FrmAddBoard_groupBoxSelCom_Text" xml:space = "preserve"> <value> BOM </value> </data> </data>
<data name = "FrmAddBoard_likSelCsvFile_Text" xml:space = "preserve"> <value> Select file </value> </data> <data name="FrmBoardPutCom_label3_Text" xml:space="preserve">
<data name = "FrmAddBoard_likDownFile_Text" xml:space = "preserve"> <value>Template download</value> </data> <value> NUMBER： </value>
<data name = "FrmAddBoard_rdbUpload_Text" xml:space = "preserve"> <value> BOM upload </value> </data> </data>
<data name = "FrmAddBoard_rdbSelCom_Text" xml:space = "preserve"> <value> Select position </value> </data> <data name="FrmBoardPutCom_btnCancel_Text" xml:space="preserve">
<data name = "FrmBoardSelect_chbOffLine_Text" xml:space = "preserve"> <value> Offline mode </value> </data> <value> END </value>
</data>
<data name="FrmBoardPutCom_btnNext_Text" xml:space="preserve">
<value> NEXT </value>
</data>
<data name="FrmBoardPutCom_btnPre_Text" xml:space="preserve">
<value> PREVIOUS </value>
</data>
<data name="UploadFile" xml:space="preserve">
<value> Please upload the program file </value>
</data>
<data name="CanotDelCom" xml:space="preserve">
<value> The component is in use and cannot be deleted </value>
</data>
<data name="SureImportPosition" xml:space="preserve">
<value> The component [{0}] is configured with multiple locations [{1}], whether it is determined to import ？ </value>
</data>
<data name="ComExists" xml:space="preserve">
<value> The component already exists </value>
</data>
<data name="SureImportPn" xml:space="preserve">
<value> Location [{0}] Configure multiple components [{1}], determine whether to import？ </value>
</data>
<data name="BLText" xml:space="preserve">
<value> Program [{0}] component library [{1}] is preparing materials </value>
</data>
<data name="Move" xml:space="preserve">
<value> Moving </value>
</data>
<data name="Inplace" xml:space="preserve">
<value> Already in place </value>
</data>
<data name="新增组装点" xml:space="preserve">
<value> New assembly point </value>
</data>
<data name="FrmAddBoard_linkLabel1_Text" xml:space="preserve">
<value> Select file </value>
</data>
<data name="FrmAddBoard_groupBoxSelCom_Text" xml:space="preserve">
<value> BOM </value>
</data>
<data name="FrmAddBoard_likSelCsvFile_Text" xml:space="preserve">
<value> Select file </value>
</data>
<data name="FrmAddBoard_likDownFile_Text" xml:space="preserve">
<value>Template download</value>
</data>
<data name="FrmAddBoard_rdbUpload_Text" xml:space="preserve">
<value> BOM upload </value>
</data>
<data name="FrmAddBoard_rdbSelCom_Text" xml:space="preserve">
<value> Select position </value>
</data>
<data name="FrmBoardSelect_chbOffLine_Text" xml:space="preserve">
<value> Offline mode </value>
</data>
<data name="State_End" xml:space="preserve"> <data name="State_End" xml:space="preserve">
<value>completed</value> <value>completed</value>
</data> </data>
...@@ -2466,4 +2518,28 @@ ...@@ -2466,4 +2518,28 @@
<data name="Type9" xml:space="preserve"> <data name="Type9" xml:space="preserve">
<value>Polarity_left</value> <value>Polarity_left</value>
</data> </data>
<data name="FrmAddBoard_groupBox_new_Text" xml:space="preserve">
<value>Program</value>
</data>
<data name="ItemText_AutoSort" xml:space="preserve">
<value>Sort list</value>
</data>
<data name="ItemText_DisableAll" xml:space="preserve">
<value>Disable all item</value>
</data>
<data name="ItemText_EnableAll" xml:space="preserve">
<value>Enable all item</value>
</data>
<data name="ItemText_Global" xml:space="preserve">
<value>Global</value>
</data>
<data name="FrmUpdatePwd_btnNext_Text" xml:space="preserve">
<value>confirm</value>
</data>
<data name="CreateNew" xml:space="preserve">
<value>Create new</value>
</data>
<data name="DeviceInGohome" xml:space="preserve">
<value>11:34Backing to origin.</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
<value>元器件库名称：</value> <value>元器件库名称：</value>
</data> </data>
<data name="FrmBoardList_Text" xml:space="preserve"> <data name="FrmBoardList_Text" xml:space="preserve">
<value>程序配置</value> <value>程序编辑</value>
</data> </data>
<data name="FrmBoardList_groupBox2_Text" xml:space="preserve"> <data name="FrmBoardList_groupBox2_Text" xml:space="preserve">
<value>程序信息</value> <value>程序信息</value>
...@@ -424,10 +424,10 @@ ...@@ -424,10 +424,10 @@
<value>保存程序</value> <value>保存程序</value>
</data> </data>
<data name="FrmAddBoard_label5_Text" xml:space="preserve"> <data name="FrmAddBoard_label5_Text" xml:space="preserve">
<value>宽度 ↑：</value> <value>Y轴长度 ↑：</value>
</data> </data>
<data name="FrmAddBoard_label4_Text" xml:space="preserve"> <data name="FrmAddBoard_label4_Text" xml:space="preserve">
<value>长度→：</value> <value>X轴长度 →：</value>
</data> </data>
<data name="FrmAddBoard_label25_Text" xml:space="preserve"> <data name="FrmAddBoard_label25_Text" xml:space="preserve">
<value>mm</value> <value>mm</value>
...@@ -514,13 +514,13 @@ ...@@ -514,13 +514,13 @@
<value>程序基本信息</value> <value>程序基本信息</value>
</data> </data>
<data name="FrmBoardInfo_label5_Text" xml:space="preserve"> <data name="FrmBoardInfo_label5_Text" xml:space="preserve">
<value>宽度 ↑</value> <value>Y轴长度 ↑</value>
</data> </data>
<data name="FrmBoardInfo_label14_Text" xml:space="preserve"> <data name="FrmBoardInfo_label14_Text" xml:space="preserve">
<value>条码</value> <value>条码</value>
</data> </data>
<data name="FrmBoardInfo_label3_Text" xml:space="preserve"> <data name="FrmBoardInfo_label3_Text" xml:space="preserve">
<value>长度→</value> <value>X轴长度→</value>
</data> </data>
<data name="FrmBoardInfo_label2_Text" xml:space="preserve"> <data name="FrmBoardInfo_label2_Text" xml:space="preserve">
<value>名称</value> <value>名称</value>
...@@ -591,7 +591,7 @@ ...@@ -591,7 +591,7 @@
<data name="FrmPointInfo_btnSave_Text" xml:space="preserve"> <data name="FrmPointInfo_btnSave_Text" xml:space="preserve">
<value>保存</value> <value>保存</value>
</data> </data>
<data name="FrmSelectPoint_Text" xml:space="preserve"> <data name="smtpoint_select" xml:space="preserve">
<value>请选择组件</value> <value>请选择组件</value>
</data> </data>
<data name="FrmSelectPoint_btnCancel_Text" xml:space="preserve"> <data name="FrmSelectPoint_btnCancel_Text" xml:space="preserve">
...@@ -2377,7 +2377,7 @@ ...@@ -2377,7 +2377,7 @@
<value> 全部启用 </value> <value> 全部启用 </value>
</data> </data>
<data name="ItemText_Disable" xml:space="preserve"> <data name="ItemText_Disable" xml:space="preserve">
<value>禁用</value> <value>禁用/启用</value>
</data> </data>
<data name="FrmDeviceConfig_chbDisSideCylinder_Text" xml:space="preserve"> <data name="FrmDeviceConfig_chbDisSideCylinder_Text" xml:space="preserve">
<value> 禁用侧挡气缸 </value> <value> 禁用侧挡气缸 </value>
...@@ -2535,4 +2535,22 @@ ...@@ -2535,4 +2535,22 @@
<data name="Type9" xml:space="preserve"> <data name="Type9" xml:space="preserve">
<value>极性_左方</value> <value>极性_左方</value>
</data> </data>
<data name="FrmAddBoard_groupBox_new_Text" xml:space="preserve">
<value>程序</value>
</data>
<data name="ItemText_AutoSort" xml:space="preserve">
<value>自动排序</value>
</data>
<data name="ItemText_DisableAll" xml:space="preserve">
<value>全部禁用</value>
</data>
<data name="ItemText_EnableAll" xml:space="preserve">
<value>全部启用</value>
</data>
<data name="ItemText_Global" xml:space="preserve">
<value>全局</value>
</data>
<data name="CreateNew" xml:space="preserve">
<value>新建</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace TSA_V.Properties { ...@@ -19,7 +19,7 @@ namespace TSA_V.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -47,8 +47,8 @@ namespace TSA_V.Properties { ...@@ -47,8 +47,8 @@ namespace TSA_V.Properties {
} }
/// <summary> /// <summary>
/// 重写当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
...@@ -63,6 +63,16 @@ namespace TSA_V.Properties { ...@@ -63,6 +63,16 @@ namespace TSA_V.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap axisbg {
get {
object obj = ResourceManager.GetObject("axisbg", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap backImage { internal static System.Drawing.Bitmap backImage {
get { get {
object obj = ResourceManager.GetObject("backImage", resourceCulture); object obj = ResourceManager.GetObject("backImage", resourceCulture);
...@@ -113,6 +123,26 @@ namespace TSA_V.Properties { ...@@ -113,6 +123,26 @@ namespace TSA_V.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap NEO_STATION {
get {
object obj = ResourceManager.GetObject("NEO_STATION", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon neo_station1 {
get {
object obj = ResourceManager.GetObject("neo_station1", resourceCulture);
return ((System.Drawing.Icon)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ok { internal static System.Drawing.Bitmap ok {
get { get {
object obj = ResourceManager.GetObject("ok", resourceCulture); object obj = ResourceManager.GetObject("ok", resourceCulture);
...@@ -303,6 +333,16 @@ namespace TSA_V.Properties { ...@@ -303,6 +333,16 @@ namespace TSA_V.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap 背景图dark {
get {
object obj = ResourceManager.GetObject("背景图dark", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap 设备配置 { internal static System.Drawing.Bitmap 设备配置 {
get { get {
object obj = ResourceManager.GetObject("设备配置", resourceCulture); object obj = ResourceManager.GetObject("设备配置", resourceCulture);
......
TSA-V/Properties/Resources.resx
...@@ -202,4 +202,16 @@ ...@@ -202,4 +202,16 @@
<data name="backImage" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="backImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\backImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\backImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="背景图dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\背景图dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NEO_STATION" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\NEO STATION.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="neo_station1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\neo station.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="axisbg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\axisbg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/ResourceCulture.cs
...@@ -746,6 +746,11 @@ namespace TSA_V ...@@ -746,6 +746,11 @@ namespace TSA_V
/// 已到位 /// 已到位
/// </summary> /// </summary>
internal static string Inplace= "Inplace"; internal static string Inplace= "Inplace";
internal static string ItemText_Global= "ItemText_Global";
internal static string ItemText_EnableAll = "ItemText_EnableAll";
internal static string ItemText_DisableAll = "ItemText_DisableAll";
internal static string ItemText_AutoSort = "ItemText_AutoSort";
internal static string smtpoint_select= "smtpoint_select";
/// <summary> /// <summary>
/// 位置【{0}】配置多个元器件【{1}】，是否确定导入？ /// 位置【{0}】配置多个元器件【{1}】，是否确定导入？
...@@ -784,7 +789,8 @@ namespace TSA_V ...@@ -784,7 +789,8 @@ namespace TSA_V
/// 极性_右方 /// 极性_右方
/// </summary> /// </summary>
internal static readonly string Type10 = "Type10"; internal static readonly string Type10 = "Type10";
internal static readonly string CreateNew = "CreateNew";
} }
} }
TSA-V/Resources/Resources.zip 0 → 100644
此文件类型无法预览
TSA-V/Smart-Workstation.csproj
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="AccAOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AccAOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AccAOI.dll</HintPath> <HintPath>..\..\AccAOI\AccAOI\bin\Debug\AccAOI.dll</HintPath>
</Reference> </Reference>
<Reference Include="AccImageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AccImageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</Reference> </Reference>
<Reference Include="AOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AOI.dll</HintPath> <HintPath>..\..\AccAOI\AOI\bin\Debug\AOI.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.Theme"> <Reference Include="Asa.Theme">
<HintPath>..\dll\Asa.Theme.dll</HintPath> <HintPath>..\dll\Asa.Theme.dll</HintPath>
...@@ -616,7 +616,10 @@ ...@@ -616,7 +616,10 @@
<None Include="Resources\IMG_3500.JPG" /> <None Include="Resources\IMG_3500.JPG" />
<None Include="Resources\IMG_3501.JPG" /> <None Include="Resources\IMG_3501.JPG" />
<Content Include="neo station.ico" /> <Content Include="neo station.ico" />
<None Include="NEO STATION.png" />
<Content Include="Properties\MOSCOT.jpg" /> <Content Include="Properties\MOSCOT.jpg" />
<None Include="Resources\背景图dark.png" />
<None Include="Resources\axisbg.png" />
<Content Include="记录.txt" /> <Content Include="记录.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
......
TSA-V/workForm/FrmAOICheck.cs
...@@ -132,6 +132,7 @@ namespace TSA_V ...@@ -132,6 +132,7 @@ namespace TSA_V
private int AoiCheck() private int AoiCheck()
{ {
GC.Collect(0, GCCollectionMode.Forced);
//GC.Collect(); //GC.Collect();
IsCheck = true; IsCheck = true;
btnRun.Visible = false; btnRun.Visible = false;
...@@ -145,14 +146,15 @@ namespace TSA_V ...@@ -145,14 +146,15 @@ namespace TSA_V
return 0; return 0;
} }
chbAllShow.Enabled = false; chbAllShow.Enabled = false;
string camera = ConfigAppSettings.GetValue(Setting_Init.CameraName); string camera = ConfigAppSettings.GetValue(Setting_Init.CameraName);
Image currImage = CameraManager.GetCamerImage(camera); Image currImage = CameraManager.GetCamerImage(camera);
if (currImage != null) if (currImage != null)
{ {
Bitmap bitmap = new Bitmap(currImage); //Bitmap bitmap = new Bitmap(currImage);
currImage.Dispose();
Image outImage = null; Image outImage = null;
List<ResultBean> resultBean = CurrProject.CheckAll(bitmap, out outImage); List<ResultBean> resultBean = CurrProject.CheckAll(currImage, out outImage);
currImage.Dispose();
ResultList = resultBean; ResultList = resultBean;
if (outImage != null) if (outImage != null)
{ {
......
TSA-V/workForm/FrmTSAV.Designer.cs
...@@ -825,6 +825,7 @@ ...@@ -825,6 +825,7 @@
this.Controls.Add(this.lblNotices); this.Controls.Add(this.lblNotices);
this.Controls.Add(this.lblBoardPoint); this.Controls.Add(this.lblBoardPoint);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1; this.MainMenuStrip = this.menuStrip1;
this.Name = "FrmWork"; this.Name = "FrmWork";
......
UserFromControl/ProjectorControl.Designer.cs
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
this.group.Controls.Add(this.lbltype); this.group.Controls.Add(this.lbltype);
this.group.Location = new System.Drawing.Point(5, 3); this.group.Location = new System.Drawing.Point(5, 3);
this.group.Name = "group"; this.group.Name = "group";
this.group.Size = new System.Drawing.Size(495, 298); this.group.Size = new System.Drawing.Size(532, 298);
this.group.TabIndex = 61; this.group.TabIndex = 61;
this.group.TabStop = false; this.group.TabStop = false;
this.group.Text = "投影位置"; this.group.Text = "投影位置";
...@@ -96,17 +96,19 @@ ...@@ -96,17 +96,19 @@
// //
// panImg // panImg
// //
this.panImg.Location = new System.Drawing.Point(314, 15); this.panImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panImg.ForeColor = System.Drawing.Color.White;
this.panImg.Location = new System.Drawing.Point(343, 16);
this.panImg.Name = "panImg"; this.panImg.Name = "panImg";
this.panImg.Size = new System.Drawing.Size(165, 84); this.panImg.Size = new System.Drawing.Size(153, 84);
this.panImg.TabIndex = 328; this.panImg.TabIndex = 328;
// //
// lblName // lblName
// //
this.lblName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.Location = new System.Drawing.Point(6, 27); this.lblName.Location = new System.Drawing.Point(11, 27);
this.lblName.Name = "lblName"; this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(146, 17); this.lblName.Size = new System.Drawing.Size(107, 17);
this.lblName.TabIndex = 327; this.lblName.TabIndex = 327;
this.lblName.Text = "投影文字："; this.lblName.Text = "投影文字：";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -114,7 +116,7 @@ ...@@ -114,7 +116,7 @@
// txtname // txtname
// //
this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtname.Location = new System.Drawing.Point(158, 23); this.txtname.Location = new System.Drawing.Point(124, 23);
this.txtname.Name = "txtname"; this.txtname.Name = "txtname";
this.txtname.Size = new System.Drawing.Size(134, 26); this.txtname.Size = new System.Drawing.Size(134, 26);
this.txtname.TabIndex = 326; this.txtname.TabIndex = 326;
...@@ -122,7 +124,7 @@ ...@@ -122,7 +124,7 @@
// numSizeY // numSizeY
// //
this.numSizeY.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numSizeY.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numSizeY.Location = new System.Drawing.Point(158, 187); this.numSizeY.Location = new System.Drawing.Point(124, 187);
this.numSizeY.Maximum = new decimal(new int[] { this.numSizeY.Maximum = new decimal(new int[] {
255, 255,
0, 0,
...@@ -145,7 +147,7 @@ ...@@ -145,7 +147,7 @@
// numSizeX // numSizeX
// //
this.numSizeX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numSizeX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numSizeX.Location = new System.Drawing.Point(158, 154); this.numSizeX.Location = new System.Drawing.Point(124, 154);
this.numSizeX.Maximum = new decimal(new int[] { this.numSizeX.Maximum = new decimal(new int[] {
255, 255,
0, 0,
...@@ -168,7 +170,7 @@ ...@@ -168,7 +170,7 @@
// numY // numY
// //
this.numY.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numY.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numY.Location = new System.Drawing.Point(158, 86); this.numY.Location = new System.Drawing.Point(124, 86);
this.numY.Maximum = new decimal(new int[] { this.numY.Maximum = new decimal(new int[] {
4000, 4000,
0, 0,
...@@ -191,7 +193,7 @@ ...@@ -191,7 +193,7 @@
// numX // numX
// //
this.numX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numX.Location = new System.Drawing.Point(158, 53); this.numX.Location = new System.Drawing.Point(124, 53);
this.numX.Maximum = new decimal(new int[] { this.numX.Maximum = new decimal(new int[] {
4000, 4000,
0, 0,
...@@ -214,7 +216,7 @@ ...@@ -214,7 +216,7 @@
// numPenWidth // numPenWidth
// //
this.numPenWidth.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numPenWidth.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numPenWidth.Location = new System.Drawing.Point(158, 220); this.numPenWidth.Location = new System.Drawing.Point(124, 220);
this.numPenWidth.Minimum = new decimal(new int[] { this.numPenWidth.Minimum = new decimal(new int[] {
1, 1,
0, 0,
...@@ -232,9 +234,9 @@ ...@@ -232,9 +234,9 @@
// lblLineWidth // lblLineWidth
// //
this.lblLineWidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblLineWidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLineWidth.Location = new System.Drawing.Point(6, 228); this.lblLineWidth.Location = new System.Drawing.Point(11, 228);
this.lblLineWidth.Name = "lblLineWidth"; this.lblLineWidth.Name = "lblLineWidth";
this.lblLineWidth.Size = new System.Drawing.Size(146, 17); this.lblLineWidth.Size = new System.Drawing.Size(107, 17);
this.lblLineWidth.TabIndex = 318; this.lblLineWidth.TabIndex = 318;
this.lblLineWidth.Text = "画笔宽度："; this.lblLineWidth.Text = "画笔宽度：";
this.lblLineWidth.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblLineWidth.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -242,9 +244,9 @@ ...@@ -242,9 +244,9 @@
// lblSizeWidth // lblSizeWidth
// //
this.lblSizeWidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblSizeWidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSizeWidth.Location = new System.Drawing.Point(6, 194); this.lblSizeWidth.Location = new System.Drawing.Point(11, 194);
this.lblSizeWidth.Name = "lblSizeWidth"; this.lblSizeWidth.Name = "lblSizeWidth";
this.lblSizeWidth.Size = new System.Drawing.Size(146, 17); this.lblSizeWidth.Size = new System.Drawing.Size(107, 17);
this.lblSizeWidth.TabIndex = 296; this.lblSizeWidth.TabIndex = 296;
this.lblSizeWidth.Text = "纵向大小↓："; this.lblSizeWidth.Text = "纵向大小↓：";
this.lblSizeWidth.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblSizeWidth.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -252,9 +254,9 @@ ...@@ -252,9 +254,9 @@
// lblSizeLength // lblSizeLength
// //
this.lblSizeLength.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblSizeLength.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSizeLength.Location = new System.Drawing.Point(6, 160); this.lblSizeLength.Location = new System.Drawing.Point(11, 160);
this.lblSizeLength.Name = "lblSizeLength"; this.lblSizeLength.Name = "lblSizeLength";
this.lblSizeLength.Size = new System.Drawing.Size(146, 17); this.lblSizeLength.Size = new System.Drawing.Size(107, 17);
this.lblSizeLength.TabIndex = 317; this.lblSizeLength.TabIndex = 317;
this.lblSizeLength.Text = "横向大小→："; this.lblSizeLength.Text = "横向大小→：";
this.lblSizeLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblSizeLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -272,7 +274,7 @@ ...@@ -272,7 +274,7 @@
"20", "20",
"50", "50",
"100"}); "100"});
this.cmbStep.Location = new System.Drawing.Point(158, 253); this.cmbStep.Location = new System.Drawing.Point(124, 253);
this.cmbStep.Name = "cmbStep"; this.cmbStep.Name = "cmbStep";
this.cmbStep.Size = new System.Drawing.Size(134, 28); this.cmbStep.Size = new System.Drawing.Size(134, 28);
this.cmbStep.TabIndex = 315; this.cmbStep.TabIndex = 315;
...@@ -280,18 +282,19 @@ ...@@ -280,18 +282,19 @@
// lblStepValue // lblStepValue
// //
this.lblStepValue.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblStepValue.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStepValue.Location = new System.Drawing.Point(6, 262); this.lblStepValue.Location = new System.Drawing.Point(11, 262);
this.lblStepValue.Name = "lblStepValue"; this.lblStepValue.Name = "lblStepValue";
this.lblStepValue.Size = new System.Drawing.Size(146, 17); this.lblStepValue.Size = new System.Drawing.Size(107, 17);
this.lblStepValue.TabIndex = 314; this.lblStepValue.TabIndex = 314;
this.lblStepValue.Text = "步进值："; this.lblStepValue.Text = "步进值：";
this.lblStepValue.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStepValue.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnDown // btnDown
// //
this.btnDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDown.Location = new System.Drawing.Point(344, 237); this.btnDown.Location = new System.Drawing.Point(381, 239);
this.btnDown.Name = "btnDown"; this.btnDown.Name = "btnDown";
this.btnDown.Size = new System.Drawing.Size(80, 36); this.btnDown.Size = new System.Drawing.Size(80, 36);
this.btnDown.TabIndex = 309; this.btnDown.TabIndex = 309;
...@@ -301,9 +304,10 @@ ...@@ -301,9 +304,10 @@
// //
// btnUp // btnUp
// //
this.btnUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUp.Location = new System.Drawing.Point(344, 161); this.btnUp.Location = new System.Drawing.Point(381, 160);
this.btnUp.Name = "btnUp"; this.btnUp.Name = "btnUp";
this.btnUp.Size = new System.Drawing.Size(80, 36); this.btnUp.Size = new System.Drawing.Size(80, 36);
this.btnUp.TabIndex = 308; this.btnUp.TabIndex = 308;
...@@ -313,9 +317,10 @@ ...@@ -313,9 +317,10 @@
// //
// btnLeft // btnLeft
// //
this.btnLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnLeft.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLeft.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLeft.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLeft.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLeft.Location = new System.Drawing.Point(314, 199); this.btnLeft.Location = new System.Drawing.Point(345, 199);
this.btnLeft.Name = "btnLeft"; this.btnLeft.Name = "btnLeft";
this.btnLeft.Size = new System.Drawing.Size(72, 36); this.btnLeft.Size = new System.Drawing.Size(72, 36);
this.btnLeft.TabIndex = 307; this.btnLeft.TabIndex = 307;
...@@ -325,9 +330,10 @@ ...@@ -325,9 +330,10 @@
// //
// btnRight // btnRight
// //
this.btnRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnRight.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRight.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRight.Location = new System.Drawing.Point(387, 199); this.btnRight.Location = new System.Drawing.Point(421, 199);
this.btnRight.Name = "btnRight"; this.btnRight.Name = "btnRight";
this.btnRight.Size = new System.Drawing.Size(72, 36); this.btnRight.Size = new System.Drawing.Size(72, 36);
this.btnRight.TabIndex = 306; this.btnRight.TabIndex = 306;
...@@ -347,7 +353,7 @@ ...@@ -347,7 +353,7 @@
"4=━━", "4=━━",
"5=□", "5=□",
"6=○"}); "6=○"});
this.cmbType.Location = new System.Drawing.Point(158, 119); this.cmbType.Location = new System.Drawing.Point(124, 119);
this.cmbType.Name = "cmbType"; this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(134, 28); this.cmbType.Size = new System.Drawing.Size(134, 28);
this.cmbType.TabIndex = 303; this.cmbType.TabIndex = 303;
...@@ -356,9 +362,9 @@ ...@@ -356,9 +362,9 @@
// lbly // lbly
// //
this.lbly.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbly.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbly.Location = new System.Drawing.Point(6, 92); this.lbly.Location = new System.Drawing.Point(11, 92);
this.lbly.Name = "lbly"; this.lbly.Name = "lbly";
this.lbly.Size = new System.Drawing.Size(146, 17); this.lbly.Size = new System.Drawing.Size(107, 17);
this.lbly.TabIndex = 302; this.lbly.TabIndex = 302;
this.lbly.Text = "Y轴坐标："; this.lbly.Text = "Y轴坐标：";
this.lbly.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lbly.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -366,18 +372,19 @@ ...@@ -366,18 +372,19 @@
// lblx // lblx
// //
this.lblx.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblx.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblx.Location = new System.Drawing.Point(6, 58); this.lblx.Location = new System.Drawing.Point(11, 58);
this.lblx.Name = "lblx"; this.lblx.Name = "lblx";
this.lblx.Size = new System.Drawing.Size(146, 17); this.lblx.Size = new System.Drawing.Size(107, 17);
this.lblx.TabIndex = 301; this.lblx.TabIndex = 301;
this.lblx.Text = "X轴坐标："; this.lblx.Text = "X轴坐标：";
this.lblx.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblx.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnShowPoint // btnShowPoint
// //
this.btnShowPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnShowPoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnShowPoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShowPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnShowPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShowPoint.Location = new System.Drawing.Point(335, 110); this.btnShowPoint.Location = new System.Drawing.Point(371, 110);
this.btnShowPoint.Name = "btnShowPoint"; this.btnShowPoint.Name = "btnShowPoint";
this.btnShowPoint.Size = new System.Drawing.Size(100, 37); this.btnShowPoint.Size = new System.Drawing.Size(100, 37);
this.btnShowPoint.TabIndex = 293; this.btnShowPoint.TabIndex = 293;
...@@ -388,9 +395,9 @@ ...@@ -388,9 +395,9 @@
// lbltype // lbltype
// //
this.lbltype.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbltype.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbltype.Location = new System.Drawing.Point(6, 126); this.lbltype.Location = new System.Drawing.Point(11, 126);
this.lbltype.Name = "lbltype"; this.lbltype.Name = "lbltype";
this.lbltype.Size = new System.Drawing.Size(146, 17); this.lbltype.Size = new System.Drawing.Size(107, 17);
this.lbltype.TabIndex = 294; this.lbltype.TabIndex = 294;
this.lbltype.Text = "点形状："; this.lbltype.Text = "点形状：";
this.lbltype.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lbltype.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -403,7 +410,7 @@ ...@@ -403,7 +410,7 @@
this.Controls.Add(this.group); this.Controls.Add(this.group);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "ProjectorControl"; this.Name = "ProjectorControl";
this.Size = new System.Drawing.Size(507, 308); this.Size = new System.Drawing.Size(544, 308);
this.Load += new System.EventHandler(this.GalvanometerControl_Load); this.Load += new System.EventHandler(this.GalvanometerControl_Load);
this.group.ResumeLayout(false); this.group.ResumeLayout(false);
this.group.PerformLayout(); this.group.PerformLayout();
......
UserFromControl/ProjectorControl.cs
...@@ -307,9 +307,9 @@ namespace UserFromControl ...@@ -307,9 +307,9 @@ namespace UserFromControl
g.Clear(panImg.BackColor); g.Clear(panImg.BackColor);
Pen pen = new Pen(Color.Black, lineLength); Pen pen = new Pen(panImg.ForeColor, lineLength);
System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(Color.Black); System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(panImg.ForeColor);
//点类型，1 = 点，2 = +，3 =|，4 = -，5 = 方形，6 = 圆圈 //点类型，1 = 点，2 = +，3 =|，4 = -，5 = 方形，6 = 圆圈
if (type.Equals(2)) if (type.Equals(2))
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!