From 5241a8f6377dfd1618610dd15fd05ed6f51c8ba2 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 16 十二月 2020 11:19:45 +0800
Subject: [PATCH] 1. 添加默认流程和默认产品功能 2. 修改批量建立检测项功能
---
src/Bro.M071.Process/M071Models.cs | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index 2e9b2db..ed4c138 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -24,17 +24,31 @@
[TypeConverter(typeof(KeyNameDictConverter))]
public string Key { get; set; }
+ [Category("榛樿閰嶇疆")]
+ [Description("鏄惁榛樿灏哄閰嶇疆")]
+ public bool IsDefault { get; set; } = false;
+
+ //[Category("浣嶇疆閰嶇疆")]
+ //[Description("鍗曢敭鍦ㄩ敭鐩樺钩闈㈠浘涓婄殑浣嶇疆鏄剧ず")]
+ //public RectangleF KeyRect { get; set; } = new RectangleF(0, 0, 0, 0);
+
[Category("浣嶇疆閰嶇疆")]
- [Description("鍗曢敭鍦ㄩ敭鐩樺钩闈㈠浘涓婄殑浣嶇疆鏄剧ず")]
- public Rectangle KeyRect { get; set; } = new Rectangle();
+ [Description("鍗曢敭宸︿笂瑙掑潗鏍�")]
+ [TypeConverter(typeof(ComplexObjectConvert))]
+ [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
+ public CustomizedPoint KeyPosition { get; set; } = new CustomizedPoint();
+
+ [Category("浣嶇疆閰嶇疆")]
+ [Description("鍗曢敭灏哄")]
+ public SizeF KeySize { get; set; } = new SizeF();
[Category("浣嶇疆閰嶇疆")]
[Description("鍗曢敭涔嬪悗闂撮殭浣嶇疆")]
- public Rectangle IntervalRect { get; set; } = new Rectangle();
+ public SizeF IntervalSize { get; set; } = new SizeF();
public string GetDisplayText()
{
- return $"{Key}:{KeyRect.X},{KeyRect.Y},{KeyRect.Width},{KeyRect.Height}";
+ return $"{(IsDefault ? "Default" : Key)}:{KeyPosition.X},{KeyPosition.Y},{KeySize.Width},{KeySize.Height}";
}
}
@@ -70,6 +84,11 @@
[Description("妫�娴嬬畻娉曡矾寰�")]
[Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
public string AlgorithemPath { get; set; }
+
+ [Category("鏄剧ず閰嶇疆")]
+ [Description("鏄剧ず鍖哄煙澶у皬")]
+ [DisplayName("鏍囩澶у皬")]
+ public Size DisplayRect { get; set; }
}
public class KeyResult : IComplexDisplay
@@ -349,6 +368,11 @@
mUnit.Id = this.Id;
mUnit.Name = this.Name;
+ if (string.IsNullOrWhiteSpace(mUnit.Name))
+ {
+ mUnit.Name = string.Join("-", KeyUnitCollection.Select(u => u.GetDisplayText()));
+ }
+
mUnit.IsEnabled = this.IsEnabled;
mUnit.MeasureType = this.MeasureType;
--
Gitblit v1.8.0