merge

xcd

2020-07-06 0f71990dc60af6e96c9f4c2f2095ca6711e2c870

 src/Bro.M071.Process/M071Config.cs

@@ -64,8 +64,8 @@
        [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("单键图片保存配置")]
@@ -75,7 +75,25 @@

        [Category("图片保存配置")]
        [Description("单键图片保存目录路径")]
        [Editor(typeof(FoldDialogEditor),typeof(UITypeEditor))]
        [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;
    }
}