Skip to content

李娜 / Line-Smart-Workstation

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

程序增加：线体宽度字段。选择程序后自动调宽

1 个父辈 31d33c0b
全部展开
内嵌 并排
正在显示 23 个修改的文件 包含 475 行增加 和 153 行删除
Common/Setting_Init.cs
...@@ -90,13 +90,13 @@ namespace TSA_V.Common ...@@ -90,13 +90,13 @@ namespace TSA_V.Common
public static string AuToSoldering_FilePath = "AuToSoldering_FilePath"; public static string AuToSoldering_FilePath = "AuToSoldering_FilePath";
public static string IsDebug = "IsDebug"; public static string IsDebug = "IsDebug";
public static string XAxis_Change = "XAxis_Change"; // public static string XAxis_Change = "XAxis_Change";
public static string XAxis_MaxValue = "XAxis_MaxValue"; //public static string XAxis_MaxValue = "XAxis_MaxValue";
public static string XAxis_MinValue = "XAxis_MinValue"; //public static string XAxis_MinValue = "XAxis_MinValue";
public static string YAxis_Change = "YAxis_Change"; //public static string YAxis_Change = "YAxis_Change";
public static string YAxis_MaxValue = "YAxis_MaxValue"; //public static string YAxis_MaxValue = "YAxis_MaxValue";
public static string YAxis_MinValue = "YAxis_MinValue"; //public static string YAxis_MinValue = "YAxis_MinValue";
public static string SolderingLedIP = "SolderingLedIP"; public static string SolderingLedIP = "SolderingLedIP";
......
DeviceLibrary/bean/BoardInfo.cs
...@@ -60,6 +60,10 @@ namespace TSA_V.DeviceLibrary ...@@ -60,6 +60,10 @@ namespace TSA_V.DeviceLibrary
/// </summary> /// </summary>
public int orgType { get; set; } public int orgType { get; set; }
/// <summary>
/// 线体宽度
/// </summary>
public int LineWidth { get; set; }
public double BaseX = 0; public double BaseX = 0;
public double BaseY = 0; public double BaseY = 0;
...@@ -97,9 +101,13 @@ namespace TSA_V.DeviceLibrary ...@@ -97,9 +101,13 @@ namespace TSA_V.DeviceLibrary
} }
} }
public string GetDes( ) public string GetDes()
{ {
return " "+ResourceControl.GetString(ResourceControl.Length,"长度")+"：" + boardLength + "，"+ ResourceControl.GetString(ResourceControl.Width, "宽度")+"：" + boardWidth + "，"+ ResourceControl.GetString(ResourceControl.InfoCount, "组件数量") + "：" + smtList.Count; return " " + ResourceControl.GetString(ResourceControl.Length, "长度") + "：" + boardLength +
"，" + ResourceControl.GetString(ResourceControl.Width, "宽度") + "：" + boardWidth +
"，" + ResourceControl.GetString(ResourceControl.LineWidth, "线体宽度") + "：" + LineWidth +
"，" + ResourceControl.GetString(ResourceControl.InfoCount, "组件数量") +
"：" + smtList.Count;
//return "电路板名称：" + boardName + "，长度：" + boardLength + "，宽度：" + boardWidth + "，组装信息数量：" + pointList.Count; //return "电路板名称：" + boardName + "，长度：" + boardLength + "，宽度：" + boardWidth + "，组装信息数量：" + pointList.Count;
} }
......
DeviceLibrary/manager/BoardManager.cs
...@@ -74,7 +74,7 @@ namespace TSA_V.DeviceLibrary ...@@ -74,7 +74,7 @@ namespace TSA_V.DeviceLibrary
if (sm.PartNum == null) if (sm.PartNum == null)
{ {
sm.PartNum = ""; sm.PartNum = "";
} }
} }
if (board.boardId > MaxId) if (board.boardId > MaxId)
...@@ -100,6 +100,10 @@ namespace TSA_V.DeviceLibrary ...@@ -100,6 +100,10 @@ namespace TSA_V.DeviceLibrary
{ {
board.orgType = 1; board.orgType = 1;
} }
if (board.LineWidth <= 0)
{
board.LineWidth = board.boardWidth;
}
boardList.Add(board); boardList.Add(board);
} }
} }
......
DeviceLibrary/manager/LineWidthManager.cs
...@@ -83,6 +83,13 @@ namespace TSA_V.DeviceLibrary ...@@ -83,6 +83,13 @@ namespace TSA_V.DeviceLibrary
// PUSICANLibrary.PUSICANControl.AbsMove(Line_NodeAddr, targetPosition); // PUSICANLibrary.PUSICANControl.AbsMove(Line_NodeAddr, targetPosition);
Stopwatch stopwatch = new Stopwatch(); Stopwatch stopwatch = new Stopwatch();
stopwatch.Start(); stopwatch.Start();
if (PUSICANControl.IsBusy(Line_NodeAddr))
{
LogUtil.info(logName + " Node[" + Line_NodeAddr + "]开始原点返回前发现在忙碌中，先停止运动");
PUSICANControl.StopMove(Line_NodeAddr);
}
LogUtil.info(logName + " Node[" + Line_NodeAddr + "]开始原点返回"); LogUtil.info(logName + " Node[" + Line_NodeAddr + "]开始原点返回");
PUSICANControl.HomeMove(LWidthManager.Line_NodeAddr,true); PUSICANControl.HomeMove(LWidthManager.Line_NodeAddr,true);
while (true) while (true)
......
DeviceLibrary/manager/ResourceControl.cs
...@@ -122,5 +122,9 @@ namespace TSA_V ...@@ -122,5 +122,9 @@ namespace TSA_V
/// 已工作{0},{1}块电路板 /// 已工作{0},{1}块电路板
/// </summary> /// </summary>
public static string WorkInfoMsg = "WorkInfoMsg"; public static string WorkInfoMsg = "WorkInfoMsg";
/// <summary>
/// 线体宽度
/// </summary>
public static string LineWidth = "LineWidth";
} }
} }
DeviceLibrary/manager/TSAVBean.cs
...@@ -617,11 +617,16 @@ namespace TSA_V.DeviceLibrary ...@@ -617,11 +617,16 @@ namespace TSA_V.DeviceLibrary
public static double X_Min = (double)ConfigAppSettings.GetNumValue(Setting_Init.XAxis_MinValue); //public static double X_Min = (double)ConfigAppSettings.GetNumValue(Setting_Init.XAxis_MinValue);
public static double X_Max = (double)ConfigAppSettings.GetNumValue(Setting_Init.XAxis_MaxValue); //public static double X_Max = (double)ConfigAppSettings.GetNumValue(Setting_Init.XAxis_MaxValue);
public static double Y_Min = (double)ConfigAppSettings.GetNumValue(Setting_Init.YAxis_MinValue); //public static double Y_Min = (double)ConfigAppSettings.GetNumValue(Setting_Init.YAxis_MinValue);
public static double Y_Max = (double)ConfigAppSettings.GetNumValue(Setting_Init.YAxis_MaxValue); //public static double Y_Max = (double)ConfigAppSettings.GetNumValue(Setting_Init.YAxis_MaxValue);
public static double X_Min = 1;
public static double X_Max = 1920;
public static double Y_Min = 1;
public static double Y_Max = 1080;
public static double X_ChangeValue = 1;
public static double Y_ChangeValue = 1;
/// <summary> /// <summary>
/// 判断是否是有效的地址 /// 判断是否是有效的地址
/// </summary> /// </summary>
......
PUSICANLibrary/PUSICANControl.cs
...@@ -628,26 +628,7 @@ namespace PUSICANLibrary ...@@ -628,26 +628,7 @@ namespace PUSICANLibrary
result = PUSICANControl.WriteSDO(nodeid, CAN_Address.RelativeMove, (speed)); result = PUSICANControl.WriteSDO(nodeid, CAN_Address.RelativeMove, (speed));
return CheckWriteResult(result, " node [" + nodeid + "] CAN_Address.RelativeMove"); return CheckWriteResult(result, " node [" + nodeid + "] CAN_Address.RelativeMove");
} }
///// <summary>
///// 原点返回
///// </summary>
//public static bool HomeMove(uint nodeid, int speed)
//{
// //写模式
// PUSIResult result;
// PUSICANControl.WriteSDO(nodeid, CAN_Address.MoveType, 1);
// if (speed < 0)
// {
// PUSICANControl.WriteSDO(nodeid, CAN_Address.MoveDirection, 1);
// }
// else
// {
// PUSICANControl.WriteSDO(nodeid, CAN_Address.MoveDirection, 0);
// }
// SetMaxSpeed(nodeid, speed);
// result = PUSICANControl.WriteSDO(nodeid, CAN_Address.RelativeMove, Math.Abs(speed));
// return CheckWriteResult(result, " node [" + nodeid + "] CAN_Address.RelativeMove");
//}
/// <summary> /// <summary>
/// 原点返回 ,旋转轴原点返回使用的方法 /// 原点返回 ,旋转轴原点返回使用的方法
/// </summary> /// </summary>
...@@ -1052,3 +1033,17 @@ namespace PUSICANLibrary ...@@ -1052,3 +1033,17 @@ namespace PUSICANLibrary
} }
} }
public class NodeConfig
{
public uint NodeId { get; set; }
public int AddSpeed { get; set; }
public int DelSpeed { get; set; }
public int MaxPhaseCurrent { get; set; }
public int HomeStartSpeed { get; set; }
public int HomeStopSpeed { get; set; }
public int MaxSpeed { get; set; }
public int MicroStepping { get; set; }
public int DelPhaseCurrent { get; set; }
}
TSA-V/App.config
...@@ -62,15 +62,7 @@ ...@@ -62,15 +62,7 @@
<add key="RNode_Addr_2_4" value="9" /> <add key="RNode_Addr_2_4" value="9" />
<add key="RNode_Addr_2_5" value="10" /> <add key="RNode_Addr_2_5" value="10" />
<add key="app.title" value="智能组装工作站" /> <add key="app.title" value="智能组装工作站" />
<!--表示X轴1毫米对应的脉冲数-->
<add key="XAxis_Change" value="1" />
<add key="XAxis_MaxValue" value="1920" />
<add key="XAxis_MinValue" value="1" />
<!--<add key="XAxis_HomeValue" value="2000" />-->
<!--表示Y轴1毫米对应的脉冲数-->
<add key="YAxis_Change" value="1" />
<add key="YAxis_MaxValue" value="1920" />
<add key="YAxis_MinValue" value="1" />
<!--0=脚踏模式，1=自动模式，间隔指定的时间自动下一步--> <!--0=脚踏模式，1=自动模式，间隔指定的时间自动下一步-->
<add key="WorkMode" value="1" /> <add key="WorkMode" value="1" />
<!-- 自动模式间隔时间/秒--> <!-- 自动模式间隔时间/秒-->
......
TSA-V/FrmAddBoard.Designer.cs
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
this.cmbOrgType = new System.Windows.Forms.ComboBox(); this.cmbOrgType = new System.Windows.Forms.ComboBox();
this.xyMoveControl1 = new UserFromControl.ProjectorControl(); this.xyMoveControl1 = new UserFromControl.ProjectorControl();
this.chbSort = new System.Windows.Forms.CheckBox(); this.chbSort = new System.Windows.Forms.CheckBox();
this.lblLineWidth = new System.Windows.Forms.Label();
this.txtLineWidth = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -121,7 +124,7 @@ ...@@ -121,7 +124,7 @@
// label5 // label5
// //
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(386, 62); this.label5.Location = new System.Drawing.Point(390, 23);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(97, 20); this.label5.Size = new System.Drawing.Size(97, 20);
this.label5.TabIndex = 282; this.label5.TabIndex = 282;
...@@ -131,7 +134,7 @@ ...@@ -131,7 +134,7 @@
// label4 // label4
// //
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(403, 102); this.label4.Location = new System.Drawing.Point(407, 63);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(80, 20); this.label4.Size = new System.Drawing.Size(80, 20);
this.label4.TabIndex = 281; this.label4.TabIndex = 281;
...@@ -141,7 +144,7 @@ ...@@ -141,7 +144,7 @@
// txtBoardL // txtBoardL
// //
this.txtBoardL.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(489, 99); this.txtBoardL.Location = new System.Drawing.Point(493, 60);
this.txtBoardL.MaxLength = 8; this.txtBoardL.MaxLength = 8;
this.txtBoardL.Name = "txtBoardL"; this.txtBoardL.Name = "txtBoardL";
this.txtBoardL.Size = new System.Drawing.Size(70, 29); this.txtBoardL.Size = new System.Drawing.Size(70, 29);
...@@ -150,7 +153,7 @@ ...@@ -150,7 +153,7 @@
// txtBoardW // txtBoardW
// //
this.txtBoardW.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(489, 60); this.txtBoardW.Location = new System.Drawing.Point(493, 21);
this.txtBoardW.MaxLength = 8; this.txtBoardW.MaxLength = 8;
this.txtBoardW.Name = "txtBoardW"; this.txtBoardW.Name = "txtBoardW";
this.txtBoardW.Size = new System.Drawing.Size(70, 29); this.txtBoardW.Size = new System.Drawing.Size(70, 29);
...@@ -160,7 +163,7 @@ ...@@ -160,7 +163,7 @@
// //
this.label25.AutoSize = true; this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label25.Location = new System.Drawing.Point(566, 102); this.label25.Location = new System.Drawing.Point(570, 63);
this.label25.Name = "label25"; this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(30, 17); this.label25.Size = new System.Drawing.Size(30, 17);
this.label25.TabIndex = 280; this.label25.TabIndex = 280;
...@@ -170,7 +173,7 @@ ...@@ -170,7 +173,7 @@
// //
this.label24.AutoSize = true; this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.Location = new System.Drawing.Point(565, 66); this.label24.Location = new System.Drawing.Point(569, 27);
this.label24.Name = "label24"; this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17); this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 279; this.label24.TabIndex = 279;
...@@ -282,7 +285,7 @@ ...@@ -282,7 +285,7 @@
this.xyMoveControl1.PenWidth = 2; this.xyMoveControl1.PenWidth = 2;
this.xyMoveControl1.PointSizeX = 1; this.xyMoveControl1.PointSizeX = 1;
this.xyMoveControl1.PointSizeY = 1; this.xyMoveControl1.PointSizeY = 1;
this.xyMoveControl1.PointType = 0; this.xyMoveControl1.PointType = 1;
this.xyMoveControl1.ShowText = ""; this.xyMoveControl1.ShowText = "";
this.xyMoveControl1.Size = new System.Drawing.Size(526, 315); this.xyMoveControl1.Size = new System.Drawing.Size(526, 315);
this.xyMoveControl1.TabIndex = 287; this.xyMoveControl1.TabIndex = 287;
...@@ -302,10 +305,42 @@ ...@@ -302,10 +305,42 @@
this.chbSort.Text = "自动排序"; this.chbSort.Text = "自动排序";
this.chbSort.UseVisualStyleBackColor = true; this.chbSort.UseVisualStyleBackColor = true;
// //
// lblLineWidth
//
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;
//
// 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(493, 100);
this.txtLineWidth.MaxLength = 8;
this.txtLineWidth.Name = "txtLineWidth";
this.txtLineWidth.Size = new System.Drawing.Size(70, 29);
this.txtLineWidth.TabIndex = 292;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(570, 106);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(30, 17);
this.label9.TabIndex = 293;
this.label9.Text = "mm";
//
// FrmAddBoard // FrmAddBoard
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.ClientSize = new System.Drawing.Size(632, 707); this.ClientSize = new System.Drawing.Size(632, 707);
this.Controls.Add(this.lblLineWidth);
this.Controls.Add(this.txtLineWidth);
this.Controls.Add(this.label9);
this.Controls.Add(this.chbSort); this.Controls.Add(this.chbSort);
this.Controls.Add(this.label8); this.Controls.Add(this.label8);
this.Controls.Add(this.cmbOrgType); this.Controls.Add(this.cmbOrgType);
...@@ -362,5 +397,8 @@ ...@@ -362,5 +397,8 @@
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.ComboBox cmbOrgType; private System.Windows.Forms.ComboBox cmbOrgType;
private System.Windows.Forms.CheckBox chbSort; private System.Windows.Forms.CheckBox chbSort;
private System.Windows.Forms.Label lblLineWidth;
private System.Windows.Forms.TextBox txtLineWidth;
private System.Windows.Forms.Label label9;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmAddBoard.cs
...@@ -72,6 +72,7 @@ namespace TSA_V ...@@ -72,6 +72,7 @@ namespace TSA_V
} }
board.boardLength = FormUtil.GetIntValue(txtBoardW); board.boardLength = FormUtil.GetIntValue(txtBoardW);
board.boardWidth = FormUtil.GetIntValue(txtBoardL); board.boardWidth = FormUtil.GetIntValue(txtBoardL);
if (board.boardLength <= 0) if (board.boardLength <= 0)
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteLength, "请输入宽度！")); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteLength, "请输入宽度！"));
...@@ -84,6 +85,13 @@ namespace TSA_V ...@@ -84,6 +85,13 @@ namespace TSA_V
this.txtBoardL.Focus(); this.txtBoardL.Focus();
return false ; return false ;
} }
board.LineWidth = FormUtil.GetIntValue(txtLineWidth);
if (board.LineWidth <= 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteLineWidth, "请输入线体宽度！"));
this.txtLineWidth.Focus();
return false;
}
if (!TSAVBean.IsValidPosition(board.originX, board.originY)) if (!TSAVBean.IsValidPosition(board.originX, board.originY))
{ {
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WPointP, "请输入有效的右下角坐标！")); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WPointP, "请输入有效的右下角坐标！"));
...@@ -113,8 +121,8 @@ namespace TSA_V ...@@ -113,8 +121,8 @@ namespace TSA_V
} }
List<SMTPointInfo> smtList = new List<SMTPointInfo>(); List<SMTPointInfo> smtList = new List<SMTPointInfo>();
int i = 1; int i = 1;
double xNodeChange =(double) ConfigAppSettings.GetNumValue(Setting_Init.XAxis_Change); double xNodeChange = TSAVBean.X_ChangeValue;
double yNodeChange = (double)ConfigAppSettings.GetNumValue(Setting_Init.YAxis_Change); double yNodeChange = TSAVBean.Y_ChangeValue;
LogUtil.info("新增【"+board.boardName+"】，根据换算参数计算红外坐标（转换系数：x["+xNodeChange + "]y["+yNodeChange+"])"); LogUtil.info("新增【"+board.boardName+"】，根据换算参数计算红外坐标（转换系数：x["+xNodeChange + "]y["+yNodeChange+"])");
double pianYiX = 0, pianYiY = 0; double pianYiX = 0, pianYiY = 0;
......
TSA-V/FrmBoardInfo.cs
...@@ -228,6 +228,7 @@ namespace TSA_V ...@@ -228,6 +228,7 @@ namespace TSA_V
txtBoardL.Text = updateBoardInfo.boardWidth.ToString(); txtBoardL.Text = updateBoardInfo.boardWidth.ToString();
txtCode.Text = updateBoardInfo.boardCode.ToString(); txtCode.Text = updateBoardInfo.boardCode.ToString();
picBoard.Image = updateBoardInfo.GetImage(); picBoard.Image = updateBoardInfo.GetImage();
txtLineWidth.Text = updateBoardInfo.LineWidth.ToString();
//txtOriginX.Text = updateBoardInfo.originX.ToString(); //txtOriginX.Text = updateBoardInfo.originX.ToString();
//txtOriginY.Text = updateBoardInfo.originY.ToString(); //txtOriginY.Text = updateBoardInfo.originY.ToString();
picBoard.SizeMode = PictureBoxSizeMode.StretchImage; picBoard.SizeMode = PictureBoxSizeMode.StretchImage;
...@@ -485,6 +486,7 @@ namespace TSA_V ...@@ -485,6 +486,7 @@ namespace TSA_V
board.boardName = FormUtil.getValue(txtBoardName); board.boardName = FormUtil.getValue(txtBoardName);
board.boardLength = FormUtil.GetIntValue(txtBoardW); board.boardLength = FormUtil.GetIntValue(txtBoardW);
board.boardWidth = FormUtil.GetIntValue(txtBoardL); board.boardWidth = FormUtil.GetIntValue(txtBoardL);
board.LineWidth = FormUtil.GetIntValue(txtLineWidth);
//board.originX = orgXValue; //board.originX = orgXValue;
//board.originY = orgYValue; //board.originY = orgYValue;
board.boardCode = FormUtil.getValue(txtCode); board.boardCode = FormUtil.getValue(txtCode);
...@@ -527,6 +529,13 @@ namespace TSA_V ...@@ -527,6 +529,13 @@ namespace TSA_V
txtBoardL.Focus(); txtBoardL.Focus();
return; return;
} }
if (board.LineWidth <= 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteLineWidth, "请输入线体宽度"));
txtLineWidth.Focus();
return;
}
if (picBoard.Image == null) if (picBoard.Image == null)
{ {
//MessageBox.Show("请添加程序图片"); //MessageBox.Show("请添加程序图片");
...@@ -1298,5 +1307,10 @@ namespace TSA_V ...@@ -1298,5 +1307,10 @@ namespace TSA_V
LogUtil.error("加载AOI配置界面出错：" + ex.ToString()); LogUtil.error("加载AOI配置界面出错：" + ex.ToString());
} }
} }
private void btnOpenFile_Click(object sender, LinkLabelLinkClickedEventArgs e)
{
btnOpenFile_Click(null, null);
}
} }
} }
TSA-V/FrmBoardList.Designer.cs
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.listPoint.FullRowSelect = true; this.listPoint.FullRowSelect = true;
this.listPoint.GridLines = true; this.listPoint.GridLines = true;
this.listPoint.HideSelection = false;
this.listPoint.Location = new System.Drawing.Point(10, 140); this.listPoint.Location = new System.Drawing.Point(10, 140);
this.listPoint.MultiSelect = false; this.listPoint.MultiSelect = false;
this.listPoint.Name = "listPoint"; this.listPoint.Name = "listPoint";
...@@ -230,7 +231,7 @@ ...@@ -230,7 +231,7 @@
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(92, 17); this.label4.Size = new System.Drawing.Size(92, 17);
this.label4.TabIndex = 5; this.label4.TabIndex = 5;
this.label4.Text = "长度："; this.label4.Text = "长度→：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtLength // txtLength
...@@ -247,7 +248,7 @@ ...@@ -247,7 +248,7 @@
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(75, 17); this.label3.Size = new System.Drawing.Size(75, 17);
this.label3.TabIndex = 3; this.label3.TabIndex = 3;
this.label3.Text = "宽度："; this.label3.Text = "宽度↑：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtBomName // txtBomName
......
TSA-V/FrmChangeWidth.Designer.cs
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
this.btnDSave = new System.Windows.Forms.Button(); this.btnDSave = new System.Windows.Forms.Button();
this.txtWP = new System.Windows.Forms.TextBox(); this.txtWP = new System.Windows.Forms.TextBox();
this.lbWidthMap = new System.Windows.Forms.ListBox(); this.lbWidthMap = new System.Windows.Forms.ListBox();
this.btnHomeM = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numTarget)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numTarget)).BeginInit();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -70,7 +71,7 @@ ...@@ -70,7 +71,7 @@
// //
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(106, 174); this.btnSave.Location = new System.Drawing.Point(215, 172);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(128, 40); this.btnSave.Size = new System.Drawing.Size(128, 40);
this.btnSave.TabIndex = 288; this.btnSave.TabIndex = 288;
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
// //
this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClose.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClose.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClose.Location = new System.Drawing.Point(199, 119); this.btnClose.Location = new System.Drawing.Point(215, 119);
this.btnClose.Name = "btnClose"; this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(128, 40); this.btnClose.Size = new System.Drawing.Size(128, 40);
this.btnClose.TabIndex = 287; this.btnClose.TabIndex = 287;
...@@ -173,6 +174,7 @@ ...@@ -173,6 +174,7 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.btnHomeM);
this.groupBox2.Controls.Add(this.numChangeValue); this.groupBox2.Controls.Add(this.numChangeValue);
this.groupBox2.Controls.Add(this.numHomeWidth); this.groupBox2.Controls.Add(this.numHomeWidth);
this.groupBox2.Controls.Add(this.numSlv); this.groupBox2.Controls.Add(this.numSlv);
...@@ -362,11 +364,23 @@ ...@@ -362,11 +364,23 @@
this.lbWidthMap.TabIndex = 319; this.lbWidthMap.TabIndex = 319;
this.lbWidthMap.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged); this.lbWidthMap.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged);
// //
// btnHomeM
//
this.btnHomeM.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHomeM.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHomeM.Location = new System.Drawing.Point(32, 172);
this.btnHomeM.Name = "btnHomeM";
this.btnHomeM.Size = new System.Drawing.Size(128, 40);
this.btnHomeM.TabIndex = 296;
this.btnHomeM.Text = "原点返回";
this.btnHomeM.UseVisualStyleBackColor = true;
this.btnHomeM.Click += new System.EventHandler(this.btnHomeM_Click);
//
// FrmChangeWidth // FrmChangeWidth
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(672, 489); this.ClientSize = new System.Drawing.Size(671, 489);
this.Controls.Add(this.groupDetial); this.Controls.Add(this.groupDetial);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
...@@ -413,5 +427,6 @@ ...@@ -413,5 +427,6 @@
internal System.Windows.Forms.TextBox txtWP; internal System.Windows.Forms.TextBox txtWP;
private System.Windows.Forms.ListBox lbWidthMap; private System.Windows.Forms.ListBox lbWidthMap;
internal System.Windows.Forms.TextBox txtW; internal System.Windows.Forms.TextBox txtW;
private System.Windows.Forms.Button btnHomeM;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmChangeWidth.cs
...@@ -158,5 +158,11 @@ namespace TSA_V ...@@ -158,5 +158,11 @@ namespace TSA_V
txtTargetPosition.Text = p.ToString(); txtTargetPosition.Text = p.ToString();
} }
private void btnHomeM_Click(object sender, EventArgs e)
{
LogUtil.info(Name+ "点击 原点返回");
PUSICANControl.HomeMove(LWidthManager.Line_NodeAddr, true);
}
} }
} }
TSA-V/Properties/Resource.en-US.resx
...@@ -385,10 +385,10 @@ ...@@ -385,10 +385,10 @@
<value>ASSEMBLY QUANTITY</value> <value>ASSEMBLY QUANTITY</value>
</data> </data>
<data name="FrmBoardList_label4_Text" xml:space="preserve"> <data name="FrmBoardList_label4_Text" xml:space="preserve">
<value>LENGTH</value> <value>LENGTH→</value>
</data> </data>
<data name="FrmBoardList_label3_Text" xml:space="preserve"> <data name="FrmBoardList_label3_Text" xml:space="preserve">
<value>WIDTH</value> <value>WIDTH ↑</value>
</data> </data>
<data name="FrmBoardList_label2_Text" xml:space="preserve"> <data name="FrmBoardList_label2_Text" xml:space="preserve">
<value>STOCK NAME</value> <value>STOCK NAME</value>
...@@ -424,10 +424,10 @@ ...@@ -424,10 +424,10 @@
<value>SAVE PROGRAM</value> <value>SAVE PROGRAM</value>
</data> </data>
<data name="FrmAddBoard_label5_Text" xml:space="preserve"> <data name="FrmAddBoard_label5_Text" xml:space="preserve">
<value>WIDTH</value> <value>WIDTH↑</value>
</data> </data>
<data name="FrmAddBoard_label4_Text" xml:space="preserve"> <data name="FrmAddBoard_label4_Text" xml:space="preserve">
<value>LENGTH</value> <value>LENGTH→</value>
</data> </data>
<data name="FrmAddBoard_label25_Text" xml:space="preserve"> <data name="FrmAddBoard_label25_Text" xml:space="preserve">
<value>mm</value> <value>mm</value>
...@@ -514,13 +514,13 @@ ...@@ -514,13 +514,13 @@
<value> BASIC INFO.</value> <value> BASIC INFO.</value>
</data> </data>
<data name="FrmBoardInfo_label5_Text" xml:space="preserve"> <data name="FrmBoardInfo_label5_Text" xml:space="preserve">
<value>WIDTH</value> <value>WIDTH↑</value>
</data> </data>
<data name="FrmBoardInfo_label14_Text" xml:space="preserve"> <data name="FrmBoardInfo_label14_Text" xml:space="preserve">
<value>TYPE</value> <value>TYPE</value>
</data> </data>
<data name="FrmBoardInfo_label3_Text" xml:space="preserve"> <data name="FrmBoardInfo_label3_Text" xml:space="preserve">
<value>LENGTH</value> <value>LENGTH→</value>
</data> </data>
<data name="FrmBoardInfo_label2_Text" xml:space="preserve"> <data name="FrmBoardInfo_label2_Text" xml:space="preserve">
<value>NAME</value> <value>NAME</value>
...@@ -1388,7 +1388,7 @@ ...@@ -1388,7 +1388,7 @@
<value>In assembly, waiting for [{0}] timeout has waited for [{1}] seconds</value> <value>In assembly, waiting for [{0}] timeout has waited for [{1}] seconds</value>
</data> </data>
<data name="Width" xml:space="preserve"> <data name="Width" xml:space="preserve">
<value>Width</value> <value>Width↑</value>
</data> </data>
<data name="XTGoHome" xml:space="preserve"> <data name="XTGoHome" xml:space="preserve">
<value>Axis XY Reset</value> <value>Axis XY Reset</value>
...@@ -2290,4 +2290,16 @@ ...@@ -2290,4 +2290,16 @@
<data name = "添加用户成功" xml:space = "preserve"> <value> Added user successfully </value> </data> <data name = "添加用户成功" xml:space = "preserve"> <value> Added user successfully </value> </data>
<data name = "FrmDeviceConfig_lblCode_Text" xml:space = "preserve"> <value> Barcode： </value> </data> <data name = "FrmDeviceConfig_lblCode_Text" xml:space = "preserve"> <value> Barcode： </value> </data>
<data name = "FrmPusicanTest_llblClearp_Text" xml:space = "preserve"> <value> Zero position </value> </data> <data name = "FrmPusicanTest_llblClearp_Text" xml:space = "preserve"> <value> Zero position </value> </data>
<data name="LineWidth" xml:space="preserve">
<value>Line body width</value>
</data>
<data name="WriteLineWidth" xml:space="preserve">
<value>Please enter the line width</value>
</data>
<data name = "FrmBoardSelect_btnChangeW_Text" xml:space = "preserve"> <value> Adjust the line width </value> </data>
<data name = "FrmAddBoard_label9_Text" xml:space = "preserve"> <value> mm </value> </data>
<data name = "FrmAddBoard_lblName_Text" xml:space = "preserve"> <value> Projection words： </value> </data>
<data name = "FrmBoardInfo_lblLineW_Text" xml:space = "preserve"> <value> Line body width： </value> </data>
<data name = "FrmBoardInfo_lbllinews_Text" xml:space = "preserve"> <value> mm </value> </data>
<data name = "FrmChangeWidth_btnHomeM_Text" xml:space = "preserve"> <value> The origin back </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -385,10 +385,10 @@ ...@@ -385,10 +385,10 @@
<value>组装数量：</value> <value>组装数量：</value>
</data> </data>
<data name="FrmBoardList_label4_Text" xml:space="preserve"> <data name="FrmBoardList_label4_Text" xml:space="preserve">
<value>长度：</value> <value>长度→：</value>
</data> </data>
<data name="FrmBoardList_label3_Text" xml:space="preserve"> <data name="FrmBoardList_label3_Text" xml:space="preserve">
<value>宽度：</value> <value>宽度 ↑：</value>
</data> </data>
<data name="FrmBoardList_label2_Text" xml:space="preserve"> <data name="FrmBoardList_label2_Text" xml:space="preserve">
<value>元器件库名称：</value> <value>元器件库名称：</value>
...@@ -424,10 +424,10 @@ ...@@ -424,10 +424,10 @@
<value>保存程序</value> <value>保存程序</value>
</data> </data>
<data name="FrmAddBoard_label5_Text" xml:space="preserve"> <data name="FrmAddBoard_label5_Text" xml:space="preserve">
<value>宽度：</value> <value>宽度 ↑：</value>
</data> </data>
<data name="FrmAddBoard_label4_Text" xml:space="preserve"> <data name="FrmAddBoard_label4_Text" xml:space="preserve">
<value>长度：</value> <value>长度→：</value>
</data> </data>
<data name="FrmAddBoard_label25_Text" xml:space="preserve"> <data name="FrmAddBoard_label25_Text" xml:space="preserve">
<value>mm</value> <value>mm</value>
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
<value>mm</value> <value>mm</value>
</data> </data>
<data name="FrmAddBoard_btnOpenFile_Text" xml:space="preserve"> <data name="FrmAddBoard_btnOpenFile_Text" xml:space="preserve">
<value>选择图片</value> <value>更改图片</value>
</data> </data>
<data name="FrmAddBoard_label1_Text" xml:space="preserve"> <data name="FrmAddBoard_label1_Text" xml:space="preserve">
<value>导入图片：</value> <value>导入图片：</value>
...@@ -514,13 +514,13 @@ ...@@ -514,13 +514,13 @@
<value>程序基本信息</value> <value>程序基本信息</value>
</data> </data>
<data name="FrmBoardInfo_label5_Text" xml:space="preserve"> <data name="FrmBoardInfo_label5_Text" xml:space="preserve">
<value>宽度</value> <value>宽度 ↑</value>
</data> </data>
<data name="FrmBoardInfo_label14_Text" xml:space="preserve"> <data name="FrmBoardInfo_label14_Text" xml:space="preserve">
<value>类型</value> <value>类型</value>
</data> </data>
<data name="FrmBoardInfo_label3_Text" xml:space="preserve"> <data name="FrmBoardInfo_label3_Text" xml:space="preserve">
<value>长度</value> <value>长度→</value>
</data> </data>
<data name="FrmBoardInfo_label2_Text" xml:space="preserve"> <data name="FrmBoardInfo_label2_Text" xml:space="preserve">
<value>名称</value> <value>名称</value>
...@@ -1348,7 +1348,7 @@ ...@@ -1348,7 +1348,7 @@
<value>红外Y轴初始化失败</value> <value>红外Y轴初始化失败</value>
</data> </data>
<data name="Length" xml:space="preserve"> <data name="Length" xml:space="preserve">
<value>长度</value> <value>长度→</value>
</data> </data>
<data name="LineTimeOutMsg" xml:space="preserve"> <data name="LineTimeOutMsg" xml:space="preserve">
<value>流水线转动中，等待【{0}】超时 已等待[{1}]秒</value> <value>流水线转动中，等待【{0}】超时 已等待[{1}]秒</value>
...@@ -1372,7 +1372,7 @@ ...@@ -1372,7 +1372,7 @@
<value>组装中，等待【{0}】超时 已等待[{1}]秒</value> <value>组装中，等待【{0}】超时 已等待[{1}]秒</value>
</data> </data>
<data name="Width" xml:space="preserve"> <data name="Width" xml:space="preserve">
<value>长度</value> <value>宽度 ↑</value>
</data> </data>
<data name="XTGoHome" xml:space="preserve"> <data name="XTGoHome" xml:space="preserve">
<value>XY轴回待机点</value> <value>XY轴回待机点</value>
...@@ -2286,22 +2286,70 @@ ...@@ -2286,22 +2286,70 @@
<data name="用户名或密码错误" xml:space="preserve"> <data name="用户名或密码错误" xml:space="preserve">
<value>用户名或密码错误</value> <value>用户名或密码错误</value>
</data> </data>
<data name = "添加用户失败" xml:space = "preserve"> <value> 添加用户失败 </value> </data> <data name="添加用户失败" xml:space="preserve">
<data name = "退出" xml:space = "preserve"> <value> 退出 </value> </data> <value> 添加用户失败 </value>
<data name = "增加" xml:space = "preserve"> <value> 增加 </value> </data> </data>
<data name = "修改" xml:space = "preserve"> <value> 修改 </value> </data> <data name="退出" xml:space="preserve">
<data name = "删除" xml:space = "preserve"> <value> 删除 </value> </data> <value> 退出 </value>
<data name = "用户名" xml:space = "preserve"> <value> 用户名 </value> </data> </data>
<data name = "密码" xml:space = "preserve"> <value> 密码 </value> </data> <data name="增加" xml:space="preserve">
<data name = "权限" xml:space = "preserve"> <value> 权限 </value> </data> <value> 增加 </value>
<data name = "用户管理" xml:space = "preserve"> <value> 用户管理 </value> </data> </data>
<data name = "确认删除用户" xml:space = "preserve"> <value> 确认删除用户 </value> </data> <data name="修改" xml:space="preserve">
<data name = "删除用户成功" xml:space = "preserve"> <value> 删除用户成功 </value> </data> <value> 修改 </value>
<data name = "删除用户失败" xml:space = "preserve"> <value> 删除用户失败 </value> </data> </data>
<data name = "确定修改用户信息" xml:space = "preserve"> <value> 确定修改用户信息 </value> </data> <data name="删除" xml:space="preserve">
<data name = "修改用户成功" xml:space = "preserve"> <value> 修改用户成功 </value> </data> <value> 删除 </value>
<data name = "修改用户失败" xml:space = "preserve"> <value> 修改用户失败 </value> </data> </data>
<data name = "添加用户成功" xml:space = "preserve"> <value> 添加用户成功 </value> </data> <data name="用户名" xml:space="preserve">
<data name = "FrmDeviceConfig_lblCode_Text" xml:space = "preserve"> <value> 条码： </value> </data> <value> 用户名 </value>
<data name = "FrmPusicanTest_llblClearp_Text" xml:space = "preserve"> <value> 清零位置 </value> </data> </data>
<data name="密码" xml:space="preserve">
<value> 密码 </value>
</data>
<data name="权限" xml:space="preserve">
<value> 权限 </value>
</data>
<data name="用户管理" xml:space="preserve">
<value> 用户管理 </value>
</data>
<data name="确认删除用户" xml:space="preserve">
<value> 确认删除用户 </value>
</data>
<data name="删除用户成功" xml:space="preserve">
<value> 删除用户成功 </value>
</data>
<data name="删除用户失败" xml:space="preserve">
<value> 删除用户失败 </value>
</data>
<data name="确定修改用户信息" xml:space="preserve">
<value> 确定修改用户信息 </value>
</data>
<data name="修改用户成功" xml:space="preserve">
<value> 修改用户成功 </value>
</data>
<data name="修改用户失败" xml:space="preserve">
<value> 修改用户失败 </value>
</data>
<data name="添加用户成功" xml:space="preserve">
<value> 添加用户成功 </value>
</data>
<data name="FrmDeviceConfig_lblCode_Text" xml:space="preserve">
<value> 条码： </value>
</data>
<data name="FrmPusicanTest_llblClearp_Text" xml:space="preserve">
<value> 清零位置 </value>
</data>
<data name="LineWidth" xml:space="preserve">
<value>线体宽度</value>
</data>
<data name="WriteLineWidth" xml:space="preserve">
<value>请输入线体宽度</value>
</data>
<data name = "FrmBoardSelect_btnChangeW_Text" xml:space = "preserve"> <value> 调宽 </value> </data>
<data name = "FrmAddBoard_label9_Text" xml:space = "preserve"> <value> mm </value> </data>
<data name = "FrmAddBoard_lblName_Text" xml:space = "preserve"> <value> 投影文字： </value> </data>
<data name = "FrmBoardInfo_lblLineW_Text" xml:space = "preserve"> <value> 线体宽度： </value> </data>
<data name = "FrmBoardInfo_lbllinews_Text" xml:space = "preserve"> <value> mm </value> </data>
<data name = "FrmChangeWidth_btnHomeM_Text" xml:space = "preserve"> <value> 原点返回 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/ResourceCulture.cs
...@@ -678,6 +678,12 @@ namespace TSA_V ...@@ -678,6 +678,12 @@ namespace TSA_V
/// 中心点确认之后不可更改 /// 中心点确认之后不可更改
/// </summary> /// </summary>
public static string CenterConotEdit = "CenterConotEdit"; public static string CenterConotEdit = "CenterConotEdit";
/// <summary>
/// 请输入线体宽度
/// </summary>
public static string WriteLineWidth = "WriteLineWidth";
} }
} }
TSA-V/workForm/FrmBoardSelect.Designer.cs
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBoardSelect));
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.txtCode = new System.Windows.Forms.TextBox(); this.txtCode = new System.Windows.Forms.TextBox();
this.btnNext = new System.Windows.Forms.Button(); this.btnNext = new System.Windows.Forms.Button();
...@@ -35,12 +37,15 @@ ...@@ -35,12 +37,15 @@
this.lblBoardMsg = new System.Windows.Forms.Label(); this.lblBoardMsg = new System.Windows.Forms.Label();
this.cmbBoardList = new System.Windows.Forms.ComboBox(); this.cmbBoardList = new System.Windows.Forms.ComboBox();
this.chbGuoban = new System.Windows.Forms.CheckBox(); this.chbGuoban = new System.Windows.Forms.CheckBox();
this.btnChangeW = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.lblWait = new System.Windows.Forms.Label();
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(115, 44); this.label1.Location = new System.Drawing.Point(149, 44);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(137, 12); this.label1.Size = new System.Drawing.Size(137, 12);
this.label1.TabIndex = 275; this.label1.TabIndex = 275;
...@@ -49,7 +54,7 @@ ...@@ -49,7 +54,7 @@
// txtCode // txtCode
// //
this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCode.Location = new System.Drawing.Point(117, 70); this.txtCode.Location = new System.Drawing.Point(151, 59);
this.txtCode.MaxLength = 40; this.txtCode.MaxLength = 40;
this.txtCode.Name = "txtCode"; this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(246, 29); this.txtCode.Size = new System.Drawing.Size(246, 29);
...@@ -60,7 +65,7 @@ ...@@ -60,7 +65,7 @@
// //
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnNext.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(243, 249); this.btnNext.Location = new System.Drawing.Point(340, 249);
this.btnNext.Name = "btnNext"; this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(120, 45); this.btnNext.Size = new System.Drawing.Size(120, 45);
this.btnNext.TabIndex = 273; this.btnNext.TabIndex = 273;
...@@ -72,7 +77,7 @@ ...@@ -72,7 +77,7 @@
// //
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBack.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(117, 249); this.btnBack.Location = new System.Drawing.Point(88, 249);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(120, 45); this.btnBack.Size = new System.Drawing.Size(120, 45);
this.btnBack.TabIndex = 272; this.btnBack.TabIndex = 272;
...@@ -84,9 +89,9 @@ ...@@ -84,9 +89,9 @@
// //
this.lblBoardMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblBoardMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBoardMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.lblBoardMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblBoardMsg.Location = new System.Drawing.Point(4, 161); this.lblBoardMsg.Location = new System.Drawing.Point(12, 177);
this.lblBoardMsg.Name = "lblBoardMsg"; this.lblBoardMsg.Name = "lblBoardMsg";
this.lblBoardMsg.Size = new System.Drawing.Size(480, 19); this.lblBoardMsg.Size = new System.Drawing.Size(510, 69);
this.lblBoardMsg.TabIndex = 5; this.lblBoardMsg.TabIndex = 5;
this.lblBoardMsg.Text = "程序信息"; this.lblBoardMsg.Text = "程序信息";
this.lblBoardMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblBoardMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -96,7 +101,7 @@ ...@@ -96,7 +101,7 @@
this.cmbBoardList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbBoardList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbBoardList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbBoardList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbBoardList.FormattingEnabled = true; this.cmbBoardList.FormattingEnabled = true;
this.cmbBoardList.Location = new System.Drawing.Point(117, 116); this.cmbBoardList.Location = new System.Drawing.Point(151, 109);
this.cmbBoardList.Name = "cmbBoardList"; this.cmbBoardList.Name = "cmbBoardList";
this.cmbBoardList.Size = new System.Drawing.Size(246, 29); this.cmbBoardList.Size = new System.Drawing.Size(246, 29);
this.cmbBoardList.TabIndex = 6; this.cmbBoardList.TabIndex = 6;
...@@ -106,18 +111,42 @@ ...@@ -106,18 +111,42 @@
// //
this.chbGuoban.AutoSize = true; this.chbGuoban.AutoSize = true;
this.chbGuoban.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbGuoban.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbGuoban.Location = new System.Drawing.Point(176, 203); this.chbGuoban.Location = new System.Drawing.Point(214, 159);
this.chbGuoban.Name = "chbGuoban"; this.chbGuoban.Name = "chbGuoban";
this.chbGuoban.Size = new System.Drawing.Size(126, 24); this.chbGuoban.Size = new System.Drawing.Size(126, 24);
this.chbGuoban.TabIndex = 276; this.chbGuoban.TabIndex = 276;
this.chbGuoban.Text = "流水线过板模式"; this.chbGuoban.Text = "流水线过板模式";
this.chbGuoban.UseVisualStyleBackColor = true; this.chbGuoban.UseVisualStyleBackColor = true;
// //
// btnChangeW
//
this.btnChangeW.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnChangeW.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnChangeW.Location = new System.Drawing.Point(214, 249);
this.btnChangeW.Name = "btnChangeW";
this.btnChangeW.Size = new System.Drawing.Size(120, 45);
this.btnChangeW.TabIndex = 277;
this.btnChangeW.Text = "调宽";
this.btnChangeW.UseVisualStyleBackColor = false;
this.btnChangeW.Click += new System.EventHandler(this.btnChangeW_Click);
//
// lblWait
//
this.lblWait.BackColor = System.Drawing.Color.Transparent;
this.lblWait.Image = ((System.Drawing.Image)(resources.GetObject("lblWait.Image")));
this.lblWait.Location = new System.Drawing.Point(101, 32);
this.lblWait.Name = "lblWait";
this.lblWait.Size = new System.Drawing.Size(331, 151);
this.lblWait.TabIndex = 278;
this.lblWait.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// FrmBoardSelect // FrmBoardSelect
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(496, 320); this.ClientSize = new System.Drawing.Size(534, 320);
this.Controls.Add(this.lblWait);
this.Controls.Add(this.btnChangeW);
this.Controls.Add(this.chbGuoban); this.Controls.Add(this.chbGuoban);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.txtCode); this.Controls.Add(this.txtCode);
...@@ -143,5 +172,8 @@ ...@@ -143,5 +172,8 @@
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtCode; private System.Windows.Forms.TextBox txtCode;
private System.Windows.Forms.CheckBox chbGuoban; private System.Windows.Forms.CheckBox chbGuoban;
private System.Windows.Forms.Button btnChangeW;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label lblWait;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/workForm/FrmBoardSelect.cs
...@@ -5,6 +5,7 @@ using System.Data; ...@@ -5,6 +5,7 @@ using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using TSA_V.Common; using TSA_V.Common;
...@@ -28,6 +29,7 @@ namespace TSA_V ...@@ -28,6 +29,7 @@ namespace TSA_V
} }
private void FrmBoardSelect_Load(object sender, EventArgs e) private void FrmBoardSelect_Load(object sender, EventArgs e)
{ {
FormEn(true);
SetSkin(this); SetSkin(this);
LanguageProcess(); LanguageProcess();
LoadCom(); LoadCom();
...@@ -73,59 +75,23 @@ namespace TSA_V ...@@ -73,59 +75,23 @@ namespace TSA_V
private void btnBack_Click(object sender, EventArgs e) private void btnBack_Click(object sender, EventArgs e)
{ {
if (ChangeWidthTask != null&&ChangeWidthTask.IsCompleted.Equals(false))
{
LWidthManager.StopChangeWidth();
LogUtil.info(Name + "返回之前，停止调宽");
}
FormEn(true);
this.Close(); this.Close();
} }
private void BtnNext_Click(object sender, EventArgs e) private void BtnNext_Click(object sender, EventArgs e)
{ {
if (CanStart())
if (this.cmbBoardList.SelectedIndex < 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ConfigProduct, "请先配置程序"));
this.Close();
}
else if (this.cmbBoardList.SelectedIndex.Equals(0))
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ConfigProduct, "请先选择程序"));
}
else
{ {
TSAVBean.OnlyGuoBan = chbGuoban.Checked; WorkInfo.LastDBId = 0;
LogUtil.info("选择程序，是否流水线过板=" + TSAVBean.OnlyGuoBan); FrmWork fw = new FrmWork();
if (WorkType.Equals(1)) this.Hide();
{ fw.ShowDialog();
if (BoardManager.CurrBoard.smtList.Count <= 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotFindInfo, "电路板【{0}】没有组装信息，请选择其他程序！", BoardManager.CurrBoard.boardName));
return;
}
WorkInfo.LastDBId = 0;
FrmWork fw = new FrmWork();
this.Hide();
fw.ShowDialog();
}
else if (WorkType.Equals(2))
{
if (BoardManager.CurrBoard.GetSolderingSMTList().Count <= 0)
{
MessageBox.Show("电路板【" + BoardManager.CurrBoard.boardName + "】没有配置焊接信息，请选择其他程序！");
return;
}
//FrmTSAVSoldering fw = new FrmTSAVSoldering();
//this.Hide();
//fw.ShowDialog();
}
else if (WorkType.Equals(3))
{
if (BoardManager.CurrBoard.GetCheckSMTList().Count <= 0)
{
MessageBox.Show("电路板【" + BoardManager.CurrBoard.boardName + "】没有配置检测信息，请选择其他程序！");
return;
}
//FrmCheck fw = new FrmCheck();
//this.Hide();
//fw.ShowDialog();
}
this.Close(); this.Close();
} }
} }
...@@ -178,5 +144,104 @@ namespace TSA_V ...@@ -178,5 +144,104 @@ namespace TSA_V
{ {
txtCode.Focus(); txtCode.Focus();
} }
private bool CanStart()
{
if (this.cmbBoardList.SelectedIndex < 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ConfigProduct, "请先配置程序"));
this.Close();
}
else if (this.cmbBoardList.SelectedIndex.Equals(0))
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ConfigProduct, "请先选择程序"));
}
else
{
TSAVBean.OnlyGuoBan = chbGuoban.Checked;
LogUtil.info("选择程序，是否流水线过板=" + TSAVBean.OnlyGuoBan);
if (WorkType.Equals(1))
{
if (BoardManager.CurrBoard.smtList.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;
}
}
return false;
}
Task ChangeWidthTask = null;
private void btnChangeW_Click(object sender, EventArgs e)
{
if (CanStart())
{
int w = BoardManager.CurrBoard.LineWidth;
int p = LWidthManager.GetWidthPosition(w);
LogUtil.info(" 选择程序[" + BoardManager.CurrBoard.boardName + "]后，开始轨道调宽：【" + w + "】【" + p + "】");
DialogResult result= MessageBox.Show("当前宽度[],目标宽度[]，是否开始调宽","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Question);
if (!result.Equals(DialogResult.OK))
{
return;
}
if (!LWidthManager.CanStartChWidth())
{
MessageBox.Show("启动调宽失败");
return;
}
FormEn(false); Task.Factory.StartNew(delegate
{
ChangeWidthTask = Task.Factory.StartNew(delegate
{
//string result = LWidthManager.StartChangeWidth(w, p);
//LogUtil.info("调宽" + w + "=" + p + "结束：" + result);
//if (String.IsNullOrEmpty(result))
//{
// MessageBox.Show("调宽" + w + "=" + p + "完成");
//}
//else
//{
// MessageBox.Show("调宽" + w + "=" + p + "结束：" + result);
//}
Thread.Sleep(5000);
});
ChangeWidthTask.Wait();
FormEn(true);
});
}
}
private void FormEn(bool en)
{
lblWait.Visible = !en;
txtCode.Enabled = en;
cmbBoardList.Enabled = en;
btnChangeW.Enabled = en;
btnNext.Enabled = en;
chbGuoban.Enabled = en;
btnBack.Enabled = true;
}
} }
} }
TSA-V/workForm/FrmBoardSelect.resx
...@@ -117,4 +117,66 @@ ...@@ -117,4 +117,66 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblWait.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
5B8TgRwSRKIHQtaLCwg1RAAAOw==
</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
UserFromControl/ProjectorControl.cs
...@@ -97,8 +97,8 @@ namespace UserFromControl ...@@ -97,8 +97,8 @@ namespace UserFromControl
} }
private void btnUp_Click(object sender, EventArgs e) private void btnUp_Click(object sender, EventArgs e)
{ {
int stepValue = (int)(GetStepValue() * ConfigAppSettings.GetDoubleValue(Setting_Init.YAxis_Change)); int stepValue = (int)(GetStepValue() * TSAVBean.Y_ChangeValue);
int targetValue = FormUtil.GetIntValue(numY) - stepValue; int targetValue = FormUtil.GetIntValue(numY) - stepValue;
if (targetValue >= 0 ) if (targetValue >= 0 )
{ {
...@@ -108,8 +108,8 @@ namespace UserFromControl ...@@ -108,8 +108,8 @@ namespace UserFromControl
} }
private void btnLeft_Click(object sender, EventArgs e) private void btnLeft_Click(object sender, EventArgs e)
{ {
int stepValue = (int)(GetStepValue() * ConfigAppSettings.GetDoubleValue(Setting_Init.XAxis_Change)); int stepValue = (int)(GetStepValue() * TSAVBean.X_ChangeValue);
int targetValue = FormUtil.GetIntValue(numX) - stepValue; int targetValue = FormUtil.GetIntValue(numX) - stepValue;
if (targetValue >= 0 ) if (targetValue >= 0 )
{ {
...@@ -120,7 +120,7 @@ namespace UserFromControl ...@@ -120,7 +120,7 @@ namespace UserFromControl
private void btnRight_Click(object sender, EventArgs e) private void btnRight_Click(object sender, EventArgs e)
{ {
int stepValue = (int)(GetStepValue() * ConfigAppSettings.GetDoubleValue(Setting_Init.XAxis_Change)); int stepValue = (int)(GetStepValue() * TSAVBean.X_ChangeValue);
int targetValue = FormUtil.GetIntValue(numX) + stepValue; int targetValue = FormUtil.GetIntValue(numX) + stepValue;
if ( targetValue <= MaxX) if ( targetValue <= MaxX)
...@@ -132,7 +132,7 @@ namespace UserFromControl ...@@ -132,7 +132,7 @@ namespace UserFromControl
private void btnDown_Click(object sender, EventArgs e) private void btnDown_Click(object sender, EventArgs e)
{ {
int stepValue = (int)(GetStepValue() * ConfigAppSettings.GetDoubleValue(Setting_Init.YAxis_Change)); int stepValue = (int)(GetStepValue() * TSAVBean.Y_ChangeValue);
int targetValue = FormUtil.GetIntValue(numY) + stepValue; int targetValue = FormUtil.GetIntValue(numY) + stepValue;
if ( targetValue <= MaxY) if ( targetValue <= MaxY)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!