Major advancement on Violet predictions.

3 files changed, 187 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs
index 7730131d8..de8dfdb08 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs
@@ -294,6 +294,38 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// v10
+        /// </summary>
+        public Double V10 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// v10 div
+        /// </summary>
+        public Int32 V10Div 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// v11
+        /// </summary>
+        public Double V11 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// v11 div
+        /// </summary>
+        public Int32 V11Div 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// corrected
         /// </summary>
         public Boolean Corrected 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index 5f2996014..41ebbee7c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -588,9 +588,9 @@ namespace Tango.BL.Entities
         /// Sets all dispensing step divisions.
         /// </summary>
         /// <param name="division">The division.</param>
-        public void SetAllDispensingStepDivisions(Dispensing.DispenserStepDivisions division)
+        public void SetAllDispensingStepDivisions(Dispensing.DispenserStepDivisions division, Configuration configuration)
         {
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < configuration.IdsPacks.Count; i++)
             {
                 typeof(BrushStop).GetProperty("V" + i + "Div").SetValue(this, (int)division);
             }
@@ -835,7 +835,7 @@ namespace Tango.BL.Entities
             cloned.BestMatchR = this.BestMatchR;
             cloned.BestMatchG = this.BestMatchG;
             cloned.BestMatchB = this.BestMatchB;
-            
+
 
             cloned.ColorCatalogGuid = this.ColorCatalogGuid;
             cloned.ColorCatalogsItem = this.ColorCatalogsItem;
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
index 23cb993be..60de12338 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
@@ -91,6 +91,14 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> V9DivChanged;
 
+        public event EventHandler<Double> V10Changed;
+
+        public event EventHandler<Int32> V10DivChanged;
+
+        public event EventHandler<Double> V11Changed;
+
+        public event EventHandler<Int32> V11DivChanged;
+
         public event EventHandler<Boolean> CorrectedChanged;
 
         public event EventHandler<Boolean> IsTransparentChanged;
@@ -1025,6 +1033,114 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Double _v10;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v10.
+        /// </summary>
+
+        [Column("V10")]
+
+        public  Double V10
+        {
+            get 
+            {
+                return _v10; 
+            }
+
+            set 
+            {
+                if (_v10 != value)
+                {
+                    _v10 = value;
+
+                    OnV10Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _v10div;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v10 div.
+        /// </summary>
+
+        [Column("V10_DIV")]
+
+        public  Int32 V10Div
+        {
+            get 
+            {
+                return _v10div; 
+            }
+
+            set 
+            {
+                if (_v10div != value)
+                {
+                    _v10div = value;
+
+                    OnV10DivChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _v11;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v11.
+        /// </summary>
+
+        [Column("V11")]
+
+        public  Double V11
+        {
+            get 
+            {
+                return _v11; 
+            }
+
+            set 
+            {
+                if (_v11 != value)
+                {
+                    _v11 = value;
+
+                    OnV11Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _v11div;
+
+        /// <summary>
+        /// Gets or sets the brushstopbase v11 div.
+        /// </summary>
+
+        [Column("V11_DIV")]
+
+        public  Int32 V11Div
+        {
+            get 
+            {
+                return _v11div; 
+            }
+
+            set 
+            {
+                if (_v11div != value)
+                {
+                    _v11div = value;
+
+                    OnV11DivChanged(value);
+
+                }
+            }
+        }
+
         protected Boolean _corrected;
 
         /// <summary>
@@ -1629,6 +1745,42 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the V10 has changed.
+        /// </summary>
+        protected virtual void OnV10Changed(Double v10)
+        {
+            V10Changed?.Invoke(this, v10);
+            RaisePropertyChanged(nameof(V10));
+        }
+
+        /// <summary>
+        /// Called when the V10Div has changed.
+        /// </summary>
+        protected virtual void OnV10DivChanged(Int32 v10div)
+        {
+            V10DivChanged?.Invoke(this, v10div);
+            RaisePropertyChanged(nameof(V10Div));
+        }
+
+        /// <summary>
+        /// Called when the V11 has changed.
+        /// </summary>
+        protected virtual void OnV11Changed(Double v11)
+        {
+            V11Changed?.Invoke(this, v11);
+            RaisePropertyChanged(nameof(V11));
+        }
+
+        /// <summary>
+        /// Called when the V11Div has changed.
+        /// </summary>
+        protected virtual void OnV11DivChanged(Int32 v11div)
+        {
+            V11DivChanged?.Invoke(this, v11div);
+            RaisePropertyChanged(nameof(V11Div));
+        }
+
+        /// <summary>
         /// Called when the Corrected has changed.
         /// </summary>
         protected virtual void OnCorrectedChanged(Boolean corrected)