merge

xcd

2020-07-06 0f71990dc60af6e96c9f4c2f2095ca6711e2c870

 src/Bro.M071.Process/M071Config.cs

@@ -1,4 +1,5 @@
using Bro.Common.Helper;
using Bro.Common.Base;
using Bro.Common.Helper;
using Bro.Common.Model;
using Bro.Process;
using System;
@@ -22,10 +23,10 @@
        public List<string> KeyNameCollection { get; set; } = new List<string>();

        [Category("公共字典配置")]
        [Description("检测标准集合")]
        [Description("检测类型和标准集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<Spec>), typeof(UITypeEditor))]
        public List<Spec> MeasureSpecCollection { get; set; } = new List<Spec>();
        [Editor(typeof(ComplexCollectionEditor<MeasureType>), typeof(UITypeEditor))]
        public List<MeasureType> MeasureTypeCollection { get; set; } = new List<MeasureType>();

        [Category("公共字典配置")]
        [Description("单键算法配置集合")]
@@ -43,24 +44,56 @@
        [Category("背景图片设置")]
        [Description("运行背景图片路径")]
        [Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
        [DisplayName("背景图片")]
        public string BackgroundImagePath { get; set; }

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

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

        [Category("检测设置")]
        [Description("检测配置集合")]
        [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("单键图片保存配置")]
        [TypeConverter(typeof(ComplexObjectConvert))]
        [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
        public ImageSaveOption ImageSaveOption { get; set; } = new ImageSaveOption();

        [Category("图片保存配置")]
        [Description("单键图片保存目录路径")]
        [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
        public string ImageSaveFolder { get; set; } = "";

        [Category("屏蔽配置")]
        [Description("true：屏蔽安全门 false：启用安全门")]
        [ReadOnly(true)]
        public bool IsSafetyDoorBlocked { get; set; } = false;

        [Category("屏蔽配置")]
        [Description("true：屏蔽安全光线 false：启用安全光线")]
        [ReadOnly(true)]
        public bool IsSafetyBeamBlocked { get; set; } = false;

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

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