From b2a5e60d5df66bc8a6be7e12eded1f7e923e9196 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 13 七月 2020 18:50:16 +0800
Subject: [PATCH] 一天一个excel 添加产品条码列
---
src/Bro.Common.Device/DeviceBase/CameraBase.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/CameraBase.cs b/src/Bro.Common.Device/DeviceBase/CameraBase.cs
index 4204c9b..42d1be2 100644
--- a/src/Bro.Common.Device/DeviceBase/CameraBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/CameraBase.cs
@@ -152,7 +152,7 @@
set.IsOriginSaved = !set.ImageSaveOption.IsSaveOriginImage;
set.IsFitSaved = !set.ImageSaveOption.IsSaveFitImage;
- set.IsAddtionalSaved = !string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
+ set.IsAddtionalSaved = string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;
_imageSetList.Add(set);
@@ -181,7 +181,7 @@
{
set.IsOriginSaved = !set.ImageSaveOption.IsSaveOriginImage;
set.IsFitSaved = !set.ImageSaveOption.IsSaveFitImage;
- set.IsAddtionalSaved = !string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
+ set.IsAddtionalSaved = string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;
_imageSetList.Add(set);
}
@@ -196,7 +196,7 @@
public virtual async void SaveOriginImage(Bitmap map, Bitmap showImage, string imgSetId)
{
- Task.Run(() =>
+ await Task.Run(() =>
{
OnImageUpdated?.Invoke(this, showImage, imgSetId);
});
@@ -539,7 +539,7 @@
});
}
- protected async void Generate16GrayImageByPointer(int width, int height, IntPtr dataPtr, string imgSetId)
+ protected async Task Generate16GrayImageByPointer(int width, int height, IntPtr dataPtr, string imgSetId)
{
await Task.Run(() =>
{
@@ -848,6 +848,11 @@
bool IsAddtionalSaved { get; set; }
event Action<ImageSet> OnImageSetTimeout;
+
+ /// <summary>
+ /// 搴忓垪鍖栨搷浣滅殑鍥惧儚淇℃伅
+ /// </summary>
+ string ImageData { get; set; }
}
public class ImageSet : IImageSet
@@ -887,6 +892,8 @@
public object SaveLock { get; set; } = new object();
+ public virtual string ImageData { get; set; }
+
public event Action<ImageSet> OnImageSetTimeout;
private Timer autoDisposeTimer = null;
@@ -897,7 +904,7 @@
public ImageSet()
{
- autoDisposeTimer = new Timer(OnAutoDispose, null, -1, 10 * 1000);
+ autoDisposeTimer = new Timer(OnAutoDispose, null, 10 * 1000, -1);
}
public virtual void Dispose()
--
Gitblit v1.8.0