From e2bf9f578c3ed53d869744f94b020048ca806c6e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 8 Jan 2019 14:27:21 +0200
Subject: Refactored catalogs to per RML. Dropped MEDIA_COLOR. Added RML White
 Point LAB. Added additional dispenser parameters in MS module. Attempt to
 optimize PPC color catalog view performance. Removed "Color Catalog Code"
 from brush stop. Implemented PPC color catalog selection per RML.

---
 .../Tango.MachineStudio.RML/Views/RmlView.xaml       | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index d72b6c7d3..8f2c5d187 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -65,20 +65,12 @@
                                     <TextBlock Text="Material:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding Materials}" SelectedItem="{Binding ActiveRML.MediaMaterial,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
-                                    <TextBlock Text="Color:" ></TextBlock>
-                                    <ComboBox ItemsSource="{Binding Colors}" SelectedItem="{Binding ActiveRML.MediaColor,Mode=TwoWay}">
-                                        <ComboBox.ItemTemplate>
-                                            <DataTemplate>
-                                                <StackPanel Orientation="Horizontal">
-                                                    <Rectangle Width="16" Height="16" VerticalAlignment="Center">
-                                                        <Rectangle.Fill>
-                                                            <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
-                                                        </Rectangle.Fill>
-                                                    </Rectangle>
-                                                </StackPanel>
-                                            </DataTemplate>
-                                        </ComboBox.ItemTemplate>
-                                    </ComboBox>
+                                    <TextBlock Text="White Point:" ></TextBlock>
+                                    <UniformGrid Columns="3">
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointL}" HorizontalContentAlignment="Left" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointA}" HorizontalContentAlignment="Left" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointB}" HorizontalContentAlignment="Left" />
+                                    </UniformGrid>
 
                                     <TextBlock Text="Purpose:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding Purposes}" SelectedItem="{Binding ActiveRML.MediaPurpose,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-- 
cgit v1.3.1