From e33a8aa1dd7b9d0a29cc38a38f40d0308aa9dcf4 Mon Sep 17 00:00:00 2001
From: C3032 <C3032@BC3032>
Date: 星期五, 09 一月 2026 10:08:09 +0800
Subject: [PATCH] 冲突解决
---
LB_VisionProcesses/Alogrithms/Halcon/2D/HFindModelTool/HFindModelToolEdit.cs | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindModelTool/HFindModelToolEdit.cs b/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindModelTool/HFindModelToolEdit.cs
index 2729c6f..ffed42b 100644
--- a/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindModelTool/HFindModelToolEdit.cs
+++ b/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindModelTool/HFindModelToolEdit.cs
@@ -448,15 +448,9 @@
}
}
- if (Subject.InputImage != null && Subject.InputImage is HImage)
- {
- using (HImage hImage = (HImage)Subject.InputImage)
- {
- hImage.GetImageSize(out HTuple ho_ImageWidth, out HTuple ho_ImageHeight);
- inputImageHSmartWindowControl.ShowHoImage(hImage);
- }
+ if (Subject.InputImage != null && Subject.InputImage is HObject)
+ inputImageHSmartWindowControl.ShowHoImage((HObject)Subject.InputImage);
- }
Type type = Subject.Params.ROI?.GetType();
if (Subject.Params.ROI != null)
{
@@ -569,13 +563,10 @@
UpdataOutputs();
imgTabControl.SelectedTab = tabPageRecordImage;
- if (Subject.InputImage != null && Subject.InputImage is HImage)
+ if (Subject.InputImage != null && Subject.InputImage is HObject)
{
- using (HImage hImage = (HImage)Subject.InputImage)
- {
- hImage.GetImageSize(out HTuple ho_ImageWidth, out HTuple ho_ImageHeight);
- recordImageHSmartWindowControl.ShowHoImage(hImage);
- }
+ HOperatorSet.GetImageSize((HObject)Subject.InputImage, out HTuple ho_ImageWidth, out HTuple ho_ImageHeight);
+ recordImageHSmartWindowControl.ShowHoImage((HObject)Subject.InputImage);
}
//鍏堝垽鏂瓙绫诲啀鍒ゆ柇鐖剁被
@@ -1300,18 +1291,15 @@
private void btnCreateModel_Click(object sender, EventArgs e)
{
- if (InputImage != null && InputImage is HImage)
+ if (InputImage != null && InputImage is HObject)
{
imgTabControl.SelectedTab = tabPageModelImage;
- using (HImage hImage = (HImage)Subject.InputImage)
- {
- hImage.GetImageSize(out HTuple hv_imageWidth, out HTuple hv_imageHeight);
- createModelImageHSmartWindowControl.ShowHoImage(hImage);
- createModelImageHSmartWindowControl.bAollowDraw = true;
- createModelImageHSmartWindowControl.oRoi = new HRectangle2(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2
- , 0, hv_imageWidth.TupleReal() / 4, hv_imageHeight.TupleReal() / 4);
- }
+ HOperatorSet.GetImageSize((HObject)InputImage, out HTuple hv_imageWidth, out HTuple hv_imageHeight);
+ createModelImageHSmartWindowControl.ShowHoImage((HObject)InputImage);
+ createModelImageHSmartWindowControl.bAollowDraw = true;
+ createModelImageHSmartWindowControl.oRoi = new HRectangle2(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2
+ , 0, hv_imageWidth.TupleReal() / 4, hv_imageHeight.TupleReal() / 4);
}
}
--
Gitblit v1.9.3