Added Extra Inks + Color Blending + MS Handling.

Removed Violet Impl.
Updated Inks LAB.

4 files changed, 342 insertions, 224 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
index 60de12338..864393461 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
@@ -99,6 +99,22 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> V11DivChanged;
 
+        public event EventHandler<Double> V12Changed;
+
+        public event EventHandler<Int32> V12DivChanged;
+
+        public event EventHandler<Double> V13Changed;
+
+        public event EventHandler<Int32> V13DivChanged;
+
+        public event EventHandler<Double> V14Changed;
+
+        public event EventHandler<Int32> V14DivChanged;
+
+        public event EventHandler<Double> V15Changed;
+
+        public event EventHandler<Int32> V15DivChanged;
+
         public event EventHandler<Boolean> CorrectedChanged;
 
         public event EventHandler<Boolean> IsTransparentChanged;
@@ -1141,6 +1157,222 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Double _v12;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v12.
+        /// </summary>
+
+        [Column("V12")]
+
+        public  Double V12
+        {
+            get 
+            {
+                return _v12; 
+            }
+
+            set 
+            {
+                if (_v12 != value)
+                {
+                    _v12 = value;
+
+                    OnV12Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _v12div;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v12 div.
+        /// </summary>
+
+        [Column("V12_DIV")]
+
+        public  Int32 V12Div
+        {
+            get 
+            {
+                return _v12div; 
+            }
+
+            set 
+            {
+                if (_v12div != value)
+                {
+                    _v12div = value;
+
+                    OnV12DivChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _v13;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v13.
+        /// </summary>
+
+        [Column("V13")]
+
+        public  Double V13
+        {
+            get 
+            {
+                return _v13; 
+            }
+
+            set 
+            {
+                if (_v13 != value)
+                {
+                    _v13 = value;
+
+                    OnV13Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _v13div;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v13 div.
+        /// </summary>
+
+        [Column("V13_DIV")]
+
+        public  Int32 V13Div
+        {
+            get 
+            {
+                return _v13div; 
+            }
+
+            set 
+            {
+                if (_v13div != value)
+                {
+                    _v13div = value;
+
+                    OnV13DivChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _v14;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v14.
+        /// </summary>
+
+        [Column("V14")]
+
+        public  Double V14
+        {
+            get 
+            {
+                return _v14; 
+            }
+
+            set 
+            {
+                if (_v14 != value)
+                {
+                    _v14 = value;
+
+                    OnV14Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _v14div;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v14 div.
+        /// </summary>
+
+        [Column("V14_DIV")]
+
+        public  Int32 V14Div
+        {
+            get 
+            {
+                return _v14div; 
+            }
+
+            set 
+            {
+                if (_v14div != value)
+                {
+                    _v14div = value;
+
+                    OnV14DivChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _v15;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v15.
+        /// </summary>
+
+        [Column("V15")]
+
+        public  Double V15
+        {
+            get 
+            {
+                return _v15; 
+            }
+
+            set 
+            {
+                if (_v15 != value)
+                {
+                    _v15 = value;
+
+                    OnV15Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _v15div;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v15 div.
+        /// </summary>
+
+        [Column("V15_DIV")]
+
+        public  Int32 V15Div
+        {
+            get 
+            {
+                return _v15div; 
+            }
+
+            set 
+            {
+                if (_v15div != value)
+                {
+                    _v15div = value;
+
+                    OnV15DivChanged(value);
+
+                }
+            }
+        }
+
         protected Boolean _corrected;
 
         /// <summary>
@@ -1781,6 +2013,78 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the V12 has changed.
+        /// </summary>
+        protected virtual void OnV12Changed(Double v12)
+        {
+            V12Changed?.Invoke(this, v12);
+            RaisePropertyChanged(nameof(V12));
+        }
+
+        /// <summary>
+        /// Called when the V12Div has changed.
+        /// </summary>
+        protected virtual void OnV12DivChanged(Int32 v12div)
+        {
+            V12DivChanged?.Invoke(this, v12div);
+            RaisePropertyChanged(nameof(V12Div));
+        }
+
+        /// <summary>
+        /// Called when the V13 has changed.
+        /// </summary>
+        protected virtual void OnV13Changed(Double v13)
+        {
+            V13Changed?.Invoke(this, v13);
+            RaisePropertyChanged(nameof(V13));
+        }
+
+        /// <summary>
+        /// Called when the V13Div has changed.
+        /// </summary>
+        protected virtual void OnV13DivChanged(Int32 v13div)
+        {
+            V13DivChanged?.Invoke(this, v13div);
+            RaisePropertyChanged(nameof(V13Div));
+        }
+
+        /// <summary>
+        /// Called when the V14 has changed.
+        /// </summary>
+        protected virtual void OnV14Changed(Double v14)
+        {
+            V14Changed?.Invoke(this, v14);
+            RaisePropertyChanged(nameof(V14));
+        }
+
+        /// <summary>
+        /// Called when the V14Div has changed.
+        /// </summary>
+        protected virtual void OnV14DivChanged(Int32 v14div)
+        {
+            V14DivChanged?.Invoke(this, v14div);
+            RaisePropertyChanged(nameof(V14Div));
+        }
+
+        /// <summary>
+        /// Called when the V15 has changed.
+        /// </summary>
+        protected virtual void OnV15Changed(Double v15)
+        {
+            V15Changed?.Invoke(this, v15);
+            RaisePropertyChanged(nameof(V15));
+        }
+
+        /// <summary>
+        /// Called when the V15Div has changed.
+        /// </summary>
+        protected virtual void OnV15DivChanged(Int32 v15div)
+        {
+            V15DivChanged?.Invoke(this, v15div);
+            RaisePropertyChanged(nameof(V15Div));
+        }
+
+        /// <summary>
         /// Called when the Corrected has changed.
         /// </summary>
         protected virtual void OnCorrectedChanged(Boolean corrected)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
index ea4d18f9b..bfdc8cfb7 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs
@@ -43,6 +43,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> AvailableForStandardUserChanged;
 
+        public event EventHandler<Boolean> IsExtraInkChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<IdsPack>> IdsPacksChanged;
@@ -267,6 +269,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Boolean _isextraink;
+
+        /// <summary>
+        /// Gets or sets the liquidtypebase is extra ink.
+        /// </summary>
+
+        [Column("IS_EXTRA_INK")]
+
+        public  Boolean IsExtraInk
+        {
+            get 
+            {
+                return _isextraink; 
+            }
+
+            set 
+            {
+                if (_isextraink != value)
+                {
+                    _isextraink = value;
+
+                    OnIsExtraInkChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
@@ -440,6 +469,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the IsExtraInk has changed.
+        /// </summary>
+        protected virtual void OnIsExtraInkChanged(Boolean isextraink)
+        {
+            IsExtraInkChanged?.Invoke(this, isextraink);
+            RaisePropertyChanged(nameof(IsExtraInk));
+        }
+
+        /// <summary>
         /// Called when the Cats has changed.
         /// </summary>
         protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index 9c672fd3b..fdeb8f05e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -342,39 +342,5 @@ namespace Tango.BL.Entities
         }
 
         #endregion
-
-        #region CMYKV
-
-        [NotMapped]
-        [JsonIgnore]
-        public CMYKVPredictionTypes PredictionType
-        {
-            get
-            {
-                return (CMYKVPredictionTypes)CmykvPredictionType;
-            }
-            set
-            {
-                CmykvPredictionType = value.ToInt32();
-                RaisePropertyChangedAuto();
-            }
-        }
-
-        [NotMapped]
-        [JsonIgnore]
-        public CMYKVPredictionMethods PredictionMethod
-        {
-            get
-            {
-                return (CMYKVPredictionMethods)CmykvPredictionMethod;
-            }
-            set
-            {
-                CmykvPredictionMethod = value.ToInt32();
-                RaisePropertyChangedAuto();
-            }
-        }
-
-        #endregion
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index ec34e0254..17b29d691 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -109,16 +109,6 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Double> BtsrTensionErrorChanged;
 
-        public event EventHandler<Int32> CmykvPredictionTypeChanged;
-
-        public event EventHandler<Int32> CmykvPredictionMethodChanged;
-
-        public event EventHandler<Double> CmykvHueThresholdChanged;
-
-        public event EventHandler<Int32> KNearestKChanged;
-
-        public event EventHandler<Double> SimpleRgbPreviewFactorChanged;
-
         public event EventHandler<BtsrApplicationType> BtsrApplicationTypeChanged;
 
         public event EventHandler<BtsrYarnType> BtsrYarnTypeChanged;
@@ -1550,141 +1540,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Int32 _cmykvpredictiontype;
-
-        /// <summary>
-        /// Gets or sets the rmlbase cmykv prediction type.
-        /// </summary>
-
-        [Column("CMYKV_PREDICTION_TYPE")]
-
-        public  Int32 CmykvPredictionType
-        {
-            get 
-            {
-                return _cmykvpredictiontype; 
-            }
-
-            set 
-            {
-                if (_cmykvpredictiontype != value)
-                {
-                    _cmykvpredictiontype = value;
-
-                    OnCmykvPredictionTypeChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _cmykvpredictionmethod;
-
-        /// <summary>
-        /// Gets or sets the rmlbase cmykv prediction method.
-        /// </summary>
-
-        [Column("CMYKV_PREDICTION_METHOD")]
-
-        public  Int32 CmykvPredictionMethod
-        {
-            get 
-            {
-                return _cmykvpredictionmethod; 
-            }
-
-            set 
-            {
-                if (_cmykvpredictionmethod != value)
-                {
-                    _cmykvpredictionmethod = value;
-
-                    OnCmykvPredictionMethodChanged(value);
-
-                }
-            }
-        }
-
-        protected Double _cmykvhuethreshold;
-
-        /// <summary>
-        /// Gets or sets the rmlbase cmykv hue threshold.
-        /// </summary>
-
-        [Column("CMYKV_HUE_THRESHOLD")]
-
-        public  Double CmykvHueThreshold
-        {
-            get 
-            {
-                return _cmykvhuethreshold; 
-            }
-
-            set 
-            {
-                if (_cmykvhuethreshold != value)
-                {
-                    _cmykvhuethreshold = value;
-
-                    OnCmykvHueThresholdChanged(value);
-
-                }
-            }
-        }
-
-        protected Int32 _knearestk;
-
-        /// <summary>
-        /// Gets or sets the rmlbase k nearest k.
-        /// </summary>
-
-        [Column("K_NEAREST_K")]
-
-        public  Int32 KNearestK
-        {
-            get 
-            {
-                return _knearestk; 
-            }
-
-            set 
-            {
-                if (_knearestk != value)
-                {
-                    _knearestk = value;
-
-                    OnKNearestKChanged(value);
-
-                }
-            }
-        }
-
-        protected Double _simplergbpreviewfactor;
-
-        /// <summary>
-        /// Gets or sets the rmlbase simple rgb preview factor.
-        /// </summary>
-
-        [Column("SIMPLE_RGB_PREVIEW_FACTOR")]
-
-        public  Double SimpleRgbPreviewFactor
-        {
-            get 
-            {
-                return _simplergbpreviewfactor; 
-            }
-
-            set 
-            {
-                if (_simplergbpreviewfactor != value)
-                {
-                    _simplergbpreviewfactor = value;
-
-                    OnSimpleRgbPreviewFactorChanged(value);
-
-                }
-            }
-        }
-
         protected BtsrApplicationType _btsrapplicationtype;
 
         /// <summary>
@@ -2607,51 +2462,6 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the CmykvPredictionType has changed.
-        /// </summary>
-        protected virtual void OnCmykvPredictionTypeChanged(Int32 cmykvpredictiontype)
-        {
-            CmykvPredictionTypeChanged?.Invoke(this, cmykvpredictiontype);
-            RaisePropertyChanged(nameof(CmykvPredictionType));
-        }
-
-        /// <summary>
-        /// Called when the CmykvPredictionMethod has changed.
-        /// </summary>
-        protected virtual void OnCmykvPredictionMethodChanged(Int32 cmykvpredictionmethod)
-        {
-            CmykvPredictionMethodChanged?.Invoke(this, cmykvpredictionmethod);
-            RaisePropertyChanged(nameof(CmykvPredictionMethod));
-        }
-
-        /// <summary>
-        /// Called when the CmykvHueThreshold has changed.
-        /// </summary>
-        protected virtual void OnCmykvHueThresholdChanged(Double cmykvhuethreshold)
-        {
-            CmykvHueThresholdChanged?.Invoke(this, cmykvhuethreshold);
-            RaisePropertyChanged(nameof(CmykvHueThreshold));
-        }
-
-        /// <summary>
-        /// Called when the KNearestK has changed.
-        /// </summary>
-        protected virtual void OnKNearestKChanged(Int32 knearestk)
-        {
-            KNearestKChanged?.Invoke(this, knearestk);
-            RaisePropertyChanged(nameof(KNearestK));
-        }
-
-        /// <summary>
-        /// Called when the SimpleRgbPreviewFactor has changed.
-        /// </summary>
-        protected virtual void OnSimpleRgbPreviewFactorChanged(Double simplergbpreviewfactor)
-        {
-            SimpleRgbPreviewFactorChanged?.Invoke(this, simplergbpreviewfactor);
-            RaisePropertyChanged(nameof(SimpleRgbPreviewFactor));
-        }
-
-        /// <summary>
         /// Called when the BtsrApplicationType has changed.
         /// </summary>
         protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype)