1. 添加离线测试功能 2. 单键分开测量修改赋值和释放时判断

patrick.xu

2021-04-28 96b6869bb20677f9b945f67c014a9b992ee05ac4

 src/Bro.Common.Device/DeviceBase/CameraBase.cs

@@ -71,7 +71,7 @@
        #endregion

        #region 图片相关
        public event Action<CameraBase, Bitmap, string> OnImageUpdated;
        public Action<CameraBase, Bitmap, string> OnImageUpdated;

        public Action<CameraBase, HObject, string> OnHImageOutput { get; set; }
        public event Action OnCameraOpModeChanged;
@@ -141,22 +141,21 @@
        /// </summary>
        /// <returns></returns>
        public abstract void Snapshot();
        public abstract IImageSet Snapshot(IOperationConfig config);

        public virtual ImageSet Snapshot(IOperationConfig config)
        public virtual void InitialImageSet(IImageSet set, ImageSaveOption saveOption)
        {
            OpMode = CameraOpMode.SingleSnapShot;

            ImageSet set = new ImageSet();
            CameraOprerationConfigBase opConfig = config as CameraOprerationConfigBase;
            set.ImageSaveOption.DataFrom(opConfig.ImageSaveOption);
            //CameraOprerationConfigBase opConfig = config as CameraOprerationConfigBase;
            set.ImageSaveOption.DataFrom(saveOption);

            set.IsOriginSaved = !set.ImageSaveOption.IsSaveOriginImage;
            set.IsFitSaved = !set.ImageSaveOption.IsSaveFitImage;
            set.IsAddtionalSaved = !string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
            set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;
            _imageSetList.Add(set);
            set.IsAddtionalSaved = string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
            //set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;

            return set;
            _imageSetList[set.Id] = set;
        }

        /// <summary>
@@ -172,19 +171,20 @@
        #endregion

        #region 基元处理
        public event Action<CameraBase, List<IShapeElement>, string> OnElementsUpdated;
        public Action<CameraBase, List<IShapeElement>, string> OnElementsUpdated;
        #endregion

        #region 图片缓存/保存
        readonly ConcurrentBag<ImageSet> _imageSetList = new ConcurrentBag<ImageSet>();
        //public readonly ConcurrentBag<IImageSet> _imageSetList = new ConcurrentBag<IImageSet>();
        protected Dictionary<string, IImageSet> _imageSetList = new Dictionary<string, IImageSet>();

        public void NewImageSet(ImageSet set)
        public void NewImageSet(IImageSet set)
        {
            set.IsOriginSaved = !set.ImageSaveOption.IsSaveOriginImage;
            set.IsFitSaved = !set.ImageSaveOption.IsSaveFitImage;
            set.IsAddtionalSaved = !string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
            set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;
            _imageSetList.Add(set);
            set.IsAddtionalSaved = string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
            //set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;
            _imageSetList[set.Id] = set;
        }

        //public virtual async void UpdateFitElements(List<IShapeElement> eleList, string imgSetId)
