From 5241a8f6377dfd1618610dd15fd05ed6f51c8ba2 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 16 十二月 2020 11:19:45 +0800
Subject: [PATCH] 1. 添加默认流程和默认产品功能 2. 修改批量建立检测项功能
---
src/Bro.Device.Gocator/GocatorDriver.cs | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/src/Bro.Device.Gocator/GocatorDriver.cs b/src/Bro.Device.Gocator/GocatorDriver.cs
index 2a659df..0d22a6f 100644
--- a/src/Bro.Device.Gocator/GocatorDriver.cs
+++ b/src/Bro.Device.Gocator/GocatorDriver.cs
@@ -1,11 +1,13 @@
锘縰sing Bro.Common.Base;
using Bro.Common.Helper;
using Bro.Common.Interface;
+using Bro.Common.Model;
using HalconDotNet;
using Lmi3d.GoSdk;
using Lmi3d.GoSdk.Messages;
using Lmi3d.Zen;
using Lmi3d.Zen.Io;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Drawing;
@@ -64,6 +66,8 @@
}
HandleGoData(dataSet);
+
+ dataSet.Dispose();
}
private void HandleGoData(GoDataSet dataSet, GoImageSet imgSet = null)
@@ -86,9 +90,12 @@
long bufferSize = width * height;
IntPtr bufferPointer = surfaceMsg.Data;
+
float zoomFactor = (float)((double)surfaceMsg.YResolution / (double)surfaceMsg.XResolution);
int zoomHeight = (int)(zoomFactor * height);
+
IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * 2);
+ //IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * 4);
//娌℃湁鎻掑�硷紝榛樿0
//Parallel.For(0, height, h =>
@@ -104,15 +111,44 @@
CopyMemory((IntPtr)((long)zoomPtr + width * 2 * h), (IntPtr)((long)bufferPointer + width * 2 * originHeightIndex), width * 2);
});
+ ////浣跨敤涓婁竴琛屽師鏈夋暟鎹�
+ //Parallel.For(0, zoomHeight, h =>
+ //{
+ // int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);
+
+ // byte[] rowBuffer = new byte[width * 4];
+ // Parallel.For(0, width, w =>
+ // {
+ // rowBuffer[w * 4 + 2] = Marshal.ReadByte(bufferPointer, (int)(width * 2 * originHeightIndex + w * 2));
+ // rowBuffer[w * 4 + 3] = Marshal.ReadByte(bufferPointer, (int)(width * 2 * originHeightIndex + w * 2 + 1));
+ // });
+
+ // Marshal.Copy(rowBuffer, 0, (IntPtr)((long)zoomPtr + width * 2 * h), rowBuffer.Length);
+ //});
+
if (imgSet != null)
{
imgSet.HImage = new HImage();
imgSet.HImage.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
- //imgSet.HImage = imgSet.HImage.ZoomImageSize((int)width, zoomHeight, "constant");
+ //imgSet.HImage.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
imgSet.HImage_2 = new HImage();
imgSet.HImage_2.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
+
+ //imgSet.HImage_2.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
+
+ LaserScanParam para = new LaserScanParam()
+ {
+ Resolution_X = surfaceMsg.XResolution,
+ Resolution_Y = surfaceMsg.YResolution,
+ Resolution_Z = surfaceMsg.ZResolution,
+ Offset_X = surfaceMsg.XOffset,
+ Offset_Y = surfaceMsg.YOffset,
+ Offset_Z = surfaceMsg.ZOffset,
+ Angle_Z = surfaceMsg.ZAngle,
+ };
+ imgSet.ImageData = JsonConvert.SerializeObject(para);
//imgSet.HImage_2 = imgSet.HImage_2.ZoomImageSize((int)width, zoomHeight, "constant");
}
@@ -169,6 +205,8 @@
// }
// break;
}
+
+ dataObj.Dispose();
}
}
@@ -226,6 +264,9 @@
}
HandleGoData(dataSet, imgSet);
+
+ dataSet.Dispose();
+
if (imgSet.HImage == null)
{
LogAsync(DateTime.Now, $"{Name}鏈兘鑾峰彇HImage鍥惧儚", "");
@@ -400,6 +441,8 @@
_snapHandle.Set();
}
}
+
+ dataSet.Dispose();
}
#region 閲嶅啓鍥剧墖淇濆瓨鎿嶄綔
@@ -410,7 +453,7 @@
OnImageUpdated?.Invoke(this, showImage, imgSetId);
});
- GoImageSet set = _imageSetList.FirstOrDefault(u => u.Id == imgSetId) as GoImageSet;
+ GoImageSet set = _imageSetList[imgSetId] as GoImageSet;
if (set == null)
return;
@@ -451,7 +494,7 @@
{
await Task.Run(() =>
{
- GoImageSet set = _imageSetList.FirstOrDefault(u => u.Id == imgSetId) as GoImageSet;
+ GoImageSet set = _imageSetList[imgSetId] as GoImageSet;
if (set == null)
return;
@@ -481,19 +524,22 @@
}
});
}
+
+ public override void ClearImageSet(IImageSet set)
+ {
+ if (set.IsOriginSaved && set.IsFitSaved && set.IsAddtionalSaved)
+ {
+ (set as GoImageSet).HImage_2?.Dispose();
+ (set as GoImageSet).HImage_2 = null;
+ }
+
+ base.ClearImageSet(set);
+ }
#endregion
}
public class GoImageSet : ImageSet
{
public HImage HImage_2 { get; set; }
-
- public override void Dispose()
- {
- base.Dispose();
-
- HImage_2?.Dispose();
- HImage_2 = null;
- }
}
}
--
Gitblit v1.8.0