From 3cba54c4ee8d29d33ed21a2c749a9d2f2d03e22d Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期五, 03 七月 2020 18:33:30 +0800 Subject: [PATCH] 板卡IO定义修改。板卡预定义操作功能实现 --- src/Bro.M071.Process/M071Config.cs | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs index 1c1d42d..84af1e8 100644 --- a/src/Bro.M071.Process/M071Config.cs +++ b/src/Bro.M071.Process/M071Config.cs @@ -1,4 +1,5 @@ -锘縰sing Bro.Common.Helper; +锘縰sing 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,18 +44,21 @@ [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("妫�娴嬭缃�")] @@ -62,5 +66,16 @@ [TypeConverter(typeof(CollectionCountConvert))] [Editor(typeof(ComplexCollectionEditor<MeasurementUint>), typeof(UITypeEditor))] public List<MeasurementUint> MeasurementUnitCollection { get; set; } = new List<MeasurementUint>(); + + [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; } = ""; } } -- Gitblit v1.8.0