Skip to content

李娜 / Line-Smart-Workstation

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

导入元器件增加一列： 投影文字

1 个父辈 62c5dc32
内嵌 并排
正在显示 7 个修改的文件 包含 25 行增加 和 8 行删除
DeviceLibrary/bean/BoardInfo.cs
...@@ -188,7 +188,7 @@ namespace TSA_V.DeviceLibrary ...@@ -188,7 +188,7 @@ namespace TSA_V.DeviceLibrary
PositionX = 0; PositionX = 0;
PositionY = 0; PositionY = 0;
} }
public SMTPointInfo(int num, string partNum, string name, double positionX, double positionY, string PositionNum, public SMTPointInfo(int num, string partNum, string name, double positionX, double positionY, string PositionNum,string showText,
int pointType=1,int pointSizex=1,int pointSizeY=1,int penWidth =2, int pointType=1,int pointSizex=1,int pointSizeY=1,int penWidth =2,
bool needs = false, bool needc = false, int sTemp = 0, double sTime = 0) bool needs = false, bool needc = false, int sTemp = 0, double sTime = 0)
{ {
...@@ -206,7 +206,11 @@ namespace TSA_V.DeviceLibrary ...@@ -206,7 +206,11 @@ namespace TSA_V.DeviceLibrary
this.PointSizeX = pointSizex; this.PointSizeX = pointSizex;
this.PointSizeY = pointSizeY; this.PointSizeY = pointSizeY;
this.PenWidth = penWidth; this.PenWidth = penWidth;
this.ShowText = name; this.ShowText = showText;
if (String.IsNullOrEmpty(this.ShowText))
{
this.ShowText = name;
}
} }
/// <summary> /// <summary>
......
DeviceLibrary/config/元器件信息模板.csv
位号,物料编码,数量,料盘位置,元器件描述,X坐标,Y坐标,注意事项 位号,物料编码,数量,料盘位置,元器件描述,X坐标,Y坐标,注意事项,投影文字
必填，不可重复,必填,必填,必填（1-100）,,,, 必填，不可重复,必填,必填,必填（1-100）,,,,,
DeviceLibrary/csvLoad/position/ComponetInfo.cs
...@@ -16,6 +16,7 @@ namespace TSA_V.LoadCSVLibrary ...@@ -16,6 +16,7 @@ namespace TSA_V.LoadCSVLibrary
PositionY = 0; PositionY = 0;
Notes = ""; Notes = "";
ComponentDes = ""; ComponentDes = "";
Text = "";
} }
public int Id { get; set; } public int Id { get; set; }
...@@ -66,7 +67,11 @@ namespace TSA_V.LoadCSVLibrary ...@@ -66,7 +67,11 @@ namespace TSA_V.LoadCSVLibrary
/// </summary> /// </summary>
[CSVAttribute("Notes", "注意事项", false)] [CSVAttribute("Notes", "注意事项", false)]
public string Notes { get; set; } public string Notes { get; set; }
/// <summary>
///投影文字
/// </summary>
[CSVAttribute("Text", "投影文字", false)]
public string Text { get; set; }
public int GetSortPosition() public int GetSortPosition()
{ {
......
DeviceLibrary/manager/BoardManager.cs
...@@ -229,6 +229,7 @@ namespace TSA_V.DeviceLibrary ...@@ -229,6 +229,7 @@ namespace TSA_V.DeviceLibrary
c.PositionY = p.PositionY; c.PositionY = p.PositionY;
c.TagNo = p.TagNo; c.TagNo = p.TagNo;
c.Notes = ""; c.Notes = "";
c.Text =p.ShowText;
c.ComponentDes = ""; c.ComponentDes = "";
} }
......
TSA-V/FrmAddBoard.cs
...@@ -193,7 +193,7 @@ namespace TSA_V ...@@ -193,7 +193,7 @@ namespace TSA_V
y = board.boardLength - y; y = board.boardLength - y;
x = board.boardWidth - x; x = board.boardWidth - x;
} }
SMTPointInfo point = new SMTPointInfo(i, com.TagNo, com.PN, x, y, com.PositionNum,pointType,pointSizeX,pointSizeY,penWidth); SMTPointInfo point = new SMTPointInfo(i, com.TagNo, com.PN, x, y, com.PositionNum,com.Text, pointType,pointSizeX,pointSizeY,penWidth);
y = board.boardLength - y; y = board.boardLength - y;
...@@ -313,6 +313,8 @@ namespace TSA_V ...@@ -313,6 +313,8 @@ namespace TSA_V
xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent; xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent;
xyMoveControl1.XValue = TSAVBean.X_Max/2; xyMoveControl1.XValue = TSAVBean.X_Max/2;
xyMoveControl1.YValue = TSAVBean.Y_Max/2; xyMoveControl1.YValue = TSAVBean.Y_Max/2;
xyMoveControl1.MaxX =(int) TSAVBean.X_Max;
xyMoveControl1.MaxY = (int)TSAVBean.Y_Max;
xyMoveControl1.ShowText = ""; xyMoveControl1.ShowText = "";
rdbUpload.Checked = true; rdbUpload.Checked = true;
......
TSA-V/FrmPointInfo.cs
...@@ -40,7 +40,10 @@ namespace TSA_V ...@@ -40,7 +40,10 @@ namespace TSA_V
xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent; xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent;
xyMoveControl1.XValue = nodex; xyMoveControl1.XValue = nodex;
xyMoveControl1.YValue = nodey; xyMoveControl1.YValue = nodey;
xyMoveControl1.MaxX = (int)TSAVBean.X_Max;
xyMoveControl1.MaxY = (int)TSAVBean.Y_Max;
this.txtX.Text = x.ToString(); this.txtX.Text = x.ToString();
this.txtY.Text = y.ToString(); this.txtY.Text = y.ToString();
...@@ -119,6 +122,8 @@ namespace TSA_V ...@@ -119,6 +122,8 @@ namespace TSA_V
return; return;
} }
xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent; xyMoveControl1.ShowPointEvent += XyMoveControl1_ShowPointEvent;
xyMoveControl1.MaxX = (int)TSAVBean.X_Max;
xyMoveControl1.MaxY = (int)TSAVBean.Y_Max;
this.PointList = list; this.PointList = list;
this.CurrIndex = currIndex; this.CurrIndex = currIndex;
ShowPoint(); ShowPoint();
......
TSA-V/projector/FrmProjectorScreen.cs
...@@ -66,7 +66,7 @@ namespace TSA_V ...@@ -66,7 +66,7 @@ namespace TSA_V
TSAVBean.Y_Max = ScreenHeight; TSAVBean.Y_Max = ScreenHeight;
TSAVBean.X_Min = 1; TSAVBean.X_Min = 1;
TSAVBean.Y_Min = 1; TSAVBean.Y_Min = 1;
ISShow = true; ISShow = true;
this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top); this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!