Extra Inks Catalogs.

3 files changed, 300 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
index 4b2609281..519af0f96 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs
@@ -141,5 +141,53 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// blue extra
+        /// </summary>
+        public Double BlueExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// navy extra
+        /// </summary>
+        public Double NavyExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// orange extra
+        /// </summary>
+        public Double OrangeExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// red extra
+        /// </summary>
+        public Double RedExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// rubine extra
+        /// </summary>
+        public Double RubineExtra 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// violet extra
+        /// </summary>
+        public Double VioletExtra 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index f41cfec9c..b26576647 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -684,17 +684,37 @@ namespace Tango.BL.Entities
                             {
                                 if (LiquidVolumes != null)
                                 {
-                                    var cyan = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Cyan);
+                                    var noneLightLiquidVolumes = LiquidVolumes.Where(x => !x.IdsPack.LiquidType.IsLightInk && x.IdsPack.LiquidType.HasPigment).ToList();
+
+                                    var cyan = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("cyan"));
                                     if (cyan != null) cyan.Volume = ColorCatalogsItem.Cyan;
 
-                                    var magenta = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Magenta);
+                                    var magenta = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("magenta"));
                                     if (magenta != null) magenta.Volume = ColorCatalogsItem.Magenta;
 
-                                    var yellow = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Yellow);
+                                    var yellow = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("yellow"));
                                     if (yellow != null) yellow.Volume = ColorCatalogsItem.Yellow;
 
-                                    var black = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Black);
+                                    var black = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("black"));
                                     if (black != null) black.Volume = ColorCatalogsItem.Black;
+
+                                    var blue = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("blue"));
+                                    if (blue != null) blue.Volume = ColorCatalogsItem.BlueExtra;
+
+                                    var navy = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("navy"));
+                                    if (navy != null) navy.Volume = ColorCatalogsItem.NavyExtra;
+
+                                    var orange = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("orange"));
+                                    if (orange != null) orange.Volume = ColorCatalogsItem.OrangeExtra;
+
+                                    var red = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("red"));
+                                    if (red != null) red.Volume = ColorCatalogsItem.RedExtra;
+
+                                    var rubine = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("rubine"));
+                                    if (rubine != null) red.Volume = ColorCatalogsItem.RubineExtra;
+
+                                    var violet = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("violet"));
+                                    if (violet != null) violet.Volume = ColorCatalogsItem.VioletExtra;
                                 }
                             }
                             catch (Exception ex)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
index 30d77a051..b866dc6fe 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs
@@ -55,6 +55,18 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> ProcessParametersTableIndexChanged;
 
+        public event EventHandler<Double> BlueExtraChanged;
+
+        public event EventHandler<Double> NavyExtraChanged;
+
+        public event EventHandler<Double> OrangeExtraChanged;
+
+        public event EventHandler<Double> RedExtraChanged;
+
+        public event EventHandler<Double> RubineExtraChanged;
+
+        public event EventHandler<Double> VioletExtraChanged;
+
         public event EventHandler<SynchronizedObservableCollection<BrushStop>> BrushStopsChanged;
 
         public event EventHandler<ColorCatalogsGroup> ColorCatalogsGroupChanged;
@@ -465,6 +477,168 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Double _blueextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase blue extra.
+        /// </summary>
+
+        [Column("BLUE_EXTRA")]
+
+        public  Double BlueExtra
+        {
+            get 
+            {
+                return _blueextra; 
+            }
+
+            set 
+            {
+                if (_blueextra != value)
+                {
+                    _blueextra = value;
+
+                    OnBlueExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _navyextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase navy extra.
+        /// </summary>
+
+        [Column("NAVY_EXTRA")]
+
+        public  Double NavyExtra
+        {
+            get 
+            {
+                return _navyextra; 
+            }
+
+            set 
+            {
+                if (_navyextra != value)
+                {
+                    _navyextra = value;
+
+                    OnNavyExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _orangeextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase orange extra.
+        /// </summary>
+
+        [Column("ORANGE_EXTRA")]
+
+        public  Double OrangeExtra
+        {
+            get 
+            {
+                return _orangeextra; 
+            }
+
+            set 
+            {
+                if (_orangeextra != value)
+                {
+                    _orangeextra = value;
+
+                    OnOrangeExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _redextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase red extra.
+        /// </summary>
+
+        [Column("RED_EXTRA")]
+
+        public  Double RedExtra
+        {
+            get 
+            {
+                return _redextra; 
+            }
+
+            set 
+            {
+                if (_redextra != value)
+                {
+                    _redextra = value;
+
+                    OnRedExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _rubineextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase rubine extra.
+        /// </summary>
+
+        [Column("RUBINE_EXTRA")]
+
+        public  Double RubineExtra
+        {
+            get 
+            {
+                return _rubineextra; 
+            }
+
+            set 
+            {
+                if (_rubineextra != value)
+                {
+                    _rubineextra = value;
+
+                    OnRubineExtraChanged(value);
+
+                }
+            }
+        }
+
+        protected Double _violetextra;
+
+        /// <summary>
+        /// Gets or sets the colorcatalogsitembase violet extra.
+        /// </summary>
+
+        [Column("VIOLET_EXTRA")]
+
+        public  Double VioletExtra
+        {
+            get 
+            {
+                return _violetextra; 
+            }
+
+            set 
+            {
+                if (_violetextra != value)
+                {
+                    _violetextra = value;
+
+                    OnVioletExtraChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<BrushStop> _brushstops;
 
         /// <summary>
@@ -674,6 +848,60 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the BlueExtra has changed.
+        /// </summary>
+        protected virtual void OnBlueExtraChanged(Double blueextra)
+        {
+            BlueExtraChanged?.Invoke(this, blueextra);
+            RaisePropertyChanged(nameof(BlueExtra));
+        }
+
+        /// <summary>
+        /// Called when the NavyExtra has changed.
+        /// </summary>
+        protected virtual void OnNavyExtraChanged(Double navyextra)
+        {
+            NavyExtraChanged?.Invoke(this, navyextra);
+            RaisePropertyChanged(nameof(NavyExtra));
+        }
+
+        /// <summary>
+        /// Called when the OrangeExtra has changed.
+        /// </summary>
+        protected virtual void OnOrangeExtraChanged(Double orangeextra)
+        {
+            OrangeExtraChanged?.Invoke(this, orangeextra);
+            RaisePropertyChanged(nameof(OrangeExtra));
+        }
+
+        /// <summary>
+        /// Called when the RedExtra has changed.
+        /// </summary>
+        protected virtual void OnRedExtraChanged(Double redextra)
+        {
+            RedExtraChanged?.Invoke(this, redextra);
+            RaisePropertyChanged(nameof(RedExtra));
+        }
+
+        /// <summary>
+        /// Called when the RubineExtra has changed.
+        /// </summary>
+        protected virtual void OnRubineExtraChanged(Double rubineextra)
+        {
+            RubineExtraChanged?.Invoke(this, rubineextra);
+            RaisePropertyChanged(nameof(RubineExtra));
+        }
+
+        /// <summary>
+        /// Called when the VioletExtra has changed.
+        /// </summary>
+        protected virtual void OnVioletExtraChanged(Double violetextra)
+        {
+            VioletExtraChanged?.Invoke(this, violetextra);
+            RaisePropertyChanged(nameof(VioletExtra));
+        }
+
+        /// <summary>
         /// Called when the BrushStops has changed.
         /// </summary>
         protected virtual void OnBrushStopsChanged(SynchronizedObservableCollection<BrushStop> brushstops)