Skip to content

李娜 / Line-Smart-Workstation

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

1.aoi相机名称设置。2.调试问题修改

1 个父辈 fc72ca83
内嵌 并排
正在显示 10 个修改的文件 包含 52 行增加 和 21 行删除
DeviceLibrary/manager/work/WorkInfo.cs
...@@ -246,7 +246,7 @@ namespace TSA_V.DeviceLibrary ...@@ -246,7 +246,7 @@ namespace TSA_V.DeviceLibrary
} }
if (position == null) if (position == null)
{ {
LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.PN + "】未找到对应的元器件"); LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.PN + "】未找到对应的位置["+currPoint.PositionNum+"]");
} }
else else
{ {
...@@ -297,7 +297,7 @@ namespace TSA_V.DeviceLibrary ...@@ -297,7 +297,7 @@ namespace TSA_V.DeviceLibrary
//xy轴运动到固定点 //xy轴运动到固定点
if (TSAVBean.IsValidPosition(currPoint.NodePositionX, currPoint.NodePositionY)) if (TSAVBean.IsValidPosition(currPoint.NodePositionX, currPoint.NodePositionY))
{ {
//LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.pointName + "】，X轴【" + currPoint.NodePositionX + "】，Y轴【" + currPoint.NodePositionY + "】"); LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.pointName + "】，X轴【" + currPoint.NodePositionX + "】，Y轴【" + currPoint.NodePositionY + "】显示投影光标");
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/FrmMenu.cs
...@@ -490,6 +490,10 @@ namespace TSA_V ...@@ -490,6 +490,10 @@ namespace TSA_V
if (aoiName == createnew) if (aoiName == createnew)
fileName = ""; fileName = "";
FrmAoiSetting frm = new FrmAoiSetting(fileName, null, path); FrmAoiSetting frm = new FrmAoiSetting(fileName, null, path);
if (Setting_NInit.Device_CameraName != "")
{
frm.CurrentCamera = Setting_NInit.Device_CameraName;
}
frm.ShowDialog(); frm.ShowDialog();
} }
} }
......
TSA-V/Smart-Workstation.csproj
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="AccAOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AccAOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\EyemAOI_v2\AOIProject\bin\Debug\AccAOI.dll</HintPath> <HintPath>..\dll\AccAOI.dll</HintPath>
</Reference> </Reference>
<Reference Include="AccImageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AccImageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
......
TSA-V/workForm/FrmTSAV.cs
...@@ -873,6 +873,7 @@ namespace TSA_V ...@@ -873,6 +873,7 @@ namespace TSA_V
preShowPointY = Math.Abs(smtPoint.PositionY) * picBoard.Width / height; preShowPointY = Math.Abs(smtPoint.PositionY) * picBoard.Width / height;
} }
LogUtil.debug($"投影点位：{smtPoint.PN}-{smtPoint.TagNo}-{smtPoint.PositionNum}");
FrmProjectorScreen.instance.ShowPoint(true,BoardManager.CurrBoard.PointColor, smtPoint); FrmProjectorScreen.instance.ShowPoint(true,BoardManager.CurrBoard.PointColor, smtPoint);
#region 这段代码是不是没必要 #region 这段代码是不是没必要
//ComponetInfo com = CSVBomManager.GetCom(this.board.bomName, smtPoint,true); //ComponetInfo com = CSVBomManager.GetCom(this.board.bomName, smtPoint,true);
......
UserFromControl/ProjectorControl.cs
...@@ -343,19 +343,20 @@ namespace UserFromControl ...@@ -343,19 +343,20 @@ namespace UserFromControl
private List<string> typeList = new List<string>(); private List<string> typeList = new List<string>();
private void ProjectorControl_Load(object sender, EventArgs e) private void ProjectorControl_Load(object sender, EventArgs e)
{ {
if (cmbType.SelectedIndex < 0) try
{ {
cmbType.SelectedIndex = 0; if (cmbType.SelectedIndex < 0)
} {
numSizeX.Maximum = MaxX / 2; cmbType.SelectedIndex = 0;
numSizeY.Maximum = MaxY / 2; }
cmbStep.SelectedIndex = LastStepIndexMap[ConType]; numSizeX.Maximum = MaxX / 2;
numSizeY.Maximum = MaxY / 2;
//重新设置步进值 //重新设置步进值
if (ConType == 1) if (ConType == 1)
{ {
this.cmbStep.Items.Clear(); this.cmbStep.Items.Clear();
this.cmbStep.Items.AddRange(new object[] { this.cmbStep.Items.AddRange(new object[] {
"0.1", "0.1",
"0.2", "0.2",
"0.5", "0.5",
...@@ -366,16 +367,30 @@ namespace UserFromControl ...@@ -366,16 +367,30 @@ namespace UserFromControl
"20", "20",
"50", "50",
"100"}); "100"});
numX.DecimalPlaces = 3; numX.DecimalPlaces = 3;
numY.DecimalPlaces = 3; numY.DecimalPlaces = 3;
vallue = new List<double>() { 0.1, 0.2, 0.51, 2, 5, 10, 20, 50, 100 }; vallue = new List<double>() { 0.1, 0.2, 0.51, 2, 5, 10, 20, 50, 100 };
}
else
{
numX.DecimalPlaces = 0;
numY.DecimalPlaces = 0;
}
int sindex = LastStepIndexMap[ConType];
if (cmbStep.Items.Count > sindex)
{
cmbStep.SelectedIndex = LastStepIndexMap[ConType];
}
else
{
cmbStep.SelectedIndex = cmbStep.Items.Count / 2;
}
} }
else catch (Exception ex)
{ {
numX.DecimalPlaces = 0; LogUtil.error("ProjectorControl_Load 出错：" + ex.ToString());
numY.DecimalPlaces = 0;
} }
cmbStep.SelectedIndex = LastStepIndexMap[ConType];
} }
private void DrawPoint(int type,int polaritiesType , int x=0, int y=0, int sizeX = 2, int sizeY = 2 ,int lineLength=2 ) private void DrawPoint(int type,int polaritiesType , int x=0, int y=0, int sizeX = 2, int sizeY = 2 ,int lineLength=2 )
{ {
......
dll/AccAOI.dll
此文件类型无法预览
dll/AccAOI.pdb
此文件类型无法预览
dll/ConfigHelper.dll
此文件类型无法预览
dll/ConfigHelper.pdb
此文件类型无法预览
dll/ConfigHelper.xml
...@@ -57,6 +57,17 @@ ...@@ -57,6 +57,17 @@
the contents of this method with the code editor. the contents of this method with the code editor.
</summary> </summary>
</member> </member>
<member name="P:ConfigHelper.CheckedListBoxEx.DataSource">
<summary>
绑定数据源
</summary>
<param name="data"></param>
</member>
<member name="T:ConfigHelper.CheckItem">
<summary>
Represents an item in the checklistbox
</summary>
</member>
<member name="T:ConfigHelper.Config"> <member name="T:ConfigHelper.Config">
<summary> <summary>
自定义配置存取 自定义配置存取
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!