aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Modules
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2022-02-22 18:57:39 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2022-02-22 18:57:39 +0200
commitf11a300cc013701e5c3eac2500bc3ed5fcfa310a (patch)
tree9b63685f7812d36fcd4ded5ad2d7bafa0dda64a4 /Software/Visual_Studio/PPC/Modules
parent28fa1ab91b3fb7970d9968c5cb1d018c2b44fd69 (diff)
downloadTango-f11a300cc013701e5c3eac2500bc3ed5fcfa310a.tar.gz
Tango-f11a300cc013701e5c3eac2500bc3ed5fcfa310a.zip
Best match – to be shown only with “out of gamut”
Related Work Items: #6232
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml2
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs10
2 files changed, 11 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml
index 34ed8cfb3..9e6a99179 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml
@@ -123,7 +123,7 @@
<TextBlock Text="Best Match" FontSize="{StaticResource TangoDataGridHeaderFontSize}" HorizontalAlignment="Left"/>
<Border HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="100" Width="100" Margin="0 21 0 0" CornerRadius="20" BorderThickness="1" BorderBrush="{StaticResource TangoGrayBrush}">
<Border.Background>
- <SolidColorBrush Color="{Binding SelectedBrushStop.BestMatchColor}"/>
+ <SolidColorBrush Color="{Binding SelectedBrushStop.ShownBestMatchColor}"/>
</Border.Background>
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding SelectedBrushStop.IsBusy,Converter={StaticResource BooleanToVisibilityConverter}}">
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 12add3d2f..3ced2962c 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
@@ -534,6 +534,16 @@ namespace Tango.PPC.Jobs.Models
RaisePropertyChanged(nameof(BestMatchA));
RaisePropertyChanged(nameof(BestMatchB));
RaisePropertyChanged(nameof(BestMatchL));
+ RaisePropertyChanged(nameof(ShownBestMatchColor));
+ }
+ }
+
+ public System.Windows.Media.Color ShownBestMatchColor
+ {
+ get {
+ if(IsOutOfGamut)
+ return _bestMatchColor;
+ return System.Windows.Media.Colors.Transparent;
}
}