From 8a1e772f025eaf3bfdf17905d9e33c460993e559 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 1 Jul 2019 17:56:49 +0300
Subject: Many bug fixes !!!

---
 .../Views/MainView.xaml                            | 98 ++++++++++++++--------
 1 file changed, 63 insertions(+), 35 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
index 7a2aba71e..b8c786b51 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
@@ -402,41 +402,69 @@
                                     </Grid>
                                 </DockPanel>
 
-                                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Height="60">
-                                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
-
-                                        <Grid>
-                                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                                <Rectangle.Fill>
-                                                    <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                                </Rectangle.Fill>
-                                            </Rectangle>
-                                            <TextBlock Text="{Binding TargetColor.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                        </Grid>
-                                    </DockPanel>
-                                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
-                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
-                                        <Grid>
-                                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                                <Rectangle.Fill>
-                                                    <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                                </Rectangle.Fill>
-                                            </Rectangle>
-                                            <TextBlock Text="{Binding TargetColor.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                        </Grid>
-                                    </DockPanel>
-                                    <DockPanel Width="50" HorizontalAlignment="Left">
-                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
-                                        <Grid>
-                                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
-                                                <Rectangle.Fill>
-                                                    <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
-                                                </Rectangle.Fill>
-                                            </Rectangle>
-                                            <TextBlock Text="{Binding TargetColor.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
-                                        </Grid>
-                                    </DockPanel>
+                                <StackPanel HorizontalAlignment="Right">
+                                    <StackPanel Orientation="Horizontal" Height="60">
+                                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
+
+                                            <Grid>
+                                                <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                    <Rectangle.Fill>
+                                                        <SolidColorBrush Color="Red" Opacity="{Binding TargetColor.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                                    </Rectangle.Fill>
+                                                </Rectangle>
+                                                <TextBlock Text="{Binding TargetColor.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                            </Grid>
+                                        </DockPanel>
+                                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
+                                            <Grid>
+                                                <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                    <Rectangle.Fill>
+                                                        <SolidColorBrush Color="Green" Opacity="{Binding TargetColor.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                                    </Rectangle.Fill>
+                                                </Rectangle>
+                                                <TextBlock Text="{Binding TargetColor.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                            </Grid>
+                                        </DockPanel>
+                                        <DockPanel Width="50" HorizontalAlignment="Left">
+                                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                                            <Grid>
+                                                <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                    <Rectangle.Fill>
+                                                        <SolidColorBrush Color="Blue" Opacity="{Binding TargetColor.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                                    </Rectangle.Fill>
+                                                </Rectangle>
+                                                <TextBlock Text="{Binding TargetColor.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                            </Grid>
+                                        </DockPanel>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+
+                                            <Grid>
+                                                <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                                <TextBlock Text="{Binding TargetColor.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                            </Grid>
+                                        </DockPanel>
+                                        <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
+
+                                            <Grid>
+                                                <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                                <TextBlock Text="{Binding TargetColor.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                            </Grid>
+                                        </DockPanel>
+                                        <DockPanel Width="50" HorizontalAlignment="Left">
+                                            <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+
+                                            <Grid>
+                                                <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                                <TextBlock Text="{Binding TargetColor.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                            </Grid>
+                                        </DockPanel>
+                                    </StackPanel>
                                 </StackPanel>
                             </Grid>
                         </Border>
-- 
cgit v1.3.1