From 69bbedacee151090d5d0b6665b3a1614e65f1997 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 16 Jul 2018 20:01:10 +0300
Subject: Added color conversion to Machine Studio. Fixed issue with segments
 cloning.

---
 .../Views/JobView.xaml                             | 48 +++++++++++++++++++++-
 .../Views/JobView.xaml.cs                          | 23 +++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index b4deb72a9..e350f966b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -5,7 +5,10 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:global="clr-namespace:Tango.MachineStudio.Developer"
              xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
+             xmlns:brushPicker="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:colorConversion="clr-namespace:Tango.BL.ColorConversion;assembly=Tango.BL"
+             xmlns:hive="clr-namespace:Tango.Hive;assembly=Tango.Hive"
              xmlns:automation="clr-namespace:Tango.MachineStudio.Common.Automation;assembly=Tango.MachineStudio.Common"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:techViews="clr-namespace:Tango.MachineStudio.Technician.Views;assembly=Tango.MachineStudio.Technician"
@@ -66,6 +69,7 @@
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
         <converters:IsNotConverter x:Key="IsNotConverter" />
+        <converters:ObjectToObjectTypeConverter x:Key="ObjectToObjectTypeConverter" />
 
 
         <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -136,7 +140,7 @@
                 <Setter.Value>
                     <ControlTemplate>
                         <Grid>
-                            <ToggleButton Cursor="Hand" x:Name="PopupButton" BorderThickness="0" Height="30" Background="Transparent" Foreground="{StaticResource AccentColorBrush}" VerticalAlignment="Center" Margin="30 0 0 0" IsChecked="{Binding ElementName=Popup, Path=IsOpen}">
+                            <ToggleButton Cursor="Hand" x:Name="PopupButton" Checked="PopupButton_Checked" Unchecked="PopupButton_Unchecked" BorderThickness="0" Height="30" Background="Transparent" Foreground="{StaticResource AccentColorBrush}" VerticalAlignment="Center" Margin="30 0 0 0" IsChecked="{Binding ElementName=Popup, Path=IsOpen}">
                                 <ToggleButton.Style>
                                     <Style TargetType="ToggleButton" BasedOn="{StaticResource emptyToggleButton}">
                                         <Style.Triggers>
@@ -163,7 +167,47 @@
                                     </Border.Effect>
                                     <Grid>
                                         <Grid Margin="10">
-                                            <commonControls:HiveColorPickerControl SelectedHiveColorChanged="HiveColorPickerControl_SelectedColorChanged" SelectedColor="{Binding Color,Mode=OneWay}" SelectedHiveColor="{Binding Color,Mode=OneWayToSource}" DemoMode="True" />
+                                            <DockPanel>
+                                                <DockPanel>
+                                                    <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center">SOURCE</TextBlock>
+                                                    <Viewbox Width="300" Height="180" VerticalAlignment="Center" Stretch="Fill">
+                                                        <colorPicker:ColorCanvas SelectedColor="{Binding Color,Mode=TwoWay}" SelectedColorChanged="ColorCanvas_SelectedColorChanged" Background="Transparent" BorderThickness="0" Height="150" Width="230" ></colorPicker:ColorCanvas>
+                                                    </Viewbox>
+                                                </DockPanel>
+                                                <Image DockPanel.Dock="Left" Source="../Images/arrow-long-right.png" VerticalAlignment="Center" Width="30" Margin="10 0"></Image>
+
+                                                <DockPanel>
+                                                    <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center">SUGGESTIONS</TextBlock>
+                                                    <hive:HexList VerticalAlignment="Center" Margin="0 10 0 0" Width="220" Height="270" UseHexItemHasContainer="True" Grid.Column="2" Grid.Row="1" RowCount="6" ColumnCount="5" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.HiveSuggestions}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.SelectedSuggestion,Mode=TwoWay}">
+                                                        <hive:HexList.ItemContainerStyle>
+                                                            <Style TargetType="hive:HexItem" BasedOn="{StaticResource {x:Type hive:HexItem}}">
+                                                                <Setter Property="Background" Value="{Binding Brush}"></Setter>
+                                                                <Setter Property="Grid.Column" Value="0"></Setter>
+                                                                <Setter Property="Grid.Row" Value="0"></Setter>
+                                                                <Setter Property="Background" Value="Transparent"></Setter>
+                                                                <Setter Property="BorderThickness" Value="1"></Setter>
+
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=DataContext,Converter={StaticResource ObjectToObjectTypeConverter}}" Value="{x:Type colorConversion:ColorConversionSuggestion}">
+                                                                        <Setter Property="Grid.Column" Value="{Binding Column}"></Setter>
+                                                                        <Setter Property="Grid.Row" Value="{Binding Row}"></Setter>
+                                                                        <Setter Property="Background" Value="{Binding Brush}"></Setter>
+                                                                    </DataTrigger>
+                                                                    <Trigger Property="IsSelected" Value="True">
+                                                                        <Setter Property="BorderThickness" Value="2"></Setter>
+                                                                    </Trigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </hive:HexList.ItemContainerStyle>
+
+                                                        <hive:HexList.ItemTemplate>
+                                                            <DataTemplate>
+
+                                                            </DataTemplate>
+                                                        </hive:HexList.ItemTemplate>
+                                                    </hive:HexList>
+                                                </DockPanel>
+                                            </DockPanel>
                                         </Grid>
                                     </Grid>
                                 </Border>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index b48e91f31..bb17a502d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -242,5 +242,28 @@ namespace Tango.MachineStudio.Developer.Views
                 editor.ParameterizedObject = draggedItem.ParameterizedObject;
             }
         }
+
+        private void PopupButton_Checked(object sender, RoutedEventArgs e)
+        {
+            _vm.OnHivePopupOpened();
+        }
+
+        private void BrushPicker_ColorChanged(object sender, BrushPicker.ColorChangedEventArgs e)
+        {
+           
+        }
+
+        private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (e.NewValue.HasValue)
+            {
+                _vm.OnSelectedBrushColorChanged((Color)e.NewValue);
+            }
+        }
+
+        private void PopupButton_Unchecked(object sender, RoutedEventArgs e)
+        {
+            _vm.OnHivePopupClosed();
+        }
     }
 }
-- 
cgit v1.3.1