From fec341de45f4b3fd1825807f0b3261143fa13caa Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期一, 29 十二月 2025 17:03:45 +0800
Subject: [PATCH] 修复部分显示工具为面向对象。
---
LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs b/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs
index 23027d1..d8bccd0 100644
--- a/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs
+++ b/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs
@@ -89,7 +89,7 @@
stxtInput.Text = Subject.Params.Inputs["杈撳叆"].ToString();
if (Subject.InputImage != null && Subject.InputImage is HObject)
- inputImageHSmartWindowControl.ShowHoImage((HObject)Subject.InputImage);
+ inputImageHSmartWindowControl.ShowHoImage((HImage)Subject.InputImage);
Type type = Subject.Params.ROI?.GetType();
if (Subject.Params.ROI != null)
@@ -179,18 +179,23 @@
{
if (Subject.OutputImage is Mat)
{
- TAlgorithm.Mat2HObject((Mat)Subject.OutputImage, out HObject image);
- recordImageHSmartWindowControl.ShowHoImage(image);
+ using (HImage image = TAlgorithm.Mat2HImage((Mat)Subject.OutputImage))
+ {
+ recordImageHSmartWindowControl.ShowHoImage(image);
+ }
}
else if (Subject.OutputImage is Bitmap)
{
- TAlgorithm.Bitmap2HObject((Bitmap)Subject.OutputImage, out HObject image);
- recordImageHSmartWindowControl.ShowHoImage(image);
+ using (HImage image = TAlgorithm.Bitmap2HImage((Bitmap)Subject.OutputImage))
+ {
+ recordImageHSmartWindowControl.ShowHoImage(image);
+ }
}
- else if (Subject.OutputImage is HObject)
- recordImageHSmartWindowControl.ShowHoImage((HObject)Subject.OutputImage);
+ else if (Subject.OutputImage is HImage)
+ {
+ recordImageHSmartWindowControl.ShowHoImage((HImage)Subject.OutputImage);
+ }
}
-
//鍏堝垽鏂瓙绫诲啀鍒ゆ柇鐖剁被
if (Subject.Record != null && Subject.Record is MsgRecord msgRecord)
{
@@ -198,15 +203,16 @@
recordImageHSmartWindowControl.DispObj(msgRecord.RecordObject_NG, false);
for (int i = 0; i < msgRecord.Msg.Length; i++)
+ {
recordImageHSmartWindowControl.ShowMsg(msgRecord.Msg[i]
, 1 == msgRecord.Result[i] ? true : false, msgRecord.Column[i], msgRecord.Row[i]);
+ }
}
else if (Subject.Record != null && Subject.Record is ObjectRecord objRecord)
{
recordImageHSmartWindowControl.DispObj(objRecord.RecordObject_OK, true);
recordImageHSmartWindowControl.DispObj(objRecord.RecordObject_NG, false);
}
-
GC.Collect();
}));
}
--
Gitblit v1.9.3