From b3aa95bab5796caaf28a06922abf111ae55e37df Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期六, 20 二月 2021 10:58:39 +0800
Subject: [PATCH] xlsx文件异常处理

---
 src/Bro.M071.Process/M071Models.cs |  124 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 118 insertions(+), 6 deletions(-)

diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index beb5008..790745a 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -17,6 +17,41 @@
 
 namespace Bro.M071.Process
 {
+    public class KeyLocation : IComplexDisplay
+    {
+        [Category("閿悕閰嶇疆")]
+        [Description("鍗曢敭閿悕")]
+        [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("鍗曢敭宸︿笂瑙掑潗鏍�")]
+        [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 SizeF IntervalSize { get; set; } = new SizeF();
+
+        public string GetDisplayText()
+        {
+            return $"{(IsDefault ? "Default" : Key)}:{KeyPosition.X},{KeyPosition.Y},{KeySize.Width},{KeySize.Height}";
+        }
+    }
+
     public class KeyAlgorithem : IComplexDisplay
     {
         [Browsable(false)]
@@ -48,6 +83,15 @@
         [Description("妫�娴嬬畻娉曡矾寰�")]
         [Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
         public string AlgorithemPath { get; set; }
+
+        [Category("涓婁紶NG浠ｇ爜")]
+        [Description("涓婁紶NG浠ｇ爜")]
+        public string NGCode { get; set; }
+
+        [Category("鏄剧ず閰嶇疆")]
+        [Description("鏄剧ず鍖哄煙澶у皬")]
+        [DisplayName("鏍囩澶у皬")]
+        public Size DisplayRect { get; set; }
     }
 
     public class KeyResult : IComplexDisplay
@@ -235,8 +279,8 @@
         {
             Measurements?.ForEach(m => m?.Dispose());
             Measurements = null;
-
-            Barcode = null;
+            ElementList = null;
+            //Barcode = null;
             GC.Collect();
         }
 
@@ -282,7 +326,7 @@
 
         #region 鏄剧ず
         [Browsable(false)]
-        public Rectangle DisplayLocation { get; set; } = new Rectangle();
+        public Rectangle DisplayLocation { get; set; } = new Rectangle(10, 10, 100, 100);
         #endregion
 
         #region 妫�娴嬬粨鏋�
@@ -319,6 +363,44 @@
         private void K_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("KeyUnitCollection"));
+        }
+
+        public MeasurementUnit Copy()
+        {
+            MeasurementUnit mUnit = new MeasurementUnit();
+
+            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;
+
+            mUnit.DisplayLocation = new Rectangle(this.DisplayLocation.Location, this.DisplayLocation.Size);
+
+            if (this.Spec == null)
+            {
+                mUnit.Spec = null;
+            }
+            else
+            {
+                mUnit.Spec = new MeasureType();
+                mUnit.Spec.Code = this.Spec.Code;
+                mUnit.Spec.AlgorithemPath = this.Spec.AlgorithemPath;
+                mUnit.Spec.StandardValue = this.Spec.StandardValue;
+                mUnit.Spec.Tolrenance_Positive = this.Spec.Tolrenance_Positive;
+                mUnit.Spec.Tolrenance_Negative = this.Spec.Tolrenance_Negative;
+            }
+
+            this.KeyUnitCollection.ForEach(k =>
+            {
+                mUnit.KeyUnitCollection.Add(k.Copy());
+            });
+
+            return mUnit;
         }
     }
 
@@ -369,10 +451,9 @@
 
         public void Dispose()
         {
-            SpinWait wait = new SpinWait();
             while (ImageSaveStatus != 0)
             {
-                wait.SpinOnce();
+                Thread.Sleep(10);
             }
 
             KeyImages?.ForEach(i =>
@@ -391,7 +472,7 @@
             {
                 if (valuePairs == null || valuePairs.Count == 0)
                 {
-                    IsDone = false; 
+                    IsDone = false;
                     PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("IsDone"));
                     return;
                 }
@@ -415,6 +496,37 @@
                 }
             }
         }
+
+        public KeyUnitBind Copy()
+        {
+            KeyUnitBind clone = new KeyUnitBind();
+            clone.Key = this.Key;
+            clone.KeyResultId = this.KeyResultId;
+
+            this.MeasureValueDict.Keys.ToList().ForEach(k =>
+            {
+                clone.MeasureValueDict[k] = null;
+            });
+
+            return clone;
+        }
+    }
+
+    public class KeyCodeMap : IComplexDisplay
+    {
+        [Category("閿悕鏄犲皠閰嶇疆")]
+        [Description("閿悕")]
+        [TypeConverter(typeof(KeyNameDictConverter))]
+        public string Key { get; set; }
+
+        [Category("閿悕鏄犲皠閰嶇疆")]
+        [Description("涓婁紶瀵瑰簲閿唬鐮丆ode")]
+        public string KeyCode { get; set; }
+
+        public string GetDisplayText()
+        {
+            return $"{Key}--{KeyCode}";
+        }
     }
 
     //public class NoticedDictionary<T1, T2> : Dictionary<T1, T2>, INotifyPropertyChanged

--
Gitblit v1.8.0