Skip to content

李娜 / Line-Smart-Workstation

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

投影点错误问题修改

1 个父辈 590a69a1
内嵌 并排
正在显示 4 个修改的文件 包含 9 行增加 和 3 行删除
DeviceLibrary/bean/BoardInfo.cs
...@@ -412,6 +412,12 @@ namespace TSA_V.DeviceLibrary ...@@ -412,6 +412,12 @@ namespace TSA_V.DeviceLibrary
return p; return p;
} }
public ProjectorPInfo GetScreenShowPInfo(float imageXiShu = 1)
{
ProjectorPInfo p = new ProjectorPInfo(NodePositionX * imageXiShu, NodePositionY * imageXiShu, PointType, PolaritiesType, PolarityAngle, (int)(PointSizeX * imageXiShu), (int)(PointSizeY * imageXiShu), (int)(PenWidth * imageXiShu), ShowText);
return p;
}
/// <summary> /// <summary>
/// 点大小 /// 点大小
/// </summary> /// </summary>
......
DeviceLibrary/manager/work/WorkInfo.cs
...@@ -301,7 +301,7 @@ namespace TSA_V.DeviceLibrary ...@@ -301,7 +301,7 @@ namespace TSA_V.DeviceLibrary
if (TSAVBean.IsValidPosition(currPoint.NodePositionX, currPoint.NodePositionY)) if (TSAVBean.IsValidPosition(currPoint.NodePositionX, currPoint.NodePositionY))
{ {
LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" +currPoint.TagNo+"_"+ currPoint.PN + "】，X轴【" + currPoint.NodePositionX + "】，Y轴【" + currPoint.NodePositionY + "】显示投影光标"); LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" +currPoint.TagNo+"_"+ currPoint.PN + "】，X轴【" + currPoint.NodePositionX + "】，Y轴【" + currPoint.NodePositionY + "】显示投影光标");
TSAVBean.ShowPoint( currPoint.GetShowPInfo()); TSAVBean.ShowPoint( currPoint.GetScreenShowPInfo());
//TSAVBean.ShowPoint(currPoint.NodePositionX, currPoint.NodePositionY, currPoint.PointType,currPoint.PolaritiesType, currPoint.PointSizeX, currPoint.PointSizeY, currPoint.PenWidth, currPoint.ShowText, currBoard.PointColor); //TSAVBean.ShowPoint(currPoint.NodePositionX, currPoint.NodePositionY, currPoint.PointType,currPoint.PolaritiesType, currPoint.PointSizeX, currPoint.PointSizeY, currPoint.PenWidth, currPoint.ShowText, currBoard.PointColor);
waitList.Add(WaitResultInfo.WaitTime(1000)); waitList.Add(WaitResultInfo.WaitTime(1000));
} }
......
TSA-V/frmBoard/FrmBoardInfo.cs
...@@ -508,7 +508,7 @@ namespace TSA_V ...@@ -508,7 +508,7 @@ namespace TSA_V
{ {
FrmProjectorScreen.instance.ClearPoint(); FrmProjectorScreen.instance.ClearPoint();
//FrmProjectorScreen.instance.ShowPoint(new ProjectorPInfo((int)x, (int)y, type, polaritiesType, sizeX, sizeY, penWidth, showText,btnColorChange.BackColor.ToArgb())); //FrmProjectorScreen.instance.ShowPoint(new ProjectorPInfo((int)x, (int)y, type, polaritiesType, sizeX, sizeY, penWidth, showText,btnColorChange.BackColor.ToArgb()));
FrmProjectorScreen.instance.ShowPoint(point.GetShowPInfo()); FrmProjectorScreen.instance.ShowPoint(point.GetScreenShowPInfo());
} }
} }
......
TSA-V/frmBoard/FrmPointInfo.cs
...@@ -203,7 +203,7 @@ namespace TSA_V ...@@ -203,7 +203,7 @@ namespace TSA_V
actControl.XValue = smtPointInfo.PositionX; actControl.XValue = smtPointInfo.PositionX;
actControl.YValue = smtPointInfo.PositionY; actControl.YValue = smtPointInfo.PositionY;
actControl.ShowText = smtPointInfo.ShowText; actControl.ShowText = smtPointInfo.ShowText;
actControl.SetPointType(smtPointInfo.PointType, smtPointInfo .imgP.SizeY, smtPointInfo.imgP.SizeY, smtPointInfo.imgP.PWidth, smtPointInfo.PolaritiesType,smtPointInfo.PolarityAngle); actControl.SetPointType(smtPointInfo.PointType, smtPointInfo .imgP.SizeX, smtPointInfo.imgP.SizeY, smtPointInfo.imgP.PWidth, smtPointInfo.PolaritiesType,smtPointInfo.PolarityAngle);
if (this.smtPointInfo.IsEdit == false) if (this.smtPointInfo.IsEdit == false)
{ {
if (prePoint != null && prePoint.IsEdit) if (prePoint != null && prePoint.IsEdit)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!