Color Selection Dialog . Save color space on select tab., White color saving.

Related Work Items: #6277

6 files changed, 57 insertions, 17 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/MarginOffsetSliderConverter .cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/MarginOffsetSliderConverter .cs
index e0893b41d..2de366d3b 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/MarginOffsetSliderConverter .cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Converters/MarginOffsetSliderConverter .cs
@@ -39,9 +39,7 @@ namespace Tango.PPC.Jobs.Converters
             if (sliderMaximum == sliderMinimum)
                 sliderMaximum = sliderMinimum + 1;
 
-            var test = System.Convert.ToDouble(values[3]);
-            Debug.WriteLine($" @@@@@@@   LENGTH:{test} ");
-
+            
             var slider_width = System.Convert.ToDouble(values[3]);
             if (slider_width > 60)
                 slider_width -= 60;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs
index 56e80191c..444fec726 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs
@@ -512,6 +512,7 @@ namespace Tango.PPC.Jobs.Dialogs
             SelectedBrushStop.LiquidVolumesOutOfRangeChanged += OnLiquidVolumesOutOfRangeChanged;
             SelectedBrushStop.ColorChanged -= OnBrushColorChanged;
             SelectedBrushStop.ColorChanged += OnBrushColorChanged;
+            CheckIsSelectedColorInLibrary();
         }
 
         
@@ -663,7 +664,10 @@ namespace Tango.PPC.Jobs.Dialogs
         private void OnSaveMyColorModeChanged()
         {
             NewGroupName = "";
-            IsSelectedColorInLibrary = true;
+            if (SaveMyColorMode)
+                IsSelectedColorInLibrary = true;
+            else
+                CheckIsSelectedColorInLibrary();
         }
         private void OnMyColorModeChanged()
         {
@@ -864,7 +868,7 @@ namespace Tango.PPC.Jobs.Dialogs
         private void CheckIsSelectedColorInLibrary()
         {
             List<FavoriteColor> colors;
-            if (_colorSpaceToFavoriteColorDictionary.TryGetValue(SelectedBrushStop.ColorSpace, out colors) && colors != null)
+            if (_colorSpaceToFavoriteColorDictionary != null && _colorSpaceToFavoriteColorDictionary.TryGetValue(SelectedBrushStop.ColorSpace, out colors) && colors != null)
             {
                 if (colors.Any(item => item.Color == SelectedBrushStop.Color))
                 {
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 465fd426a..66f1db177 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
@@ -609,7 +609,7 @@ namespace Tango.PPC.Jobs.Models
             SegmentModel = segmentModel;
            
             Color = Colors.White;
-            ColorSpace = ColorSpaces.CMYK;
+            ColorSpace = ColorSpaces.Volume;
             ColorCatalogsItem = null;
             PreventPropertyUpdate = false;
             LiquidVolumesOutOfRange = false;
@@ -1037,6 +1037,7 @@ namespace Tango.PPC.Jobs.Models
                     _green = (int)rgb.G;
                     _blue = (int)rgb.B;
                 }
+                ColorSpace = ColorSpaces.RGB;
 
                 RaisePropertyChanged(nameof(Red));
                 RaisePropertyChanged(nameof(Green));
@@ -1093,6 +1094,7 @@ namespace Tango.PPC.Jobs.Models
                     _b = lab.B;
                     
                 }
+                ColorSpace = ColorSpaces.LAB;
                 RaisePropertyChanged(nameof(L));
                 RaisePropertyChanged(nameof(A));
                 RaisePropertyChanged(nameof(B));
@@ -1121,6 +1123,7 @@ namespace Tango.PPC.Jobs.Models
                         IsOutOfGamut = false;
                         RaisePropertyChanged(nameof(IsLiquidVolumesOutOfRange));
                     }
+                    ColorSpace = ColorSpaces.Volume;
                     return;
                 }
                 ColorSpaces colorSpace = ColorSpace;
@@ -1158,6 +1161,7 @@ namespace Tango.PPC.Jobs.Models
                 }
                 finally
                 {
+                    ColorSpace = ColorSpaces.Volume;
                     IsBusy = false;
                 }
             }
@@ -1172,6 +1176,7 @@ namespace Tango.PPC.Jobs.Models
                 var closestItem = catalogs.SelectMany(x => x.AllItemsOrdered).GetClosestItem(BestMatchColor);
                 
                 ColorCatalogsItem = closestItem;
+                ColorSpace = ColorSpaces.Catalog;
                 RaisePropertyChanged(nameof(ColorCatalog));
             }
         }
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.cs
index a2a7a1c05..adb98d91d 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.cs
@@ -20,7 +20,8 @@ namespace Tango.Touch.Controls
     {
         public const string Number_PART = "Number_PART";
         private TouchNumericTextBox _numericValue;
-       
+        private bool _changedFromAnotherControl;
+
         #region Properties
 
         public double Value
@@ -58,7 +59,7 @@ namespace Tango.Touch.Controls
         /// </summary>
         public static readonly DependencyProperty MaxValueProperty =
             DependencyProperty.Register("MaxValue", typeof(double), typeof(TouchNumericUpDownConrol), new PropertyMetadata(100.0));
-
+        
         #endregion
 
         #region Commands
@@ -95,6 +96,7 @@ namespace Tango.Touch.Controls
             DecrementCommand = new RelayCommand(() => {
                 Value -= 1;
             }, (x) => { return (Value - 1) >= MinValue; });
+            _changedFromAnotherControl = false;
             
         }
 
