Skip to content

李娜 / Line-Smart-Workstation

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

程序编辑界面组装信息增加注意事项的显示。

1 个父辈 6f6d468c
内嵌 并排
正在显示 11 个修改的文件 包含 394 行增加 和 314 行删除
TSA-V/FrmAddBoard.Designer.cs
......@@ -53,7 +53,7 @@
this.cmbOrgType = new System.Windows.Forms.ComboBox();
this.xyMoveControl1 = new UserFromControl.ProjectorControl();
this.chbSort = new System.Windows.Forms.CheckBox();
this.lblLineWidth = new System.Windows.Forms.Label();
this.lblWidth = new System.Windows.Forms.Label();
this.txtLineWidth = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.SuspendLayout();
......@@ -305,15 +305,15 @@
this.chbSort.Text = "自动排序";
this.chbSort.UseVisualStyleBackColor = true;
//
// lblLineWidth
// lblWidth
//
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(407, 104);
this.lblLineWidth.Name = "lblLineWidth";
this.lblLineWidth.Size = new System.Drawing.Size(80, 20);
this.lblLineWidth.TabIndex = 294;
this.lblLineWidth.Text = "线体宽度：";
this.lblLineWidth.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
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(407, 104);
this.lblWidth.Name = "lblWidth";
this.lblWidth.Size = new System.Drawing.Size(80, 20);
this.lblWidth.TabIndex = 294;
this.lblWidth.Text = "线体宽度：";
this.lblWidth.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// txtLineWidth
//
......@@ -338,7 +338,7 @@
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.ClientSize = new System.Drawing.Size(632, 707);
this.Controls.Add(this.lblLineWidth);
this.Controls.Add(this.lblWidth);
this.Controls.Add(this.txtLineWidth);
this.Controls.Add(this.label9);
this.Controls.Add(this.chbSort);
......@@ -397,7 +397,7 @@
private System.Windows.Forms.Label label8;
private System.Windows.Forms.ComboBox cmbOrgType;
private System.Windows.Forms.CheckBox chbSort;
private System.Windows.Forms.Label lblLineWidth;
private System.Windows.Forms.Label lblWidth;
private System.Windows.Forms.TextBox txtLineWidth;
private System.Windows.Forms.Label label9;
}
......
TSA-V/FrmBoardInfo.Designer.cs
......@@ -64,6 +64,29 @@
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.Column_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PartNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
......@@ -83,35 +106,13 @@
this.Column_PenWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_ShowText = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_disable = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_Notes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_getPosition = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_MoveTest = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_btnDetail = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Up = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Down = new System.Windows.Forms.DataGridViewLinkColumn();
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();
......@@ -469,6 +470,7 @@
this.Column_PenWidth,
this.Column_ShowText,
this.Column_disable,
this.Column_Notes,
this.Column_getPosition,
this.Column_MoveTest,
this.Column_btnDetail,
......@@ -493,230 +495,6 @@
this.dgvList.DragDrop += new System.Windows.Forms.DragEventHandler(this.dgvList_DragDrop);
this.dgvList.DragEnter += new System.Windows.Forms.DragEventHandler(this.dgvList_DragEnter);
//
// 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
//
this.Column_WeldTime.DataPropertyName = "WeldTime";
this.Column_WeldTime.HeaderText = "焊接时间";
this.Column_WeldTime.MaxInputLength = 10;
this.Column_WeldTime.Name = "Column_WeldTime";
this.Column_WeldTime.ReadOnly = true;
this.Column_WeldTime.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTime.Visible = false;
this.Column_WeldTime.Width = 80;
//
// Column_NeedCheck
//
this.Column_NeedCheck.DataPropertyName = "NeedCheck";
this.Column_NeedCheck.HeaderText = "需检测";
this.Column_NeedCheck.Name = "Column_NeedCheck";
this.Column_NeedCheck.ReadOnly = true;
this.Column_NeedCheck.Visible = false;
this.Column_NeedCheck.Width = 55;
//
// Column_CheckOK
//
this.Column_CheckOK.HeaderText = "校准点";
this.Column_CheckOK.Name = "Column_CheckOK";
this.Column_CheckOK.ReadOnly = true;
this.Column_CheckOK.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Column_CheckOK.Width = 70;
//
// Column_PointType
//
this.Column_PointType.HeaderText = "点类型";
this.Column_PointType.Name = "Column_PointType";
this.Column_PointType.ReadOnly = true;
this.Column_PointType.Visible = false;
//
// Column_PointSizeX
//
this.Column_PointSizeX.HeaderText = "横向点大小";
this.Column_PointSizeX.Name = "Column_PointSizeX";
this.Column_PointSizeX.ReadOnly = true;
this.Column_PointSizeX.Visible = false;
//
// Column_PointSizeY
//
this.Column_PointSizeY.HeaderText = "纵向点大小";
this.Column_PointSizeY.Name = "Column_PointSizeY";
this.Column_PointSizeY.ReadOnly = true;
this.Column_PointSizeY.Visible = false;
//
// Column_PenWidth
//
this.Column_PenWidth.HeaderText = "画笔宽度";
this.Column_PenWidth.Name = "Column_PenWidth";
this.Column_PenWidth.ReadOnly = true;
this.Column_PenWidth.Visible = false;
//
// Column_ShowText
//
this.Column_ShowText.HeaderText = "投影文字";
this.Column_ShowText.Name = "Column_ShowText";
this.Column_ShowText.ReadOnly = true;
this.Column_ShowText.Visible = false;
//
// Column_disable
//
this.Column_disable.FillWeight = 80F;
this.Column_disable.HeaderText = "禁用";
this.Column_disable.Name = "Column_disable";
this.Column_disable.ReadOnly = true;
this.Column_disable.Width = 55;
//
// Column_getPosition
//
this.Column_getPosition.HeaderText = "更新坐标";
this.Column_getPosition.Name = "Column_getPosition";
this.Column_getPosition.ReadOnly = true;
this.Column_getPosition.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_getPosition.Text = "更新坐标";
this.Column_getPosition.ToolTipText = "更新坐标";
this.Column_getPosition.UseColumnTextForLinkValue = true;
this.Column_getPosition.Visible = false;
this.Column_getPosition.Width = 80;
//
// Column_MoveTest
//
this.Column_MoveTest.HeaderText = "移动测试";
this.Column_MoveTest.Name = "Column_MoveTest";
this.Column_MoveTest.ReadOnly = true;
this.Column_MoveTest.Text = "移动测试";
this.Column_MoveTest.ToolTipText = "移动测试";
this.Column_MoveTest.UseColumnTextForLinkValue = true;
this.Column_MoveTest.Width = 80;
//
// Column_btnDetail
//
this.Column_btnDetail.HeaderText = "详情";
this.Column_btnDetail.Name = "Column_btnDetail";
this.Column_btnDetail.ReadOnly = true;
this.Column_btnDetail.Text = "详情";
this.Column_btnDetail.UseColumnTextForLinkValue = true;
this.Column_btnDetail.Width = 55;
//
// Column_Del
//
this.Column_Del.HeaderText = "删除";
this.Column_Del.Name = "Column_Del";
this.Column_Del.ReadOnly = true;
this.Column_Del.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Del.Text = "删除";
this.Column_Del.ToolTipText = "删除";
this.Column_Del.UseColumnTextForLinkValue = true;
this.Column_Del.Width = 55;
//
// Column_Up
//
this.Column_Up.HeaderText = " ↑";
this.Column_Up.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.Column_Up.Name = "Column_Up";
this.Column_Up.ReadOnly = true;
this.Column_Up.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Up.Text = " ↑";
this.Column_Up.ToolTipText = " ↑";
this.Column_Up.UseColumnTextForLinkValue = true;
this.Column_Up.Width = 30;
//
// Column_Down
//
this.Column_Down.HeaderText = " ↓";
this.Column_Down.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.Column_Down.Name = "Column_Down";
this.Column_Down.ReadOnly = true;
this.Column_Down.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Down.Text = " ↓";
this.Column_Down.ToolTipText = " ↓";
this.Column_Down.UseColumnTextForLinkValue = true;
this.Column_Down.Width = 30;
//
// btnSetOrigin
//
this.btnSetOrigin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......@@ -972,6 +750,235 @@
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// 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
//
this.Column_WeldTime.DataPropertyName = "WeldTime";
this.Column_WeldTime.HeaderText = "焊接时间";
this.Column_WeldTime.MaxInputLength = 10;
this.Column_WeldTime.Name = "Column_WeldTime";
this.Column_WeldTime.ReadOnly = true;
this.Column_WeldTime.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTime.Visible = false;
this.Column_WeldTime.Width = 80;
//
// Column_NeedCheck
//
this.Column_NeedCheck.DataPropertyName = "NeedCheck";
this.Column_NeedCheck.HeaderText = "需检测";
this.Column_NeedCheck.Name = "Column_NeedCheck";
this.Column_NeedCheck.ReadOnly = true;
this.Column_NeedCheck.Visible = false;
this.Column_NeedCheck.Width = 55;
//
// Column_CheckOK
//
this.Column_CheckOK.HeaderText = "校准点";
this.Column_CheckOK.Name = "Column_CheckOK";
this.Column_CheckOK.ReadOnly = true;
this.Column_CheckOK.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Column_CheckOK.Width = 70;
//
// Column_PointType
//
this.Column_PointType.HeaderText = "点类型";
this.Column_PointType.Name = "Column_PointType";
this.Column_PointType.ReadOnly = true;
this.Column_PointType.Visible = false;
//
// Column_PointSizeX
//
this.Column_PointSizeX.HeaderText = "横向点大小";
this.Column_PointSizeX.Name = "Column_PointSizeX";
this.Column_PointSizeX.ReadOnly = true;
this.Column_PointSizeX.Visible = false;
//
// Column_PointSizeY
//
this.Column_PointSizeY.HeaderText = "纵向点大小";
this.Column_PointSizeY.Name = "Column_PointSizeY";
this.Column_PointSizeY.ReadOnly = true;
this.Column_PointSizeY.Visible = false;
//
// Column_PenWidth
//
this.Column_PenWidth.HeaderText = "画笔宽度";
this.Column_PenWidth.Name = "Column_PenWidth";
this.Column_PenWidth.ReadOnly = true;
this.Column_PenWidth.Visible = false;
//
// Column_ShowText
//
this.Column_ShowText.HeaderText = "投影文字";
this.Column_ShowText.Name = "Column_ShowText";
this.Column_ShowText.ReadOnly = true;
this.Column_ShowText.Visible = false;
//
// Column_disable
//
this.Column_disable.FillWeight = 80F;
this.Column_disable.HeaderText = "禁用";
this.Column_disable.Name = "Column_disable";
this.Column_disable.ReadOnly = true;
this.Column_disable.Width = 55;
//
// Column_Notes
//
this.Column_Notes.HeaderText = "注意事项";
this.Column_Notes.Name = "Column_Notes";
//
// Column_getPosition
//
this.Column_getPosition.HeaderText = "更新坐标";
this.Column_getPosition.Name = "Column_getPosition";
this.Column_getPosition.ReadOnly = true;
this.Column_getPosition.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_getPosition.Text = "更新坐标";
this.Column_getPosition.ToolTipText = "更新坐标";
this.Column_getPosition.UseColumnTextForLinkValue = true;
this.Column_getPosition.Visible = false;
this.Column_getPosition.Width = 80;
//
// Column_MoveTest
//
this.Column_MoveTest.HeaderText = "移动测试";
this.Column_MoveTest.Name = "Column_MoveTest";
this.Column_MoveTest.ReadOnly = true;
this.Column_MoveTest.Text = "移动测试";
this.Column_MoveTest.ToolTipText = "移动测试";
this.Column_MoveTest.UseColumnTextForLinkValue = true;
this.Column_MoveTest.Width = 80;
//
// Column_btnDetail
//
this.Column_btnDetail.HeaderText = "详情";
this.Column_btnDetail.Name = "Column_btnDetail";
this.Column_btnDetail.ReadOnly = true;
this.Column_btnDetail.Text = "详情";
this.Column_btnDetail.UseColumnTextForLinkValue = true;
this.Column_btnDetail.Width = 55;
//
// Column_Del
//
this.Column_Del.HeaderText = "删除";
this.Column_Del.Name = "Column_Del";
this.Column_Del.ReadOnly = true;
this.Column_Del.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Del.Text = "删除";
this.Column_Del.ToolTipText = "删除";
this.Column_Del.UseColumnTextForLinkValue = true;
this.Column_Del.Width = 55;
//
// Column_Up
//
this.Column_Up.HeaderText = " ↑";
this.Column_Up.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.Column_Up.Name = "Column_Up";
this.Column_Up.ReadOnly = true;
this.Column_Up.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Up.Text = " ↑";
this.Column_Up.ToolTipText = " ↑";
this.Column_Up.UseColumnTextForLinkValue = true;
this.Column_Up.Width = 30;
//
// Column_Down
//
this.Column_Down.HeaderText = " ↓";
this.Column_Down.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.Column_Down.Name = "Column_Down";
this.Column_Down.ReadOnly = true;
this.Column_Down.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Down.Text = " ↓";
this.Column_Down.ToolTipText = " ↓";
this.Column_Down.UseColumnTextForLinkValue = true;
this.Column_Down.Width = 30;
//
// FrmBoardInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -1081,6 +1088,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column_PenWidth;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_ShowText;
private System.Windows.Forms.DataGridViewCheckBoxColumn Column_disable;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Notes;
private System.Windows.Forms.DataGridViewLinkColumn Column_getPosition;
private System.Windows.Forms.DataGridViewLinkColumn Column_MoveTest;
private System.Windows.Forms.DataGridViewLinkColumn Column_btnDetail;
......
TSA-V/FrmBoardInfo.cs
......@@ -142,6 +142,7 @@ namespace TSA_V
//this.Column_Down.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点");
this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用");
this.Column_Notes.HeaderText = ResourceCulture.GetString("注意事项", "注意事项");
}
private void FrmBoardInfo_Load(object sender, EventArgs e)
{
......@@ -287,6 +288,15 @@ namespace TSA_V
view.Cells[Column_PenWidth.Index].Value = point.PenWidth;
view.Cells[Column_ShowText.Index].Value = point.ShowText;
view.Cells[Column_disable.Index].Value = point.Disable;
if (updateBoardInfo != null)
{
ComponetInfo com = CSVReaderBomManager.GetCom(updateBoardInfo.bomName, point.PartNum);
if (com != null)
{
view.Cells[Column_Notes.Index].Value = com.Notes;
}
}
if (point.CheckOK)
{
view.DefaultCellStyle.ForeColor = Color.Red;
......@@ -810,7 +820,7 @@ namespace TSA_V
}
List<SMTPointInfo> allPoint = allPointInfo();
FrmPointInfo fwpi = new FrmPointInfo( allPoint, rowIndex,NextProcess);
FrmPointInfo fwpi = new FrmPointInfo( updateBoardInfo, allPoint, rowIndex,NextProcess);
fwpi.AoiProgramName = cmbAOIFile.Text;
fwpi.PicImage = picBoard.Image;
DialogResult result = fwpi.ShowDialog();
......
TSA-V/FrmBoardInfo.resx
......@@ -210,6 +210,9 @@
<metadata name="Column_disable.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Notes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_getPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
......
TSA-V/FrmComponentList.Designer.cs
......@@ -36,6 +36,7 @@
this.label3 = new System.Windows.Forms.Label();
this.cmbList = new System.Windows.Forms.ComboBox();
this.groupInfo = new System.Windows.Forms.GroupBox();
this.btnNewCom = new System.Windows.Forms.Button();
this.cmbPositionNumList = new System.Windows.Forms.ComboBox();
this.txtPartNum = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
......@@ -50,6 +51,8 @@
this.label1 = new System.Windows.Forms.Label();
this.btnSave = new System.Windows.Forms.Button();
this.dgvList = new System.Windows.Forms.DataGridView();
this.btnBack = new System.Windows.Forms.Button();
this.btnNew = new System.Windows.Forms.Button();
this.Column_partNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
......@@ -59,9 +62,6 @@
this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnBack = new System.Windows.Forms.Button();
this.btnNew = new System.Windows.Forms.Button();
this.btnNewCom = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupInfo.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
......@@ -84,7 +84,7 @@
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(13, 16);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(983, 701);
this.groupBox1.Size = new System.Drawing.Size(1264, 701);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "元器件库管理";
......@@ -118,7 +118,7 @@
this.btnDownLoad.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnDownLoad.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDownLoad.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDownLoad.Location = new System.Drawing.Point(541, 629);
this.btnDownLoad.Location = new System.Drawing.Point(832, 623);
this.btnDownLoad.Name = "btnDownLoad";
this.btnDownLoad.Size = new System.Drawing.Size(131, 63);
this.btnDownLoad.TabIndex = 71;
......@@ -164,13 +164,25 @@
this.groupInfo.Controls.Add(this.txtName);
this.groupInfo.Controls.Add(this.label1);
this.groupInfo.Controls.Add(this.btnSave);
this.groupInfo.Location = new System.Drawing.Point(518, 84);
this.groupInfo.Location = new System.Drawing.Point(829, 84);
this.groupInfo.Name = "groupInfo";
this.groupInfo.Size = new System.Drawing.Size(442, 520);
this.groupInfo.Size = new System.Drawing.Size(416, 520);
this.groupInfo.TabIndex = 68;
this.groupInfo.TabStop = false;
this.groupInfo.Text = "元器件基本信息";
//
// btnNewCom
//
this.btnNewCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNewCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNewCom.Location = new System.Drawing.Point(108, 370);
this.btnNewCom.Name = "btnNewCom";
this.btnNewCom.Size = new System.Drawing.Size(130, 45);
this.btnNewCom.TabIndex = 76;
this.btnNewCom.Text = "新增元器件";
this.btnNewCom.UseVisualStyleBackColor = true;
this.btnNewCom.Click += new System.EventHandler(this.btnNewCom_Click);
//
// cmbPositionNumList
//
this.cmbPositionNumList.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append;
......@@ -316,18 +328,44 @@
this.Column_X,
this.Column_Y,
this.Column_Del});
this.dgvList.Location = new System.Drawing.Point(7, 84);
this.dgvList.Location = new System.Drawing.Point(5, 84);
this.dgvList.MultiSelect = false;
this.dgvList.Name = "dgvList";
this.dgvList.ReadOnly = true;
this.dgvList.RowHeadersWidth = 10;
this.dgvList.RowTemplate.Height = 23;
this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvList.Size = new System.Drawing.Size(505, 611);
this.dgvList.Size = new System.Drawing.Size(815, 611);
this.dgvList.TabIndex = 32;
this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvList_CellContentClick);
this.dgvList.SelectionChanged += new System.EventHandler(this.dgvList_SelectionChanged);
//
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(1110, 623);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(131, 63);
this.btnBack.TabIndex = 6;
this.btnBack.Text = "返回(&B)";
this.btnBack.UseVisualStyleBackColor = true;
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// btnNew
//
this.btnNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNew.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNew.Location = new System.Drawing.Point(971, 623);
this.btnNew.Name = "btnNew";
this.btnNew.Size = new System.Drawing.Size(131, 63);
this.btnNew.TabIndex = 3;
this.btnNew.Text = "上传元器件库";
this.btnNew.UseVisualStyleBackColor = true;
this.btnNew.Click += new System.EventHandler(this.btnNew_Click);
//
// Column_partNumber
//
this.Column_partNumber.DataPropertyName = "PartNum";
......@@ -364,7 +402,7 @@
this.Column_Notes.HeaderText = "注意事项";
this.Column_Notes.Name = "Column_Notes";
this.Column_Notes.ReadOnly = true;
this.Column_Notes.Width = 150;
this.Column_Notes.Width = 230;
//
// Column_description
//
......@@ -403,49 +441,11 @@
this.Column_Del.UseColumnTextForLinkValue = true;
this.Column_Del.Width = 70;
//
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(825, 629);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(131, 63);
this.btnBack.TabIndex = 6;
this.btnBack.Text = "返回(&B)";
this.btnBack.UseVisualStyleBackColor = true;
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// btnNew
//
this.btnNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNew.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNew.Location = new System.Drawing.Point(683, 629);
this.btnNew.Name = "btnNew";
this.btnNew.Size = new System.Drawing.Size(131, 63);
this.btnNew.TabIndex = 3;
this.btnNew.Text = "上传元器件库";
this.btnNew.UseVisualStyleBackColor = true;
this.btnNew.Click += new System.EventHandler(this.btnNew_Click);
//
// btnNewCom
//
this.btnNewCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNewCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNewCom.Location = new System.Drawing.Point(108, 370);
this.btnNewCom.Name = "btnNewCom";
this.btnNewCom.Size = new System.Drawing.Size(130, 45);
this.btnNewCom.TabIndex = 76;
this.btnNewCom.Text = "新增元器件";
this.btnNewCom.UseVisualStyleBackColor = true;
this.btnNewCom.Click += new System.EventHandler(this.btnNewCom_Click);
//
// FrmComponentList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1008, 729);
this.ClientSize = new System.Drawing.Size(1289, 729);
this.Controls.Add(this.groupBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmComponentList";
......@@ -488,6 +488,7 @@
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Button btnDel;
private System.Windows.Forms.ComboBox cmbPositionNumList;
private System.Windows.Forms.Button btnNewCom;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_partNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Count;
......@@ -497,6 +498,5 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column_X;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Y;
private System.Windows.Forms.DataGridViewLinkColumn Column_Del;
private System.Windows.Forms.Button btnNewCom;
}
}
\ No newline at end of file
TSA-V/FrmWeldPointInfo.Designer.cs
......@@ -35,6 +35,7 @@
this.btnPre = new System.Windows.Forms.Button();
this.btnSaveAndNext = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblNotes = new System.Windows.Forms.Label();
this.chbCheck = new System.Windows.Forms.CheckBox();
this.txtWeldTemp = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
......@@ -72,7 +73,8 @@
this.xyMoveControl1.PenWidth = 2;
this.xyMoveControl1.PointSizeX = 4;
this.xyMoveControl1.PointSizeY = 1;
this.xyMoveControl1.PointType = 0;
this.xyMoveControl1.PointType = 1;
this.xyMoveControl1.ShowText = "";
this.xyMoveControl1.Size = new System.Drawing.Size(515, 299);
this.xyMoveControl1.TabIndex = 63;
this.xyMoveControl1.XValue = 1D;
......@@ -106,6 +108,7 @@
//
// groupBox1
//
this.groupBox1.Controls.Add(this.lblNotes);
this.groupBox1.Controls.Add(this.chbCheck);
this.groupBox1.Controls.Add(this.txtWeldTemp);
this.groupBox1.Controls.Add(this.label6);
......@@ -131,11 +134,19 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "组装信息";
//
// lblNotes
//
this.lblNotes.Location = new System.Drawing.Point(6, 179);
this.lblNotes.Name = "lblNotes";
this.lblNotes.Size = new System.Drawing.Size(491, 36);
this.lblNotes.TabIndex = 85;
this.lblNotes.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// chbCheck
//
this.chbCheck.AutoSize = true;
this.chbCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbCheck.Location = new System.Drawing.Point(107, 150);
this.chbCheck.Location = new System.Drawing.Point(109, 141);
this.chbCheck.Name = "chbCheck";
this.chbCheck.Size = new System.Drawing.Size(168, 24);
this.chbCheck.TabIndex = 84;
......@@ -375,5 +386,6 @@
private System.Windows.Forms.Button btnPre;
private UserFromControl.ProjectorControl xyMoveControl1;
private System.Windows.Forms.CheckBox chbCheck;
private System.Windows.Forms.Label lblNotes;
}
}
\ No newline at end of file
TSA-V/FrmWeldPointInfo.cs
......@@ -22,7 +22,7 @@ namespace TSA_V
public event NextDel NextEvent;
public bool IsUpdate = false;
public SMTPointInfo smtPointInfo = new SMTPointInfo();
public BoardInfo boardInfo = null;
public string AoiProgramName = "";
public Image PicImage = null;
public FrmPointInfo(string name, double x, double y, double nodex, double nodey)
......@@ -66,8 +66,9 @@ namespace TSA_V
public List<SMTPointInfo> PointList = new List<SMTPointInfo>();
public int CurrIndex = -1;
public FrmPointInfo( List<SMTPointInfo> list, int currIndex,NextDel fun=null)
public FrmPointInfo( BoardInfo board, List<SMTPointInfo> list, int currIndex,NextDel fun=null)
{
this.boardInfo = board;
this.NextEvent += fun;
InitializeComponent();
if (list.Count <= 0 || (currIndex < 0) || (currIndex >= list.Count))
......@@ -120,6 +121,16 @@ namespace TSA_V
this.txtWeldTemp.Text = smtPointInfo.WeldTemp.ToString();
this.txtWeldTime.Text = smtPointInfo.WeldTime.ToString();
chbCheck.Checked = smtPointInfo.CheckOK;
lblNotes.Text = "";
if (boardInfo != null)
{
ComponetInfo com = CSVReaderBomManager.GetCom(boardInfo.bomName, smtPointInfo.PartNum);
if (com != null)
{
lblNotes.Text = com.Notes;
}
}
if (CurrIndex < PointList.Count - 1)
{
btnSaveAndNext.Enabled = true;
......
TSA-V/Properties/Resource.en-US.resx
......@@ -2099,7 +2099,7 @@
<value>step value：</value>
</data>
<data name="FrmAddBoard_lblLineWidth_Text" xml:space="preserve">
<value>penWidth：</value>
<value>peWidth：</value>
</data>
<data name="FrmPointInfo_lblLineWidth_Text" xml:space="preserve">
<value>penWidth：</value>
......@@ -2407,4 +2407,8 @@
<data name="PartNAExist" xml:space="preserve">
<value>The component number [{0}] already exists</value>
</data>
<data name="注意事项" xml:space="preserve">
<value>ANNOUNCEMENTS</value>
</data>
<data name = "FrmAddBoard_lblWidth_Text" xml:space = "preserve"> <value>Line width：</value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -2421,4 +2421,8 @@
<data name="PartNAExist" xml:space="preserve">
<value>元器件编号[{0}]已存在</value>
</data>
<data name="注意事项" xml:space="preserve">
<value>注意事项</value>
</data>
<data name = "FrmAddBoard_lblWidth_Text" xml:space = "preserve"> <value> 线体宽度： </value> </data>
</root>
\ No newline at end of file
TSA-V/workForm/FrmBoardSelect.Designer.cs
......@@ -130,6 +130,11 @@
this.btnChangeW.UseVisualStyleBackColor = false;
this.btnChangeW.Click += new System.EventHandler(this.btnChangeW_Click);
//
// timer1
//
this.timer1.Interval = 1200;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// lblWait
//
this.lblWait.BackColor = System.Drawing.Color.Transparent;
......
TSA-V/workForm/FrmBoardSelect.cs
......@@ -35,6 +35,7 @@ namespace TSA_V
LoadCom();
txtCode.Focus();
SetScreen();
timer1.Start();
IsInitOk = true;
}
private void LoadCom()
......@@ -257,5 +258,27 @@ namespace TSA_V
chbGuoban.Enabled = en;
btnBack.Enabled = true;
}
private void timer1_Tick(object sender, EventArgs e)
{
if (!this.Visible)
{
return;
}
if (TSAVBean.Status<=(TSAVStatus.Reset))
{
if (btnChangeW.Visible)
{
btnChangeW.Visible = false;
}
}
else
{
if (!btnChangeW.Visible)
{
btnChangeW.Visible = true;
}
}
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!