1. gocator添加byte2/byte4的配置，目前测试byte4不成功，暂时还是使用byte2配置。 2. 添加键名代码映射配置和NG键名代码...

patrick.xu

2020-12-21 1bc2df66bc88a6405df345dccc24a5031e18b592

 src/Bro.M071.Process/M071Models.cs

@@ -17,6 +17,41 @@

namespace Bro.M071.Process
{
    public class KeyLocation : IComplexDisplay
    {
        [Category("键名配置")]
        [Description("单键键名")]
        [TypeConverter(typeof(KeyNameDictConverter))]
        public string Key { get; set; }

        [Category("默认配置")]
        [Description("是否默认尺寸配置")]
        public bool IsDefault { get; set; } = false;

        //[Category("位置配置")]
        //[Description("单键在键盘平面图上的位置显示")]
        //public RectangleF KeyRect { get; set; } = new RectangleF(0, 0, 0, 0);

        [Category("位置配置")]
        [Description("单键左上角坐标")]
        [TypeConverter(typeof(ComplexObjectConvert))]
        [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
        public CustomizedPoint KeyPosition { get; set; } = new CustomizedPoint();

        [Category("位置配置")]
        [Description("单键尺寸")]
        public SizeF KeySize { get; set; } = new SizeF();

        [Category("位置配置")]
        [Description("单键之后间隙位置")]
        public SizeF IntervalSize { get; set; } = new SizeF();

        public string GetDisplayText()
        {
            return $"{(IsDefault ? "Default" : Key)}:{KeyPosition.X},{KeyPosition.Y},{KeySize.Width},{KeySize.Height}";
        }
    }

    public class KeyAlgorithem : IComplexDisplay
    {
        [Browsable(false)]
@@ -48,6 +83,15 @@
        [Description("检测算法路径")]
        [Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
        public string AlgorithemPath { get; set; }

        [Category("上传NG代码")]
        [Description("上传NG代码")]
        public string NGCode { get; set; }

        [Category("显示配置")]
        [Description("显示区域大小")]
        [DisplayName("标签大小")]
        public Size DisplayRect { get; set; }
    }

    public class KeyResult : IComplexDisplay
@@ -235,7 +279,7 @@
        {
            Measurements?.ForEach(m => m?.Dispose());
            Measurements = null;

            ElementList = null;
            Barcode = null;
            GC.Collect();
        }
@@ -282,7 +326,7 @@

        #region 显示
        [Browsable(false)]
        public Rectangle DisplayLocation { get; set; } = new Rectangle();
        public Rectangle DisplayLocation { get; set; } = new Rectangle(10, 10, 100, 100);
        #endregion

        #region 检测结果
@@ -319,6 +363,44 @@
        private void K_PropertyChanged(object sender, PropertyChangedEventArgs e)
        {
            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("KeyUnitCollection"));
        }

        public MeasurementUnit Copy()
        {
            MeasurementUnit mUnit = new MeasurementUnit();

            mUnit.Id = this.Id;
            mUnit.Name = this.Name;
            if (string.IsNullOrWhiteSpace(mUnit.Name))
            {
                mUnit.Name = string.Join("-", KeyUnitCollection.Select(u => u.GetDisplayText()));
            }

            mUnit.IsEnabled = this.IsEnabled;
            mUnit.MeasureType = this.MeasureType;

            mUnit.DisplayLocation = new Rectangle(this.DisplayLocation.Location, this.DisplayLocation.Size);

            if (this.Spec == null)
            {
                mUnit.Spec = null;
            }
            else
            {
                mUnit.Spec = new MeasureType();
                mUnit.Spec.Code = this.Spec.Code;
                mUnit.Spec.AlgorithemPath = this.Spec.AlgorithemPath;
                mUnit.Spec.StandardValue = this.Spec.StandardValue;
                mUnit.Spec.Tolrenance_Positive = this.Spec.Tolrenance_Positive;
                mUnit.Spec.Tolrenance_Negative = this.Spec.Tolrenance_Negative;
            }

            this.KeyUnitCollection.ForEach(k =>
            {
                mUnit.KeyUnitCollection.Add(k.Copy());
            });

            return mUnit;
        }
    }

@@ -369,10 +451,9 @@

        public void Dispose()
        {
            SpinWait wait = new SpinWait();
            while (ImageSaveStatus != 0)
            {
                wait.SpinOnce();
                Thread.Sleep(10);
            }

            KeyImages?.ForEach(i =>
@@ -392,6 +473,8 @@
                if (valuePairs == null || valuePairs.Count == 0)
                {
                    IsDone = false;
                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("IsDone"));
                    return;
                }

                foreach (KeyValuePair<string, double> pair in valuePairs)
@@ -413,6 +496,37 @@
                }
            }
        }

        public KeyUnitBind Copy()
        {
            KeyUnitBind clone = new KeyUnitBind();
            clone.Key = this.Key;
            clone.KeyResultId = this.KeyResultId;

            this.MeasureValueDict.Keys.ToList().ForEach(k =>
            {
                clone.MeasureValueDict[k] = null;
            });

            return clone;
        }
    }

    public class KeyCodeMap : IComplexDisplay
    {
        [Category("键名映射配置")]
        [Description("键名")]
        [TypeConverter(typeof(KeyNameDictConverter))]
        public string Key { get; set; }

        [Category("键名映射配置")]
        [Description("上传对应键代码Code")]
        public string KeyCode { get; set; }

        public string GetDisplayText()
        {
            return $"{Key}--{KeyCode}";
        }
    }

    //public class NoticedDictionary<T1, T2> : Dictionary<T1, T2>, INotifyPropertyChanged