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

wells.liu

2020-09-07 1491846b4736bc2e79604086acfd8544aa3ba384

 src/Bro.M071.Process/M071Config.cs

@@ -41,31 +41,55 @@
        public List<KeyResult> KeyResultCollection { get; set; } = new List<KeyResult>();
        #endregion

        [Category("背景图片设置")]
        [Category("显示配置")]
        [Description("运行背景图片路径")]
        [Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
        [DisplayName("背景图片")]
        public string BackgroundImagePath { get; set; }

        [Category("显示配置")]
        [Description("键盘关键键位布局显示")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<KeyLocation>), typeof(UITypeEditor))]
        [DisplayName("键位显示")]
        public List<KeyLocation> KeyLocationCollection { get; set; } = new List<KeyLocation>();

        [Category("检测设置")]
        [Description("拍摄点位设置集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<SnapshotPoint>), typeof(UITypeEditor))]
        [DisplayName("拍摄点位")]
        [DisplayName("1.运动点位")]
        public List<SnapshotPoint> SnapshotPointCollection { get; set; } = new List<SnapshotPoint>();

        [Category("检测设置")]
        [Description("视觉检测单键配置集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<KeyUnit>), typeof(UITypeEditor))]
        [DisplayName("单键配置")]
        [DisplayName("2.单键配置")]
        public List<KeyUnit> KeyUnitCollection { get; set; } = new List<KeyUnit>();

        [Category("检测设置")]
        [Description("检测配置集合")]
        [DisplayName("3.检测项集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MeasurementUint>), typeof(UITypeEditor))]
        public List<MeasurementUint> MeasurementUnitCollection { get; set; } = new List<MeasurementUint>();
        [Editor(typeof(ComplexCollectionEditor<MeasurementUnit>), typeof(UITypeEditor))]
        public List<MeasurementUnit> MeasurementUnitCollection { get; set; } = new List<MeasurementUnit>();

        [Category("检测设置")]
        [Description("平面补偿值")]
        [DisplayName("4.平面补偿值")]
        public double PlanCompensation { get; set; }

        [Category("检测设置")]
        [Description("数据精度设置")]
        [DisplayName("5.数据精度位数")]
        public int Precision { get; set; } = 3;

        //[Category("检测设置")]
        //[DisplayName("结果数据保存路径")]
        //[Description("检测结果数据保存路径")]
        //[Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
        //public string ResultDataSaveFolder { get; set; } = "";

        [Category("图片保存配置")]
        [Description("单键图片保存配置")]
@@ -88,12 +112,27 @@
        [ReadOnly(true)]
        public bool IsSafetyBeamBlocked { get; set; } = false;

        private bool isBeepBlocked = false;
        [Category("屏蔽配置")]
        [Description("true：屏蔽蜂鸣器 false：启用蜂鸣器")]
        public bool IsBeepBlocked { get; set; } = false;
        public bool IsBeepBlocked
        {
            get => isBeepBlocked;
            set => Set(ref isBeepBlocked, value);
        }

        private bool isBarcodeManualInputBlocked = true;
        [Category("屏蔽配置")]
        [Description("true：禁止手动输入条码 false：允许手动输入条码")]
        public bool IsBarcodeManulInputBlocked { get; set; } = true;
        public bool IsBarcodeManualInputBlocked
        {
            get => isBarcodeManualInputBlocked;
            set => Set(ref isBarcodeManualInputBlocked, value);
        }

        [Category("MES设置")]
        [Description("true：数据上传至MES false：数据不上传")]
        [ReadOnly(true)]
        public bool IsEnableMESUpload { get; set; } = false;
    }
}