Vector Fine Tuning - a little changes in report and notifications

Related Work Items: #6536

2 files changed, 16 insertions, 8 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
index d1424906b..e14e15551 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs
@@ -519,7 +519,7 @@ namespace Tango.PPC.Jobs.Dialogs
                 ColorCorrectionRepotVM vm = new ColorCorrectionRepotVM()
                 {
                     JobName = BrushStopModel.SegmentModel.Job.Name,
-                    TargetColor = String.Format($"L*{TargetL} a*{TargetA} b*{TargetB}")
+                    TargetColor = String.Format($"L*{TargetL:0.##} a*{TargetA:0.##} b*{TargetB:0.##}")
                 };
                 foreach (var item in TrialsLogitems)
                 {
@@ -549,10 +549,14 @@ namespace Tango.PPC.Jobs.Dialogs
             }
         }
 
-        private void ClearTrialsLog(object obj)
+        private async void ClearTrialsLog(object obj)
         {
             if (TrialsLogitems.Count > 1)
             {
+                if (false == await NotificationProvider.ShowQuestion("“All the trials will be cleared."))
+                {
+                    return;
+                }
                 ActiveLogModel = TrialsLogitems[0];
                 ActiveLogModel.L = ActiveLogModel.A = ActiveLogModel.B = null;
                 TrialsLogitems.Clear();
@@ -655,7 +659,7 @@ namespace Tango.PPC.Jobs.Dialogs
             return true;
         }
 
-        private void OnLABChanged()
+        private async void OnLABChanged()
         {
             if (ActiveLogModel == null)
                 return;
@@ -667,8 +671,12 @@ namespace Tango.PPC.Jobs.Dialogs
                 BrushStopModel.A = (double)MeasuredA;
                 BrushStopModel.B = (double)MeasuredB;
                 BrushStopModel.PreventPropertyUpdate = false;
-                //convergion? Out of gammut????
-
+                BrushStopModel.ConvertColor();
+                if(BrushStopModel.IsOutOfGamut)
+                {
+                    await NotificationProvider.ShowInfo("Color is out of gamut!");
+                }
+               
                 var deltaE = DeltaE_CMC(TargetL, TargetA, TargetB, (double)MeasuredL, (double)MeasuredA, (double)MeasuredB);
                 ActiveLogModel.DeltaE = deltaE;
                 ValidationTests();
@@ -684,8 +692,8 @@ namespace Tango.PPC.Jobs.Dialogs
         {
             if (ActiveLogModel.DeltaE <= 0.5)
             {
-                await NotificationProvider.ShowInfo("Previous trial seems to be very close; no more trials are recommended");
-                return;
+                if(true == await NotificationProvider.ShowQuestion("Previous trial seems to be very close; no more trials are recommended"))
+                    return;
             }
             IsJobRunning = true;
 
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml
index 9cfb89767..8eea1bfbe 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml
@@ -82,7 +82,7 @@
                         <Border Background="Transparent" BorderBrush="{StaticResource TangoGrayBrush}"  BorderThickness="0.8" CornerRadius="2" Width="{Binding NumericPartWidth,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" >
 
                             <local:TouchNumericTextBox x:Name="Number_PART" Margin="0 4 0 0" FontSize="20"  HorizontalContentAlignment="Center" VerticalAlignment="Center" BorderBrush="{TemplateBinding BorderBrush}" VerticalContentAlignment="Center" UpdateBindingOnlyWhenFocused="True"
-                                                Value="{Binding Value,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}"  Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" HasDecimalPoint="True" StringFormat="0.#"/>
+                                                Value="{Binding Value,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}"  Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" HasDecimalPoint="True" StringFormat="0.##"/>
 
                         </Border>
                         <Border  Margin="10 0 0 0"   BorderBrush="{StaticResource TangoGrayBrush}"  BorderThickness="0.8" Width="80">