zhusenlin/VisionEdit
1
0
Fork 0
mirror of https://github.com/eggplantlwj/VisionEdit.git synced 2026-03-31 22:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、更改所有位置显示窗体为自定义窗体，添加坐标及灰度显示

Browse Source 
2、添加工具移除功能
3、PMA工具添加修改模板和定义搜索区域
This commit is contained in:
liu.wenjie
2022-04-14 16:05:10 +08:00
parent e89283dda0
commit 9eb84c6265
30 changed files with 580 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CaliperTool/Caliper.cs
View File

@@ -4,7 +4,7 @@ using HalconDotNet;
using ToolBase;
using static DataStruct.DataStruct;
using ChoiceTech.Halcon.Control;
using ViewROI;
namespace CaliperTool
{
@@ -114,7 +114,7 @@ namespace CaliperTool
{
if (inputImage != null)
{
FormCaliper.Instance.myHwindow.HalconWindow.DispObj(inputImage);
FormCaliper.Instance.myHwindow.DispHWindow.DispObj(inputImage);
}
}
@@ -158,7 +158,7 @@ namespace CaliperTool
public void UpdateImage()
{
FormCaliper.Instance.myHwindow.HalconWindow.ClearWindow();
FormCaliper.Instance.myHwindow.DispHWindow.ClearWindow();
DispImage();
}
@@ -211,7 +211,7 @@ namespace CaliperTool
HOperatorSet.GenCrossContourXld(out crossDisp, ResulttRow, ResultCol, new HTuple(80), new HTuple(0));
if(softwareRunState == SoftwareRunState.Debug)
{
DispMainWindow(FormCaliper.Instance.myHwindow.HalconWindow);
DispMainWindow(FormCaliper.Instance.myHwindow);
FormCaliper.Instance.tbx_resultStartRow.Text = ResulttRow.ToString();
FormCaliper.Instance.tbx_resultStartCol.Text = ResultCol.ToString();
FormCaliper.Instance.SetToolStatus("运行成功", ToolRunStatu.Succeed);
@@ -250,19 +250,19 @@ namespace CaliperTool
}
public override void DispMainWindow(HWindow window)
public override void DispMainWindow(HWindowTool_Smart window)
{
// 显示矩形
if (dispRec && contoursDisp != null)
{
window.SetColor("blue");
window.DispObj(contoursDisp);
window.DispHWindow.SetColor("blue");
window.DispHWindow.DispObj(contoursDisp);
}
// 显示交点
if (dispCross && crossDisp != null)
{
window.SetColor("green");
window.DispObj(crossDisp);
window.DispHWindow.SetColor("green");
window.DispHWindow.DispObj(crossDisp);
}
//显示找到的线
// window.DispObj(LineDisp, "green");

2
CaliperTool/CaliperToolRun.cs
View File

@@ -73,7 +73,7 @@ namespace CaliperTool
myCaliper.Run(SoftwareRunState.Release);
if (myCaliper.toolRunStatu == ToolRunStatu.Succeed)
{
myCaliper.DispMainWindow(FormImageWindow.Instance.myHWindow.DispHWindow);
myCaliper.DispMainWindow(FormImageWindow.Instance.myHWindow);
myJob.FormLogDisp(L_toolList[toolIndex].toolName + " 运行成功", Color.Green, selectNode);
}
else

5
CaliperTool/FormCaliper.cs
View File

@@ -10,6 +10,7 @@ using System.Windows.Forms;
using CommonMethods;
using ChoiceTech.Halcon.Control;
using HalconDotNet;
using ViewROI;
namespace CaliperTool
{
@@ -18,7 +19,7 @@ namespace CaliperTool
public Caliper myCaliper = null;
public IToolInfo myToolInfo = null;
public HSmartWindowControl myHwindow = new HSmartWindowControl();
public HWindowTool_Smart myHwindow = new HWindowTool_Smart();
private static FormCaliper _instance;
public FormCaliper(ref object caliper)
@@ -90,7 +91,7 @@ namespace CaliperTool
private void btn_moveCliperRegion_Click(object sender, EventArgs e)
{
myCaliper.UpdateImage();
myCaliper.DrawExpectLine(myHwindow.HalconWindow);
myCaliper.DrawExpectLine(myHwindow.DispHWindow);
}
private void btn_runCaliperool_Click(object sender, EventArgs e)