PPC. Saving job model to json string to compare changes.

Related Work Items: #6280

1 files changed, 53 insertions, 39 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
index e2acb9e7a..e7a282382 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
@@ -14,6 +14,7 @@ using System.Reflection;
 using Tango.BL.Dispensing;
 using Tango.BL;
 using Tango.Core.ExtensionMethods;
+using Newtonsoft.Json;
 
 namespace Tango.PPC.Jobs.Models
 {
@@ -39,6 +40,7 @@ namespace Tango.PPC.Jobs.Models
 
         public String Guid { get; set; }
 
+        [JsonIgnore]
         public bool PreventPropertyUpdate { get; set; }
 
         protected Double _cyan;
@@ -473,6 +475,7 @@ namespace Tango.PPC.Jobs.Models
         }
 
         protected ColorCatalogsItem _colorcatalogsitem;
+        [JsonIgnore]
         public virtual ColorCatalogsItem ColorCatalogsItem
         {
             get
@@ -493,6 +496,13 @@ namespace Tango.PPC.Jobs.Models
             }
         }
 
+        public string ColorCatalogsItemGuid
+        {
+            get
+            {
+                return ColorCatalogsItem == null? "" : ColorCatalogsItem.Guid;
+            }
+        }
 
         /// <summary>
         /// Gets or sets the color catalog.
@@ -500,6 +510,7 @@ namespace Tango.PPC.Jobs.Models
         /// <value>
         /// The color catalog.
         /// </value>
+        [JsonIgnore]
         public virtual ColorCatalog ColorCatalog
         {
             get
@@ -512,6 +523,7 @@ namespace Tango.PPC.Jobs.Models
         }
 
         private System.Windows.Media.Color _color;
+        [JsonIgnore]
         public System.Windows.Media.Color Color
         {
             get
@@ -530,7 +542,7 @@ namespace Tango.PPC.Jobs.Models
         }
 
         private System.Windows.Media.Color _bestMatchColor;
-
+        [JsonIgnore]
         public System.Windows.Media.Color BestMatchColor
         {
             get { return _bestMatchColor; }
@@ -545,6 +557,7 @@ namespace Tango.PPC.Jobs.Models
             }
         }
 
+        [JsonIgnore]
         public System.Windows.Media.Color ShownBestMatchColor
         {
             get
@@ -554,8 +567,8 @@ namespace Tango.PPC.Jobs.Models
                 return System.Windows.Media.Colors.Transparent;
             }
         }
-
-
+        
+        [JsonIgnore]
         public SolidColorBrush ColorBrush
         {
             get
@@ -569,18 +582,18 @@ namespace Tango.PPC.Jobs.Models
         }
 
         private SegmentModel _segmentmodel;
-
+        [JsonIgnore]
         public SegmentModel SegmentModel
         {
             get { return _segmentmodel; }
             set { _segmentmodel = value; }
         }
-
-
+        
         private bool _outOfGamutChecked;
         /// <summary>
         /// Gets or sets a value indicating whether out of gamut has been checked.
         /// </summary>
+        [JsonIgnore]
         public bool OutOfGamutChecked
         {
             get { return _outOfGamutChecked; }
@@ -604,8 +617,41 @@ namespace Tango.PPC.Jobs.Models
             }
         }
 
+        [JsonIgnore]
         protected bool RequiredMaxLiquidTest { get; set; }
 
+        [JsonIgnore]
+        public bool IsLiquidVolumesOutOfRange
+        {
+            get
+            {
+                if (RequiredMaxLiquidTest)
+                {
+                    var sum = GetColorNLPerCm(Cyan, LiquidTypes.Cyan) + GetColorNLPerCm(Magenta, LiquidTypes.Magenta) + GetColorNLPerCm(Yellow, LiquidTypes.Yellow) + GetColorNLPerCm(Black, LiquidTypes.Black);
+                    var maxLiq = GetTotalMaximumLiquidNlPerCMLimit();
+                    LiquidVolumesOutOfRange = sum > GetTotalMaximumLiquidNlPerCMLimit();
+
+                    return LiquidVolumesOutOfRange;
+                }
+                else return false;
+            }
+        }
+
+        private bool _liquidVolumesOutOfRange;
+        [JsonIgnore]
+        public bool LiquidVolumesOutOfRange
+        {
+            get { return _liquidVolumesOutOfRange; }
+            set
+            {
+                if (_liquidVolumesOutOfRange != value)
+                {
+                    _liquidVolumesOutOfRange = value;
+                    LiquidVolumesOutOfRangeChanged?.Invoke(this, new EventArgs());
+                }
+            }
+        }
+
         #endregion
 
         #region constructors
@@ -1269,39 +1315,7 @@ namespace Tango.PPC.Jobs.Models
             }
             return 0.0;
         }
-
-
-        public bool IsLiquidVolumesOutOfRange
-        {
-            get
-            {
-                if (RequiredMaxLiquidTest)
-                {
-                    var sum = GetColorNLPerCm(Cyan, LiquidTypes.Cyan) + GetColorNLPerCm(Magenta, LiquidTypes.Magenta) + GetColorNLPerCm(Yellow, LiquidTypes.Yellow) + GetColorNLPerCm(Black, LiquidTypes.Black);
-                    var maxLiq = GetTotalMaximumLiquidNlPerCMLimit();
-                    LiquidVolumesOutOfRange = sum > GetTotalMaximumLiquidNlPerCMLimit();
-
-                    return LiquidVolumesOutOfRange;
-                }
-                else return false;
-            }
-        }
-
-        private bool _liquidVolumesOutOfRange;
-
-        public bool LiquidVolumesOutOfRange
-        {
-            get { return _liquidVolumesOutOfRange; }
-            set
-            {
-                if (_liquidVolumesOutOfRange != value)
-                {
-                    _liquidVolumesOutOfRange = value;
-                    LiquidVolumesOutOfRangeChanged?.Invoke(this, new EventArgs());
-                }
-            }
-        }
-
+        
         public void OnBrushStopFieldValueChanged()
         {
             IsBusy = true;