@@ -126,7 +128,18 @@ namespace Tango.Touch.Controls
         {
             Value = _numericValue.Value;
         }
-        
+
+        public void SetValueAnotherControl(double newValue)
+        {
+            if(Value != newValue)
+            {
+                _changedFromAnotherControl = true;
+                Value = newValue;
+                _changedFromAnotherControl = false;
+            }
+                
+        }
+
         private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             TouchNumericUpDownConrol colorPickerNumericUpDown = (TouchNumericUpDownConrol)d;
@@ -137,6 +150,9 @@ namespace Tango.Touch.Controls
 
         private void OnValueNumberChanged(double? oldValue, double? newValue)
         {
+            if (_changedFromAnotherControl)
+                return;
+
             RoutedPropertyChangedEventArgs<double?> args = new RoutedPropertyChangedEventArgs<double?>(oldValue, newValue);
             args.RoutedEvent = TouchNumericUpDownConrol.ColorNumberChangedEvent;
             RaiseEvent(args);
diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerControl.cs b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerControl.cs
index ab319b479..4b494491e 100644
--- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerControl.cs
+++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerControl.cs
@@ -216,23 +216,25 @@ namespace Tango.Touch.Controls
         {
             if (_colorPickerSlider != null && _colorPickerSlider.Value != (double)e.NewValue)
             {
-                _colorPickerSlider.Value = (double)e.NewValue;
+                _colorPickerSlider.SetValueAnotherControl((double)e.NewValue);
                 OnPickerSliderValueChanged((double)e.OldValue, (double)e.NewValue);
             }
         }
         public void ColorPickerSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            if (_colorPickerNumericUpDown != null && _colorPickerNumericUpDown.Value != Math.Round(e.NewValue, 1, MidpointRounding.AwayFromZero))
+            var newvalue = Math.Round(e.NewValue, 0, MidpointRounding.AwayFromZero);
+            if (_colorPickerNumericUpDown != null && _colorPickerNumericUpDown.Value != newvalue)
             {
-                _colorPickerNumericUpDown.Value = Math.Round(e.NewValue, 1, MidpointRounding.AwayFromZero);
+                _colorPickerNumericUpDown.SetValueAnotherControl(newvalue);
                 OnPickerSliderValueChanged(e.OldValue, e.NewValue);
             }
         }
 
+        
         private void OnPickerSliderValueChanged(double oldValue, double newValue)
         {
             ColorValue = newValue;
-            RoutedPropertyChangedEventArgs<double> args = new RoutedPropertyChangedEventArgs<double>(oldValue, newValue);
+            RoutedPropertyChangedEventArgs<double> args = new RoutedPropertyChangedEventArgs<double>(oldValue, newValue);//Used in parent controls
             args.RoutedEvent = TouchColorPickerControl.PickerSliderValueChangedEvent;
             RaiseEvent(args);
         }
diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerSlider.cs b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerSlider.cs
index 7b0f5881a..fb07ee976 100644
--- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerSlider.cs
+++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchColorPickerSlider.cs
@@ -16,6 +16,7 @@ namespace Tango.Touch.Controls
 
         #region Members
         private Border _colorPickerDisplay;
+        private bool _changedFromAnotherControl;
         #endregion
 
         static TouchColorPickerSlider()
@@ -117,19 +118,21 @@ namespace Tango.Touch.Controls
 
 
         #endregion
-
+        
         #region Base Class Overrides
 
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
+            _changedFromAnotherControl = false;
             _colorPickerDisplay = (Border)GetTemplateChild(PART_ColorPickerDisplay);
             _colorPickerDisplay.BorderBrush = new SolidColorBrush(SliderBorderColor);
             TouchDown -= TouchDownSlider;
             TouchDown += TouchDownSlider;
             OnValueChanged(Double.NaN, Value);
             IsMoveToPointEnabled = true;
+            
         }
 
         private void TouchDownSlider(object sender, TouchEventArgs e)
@@ -146,9 +149,12 @@ namespace Tango.Touch.Controls
         {
             base.OnValueChanged(oldValue, newValue);
 
-            RoutedPropertyChangedEventArgs<double> args = new RoutedPropertyChangedEventArgs<double>(oldValue, newValue);
-            args.RoutedEvent = TouchColorPickerSlider.PickerSliderValueChangedEvent;
-            RaiseEvent(args);
+            if (!_changedFromAnotherControl)
+            {
+                RoutedPropertyChangedEventArgs<double> args = new RoutedPropertyChangedEventArgs<double>(oldValue, newValue);
+                args.RoutedEvent = TouchColorPickerSlider.PickerSliderValueChangedEvent;
+                RaiseEvent(args);
+            }
         }
 
         #endregion
@@ -171,6 +177,15 @@ namespace Tango.Touch.Controls
         #endregion
         #region Methods       
 
+        public void SetValueAnotherControl(double newValue)
+        {
+            if (Value != newValue)
+            {
+                _changedFromAnotherControl = true;
+                Value = newValue;
+                _changedFromAnotherControl = false;
+            }
+        }
 
         #endregion //Methods
     }