Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-09 da0da2d1238555c4ff488dbaaae1371ba4cf6827

 src/Bro.M071.Process/M071Models.cs

@@ -137,13 +137,13 @@
            get => key;
            set
            {
                AlignName = key = value;
                AliasName = key = value;
            }
        }

        [Category("键名配置")]
        [Description("别名")]
        public string AlignName { get; set; }
        public string AliasName { get; set; }

        [Category("启用设置")]
        [Description("true：启用 false：禁用")]
@@ -178,7 +178,7 @@

        public string GetDisplayText()
        {
            return $"{AlignName}";
            return $"{AliasName}";
        }

        public List<string> GetHalconToolPathList()
@@ -204,10 +204,15 @@
    public class ProductionMeasurement : INotifyPropertyChanged, IDisposable
    {
        public string Barcode;
        public string PResult;

        public List<MeasurementUint> Measurements = new List<MeasurementUint>();
        public List<MeasurementUnit> Measurements = new List<MeasurementUnit>();

        public List<IShapeElement> ElementList = new List<IShapeElement>();

        public DateTime? StartTime = null;

        public DateTime? EndTime = null;

        public event PropertyChangedEventHandler PropertyChanged;

@@ -235,7 +240,7 @@
        }
    }

    public class MeasurementUint : IComplexDisplay, INotifyPropertyChanged, IDisposable
    public class MeasurementUnit : IComplexDisplay, INotifyPropertyChanged, IDisposable
    {
        public string Id = Guid.NewGuid().ToString();