Skip to content

李娜 / Line-Smart-Workstation

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

禁用启用功能bug修改

1 个父辈 82f0140c
内嵌 并排
正在显示 13 个修改的文件 包含 478 行增加 和 485 行删除
DeviceLibrary/bean/BoardInfo.cs
......@@ -54,6 +54,13 @@ namespace TSA_V.DeviceLibrary
/// </summary>
public List<SMTPointInfo> smtList { get; set; }
public List<SMTPointInfo> GetSmtList()
{
List<SMTPointInfo> needWorkSmtList = (from m in smtList where m.Disable.Equals(false) select m).ToList<SMTPointInfo>();
return needWorkSmtList;
}
/// <summary>
/// 基准点坐标X
/// </summary>
......@@ -119,20 +126,20 @@ namespace TSA_V.DeviceLibrary
"，" + ResourceControl.GetString(ResourceControl.Width, "宽度") + "：" + boardWidth +
"，" + ResourceControl.GetString(ResourceControl.LineWidth, "线体宽度") + "：" + LineWidth +
"，" + ResourceControl.GetString(ResourceControl.InfoCount, "组件数量") +
"：" + smtList.Count;
"：" + GetSmtList().Count;
//return "电路板名称：" + boardName + "，长度：" + boardLength + "，宽度：" + boardWidth + "，组装信息数量：" + pointList.Count;
}
public List<SMTPointInfo> GetSolderingSMTList()
{
List<SMTPointInfo> newList = (from m in smtList where m.NeedSoldering.Equals(true) select m).ToList<SMTPointInfo>();
return newList;
}
public List<SMTPointInfo> GetCheckSMTList()
{
List<SMTPointInfo> newList = (from m in smtList where m.NeedCheck.Equals(true) select m).ToList<SMTPointInfo>();
return newList;
}
//public List<SMTPointInfo> GetSolderingSMTList()
//{
// List<SMTPointInfo> newList = (from m in smtList where m.NeedSoldering.Equals(true) select m).ToList<SMTPointInfo>();
// return newList;
//}
//public List<SMTPointInfo> GetCheckSMTList()
//{
// List<SMTPointInfo> newList = (from m in smtList where m.NeedCheck.Equals(true) select m).ToList<SMTPointInfo>();
// return newList;
//}
public string GetAoiFileName()
{
......
DeviceLibrary/csvLoad/CSVReaderManager.cs
......@@ -457,7 +457,8 @@ namespace TSA_V.LoadCSVLibrary
}
Dictionary<string, int> useCount = new Dictionary<string, int>();
int index = 0;
foreach (SMTPointInfo smt in currBoard.smtList)
List<SMTPointInfo> list = currBoard.GetSmtList();
foreach (SMTPointInfo smt in list)
{
if (index > maxIndex)
{
......
DeviceLibrary/manager/WorkInfo.cs
......@@ -34,8 +34,9 @@ namespace TSA_V.DeviceLibrary
public DateTime endWorkTime = DateTime.Now;
public DateTime LastSetpTime = DateTime.Now;
public uint PreNodeId = 0;
public List<SMTPointInfo> needSoldSmtList = new List<SMTPointInfo>();
public List<SMTPointInfo> needCheckSmtList = new List<SMTPointInfo>();
//public List<SMTPointInfo> needSoldSmtList = new List<SMTPointInfo>();
//public List<SMTPointInfo> needCheckSmtList = new List<SMTPointInfo>();
public List<SMTPointInfo> needWorkSmtList = new List<SMTPointInfo>();
//开始工作后共工作了几块电路板
public int BoardCount = 0;
public DateTime beginWorkTime = DateTime.Now;
......@@ -49,8 +50,9 @@ namespace TSA_V.DeviceLibrary
LogUtil.info("开始程序【" + boardInfo.boardName + "】的插件");
// StatusClient.instance.SendNew(Color.Green, "开始组装【" + boardInfo.boardName + "】" );
currBoard = boardInfo;
needSoldSmtList = (from m in currBoard.smtList where m.NeedSoldering.Equals(true) select m).ToList<SMTPointInfo>();
needCheckSmtList = (from m in currBoard.smtList where m.NeedCheck.Equals(true) select m).ToList<SMTPointInfo>();
//needSoldSmtList = (from m in currBoard.smtList where m.NeedSoldering.Equals(true) select m).ToList<SMTPointInfo>();
//needCheckSmtList = (from m in currBoard.smtList where m.NeedCheck.Equals(true) select m).ToList<SMTPointInfo>();
needWorkSmtList = currBoard.GetSmtList();
currIndex = -1;
//IsShowSoldering = false;
IsShowAOI = false;
......@@ -66,19 +68,20 @@ namespace TSA_V.DeviceLibrary
{
return new List<SMTPointInfo>();
}
if (WorkType.Equals(1))
{
return currBoard.smtList;
}
else if (WorkType.Equals(2))
{
return needSoldSmtList;
}
else if (WorkType.Equals(3))
{
return needCheckSmtList;
}
return new List<SMTPointInfo>();
//if (WorkType.Equals(1))
//{
// return currBoard.smtList;
//}
//else if (WorkType.Equals(2))
//{
// return needSoldSmtList;
//}
//else if (WorkType.Equals(3))
//{
// return needCheckSmtList;
//}
//return new List<SMTPointInfo>();
return needWorkSmtList;
}
public void StopWork()
{
......
DeviceLibrary/mes/DeviceStatus.cs
......@@ -73,7 +73,8 @@ namespace TSA_V.DeviceLibrary
if (maxIndex>0)
{
int index = 0;
foreach (SMTPointInfo sm in board.smtList)
List<SMTPointInfo> list = board.GetSmtList();
foreach (SMTPointInfo sm in list)
{
if (maxIndex > 0 && index > maxIndex)
{
......
DeviceLibrary/mes/MesUtil.cs
......@@ -183,7 +183,7 @@ namespace TSA_V.DeviceLibrary
public static DeviceStatus GetTestStatus(BoardInfo board, string pcbcode = "")
{
DeviceStatus deviceStatus = new DeviceStatus();
OpInfo op = OpInfo.GetOpInfo(board,board.smtList.Count);
OpInfo op = OpInfo.GetOpInfo(board,board.GetSmtList().Count);
deviceStatus.CurrStatus = 3;
//op.ProName = board.boardName;
......
TSA-V/FrmBoardInfo.Designer.cs
......@@ -46,6 +46,8 @@
this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
this.dataGridViewImageColumn2 = new System.Windows.Forms.DataGridViewImageColumn();
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.btnCheck = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
......@@ -62,31 +64,6 @@
this.btnSort = new System.Windows.Forms.Button();
this.焊点列表 = new System.Windows.Forms.GroupBox();
this.dgvList = new System.Windows.Forms.DataGridView();
this.btnSetOrigin = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.panBoard = new System.Windows.Forms.Panel();
this.picBoard = new System.Windows.Forms.PictureBox();
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.lblAoi = new System.Windows.Forms.Label();
this.cmbAOIFile = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
this.txtCode = new System.Windows.Forms.TextBox();
this.txtBoardName = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.label3 = 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.btnSave = new System.Windows.Forms.Button();
this.llblAllSel = new System.Windows.Forms.LinkLabel();
this.llblAllUSel = new System.Windows.Forms.LinkLabel();
this.Column_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PartNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
......@@ -112,6 +89,29 @@
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Up = new System.Windows.Forms.DataGridViewImageColumn();
this.Column_Down = new System.Windows.Forms.DataGridViewImageColumn();
this.btnSetOrigin = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.panBoard = new System.Windows.Forms.Panel();
this.picBoard = new System.Windows.Forms.PictureBox();
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.lblAoi = new System.Windows.Forms.Label();
this.cmbAOIFile = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
this.txtCode = new System.Windows.Forms.TextBox();
this.txtBoardName = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.label3 = 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.btnSave = new System.Windows.Forms.Button();
this.contextMenuStrip1.SuspendLayout();
this.contextMenuStrip2.SuspendLayout();
this.panel1.SuspendLayout();
......@@ -237,6 +237,30 @@
this.panel1.Size = new System.Drawing.Size(1549, 701);
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
//
this.btnOpenFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
......@@ -468,372 +492,93 @@
this.dgvList.DragDrop += new System.Windows.Forms.DragEventHandler(this.dgvList_DragDrop);
this.dgvList.DragEnter += new System.Windows.Forms.DragEventHandler(this.dgvList_DragEnter);
//
// btnSetOrigin
//
this.btnSetOrigin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSetOrigin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSetOrigin.Location = new System.Drawing.Point(8, 546);
this.btnSetOrigin.Name = "btnSetOrigin";
this.btnSetOrigin.Size = new System.Drawing.Size(120, 31);
this.btnSetOrigin.TabIndex = 278;
this.btnSetOrigin.Text = "重置基准点";
this.btnSetOrigin.UseVisualStyleBackColor = true;
this.btnSetOrigin.Visible = false;
this.btnSetOrigin.Click += new System.EventHandler(this.btnSetBasePoint_Click);
// Column_pointNum
//
// panel3
this.Column_pointNum.DataPropertyName = "pointNum";
this.Column_pointNum.HeaderText = "Id";
this.Column_pointNum.Name = "Column_pointNum";
this.Column_pointNum.ReadOnly = true;
this.Column_pointNum.Visible = false;
this.Column_pointNum.Width = 55;
//
this.panel3.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.panel3.Controls.Add(this.panBoard);
this.panel3.Location = new System.Drawing.Point(851, 187);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(689, 473);
this.panel3.TabIndex = 277;
// Column_PartNum
//
// panBoard
this.Column_PartNum.DataPropertyName = "partNum";
this.Column_PartNum.HeaderText = "编号";
this.Column_PartNum.Name = "Column_PartNum";
this.Column_PartNum.ReadOnly = true;
//
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.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(3, 3);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(676, 467);
this.panBoard.TabIndex = 261;
// Column_Name
//
// picBoard
this.Column_Name.DataPropertyName = "pointName";
this.Column_Name.HeaderText = "名称";
this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true;
//
this.picBoard.ContextMenuStrip = this.contextMenuStrip1;
this.picBoard.Cursor = System.Windows.Forms.Cursors.Cross;
this.picBoard.Location = new System.Drawing.Point(0, 0);
this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(435, 258);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picBoard.TabIndex = 259;
this.picBoard.TabStop = false;
this.picBoard.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picBoard_MouseDown);
this.picBoard.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picBoard_MouseMove);
// Column_X
//
// groupBox1
this.Column_X.DataPropertyName = "PositionX";
this.Column_X.HeaderText = "X";
this.Column_X.Name = "Column_X";
this.Column_X.ReadOnly = true;
this.Column_X.Width = 80;
//
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.lblAoi);
this.groupBox1.Controls.Add(this.cmbAOIFile);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txtCode);
this.groupBox1.Controls.Add(this.txtBoardName);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.label3);
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.Location = new System.Drawing.Point(3, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(1541, 70);
this.groupBox1.TabIndex = 20;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "程序基本信息";
// Column_Y
//
// lblLineW
this.Column_Y.DataPropertyName = "PositionY";
this.Column_Y.HeaderText = "Y";
this.Column_Y.Name = "Column_Y";
this.Column_Y.ReadOnly = true;
this.Column_Y.Width = 80;
//
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;
// Column_NodeX
//
// txtLineWidth
this.Column_NodeX.DataPropertyName = "NodePositionX";
this.Column_NodeX.HeaderText = "X";
this.Column_NodeX.Name = "Column_NodeX";
this.Column_NodeX.ReadOnly = true;
this.Column_NodeX.Visible = false;
this.Column_NodeX.Width = 70;
//
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;
// Column_NodeY
//
// lbllinews
this.Column_NodeY.DataPropertyName = "NodePositionY";
this.Column_NodeY.HeaderText = "Y";
this.Column_NodeY.Name = "Column_NodeY";
this.Column_NodeY.ReadOnly = true;
this.Column_NodeY.Visible = false;
this.Column_NodeY.Width = 70;
//
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";
// Column_positionNum
//
// btnConfigAOI
this.Column_positionNum.DataPropertyName = "Column_positionNum";
this.Column_positionNum.HeaderText = "位置";
this.Column_positionNum.Name = "Column_positionNum";
this.Column_positionNum.ReadOnly = true;
this.Column_positionNum.Width = 70;
//
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.Location = new System.Drawing.Point(1424, 15);
this.btnConfigAOI.Name = "btnConfigAOI";
this.btnConfigAOI.Size = new System.Drawing.Size(100, 45);
this.btnConfigAOI.TabIndex = 284;
this.btnConfigAOI.Text = "配置AOI";
this.btnConfigAOI.UseVisualStyleBackColor = true;
this.btnConfigAOI.Click += new System.EventHandler(this.btnConfigAOI_Click);
// Column_NeedSoldering
//
// lblAoi
this.Column_NeedSoldering.DataPropertyName = "NeedSoldering";
this.Column_NeedSoldering.HeaderText = "需焊接";
this.Column_NeedSoldering.Name = "Column_NeedSoldering";
this.Column_NeedSoldering.ReadOnly = true;
this.Column_NeedSoldering.Visible = false;
this.Column_NeedSoldering.Width = 70;
//
this.lblAoi.Location = new System.Drawing.Point(1074, 26);
this.lblAoi.Name = "lblAoi";
this.lblAoi.Size = new System.Drawing.Size(112, 22);
this.lblAoi.TabIndex = 283;
this.lblAoi.Text = "AOI程序：";
this.lblAoi.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// Column_WeldTemp
//
// cmbAOIFile
this.Column_WeldTemp.DataPropertyName = "WeldTemp";
this.Column_WeldTemp.HeaderText = "焊接温度";
this.Column_WeldTemp.MaxInputLength = 10;
this.Column_WeldTemp.Name = "Column_WeldTemp";
this.Column_WeldTemp.ReadOnly = true;
this.Column_WeldTemp.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTemp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTemp.Visible = false;
this.Column_WeldTemp.Width = 80;
//
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.FormattingEnabled = true;
this.cmbAOIFile.Location = new System.Drawing.Point(1190, 23);
this.cmbAOIFile.Name = "cmbAOIFile";
this.cmbAOIFile.Size = new System.Drawing.Size(230, 28);
this.cmbAOIFile.TabIndex = 282;
//
// label5
//
this.label5.Location = new System.Drawing.Point(518, 29);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(80, 17);
this.label5.TabIndex = 276;
this.label5.Text = "宽度↑";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtCode
//
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(374, 23);
this.txtCode.MaxLength = 40;
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(140, 29);
this.txtCode.TabIndex = 10;
//
// txtBoardName
//
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(89, 23);
this.txtBoardName.MaxLength = 20;
this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(180, 29);
this.txtBoardName.TabIndex = 2;
//
// label14
//
this.label14.Location = new System.Drawing.Point(273, 26);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(97, 22);
this.label14.TabIndex = 9;
this.label14.Text = "类型：";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label3
//
this.label3.Location = new System.Drawing.Point(700, 29);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(80, 17);
this.label3.TabIndex = 275;
this.label3.Text = "长度→";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2
//
this.label2.Location = new System.Drawing.Point(5, 29);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(80, 17);
this.label2.TabIndex = 1;
this.label2.Text = "名称";
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(602, 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(666, 29);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 36;
this.label24.Text = "mm";
//
// button1
//
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.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.Name = "button1";
this.button1.Size = new System.Drawing.Size(120, 45);
this.button1.TabIndex = 41;
this.button1.Text = "返回";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// btnSave
//
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.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.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(120, 45);
this.btnSave.TabIndex = 40;
this.btnSave.Text = "保存";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// 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);
//
// 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(94, 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);
//
// Column_pointNum
//
this.Column_pointNum.DataPropertyName = "pointNum";
this.Column_pointNum.HeaderText = "Id";
this.Column_pointNum.Name = "Column_pointNum";
this.Column_pointNum.ReadOnly = true;
this.Column_pointNum.Visible = false;
this.Column_pointNum.Width = 55;
//
// Column_PartNum
//
this.Column_PartNum.DataPropertyName = "partNum";
this.Column_PartNum.HeaderText = "编号";
this.Column_PartNum.Name = "Column_PartNum";
this.Column_PartNum.ReadOnly = true;
//
// Column_Name
//
this.Column_Name.DataPropertyName = "pointName";
this.Column_Name.HeaderText = "名称";
this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true;
//
// Column_X
//
this.Column_X.DataPropertyName = "PositionX";
this.Column_X.HeaderText = "X";
this.Column_X.Name = "Column_X";
this.Column_X.ReadOnly = true;
this.Column_X.Width = 80;
//
// Column_Y
//
this.Column_Y.DataPropertyName = "PositionY";
this.Column_Y.HeaderText = "Y";
this.Column_Y.Name = "Column_Y";
this.Column_Y.ReadOnly = true;
this.Column_Y.Width = 80;
//
// Column_NodeX
//
this.Column_NodeX.DataPropertyName = "NodePositionX";
this.Column_NodeX.HeaderText = "X";
this.Column_NodeX.Name = "Column_NodeX";
this.Column_NodeX.ReadOnly = true;
this.Column_NodeX.Visible = false;
this.Column_NodeX.Width = 70;
//
// Column_NodeY
//
this.Column_NodeY.DataPropertyName = "NodePositionY";
this.Column_NodeY.HeaderText = "Y";
this.Column_NodeY.Name = "Column_NodeY";
this.Column_NodeY.ReadOnly = true;
this.Column_NodeY.Visible = false;
this.Column_NodeY.Width = 70;
//
// Column_positionNum
//
this.Column_positionNum.DataPropertyName = "Column_positionNum";
this.Column_positionNum.HeaderText = "位置";
this.Column_positionNum.Name = "Column_positionNum";
this.Column_positionNum.ReadOnly = true;
this.Column_positionNum.Width = 70;
//
// Column_NeedSoldering
//
this.Column_NeedSoldering.DataPropertyName = "NeedSoldering";
this.Column_NeedSoldering.HeaderText = "需焊接";
this.Column_NeedSoldering.Name = "Column_NeedSoldering";
this.Column_NeedSoldering.ReadOnly = true;
this.Column_NeedSoldering.Visible = false;
this.Column_NeedSoldering.Width = 70;
//
// Column_WeldTemp
//
this.Column_WeldTemp.DataPropertyName = "WeldTemp";
this.Column_WeldTemp.HeaderText = "焊接温度";
this.Column_WeldTemp.MaxInputLength = 10;
this.Column_WeldTemp.Name = "Column_WeldTemp";
this.Column_WeldTemp.ReadOnly = true;
this.Column_WeldTemp.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTemp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTemp.Visible = false;
this.Column_WeldTemp.Width = 80;
//
// Column_WeldTime
// Column_WeldTime
//
this.Column_WeldTime.DataPropertyName = "WeldTime";
this.Column_WeldTime.HeaderText = "焊接时间";
......@@ -965,6 +710,261 @@
this.Column_Down.Visible = false;
this.Column_Down.Width = 50;
//
// btnSetOrigin
//
this.btnSetOrigin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSetOrigin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSetOrigin.Location = new System.Drawing.Point(8, 546);
this.btnSetOrigin.Name = "btnSetOrigin";
this.btnSetOrigin.Size = new System.Drawing.Size(120, 31);
this.btnSetOrigin.TabIndex = 278;
this.btnSetOrigin.Text = "重置基准点";
this.btnSetOrigin.UseVisualStyleBackColor = true;
this.btnSetOrigin.Visible = false;
this.btnSetOrigin.Click += new System.EventHandler(this.btnSetBasePoint_Click);
//
// panel3
//
this.panel3.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.panel3.Controls.Add(this.panBoard);
this.panel3.Location = new System.Drawing.Point(851, 187);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(689, 473);
this.panel3.TabIndex = 277;
//
// 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.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(3, 3);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(676, 467);
this.panBoard.TabIndex = 261;
//
// picBoard
//
this.picBoard.ContextMenuStrip = this.contextMenuStrip1;
this.picBoard.Cursor = System.Windows.Forms.Cursors.Cross;
this.picBoard.Location = new System.Drawing.Point(0, 0);
this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(435, 258);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picBoard.TabIndex = 259;
this.picBoard.TabStop = false;
this.picBoard.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picBoard_MouseDown);
this.picBoard.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picBoard_MouseMove);
//
// 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.lblAoi);
this.groupBox1.Controls.Add(this.cmbAOIFile);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txtCode);
this.groupBox1.Controls.Add(this.txtBoardName);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.label3);
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.Location = new System.Drawing.Point(3, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(1541, 70);
this.groupBox1.TabIndex = 20;
this.groupBox1.TabStop = false;
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
//
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.Location = new System.Drawing.Point(1424, 15);
this.btnConfigAOI.Name = "btnConfigAOI";
this.btnConfigAOI.Size = new System.Drawing.Size(100, 45);
this.btnConfigAOI.TabIndex = 284;
this.btnConfigAOI.Text = "配置AOI";
this.btnConfigAOI.UseVisualStyleBackColor = true;
this.btnConfigAOI.Click += new System.EventHandler(this.btnConfigAOI_Click);
//
// lblAoi
//
this.lblAoi.Location = new System.Drawing.Point(1074, 26);
this.lblAoi.Name = "lblAoi";
this.lblAoi.Size = new System.Drawing.Size(112, 22);
this.lblAoi.TabIndex = 283;
this.lblAoi.Text = "AOI程序：";
this.lblAoi.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// cmbAOIFile
//
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.FormattingEnabled = true;
this.cmbAOIFile.Location = new System.Drawing.Point(1190, 23);
this.cmbAOIFile.Name = "cmbAOIFile";
this.cmbAOIFile.Size = new System.Drawing.Size(230, 28);
this.cmbAOIFile.TabIndex = 282;
//
// label5
//
this.label5.Location = new System.Drawing.Point(518, 29);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(80, 17);
this.label5.TabIndex = 276;
this.label5.Text = "宽度↑";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtCode
//
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(374, 23);
this.txtCode.MaxLength = 40;
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(140, 29);
this.txtCode.TabIndex = 10;
//
// txtBoardName
//
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(89, 23);
this.txtBoardName.MaxLength = 20;
this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(180, 29);
this.txtBoardName.TabIndex = 2;
//
// label14
//
this.label14.Location = new System.Drawing.Point(273, 26);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(97, 22);
this.label14.TabIndex = 9;
this.label14.Text = "类型：";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label3
//
this.label3.Location = new System.Drawing.Point(700, 29);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(80, 17);
this.label3.TabIndex = 275;
this.label3.Text = "长度→";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2
//
this.label2.Location = new System.Drawing.Point(5, 29);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(80, 17);
this.label2.TabIndex = 1;
this.label2.Text = "名称";
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(602, 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(666, 29);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 36;
this.label24.Text = "mm";
//
// button1
//
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.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.Name = "button1";
this.button1.Size = new System.Drawing.Size(120, 45);
this.button1.TabIndex = 41;
this.button1.Text = "返回";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// btnSave
//
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.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.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(120, 45);
this.btnSave.TabIndex = 40;
this.btnSave.Text = "保存";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// FrmBoardInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
TSA-V/FrmBoardInfo.cs
......@@ -132,7 +132,7 @@ namespace TSA_V
this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
this.Column_Down.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点");
this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "禁用");
this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用");
}
private void FrmBoardInfo_Load(object sender, EventArgs e)
{
......
TSA-V/Properties/Resource.en-US.resx
......@@ -2353,6 +2353,13 @@
<data name="禁用" xml:space="preserve">
<value>Disabled</value>
</data>
<data name = "FrmBoardInfo_llblAllUSel_Text" xml:space = "preserve"> <value> Disable all </value> </data>
<data name = "FrmBoardInfo_llblAllSel_Text" xml:space = "preserve"> <value> To enable all </value> </data>
<data name="FrmBoardInfo_llblAllUSel_Text" xml:space="preserve">
<value> Disable all </value>
</data>
<data name="FrmBoardInfo_llblAllSel_Text" xml:space="preserve">
<value> To enable all </value>
</data>
<data name="ItemText_Disable" xml:space="preserve">
<value>Disable</value>
</data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -2367,6 +2367,13 @@
<data name="禁用" xml:space="preserve">
<value>禁用</value>
</data>
<data name = "FrmBoardInfo_llblAllUSel_Text" xml:space = "preserve"> <value> 全部禁用 </value> </data>
<data name = "FrmBoardInfo_llblAllSel_Text" xml:space = "preserve"> <value> 全部启用 </value> </data>
<data name="FrmBoardInfo_llblAllUSel_Text" xml:space="preserve">
<value> 全部禁用 </value>
</data>
<data name="FrmBoardInfo_llblAllSel_Text" xml:space="preserve">
<value> 全部启用 </value>
</data>
<data name="ItemText_Disable" xml:space="preserve">
<value>禁用</value>
</data>
</root>
\ No newline at end of file
TSA-V/ResourceCulture.cs
......@@ -600,6 +600,10 @@ namespace TSA_V
/// </summary>
public static string ItemText_Check = "ItemText_Check";
/// <summary>
/// 禁用
/// </summary>
public static string ItemText_Disable = "ItemText_Disable";
/// <summary>
/// 编号
/// </summary>
public static string Col_Num = "Col_Num";
......
TSA-V/workForm/FrmBoardSelect.cs
......@@ -68,7 +68,7 @@ namespace TSA_V
this.lblBoardMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
BoardManager.CurrBoard = board;
LogUtil.info("切换到新板子：" + board.boardName);
FrmProjectorScreen.instance.ShowPoint(false, board.smtList.ToArray());
FrmProjectorScreen.instance.ShowPoint(false, board.GetSmtList().ToArray());
}
}
}
......@@ -165,31 +165,31 @@ namespace TSA_V
LogUtil.info("选择程序，是否流水线过板=" + TSAVBean.OnlyGuoBan);
if (WorkType.Equals(1))
{
if (BoardManager.CurrBoard.smtList.Count <= 0)
if (BoardManager.CurrBoard.GetSmtList().Count <= 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotFindInfo, "电路板【{0}】没有组装信息，请选择其他程序！", BoardManager.CurrBoard.boardName));
return false;
}
return true;
}
else if (WorkType.Equals(2))
{
if (BoardManager.CurrBoard.GetSolderingSMTList().Count <= 0)
{
MessageBox.Show("电路板【" + BoardManager.CurrBoard.boardName + "】没有配置焊接信息，请选择其他程序！");
return false;
}
return true;
}
else if (WorkType.Equals(3))
{
if (BoardManager.CurrBoard.GetCheckSMTList().Count <= 0)
{
MessageBox.Show("电路板【" + BoardManager.CurrBoard.boardName + "】没有配置检测信息，请选择其他程序！");
return false;
}
return true;
}
//else if (WorkType.Equals(2))
//{
// if (BoardManager.CurrBoard.GetSolderingSMTList().Count <= 0)
// {
// MessageBox.Show("电路板【" + BoardManager.CurrBoard.boardName + "】没有配置焊接信息，请选择其他程序！");
// return false;
// }
// return true;
//}
//else if (WorkType.Equals(3))
//{
// if (BoardManager.CurrBoard.GetCheckSMTList().Count <= 0)
// {
// MessageBox.Show("电路板【" + BoardManager.CurrBoard.boardName + "】没有配置检测信息，请选择其他程序！");
// return false;
// }
// return true;
//}
}
return false;
}
......
TSA-V/workForm/FrmTSAV.cs
......@@ -27,23 +27,25 @@ namespace TSA_V
private bool isInitOk = false;
private BoardInfo board = BoardManager.CurrBoard;
private PointDisplay display = new PointDisplay();
private List<SMTPointInfo> workSmtList = new List<SMTPointInfo>();
private void FrmWelding_Load(object sender, EventArgs e)
{
btnCamera.Visible = TSAVBean.IsNeedAOI;
TSAVBean.Work.WorkType = 1;
LanguageProcess();
BoardInfo board = BoardManager.CurrBoard;
if (board != null)
{
this.Text = "Smart Workstation：" + board.boardName;
workSmtList = board.GetSmtList();
preIndex = -1;
smtPoint = new SMTPointInfo();
timerShowForm.Stop();
if (board.smtList.Count > 0)
if (workSmtList.Count > 0)
{
smtPoint = board.smtList[0];
smtPoint = workSmtList[0];
}
ShowMsg();
......@@ -191,7 +193,7 @@ namespace TSA_V
private Bitmap bitmap = null;
private void loadPictureBoxSize(BoardInfo board)
{
display.LoadWorkFromPoint(board, smtPoint);
display.LoadWorkFromPoint(board, smtPoint,true);
updatePicPointSize(picBoard.Width, picBoard.Height);
pointXMap = display.pointXMap;
pointYMap = display.pointYMap;
......@@ -639,7 +641,7 @@ namespace TSA_V
}
int leftCount = board.smtList.Count - 1 - preIndex;
int leftCount = workSmtList.Count - 1 - preIndex;
if (preIndex.Equals(0))
{
lblLast.Visible = false;
......@@ -704,7 +706,7 @@ namespace TSA_V
private void PreOrNext(bool isNext)
{
if (board != null && board.smtList.Count > 0)
if (board != null && workSmtList.Count > 0)
{
if (isNext)
{
......@@ -721,20 +723,20 @@ namespace TSA_V
if (preIndex < 0)
{
preIndex = board.smtList.Count - 1;
preIndex = workSmtList.Count - 1;
}
}
if (board.smtList.Count <= preIndex)
if (workSmtList.Count <= preIndex)
{
ShowAOI();
preIndex = 0;
}
else if (preIndex < 0)
{
preIndex = board.smtList.Count - 1;
preIndex = workSmtList.Count - 1;
}
smtPoint = board.smtList[preIndex];
smtPoint = workSmtList[preIndex];
ShowMsg();
if (pointXMap.ContainsKey(smtPoint.pointNum))
{
......@@ -771,7 +773,7 @@ namespace TSA_V
{
lblPositionNum.Text = position.PositionNum;
}
int leftCount = board.smtList.Count - 1 - preIndex;
int leftCount = workSmtList.Count - 1 - preIndex;
if (preIndex.Equals(0))
{
lblLast.Visible = false;
......
TSA-V/workForm/PointDisplay.cs
......@@ -141,7 +141,7 @@ namespace TSA_V
public Dictionary<int, double> pointXMap = new Dictionary<int, double>();
public Dictionary<int, double> pointYMap = new Dictionary<int, double>();
public void LoadWorkFromPoint(BoardInfo board, SMTPointInfo smtPoint)
public void LoadWorkFromPoint(BoardInfo board, SMTPointInfo smtPoint,bool isOnlyWork=true )
{
if (picBoard == null)
{
......@@ -175,7 +175,12 @@ namespace TSA_V
int index = 0;
pointXMap = new Dictionary<int, double>();
pointYMap = new Dictionary<int, double>();
foreach (SMTPointInfo weld in board.smtList)
List<SMTPointInfo> list = board.smtList;
if (isOnlyWork)
{
list = board.GetSmtList();
}
foreach (SMTPointInfo weld in list)
{
float x = (float)Math.Abs(weld.PositionX) * picBoard.Width / Width;
float y = (float)Math.Abs(weld.PositionY) * picBoard.Width / Width;
......@@ -220,51 +225,7 @@ namespace TSA_V
{
LogUtil.error("画图出错：" + ex.ToString());
}
}
//private void PicBoardBlowUp()
//{
// this.picBoard.SizeMode = PictureBoxSizeMode.Zoom;
// if (this.picBoard.Width > 5000 || this.picBoard.Height > 5000)
// {
// //不能继续放大
// return;
// }
// float w = this.picBoard.Width * 1.2f; //每次放大 20%
// float h = this.picBoard.Height * 1.2f;
// CurrBeiLu = CurrBeiLu * 1.2f;
// this.picBoard.Size = Size.Ceiling(new SizeF(w, h));
// picBoard.Invalidate();
//}
//private void PicBoardShrink()
//{
// this.picBoard.SizeMode = PictureBoxSizeMode.Zoom;
// if (this.picBoard.Width < panBoard.Width && this.picBoard.Height < panBoard.Height)
// {
// //不能继续缩小
// return;
// }
// float w = this.picBoard.Width * 0.8f; //每次縮小 20%
// float h = this.picBoard.Height * 0.8f;
// this.picBoard.Size = Size.Ceiling(new SizeF(w, h));
// CurrBeiLu = CurrBeiLu * 0.8f;
//}
//void picBoard_MouseWheel(object sender, MouseEventArgs e)
//{
// //向前
// if (e.Delta > 0)
// {
// PicBoardBlowUp();
// LoadPoint(Width, Height, PointList);
// }
// //向后
// else if (e.Delta < 0)
// {
// PicBoardShrink();
// LoadPoint(Width, Height, PointList);
// }
//}
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!