Skip to content

李娜 / Line-Smart-Workstation

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

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

1 个父辈 6f6d468c
全部展开
内嵌 并排
正在显示 11 个修改的文件 包含 89 行增加 和 17 行删除
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.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/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!