From 3462941c01a6d6055988ae079576cac9cc6ebf65 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期二, 06 一月 2026 16:15:11 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/~zhengyabo/LB_TyreAppearanceInspectionSoftware
---
LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs b/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TestTool/TestToolEdit.cs
index d8bccd0..a445945 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((HImage)Subject.InputImage);
+ inputImageHSmartWindowControl.ShowHoImage((HObject)Subject.InputImage);
Type type = Subject.Params.ROI?.GetType();
if (Subject.Params.ROI != null)
@@ -179,21 +179,17 @@
{
if (Subject.OutputImage is Mat)
{
- using (HImage image = TAlgorithm.Mat2HImage((Mat)Subject.OutputImage))
- {
- recordImageHSmartWindowControl.ShowHoImage(image);
- }
+ TAlgorithm.Mat2HObject((Mat)Subject.OutputImage, out HObject image);
+ recordImageHSmartWindowControl.ShowHoImage(image);
}
else if (Subject.OutputImage is Bitmap)
{
- using (HImage image = TAlgorithm.Bitmap2HImage((Bitmap)Subject.OutputImage))
- {
- recordImageHSmartWindowControl.ShowHoImage(image);
- }
+ TAlgorithm.Bitmap2HObject((Bitmap)Subject.OutputImage, out HObject image);
+ recordImageHSmartWindowControl.ShowHoImage(image);
}
- else if (Subject.OutputImage is HImage)
+ else if (Subject.OutputImage is HObject)
{
- recordImageHSmartWindowControl.ShowHoImage((HImage)Subject.OutputImage);
+ recordImageHSmartWindowControl.ShowHoImage((HObject)Subject.OutputImage);
}
}
//鍏堝垽鏂瓙绫诲啀鍒ゆ柇鐖剁被
--
Gitblit v1.9.3