From 1bc2df66bc88a6405df345dccc24a5031e18b592 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 21 十二月 2020 09:54:48 +0800
Subject: [PATCH] 1. gocator添加byte2/byte4的配置，目前测试byte4不成功，暂时还是使用byte2配置。 2. 添加键名代码映射配置和NG键名代码上传功能
---
src/Bro.Device.Gocator/GocatorDriver.cs | 82 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/src/Bro.Device.Gocator/GocatorDriver.cs b/src/Bro.Device.Gocator/GocatorDriver.cs
index 0d22a6f..a45de96 100644
--- a/src/Bro.Device.Gocator/GocatorDriver.cs
+++ b/src/Bro.Device.Gocator/GocatorDriver.cs
@@ -94,8 +94,9 @@
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 * 2);
//IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * 4);
+ IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * (int)IIConfig.ByteNums);
//娌℃湁鎻掑�硷紝榛樿0
//Parallel.For(0, height, h =>
@@ -103,40 +104,45 @@
// CopyMemory((IntPtr)((long)zoomPtr + width * 2 * Math.Floor(h * zoomFactor)), (IntPtr)((long)bufferPointer + width * 2 * h), width * 2);
// });
- //浣跨敤涓婁竴琛屽師鏈夋暟鎹�
- Parallel.For(0, zoomHeight, h =>
+ if (IIConfig.ByteNums == GocatorDataByteNums.Byte2)
{
- int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);
+ //浣跨敤涓婁竴琛屽師鏈夋暟鎹�
+ Parallel.For(0, zoomHeight, h =>
+ {
+ int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);
- CopyMemory((IntPtr)((long)zoomPtr + width * 2 * h), (IntPtr)((long)bufferPointer + width * 2 * originHeightIndex), width * 2);
- });
+ CopyMemory((IntPtr)((long)zoomPtr + width * 2 * h), (IntPtr)((long)bufferPointer + width * 2 * originHeightIndex), width * 2);
+ });
+ }
+ else
+ {
+ //浣跨敤涓婁竴琛屽師鏈夋暟鎹�
+ Parallel.For(0, zoomHeight, h =>
+ {
+ int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);
- ////浣跨敤涓婁竴琛屽師鏈夋暟鎹�
- //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));
+ });
- // 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);
- //});
+ 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.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
//imgSet.HImage.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
+ imgSet.HImage.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);
- imgSet.HImage_2 = new HImage();
- imgSet.HImage_2.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
-
+ imgSet.HImage_2 = imgSet.HImage.Clone();
+ //imgSet.HImage_2.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
//imgSet.HImage_2.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
+ //imgSet.HImage_2.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);
LaserScanParam para = new LaserScanParam()
{
@@ -289,7 +295,12 @@
if (!string.IsNullOrWhiteSpace(opConfig.JobName) && _currentJob != opConfig.JobName)
{
- _currentJob = sensor.DefaultJob = opConfig.JobName;
+ LogAsync(DateTime.Now, $"{Name}鍒囨崲褰撳墠浠诲姟涓簕opConfig.JobName}", "");
+ sensor.CopyFile(_currentJob, "_live.job");
+
+ bool isChanged = false;
+ sensor.LoadedJob(ref _currentJob, ref isChanged);
+ LogAsync(DateTime.Now, $"{Name}褰撳墠浠诲姟{_currentJob}", "");
}
sensor.Flush();
@@ -345,18 +356,17 @@
_currentExposure = (float)sensor.Setup.GetExposure(GoRole.Main);
}
- _currentJob = sensor.DefaultJob;
- if (!string.IsNullOrWhiteSpace(IIConfig.DefaultJob) && _currentJob != IIConfig.DefaultJob)
- {
- //_currentJob = sensor.DefaultJob = IIConfig.DefaultJob;
- string currentJob = IIConfig.DefaultJob;
- bool isChanged = false;
- sensor.LoadedJob(ref currentJob, ref isChanged);
+ bool isChanged = false;
+ sensor.LoadedJob(ref _currentJob, ref isChanged);
+ LogAsync(DateTime.Now, $"{Name}褰撳墠浠诲姟{_currentJob}", "");
- if (!isChanged)
- {
- throw new ProcessException($"{Name}鏈垚鍔熷垏鎹㈣嚦浠诲姟{IIConfig.DefaultJob}");
- }
+ if (!string.IsNullOrWhiteSpace(IIConfig.DefaultJob) && IIConfig.DefaultJob != _currentJob)
+ {
+ sensor.CopyFile(IIConfig.DefaultJob, "_live.job");
+ //_currentJob = IIConfig.DefaultJob;
+
+ sensor.LoadedJob(ref _currentJob, ref isChanged);
+ LogAsync(DateTime.Now, $"{Name}褰撳墠浠诲姟{_currentJob}", "");
}
sensor.Flush();
--
Gitblit v1.8.0