Commit 2bee034a LN

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

1 个父辈 fc72ca83
......@@ -246,7 +246,7 @@ namespace TSA_V.DeviceLibrary
}
if (position == null)
{
LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.PN + "】未找到对应的元器件");
LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.PN + "】未找到对应的位置["+currPoint.PositionNum+"]");
}
else
{
......@@ -297,7 +297,7 @@ namespace TSA_V.DeviceLibrary
//xy轴运动到固定点
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);
waitList.Add(WaitResultInfo.WaitTime(1000));
}
......
......@@ -490,6 +490,10 @@ namespace TSA_V
if (aoiName == createnew)
fileName = "";
FrmAoiSetting frm = new FrmAoiSetting(fileName, null, path);
if (Setting_NInit.Device_CameraName != "")
{
frm.CurrentCamera = Setting_NInit.Device_CameraName;
}
frm.ShowDialog();
}
}
......
......@@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="AccAOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\EyemAOI_v2\AOIProject\bin\Debug\AccAOI.dll</HintPath>
<HintPath>..\dll\AccAOI.dll</HintPath>
</Reference>
<Reference Include="AccImageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......
......@@ -873,6 +873,7 @@ namespace TSA_V
preShowPointY = Math.Abs(smtPoint.PositionY) * picBoard.Width / height;
}
LogUtil.debug($"投影点位:{smtPoint.PN}-{smtPoint.TagNo}-{smtPoint.PositionNum}");
FrmProjectorScreen.instance.ShowPoint(true,BoardManager.CurrBoard.PointColor, smtPoint);
#region 这段代码是不是没必要
//ComponetInfo com = CSVBomManager.GetCom(this.board.bomName, smtPoint,true);
......
......@@ -343,13 +343,14 @@ namespace UserFromControl
private List<string> typeList = new List<string>();
private void ProjectorControl_Load(object sender, EventArgs e)
{
try
{
if (cmbType.SelectedIndex < 0)
{
cmbType.SelectedIndex = 0;
}
numSizeX.Maximum = MaxX / 2;
numSizeY.Maximum = MaxY / 2;
cmbStep.SelectedIndex = LastStepIndexMap[ConType];
//重新设置步进值
if (ConType == 1)
......@@ -375,8 +376,22 @@ namespace UserFromControl
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;
}
}
catch (Exception ex)
{
LogUtil.error("ProjectorControl_Load 出错:" + ex.ToString());
}
}
private void DrawPoint(int type,int polaritiesType , int x=0, int y=0, int sizeX = 2, int sizeY = 2 ,int lineLength=2 )
{
Graphics g = panImg.CreateGraphics();
......
此文件类型无法预览
此文件类型无法预览
此文件类型无法预览
此文件类型无法预览
......@@ -57,6 +57,17 @@
the contents of this method with the code editor.
</summary>
</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">
<summary>
自定义配置存取
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!