From 65509ea2a0808389a07a446f2df1cadb16d97dbc Mon Sep 17 00:00:00 2001
From: C3032 <C3032@BC3032>
Date: 星期二, 30 十二月 2025 16:36:05 +0800
Subject: [PATCH] Merge branch 'master' into feature/HR_Camera
---
LB_VisionProcesses/Alogrithms/OpenCvSharp/BlobTool/BlobToolEdit.cs | 72 ++++++++++++++++-------------------
1 files changed, 33 insertions(+), 39 deletions(-)
diff --git a/LB_VisionProcesses/Alogrithms/OpenCvSharp/BlobTool/BlobToolEdit.cs b/LB_VisionProcesses/Alogrithms/OpenCvSharp/BlobTool/BlobToolEdit.cs
index cfe7641..5395562 100644
--- a/LB_VisionProcesses/Alogrithms/OpenCvSharp/BlobTool/BlobToolEdit.cs
+++ b/LB_VisionProcesses/Alogrithms/OpenCvSharp/BlobTool/BlobToolEdit.cs
@@ -120,11 +120,10 @@
if (Subject.InputImage != null && Subject.InputImage is Mat)
{
- using (HImage image = TAlgorithm.Mat2HObject((Mat)Subject.InputImage))
- {
- inputImageHSmartWindowControl.ShowHoImage(image);
- }
+ TAlgorithm.Mat2HObject((Mat)Subject.InputImage, out HObject image);
+ inputImageHSmartWindowControl.ShowHoImage(image);
}
+
Type type = Subject.Params.ROI?.GetType();
if (Subject.Params.ROI != null)
{
@@ -216,11 +215,9 @@
if (Subject.InputImage != null && Subject.InputImage is Mat)
{
- using (HImage image = TAlgorithm.Mat2HObject((Mat)Subject.InputImage))
- {
- HOperatorSet.GetImageSize(image, out HTuple ho_ImageWidth, out HTuple ho_ImageHeight);
- recordImageHSmartWindowControl.ShowHoImage(image);
- }
+ TAlgorithm.Mat2HObject((Mat)Subject.InputImage, out HObject image);
+ HOperatorSet.GetImageSize(image, out HTuple ho_ImageWidth, out HTuple ho_ImageHeight);
+ recordImageHSmartWindowControl.ShowHoImage(image);
}
//鍏堝垽鏂瓙绫诲啀鍒ゆ柇鐖剁被
@@ -228,11 +225,10 @@
{
recordImageHSmartWindowControl.DispObj(msgRecord.RecordObject_OK, true);
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)
{
@@ -306,34 +302,32 @@
HTuple hv_imageHeight = 0;
if (InputImage != null && InputImage is Mat)
{
- using (HImage image = TAlgorithm.Mat2HObject((Mat)InputImage))
- {
- image.GetImageSize(out hv_imageWidth, out hv_imageHeight);
- switch (type)
- {
- case RoiType.Rectangle2:
- inputImageHSmartWindowControl.oRoi
- = new HRectangle2(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2, 0
- , hv_imageWidth.TupleReal() / 4, hv_imageHeight.TupleReal() / 4);
- break;
- case RoiType.Circle:
- inputImageHSmartWindowControl.oRoi
- = new HCircle(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2, hv_imageWidth.TupleReal() / 4);
- break;
- //case RoiType.Ellipse:
- // inputImageHSmartWindowControl.oRoi
- // = new HEllipse(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2,0, hv_imageHeight.TupleReal() / 4, hv_imageWidth.TupleReal() / 4);
- // break;
- //case RoiType.Segment:
- // inputImageHSmartWindowControl.oRoi
- // = new HSegment(0, 0, hv_imageWidth.TupleReal() / 4, hv_imageHeight.TupleReal() / 4);
- // break;
- case RoiType.None:
- default:
- inputImageHSmartWindowControl.oRoi = null;
- break;
- }
- }
+ TAlgorithm.Mat2HObject((Mat)InputImage, out HObject image);
+ HOperatorSet.GetImageSize(image, out hv_imageWidth, out hv_imageHeight);
+ }
+ switch (type)
+ {
+ case RoiType.Rectangle2:
+ inputImageHSmartWindowControl.oRoi
+ = new HRectangle2(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2, 0
+ , hv_imageWidth.TupleReal() / 4, hv_imageHeight.TupleReal() / 4);
+ break;
+ case RoiType.Circle:
+ inputImageHSmartWindowControl.oRoi
+ = new HCircle(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2, hv_imageWidth.TupleReal() / 4);
+ break;
+ //case RoiType.Ellipse:
+ // inputImageHSmartWindowControl.oRoi
+ // = new HEllipse(hv_imageWidth.TupleReal() / 2, hv_imageHeight.TupleReal() / 2,0, hv_imageHeight.TupleReal() / 4, hv_imageWidth.TupleReal() / 4);
+ // break;
+ //case RoiType.Segment:
+ // inputImageHSmartWindowControl.oRoi
+ // = new HSegment(0, 0, hv_imageWidth.TupleReal() / 4, hv_imageHeight.TupleReal() / 4);
+ // break;
+ case RoiType.None:
+ default:
+ inputImageHSmartWindowControl.oRoi = null;
+ break;
}
}
}
--
Gitblit v1.9.3