@@ -197,12 +197,12 @@

        public virtual async void SaveOriginImage(Bitmap map, Bitmap showImage, string imgSetId)
        {
            Task.Run(() =>
            await Task.Run(() =>
            {
                OnImageUpdated?.Invoke(this, showImage, imgSetId);
            });

            ImageSet set = _imageSetList.FirstOrDefault(u => u.Id == imgSetId);
            IImageSet set = _imageSetList[imgSetId];

            if (set == null)
                return;
@@ -225,10 +225,6 @@
                        {
                            LogAsync(DateTime.Now, $"{set.Id}原图保存失败", ex.GetExceptionMessage());
                        }
                        //finally
                        //{
                        //    set.IsOriginSaved = true;
                        //}
                    }
                    set.IsOriginSaved = true;
                    ClearImageSet(set);
@@ -241,7 +237,7 @@
            if (eleList.Count > 0)
                OnElementsUpdated?.BeginInvoke(this, eleList, imgSetId, null, null);

            ImageSet set = _imageSetList.FirstOrDefault(u => u.Id == imgSetId);
            IImageSet set = _imageSetList[imgSetId];
            if (set == null)
                return;

@@ -305,7 +301,7 @@
        {
            await Task.Run(() =>
            {
                ImageSet set = _imageSetList.FirstOrDefault(u => u.Id == imgSetId);
                IImageSet set = _imageSetList[imgSetId];
                if (set == null)
                    return;

@@ -341,7 +337,7 @@
            });
        }

        private string CheckImageDirectory(string subDir, string prefix)
        protected string CheckImageDirectory(string subDir, string prefix)
        {
            if (string.IsNullOrWhiteSpace(subDir))
            {
@@ -363,7 +359,7 @@
            return imgDir;
        }

        private void SaveImageByNameAndType(Bitmap map, string imageName, ImageFormat imgFormat, string imageDir)
        protected void SaveImageByNameAndType(Bitmap map, string imageName, ImageFormat imgFormat, string imageDir)
        {
            string filePath = Path.Combine(imageDir, $"{imageName}.{imgFormat.ToString().ToLower()}");
            map.Save(filePath, imgFormat);
@@ -371,7 +367,7 @@

        //private Timer clearImageSetTimer = null;

        public void ClearImageSet(ImageSet set)
        public virtual void ClearImageSet(IImageSet set)
        {
            try
            {
@@ -380,9 +376,10 @@
                //    && (!set.ImageSaveOption.IsSaveNGImage || set.IsNGSaved))
                if (set.IsOriginSaved && set.IsFitSaved && set.IsAddtionalSaved)
                {
                    _imageSetList.TryTake(out set);
                    set.Dispose();
                    //LogAsync(DateTime.Now, $"移除图片信息，当前缓存数量：{_imageSetList.Count}", "");

                    _imageSetList.Remove(set.Id);
                    LogAsync(DateTime.Now, $"移除图片信息，当前缓存数量：{_imageSetList.Count}", "");
                }
                //bool flag = false;

@@ -400,17 +397,17 @@
            }
        }

        public void ClearImageSet(string imgSetId)
        {
            ImageSet set = _imageSetList.First(u => u.Id == imgSetId);
            if (set != null)
                ClearImageSet(set);
        }
        //public void ClearImageSet(string imgSetId)
        //{
        //    IImageSet set = _imageSetList[imgSetId];
        //    if (set != null)
        //        ClearImageSet(set);
        //}

        private void ImageSet_OnImageSetTimeout(ImageSet set)
        {
            ClearImageSet(set);
        }
        //private void ImageSet_OnImageSetTimeout(ImageSet set)
        //{
        //    ClearImageSet(set);
        //}

        //private void ClearImageSetPeriodically()
        //{
@@ -544,10 +541,11 @@
            });
        }

        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(() =>
            {
                //Thread.Sleep(1000);
                int widthIn4 = (int)Math.Ceiling(width / 4.0) * 4;

                Bitmap bmp = new Bitmap(widthIn4, height, PixelFormat.Format48bppRgb);
@@ -575,15 +573,14 @@
                      {
                          int index = (i + 1) % width + widthIn4 * ((i + 1) / width) - 1;

                          showBitmapBuffer[index * 6] = data[i * 2];
                          showBitmapBuffer[index * 6 + 1] = data[i * 2 + 1];
                          showBitmapBuffer[index * 6] = bitmapBuffer[index * 6] = data[i * 2];
                          showBitmapBuffer[index * 6 + 1] = bitmapBuffer[index * 6 + 1] = data[i * 2 + 1];
                      });
                }
                

                bmp.UnlockBits(bitmapData);
                showImage.UnlockBits(showImageData);

                //showImage.Save(@"D:\1.bmp", ImageFormat.Bmp);
                SaveOriginImage(bmp, showImage, imgSetId);
            });
        }
@@ -788,7 +785,7 @@
        [Category("图片保存")]
        [Description("是否保存原始图片")]
        [DisplayName("保存原始图片")]
        public bool IsSaveOriginImage { get; set; } = true;
        public bool IsSaveOriginImage { get; set; } = false;

        [Category("图片保存")]
        [Description("图片保存格式")]
@@ -838,7 +835,29 @@
        }
    }

    public class ImageSet : IDisposable
    public interface IImageSet:IDisposable
    {
        DateTime InitialTime { get; set; }
        string Id { get; }
        HImage HImage { get; set; }
        Bitmap Image { get; set; }

        object SaveLock { get; set; }

        ImageSaveOption ImageSaveOption { get; set; }
        bool IsOriginSaved { get; set; }
        bool IsFitSaved { get; set; }
        bool IsAddtionalSaved { get; set; }

        //event Action<ImageSet> OnImageSetTimeout;

        /// <summary>
        /// 序列化操作的图像信息
        /// </summary>
        string ImageData { get; set; }
    }

    public class ImageSet : IImageSet
    {
        public DateTime InitialTime { get; set; } = DateTime.Now;

@@ -873,31 +892,32 @@
        //public bool IsInvokeSaveNG { get; set; } = false;
        public bool IsAddtionalSaved { get; set; } = false;

        public object SaveLock = new object();
        public object SaveLock { get; set; } = new object();

        public event Action<ImageSet> OnImageSetTimeout;
        private Timer autoDisposeTimer = null;
        public virtual string ImageData { get; set; }

        private void OnAutoDispose(object state)
        //public event Action<ImageSet> OnImageSetTimeout;
        //private Timer autoDisposeTimer = null;

        public void Dispose(object state)
        {
            OnImageSetTimeout?.Invoke(this);
            //OnImageSetTimeout?.Invoke(this);

            //autoDisposeTimer.Change(-1, -1);
            //autoDisposeTimer.Dispose();

            Image?.Dispose();
            Image = null;
        }

        public virtual void Dispose()
        {
            Dispose(null);
        }

        public ImageSet()
        {
            autoDisposeTimer = new Timer(OnAutoDispose, null, -1, 10 * 1000);
        }

        public void Dispose()
        {
            autoDisposeTimer.Change(-1, -1);
            autoDisposeTimer.Dispose();

            Image?.Dispose();
            Image = null;

            HImage?.Dispose();
            HImage = null;
            //autoDisposeTimer = new Timer(Dispose, null, 10 * 1000, -1);
        }
        #endregion
    }