1、修改Halcon取图工具,对功能进行拆分,简化逻辑

2、修改PMA工具,修正其中的bug
3、其他BUG修复
This commit is contained in:
liu.wenjie
2022-04-08 15:31:57 +08:00
parent 159fb6b967
commit 8f7a1e0ffd
52 changed files with 1360 additions and 1457 deletions

View File

@@ -84,21 +84,6 @@ namespace HalconTool
/// </summary>
internal WorkMode workMode = WorkMode.ReadMultImage;
public bool ReadImage(out string filePath)
{
filePath = string.Empty;
HTuple channelCount = 0;
OpenFileDialog dig_openImage = new OpenFileDialog();
dig_openImage.Title = "请选择图像文件路径";
dig_openImage.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
dig_openImage.Filter = "图像文件(*.*)|*.*|图像文件(*.png)|*.png|图像文件(*.jpg)|*.jpg|图像文件(*.tif)|*.tif";
if (dig_openImage.ShowDialog() == DialogResult.OK)
{
filePath = dig_openImage.FileName;
outputImageFilePath = dig_openImage.FileName;
}
return true;
}
public override void Run(SoftwareRunState softwareState)
{
@@ -109,7 +94,6 @@ namespace HalconTool
SetToolStatusDisp();
sw.Stop();
runTime = $"工具运行时间:{sw.ElapsedMilliseconds.ToString()} ms";
}
public override void DispImage()
@@ -150,7 +134,8 @@ namespace HalconTool
if (softwareRunState == SoftwareRunState.Debug)
{
FormHalconTool.Instance.myHwindow.DispImage(outputImage);
}
}
}
else
{