zhusenlin/VisionEdit
1
0
Fork 0
mirror of https://github.com/eggplantlwj/VisionEdit.git synced 2026-04-05 17:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、优化LOG显示与引用

Browse Source 
2、添加PMA工具，工具内容待完善
3、修复流程树显示
4、添加开源项目，优化UI空间
5、其他BUG更改
This commit is contained in:
liu.wenjie
2021-11-23 15:51:37 +08:00
parent 47f77f5e64
commit a24dda2525
474 changed files with 91916 additions and 6429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
HalconTool/HalconTool.cs
View File

@@ -83,24 +83,6 @@ namespace HalconTool
/// 读取单张图像或批量读取文件夹图像工作模式
/// </summary>
internal WorkMode workMode = WorkMode.ReadMultImage;
public ToolRunStatu toolRunStatu { get; set; } = ToolRunStatu.Not_Run;
/// <summary>
/// 运行过程信息
/// </summary>
public string runMessage { get; set; }
/// <summary>
/// 工具运行时间
/// </summary>
public string runTime { get; set; } = string.Empty;
public HObject inputImage { get; set; } = null;
/// <summary>
/// 运行模式
/// </summary>
public SoftwareRunState softwareRunState { get; set; } = SoftwareRunState.Debug;
public bool ReadImage(out string filePath)
{
@@ -118,7 +100,7 @@ namespace HalconTool
return true;
}
public void Run(SoftwareRunState softwareState)
public override void Run(SoftwareRunState softwareState)
{
Stopwatch sw = new Stopwatch();
sw.Restart();
@@ -130,7 +112,7 @@ namespace HalconTool
}
public void DispImage()
public override void DispImage()
{
HObject image = new HObject();
try
@@ -191,6 +173,11 @@ namespace HalconTool
FormHalconTool.Instance.statusStrip.BackColor = System.Drawing.Color.Red;
}
}
public override void DispMainWindow(HWindow window)
{
throw new NotImplementedException();
}
}

2
HalconTool/HalconToolRun.cs
View File

@@ -40,7 +40,7 @@ namespace HalconTool
else
{
myJob.FormLogDisp($"{L_toolList[toolIndex].toolName} 运行成功，{myHalconTool.runTime}", Color.Green, selectNode);
FormImageWindow.Instance.myHWindow.HobjectToHimage(myHalconTool.outputImage);
FormImageWindow.Instance.myHWindow.DispHWindow.DispObj(myHalconTool.outputImage);
}
}
}

10
HalconTool/obj/Debug/HalconTool.csproj.FileListAbsolute.txt
View File

@@ -32,6 +32,9 @@ G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalconTool.resource
G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache
G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.dll
G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.pdb
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.csprojResolveAssemblyReference.cache
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalconTool.resources
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\log4net.config
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\HalconTool.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\HalconTool.pdb
@@ -45,7 +48,6 @@ F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\ToolBase.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\Newtonsoft.Json.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\LogForm.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\log4net.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\CommonMethods.pdb
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\FormLib.pdb
@@ -55,10 +57,6 @@ F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.pd
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\HWindow_Tool.pdb
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\DevComponents.DotNetBar2.xml
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\halcondotnet.xml
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.pdb
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\LogForm.pdb
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.csprojResolveAssemblyReference.cache
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalconTool.resources
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\Newtonsoft.Json.xml
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.dll
F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.pdb