Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

14 files changed, 256 insertions, 65 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
index 6c94271a2..64caa2a1d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
@@ -115,6 +115,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\SideChains\ColorMine\ColorMine.csproj">
+      <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project>
+      <Name>ColorMine</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
       <Name>Tango.BL</Name>
@@ -191,7 +195,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index 16479282c..d264dd209 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -306,7 +306,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 if (LiquidsCalibrationData == null || CCT.ForwardData == null) return;
 
                 ConversionInput input = new ConversionInput();
-                input.ColorSpace = PMR.ColorLab.ColorSpace.Rgb;
+                input.ColorSpace =  SourceColor.IsLab ? PMR.ColorLab.ColorSpace.Lab : PMR.ColorLab.ColorSpace.Rgb;
                 input.DeltaChroma = DeltaChroma;
                 input.DeltaL = DeltaL;
                 input.ForwardData = ByteString.CopyFrom(CCT.ForwardData);
@@ -315,6 +315,9 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 input.InputCoordinates.Red = (int)SourceColor.Red;
                 input.InputCoordinates.Green = (int)SourceColor.Green;
                 input.InputCoordinates.Blue = (int)SourceColor.Blue;
+                input.InputCoordinates.L = SourceColor.L;
+                input.InputCoordinates.A = SourceColor.A;
+                input.InputCoordinates.B = SourceColor.B;
                 input.ThreadL = 92.1815; //SelectedRML.MediaColor.L;
                 input.ThreadA = 2.2555; //SelectedRML.MediaColor.A;
                 input.ThreadB = -10.9325; //SelectedRML.MediaColor.B;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/RgbVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/RgbVM.cs
index aae490a6e..cda1d0b9f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/RgbVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/RgbVM.cs
@@ -1,4 +1,5 @@
-using System;
+using ColorMine.ColorSpaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -39,6 +40,27 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             set { _blue = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
         }
 
+        private double _l;
+        public double L
+        {
+            get { return _l; }
+            set { _l = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _a;
+        public double A
+        {
+            get { return _a; }
+            set { _a = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _b;
+        public double B
+        {
+            get { return _b; }
+            set { _b = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
         private Color _color;
         public Color Color
         {
@@ -46,8 +68,33 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             set { _color = value; RaisePropertyChanged(nameof(Color)); SynchronizeComponents(); }
         }
 
+        private bool _isLab;
+        public bool IsLab
+        {
+            get { return _isLab; }
+            set { _isLab = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private void SynchronizeColor()
         {
+            if (!IsLab)
+            {
+                Rgb rgb = new Rgb(Red, Green, Blue);
+                Lab lab = rgb.To<Lab>();
+                _l = lab.L;
+                _a = lab.A;
+                _b = lab.B;
+            }
+            else
+            {
+                Lab lab = new Lab(L, A, B);
+                Rgb rgb = lab.To<Rgb>();
+                _red = rgb.R;
+                _green = rgb.G;
+                _blue = rgb.B;
+            }
+
             _color = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue);
             RaisePropertyChanged(nameof(Color));
             ColorChanged?.Invoke(this, _color);
@@ -59,9 +106,21 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             _green = Color.G;
             _blue = Color.B;
 
+            if (IsLab)
+            {
+                Rgb rgb = new Rgb(Red, Green, Blue);
+                Lab lab = rgb.To<Lab>();
+                _l = lab.L;
+                _a = lab.A;
+                _b = lab.B;
+            }
+
             RaisePropertyChanged(nameof(Red));
             RaisePropertyChanged(nameof(Green));
             RaisePropertyChanged(nameof(Blue));
+            RaisePropertyChanged(nameof(L));
+            RaisePropertyChanged(nameof(A));
+            RaisePropertyChanged(nameof(B));
             RaisePropertyChanged(nameof(Color));
 
             ColorChanged?.Invoke(this, Color);
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 4e8703a6e..f3f655c8d 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
@@ -27,6 +27,7 @@
         <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
         <converters:ObjectToObjectTypeConverter x:Key="ObjectToObjectTypeConverter" />
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+        <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -74,7 +75,7 @@
 
 
                         <TextBlock FontSize="16" Margin="0 40 0 0">LIQUID FACTORS</TextBlock>
-                        <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" Margin="0 10 0 0">
+                        <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" Margin="0 10 0 0" IsEnabled="False">
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
                                     <WrapPanel IsItemsHost="True"></WrapPanel>
@@ -108,21 +109,21 @@
         <Grid Grid.Column="1">
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="200" />
+                    <RowDefinition Height="135" />
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="1*" />
                 </Grid.RowDefinitions>
 
                 <Grid>
-                    <Grid Margin="10">
+                    <Grid Margin="10 10 10 0">
                         <StackPanel HorizontalAlignment="Left" Margin="20 0 0 0">
-                            <TextBlock Margin="70 10 0 0" FontSize="20" TextAlignment="Left">COLOR ADJUSTMENT DATA</TextBlock>
+                            <TextBlock Margin="0 0 0 0" FontSize="20" TextAlignment="Left">COLOR ADJUSTMENT DATA</TextBlock>
                             <Grid>
-                                <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
-                                    <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="70" Height="70" />
-                                    <Image Source="../Images/data-table.png" Width="128" Opacity="0.8"></Image>
+                                <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                    <materialDesign:PackIcon Kind="ArrowLeftBoldHexagonOutline" VerticalAlignment="Center" Width="40" Height="40" />
+                                    <Image Source="../Images/data-table.png" Height="80" Opacity="0.8"></Image>
                                     <StackPanel VerticalAlignment="Center" Width="300" Margin="10 0 0 0">
-                                        <TextBlock FontSize="16" FontStyle="Italic" FontWeight="SemiBold">CCT Data</TextBlock>
+                                        
                                         <TextBox IsReadOnly="False" Margin="0 5 0 0" Text="{Binding CCT.ForwardFileName}" HorizontalContentAlignment="Center"></TextBox>
                                         <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right">
                                             <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}">
@@ -163,39 +164,87 @@
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
-                        <StackPanel VerticalAlignment="Center" Grid.Row="1">
-                            <StackPanel Height="20">
-                                <StackPanel Orientation="Horizontal" Margin="0 0 0 5" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <materialDesign:PackIcon Kind="Alert" Foreground="#FF6D6D" />
-                                    <TextBlock Margin="5 0 0 0" Foreground="#FF6D6D">Color is out of gamut</TextBlock>
-                                </StackPanel>
+                        <Grid Grid.Row="1">
+
+                            <StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-70 15 0 0">
+                                <RadioButton IsChecked="{Binding SourceColor.IsLab,Converter={StaticResource BooleanInverseConverter}}">RGB</RadioButton>
+                                <RadioButton Margin="0 10 0 0" IsChecked="{Binding SourceColor.IsLab}">LAB</RadioButton>
                             </StackPanel>
-                            <Border BorderThickness="1" BorderBrush="#545454" Margin="0" Padding="2 2 2 0">
-                                <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
-                            </Border>
 
-                            <DockPanel Margin="0 10 0 0">
-                                <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
-                                <TextBlock DockPanel.Dock="Right" Text="{Binding SourceColor.Red}"></TextBlock>
-                                <Slider x:Name="sliderR" Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
-                            </DockPanel>
-                            <DockPanel Margin="0 10 0 0">
-                                <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
-                                <TextBlock DockPanel.Dock="Right" Text="{Binding SourceColor.Green}"></TextBlock>
-                                <Slider x:Name="sliderG" Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
-                            </DockPanel>
-                            <DockPanel Margin="0 10 0 0">
-                                <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
-                                <TextBlock DockPanel.Dock="Right" Text="{Binding SourceColor.Blue}"></TextBlock>
-                                <Slider x:Name="sliderB" Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
-                            </DockPanel>
-                        </StackPanel>
+                            <StackPanel VerticalAlignment="Center">
+                                <StackPanel Height="20">
+                                    <StackPanel Orientation="Horizontal" Margin="0 0 0 5" Visibility="{Binding IsOutOfGamut,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <materialDesign:PackIcon Kind="Alert" Foreground="#FF6D6D" />
+                                        <TextBlock Margin="5 0 0 0" Foreground="#FF6D6D">Color is out of gamut</TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
+                                <Border BorderThickness="1" BorderBrush="#545454" Margin="0" Padding="2 2 2 0">
+                                    <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
+                                </Border>
+
+                                <Grid>
+                                    <ContentControl>
+                                        <ContentControl.Style>
+                                            <Style TargetType="ContentControl">
+                                                <Setter Property="Content">
+                                                    <Setter.Value>
+                                                        <StackPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Red}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Green}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                            <DockPanel Margin="0 10 0 0">
+                                                                <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
+                                                                <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="255" Width="30" Value="{Binding SourceColor.Blue}"></mahapps:NumericUpDown>
+                                                                <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
+                                                            </DockPanel>
+                                                        </StackPanel>
+                                                    </Setter.Value>
+                                                </Setter>
+
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding SourceColor.IsLab}" Value="True">
+                                                        <Setter Property="Content">
+                                                            <Setter.Value>
+                                                                <StackPanel>
+                                                                    <DockPanel Margin="0 10 0 0">
+                                                                        <TextBlock DockPanel.Dock="Left" Text="L" VerticalAlignment="Center" />
+                                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="0" Maximum="100" Width="30" Value="{Binding SourceColor.L}"></mahapps:NumericUpDown>
+                                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="0" Maximum="100" Value="{Binding SourceColor.L,Mode=TwoWay}"></Slider>
+                                                                    </DockPanel>
+                                                                    <DockPanel Margin="0 10 0 0">
+                                                                        <TextBlock DockPanel.Dock="Left" Text="A" VerticalAlignment="Center" />
+                                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.A}"></mahapps:NumericUpDown>
+                                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.A,Mode=TwoWay}"></Slider>
+                                                                    </DockPanel>
+                                                                    <DockPanel Margin="0 10 0 0">
+                                                                        <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
+                                                                        <mahapps:NumericUpDown DockPanel.Dock="Right" HideUpDownButtons="True" StringFormat="0.00" Background="Transparent" BorderThickness="0" HorizontalContentAlignment="Center" Minimum="-128" Maximum="128" Width="30" Value="{Binding SourceColor.B}"></mahapps:NumericUpDown>
+                                                                        <Slider Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Minimum="-128" Maximum="128" Value="{Binding SourceColor.B,Mode=TwoWay}"></Slider>
+                                                                    </DockPanel>
+                                                                </StackPanel>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ContentControl.Style>
+                                    </ContentControl>
+                                </Grid>
+                            </StackPanel>
+                        </Grid>
 
-                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE RGB</TextBlock>
-                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="-120 0 0 0">SUGGESTIONS</TextBlock>
+                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE</TextBlock>
+                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="00 0 0 0">SUGGESTIONS</TextBlock>
                         <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4">LIQUID VOLUMES</TextBlock>
 
-                        <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="140" Opacity="0.8" Margin="20 0 0 0"></Image>
+                        <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
 
                         <hive:HexList Width="220" Height="270" UseHexItemHasContainer="True" Grid.Column="2" Grid.Row="1" RowCount="6" ColumnCount="5" ItemsSource="{Binding HiveSuggestions}" SelectedItem="{Binding SelectedSuggestion,Mode=TwoWay}">
                             <hive:HexList.ItemContainerStyle>
@@ -229,7 +278,7 @@
                             </hive:HexList.ItemTemplate>
                         </hive:HexList>
 
-                        <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="140" Opacity="0.8" Margin="0 0 20 0"></Image>
+                        <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
 
                         <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
                             <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" >
@@ -296,7 +345,7 @@
                         </StackPanel>
 
 
-                        <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="140" Opacity="0.8"></Image>
+                        <Image Source="../Images/arrow-long-Left.png" Grid.Column="2" Grid.Row="3" Width="140" Stretch="Fill" Height="30" Opacity="0.8"></Image>
 
                         <Border BorderBrush="Silver" Grid.Row="3">
                             <Grid>
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 dec815020..1c0bc515b 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
@@ -311,10 +311,10 @@
                                 </StackPanel>
                             </Border>
 
-                            <controls:MultiSelectListBox AutomationProperties.AutomationId="{x:Static automation:Developer.SegmentsListBox}" Style="{StaticResource {x:Type ListBox}}" SelectionMode="Extended" SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SegmentsCollectionView}" SelectedItem="{Binding SelectedSegment}" SelectedItemsList="{Binding SelectedSegments,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                            <controls:MultiSelectListBox x:Name="listBoxSegments" AutomationProperties.AutomationId="{x:Static automation:Developer.SegmentsListBox}" Style="{StaticResource {x:Type ListBox}}" SelectionMode="Extended" SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SegmentsCollectionView}" SelectedItem="{Binding SelectedSegment}" SelectedItemsList="{Binding SelectedSegments,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
                                 <ListBox.ItemContainerStyle>
                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
-
+                                        <EventSetter Event="PreviewMouseDown" Handler="ListBoxItem_PreviewMouseDown"></EventSetter>
                                     </Style>
                                 </ListBox.ItemContainerStyle>
                                 <ListBox.ItemTemplate>
@@ -378,7 +378,7 @@
                                                 </StackPanel>
 
 
-                                                <TextBox Grid.Column="1" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}"></TextBox>
+                                                <TextBox Grid.Column="1" CaretBrush="Transparent" Cursor="Arrow" VerticalAlignment="Center" Width="200" HorizontalContentAlignment="Center" Style="{x:Null}" BorderThickness="0" Background="Transparent" Text="{Binding Name}"></TextBox>
                                             </Grid>
 
                                         </Grid>
@@ -762,7 +762,7 @@
                                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                                 </ContentControl.Foreground>
-                                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                                     <mahapps:NumericUpDown.Resources>
                                                                                                                                                         <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                                                                                                                                                     </mahapps:NumericUpDown.Resources>
@@ -805,7 +805,7 @@
                                                                                                                                 <ContentControl.Foreground>
                                                                                                                                     <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                                                                                                                 </ContentControl.Foreground>
-                                                                                                                                <mahapps:NumericUpDown Foreground="#515151"  FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                <mahapps:NumericUpDown Foreground="#515151" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                     <mahapps:NumericUpDown.Resources>
                                                                                                                                         <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                                                                                                                                     </mahapps:NumericUpDown.Resources>
@@ -1102,7 +1102,7 @@
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding Volume,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="{Binding Volume}"></Run>
                                                                                                                         <Run Text="%" Foreground="Gray"></Run>
                                                                                                                                     </TextBlock>
                                                                                                                                 </DataTemplate>
@@ -1528,7 +1528,7 @@
                                             <StackPanel Margin="10 20" VerticalAlignment="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
                                                 <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
                                                     <TextBlock TextWrapping="Wrap" TextAlignment="Center">
-                                                        RESET
+                                                        TEMP OFF
                                                     </TextBlock>
                                                 </Button>
                                                 <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left">
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 bcab1c673..f7e2e8260 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
@@ -276,5 +276,10 @@ namespace Tango.MachineStudio.Developer.Views
         {
             _vm.IsJobVisible = false;
         }
+
+        private void ListBoxItem_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            listBoxSegments.SelectedItem = (sender as ListBoxItem).DataContext;
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
index 630dddec7..78b7d63c0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml
@@ -35,7 +35,32 @@
                 <materialDesign:PackIcon Kind="Home" Margin="25 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="Gainsboro" />
             </Viewbox>
 
-            <Button Click="OnHomingStarted" Style="{StaticResource emptyButton}" Cursor="Hand" Background="Transparent" BorderThickness="0"></Button>
+            <UniformGrid Columns="2">
+                <Button Click="OnHomingBackwardStarted" HorizontalAlignment="Left" Width="60" Background="Transparent" BorderThickness="0">
+                    <Button.Style>
+                        <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
+                            <Style.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter Property="Opacity" Value="0.5"></Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                    <materialDesign:PackIcon Kind="ChevronDoubleLeft" HorizontalAlignment="Center" VerticalAlignment="Center" Width="40" Height="40" Foreground="Gainsboro" />
+                </Button>
+                <Button Click="OnHomingForwardStarted" HorizontalAlignment="Right" Width="60" Background="Transparent" BorderThickness="0">
+                    <Button.Style>
+                        <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
+                            <Style.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter Property="Opacity" Value="0.5"></Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                    <materialDesign:PackIcon Kind="ChevronDoubleRight" HorizontalAlignment="Center" VerticalAlignment="Center" Width="40" Height="40" Foreground="Gainsboro" />
+                </Button>
+            </UniformGrid>
         </Grid>
     </UserControl.Resources>
 
@@ -112,7 +137,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Grid Grid.Column="1">
-                        <Border BorderBrush="Gray" BorderThickness="1 0 1 1" CornerRadius="0 0 20 20" Style="{StaticResource TechWidgetBorderCenter}">
+                        <Border BorderBrush="Gray" BorderThickness="1 0 1 1" CornerRadius="0 0 20 20" Style="{StaticResource TechWidgetBorderCenterNoHover}">
                             <Grid>
                                 <ContentControl>
                                     <ContentControl.Style>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
index f29d0a78d..f0056a740 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/DispenserElementEditor.xaml.cs
@@ -146,7 +146,7 @@ namespace Tango.MachineStudio.Technician.Editors
         private void OnHomingStarted(object sender, RoutedEventArgs e)
         {
             AnimateLeft();
-            DispenserItem.RaiseAction(MotorActionType.HomingStarted);
+            DispenserItem.RaiseAction(MotorActionType.HomingForwardStarted);
         }
 
         private void OnHomingStopped(object sender, RoutedEventArgs e)
@@ -182,5 +182,17 @@ namespace Tango.MachineStudio.Technician.Editors
                 propRotate.BeginAnimation(RotateTransform.AngleProperty, null);
             });
         }
+
+        private void OnHomingBackwardStarted(object sender, RoutedEventArgs e)
+        {
+            AnimateLeft();
+            DispenserItem.RaiseAction(MotorActionType.HomingBackwardStarted);
+        }
+
+        private void OnHomingForwardStarted(object sender, RoutedEventArgs e)
+        {
+            AnimateRight();
+            DispenserItem.RaiseAction(MotorActionType.HomingForwardStarted);
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
index 25907fd8f..7e50b3349 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml
@@ -37,7 +37,32 @@
                 <materialDesign:PackIcon Kind="Home" Margin="25 0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="24" Height="24" Foreground="Gainsboro" />
             </Viewbox>
 
-            <Button Click="OnHomingStarted" Style="{StaticResource emptyButton}" Background="Transparent" BorderThickness="0"></Button>
+            <UniformGrid Columns="2">
+                <Button Click="OnHomingBackwardStarted" HorizontalAlignment="Left" Width="60" Background="Transparent" BorderThickness="0">
+                    <Button.Style>
+                        <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
+                            <Style.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter Property="Opacity" Value="0.5"></Setter>
+                                </Trigger>
+                            </Style.Triggers> 
+                        </Style>
+                    </Button.Style>
+                    <materialDesign:PackIcon Kind="ChevronDoubleLeft" HorizontalAlignment="Center" VerticalAlignment="Center" Width="40" Height="40" Foreground="Gainsboro" />
+                </Button>
+                <Button Click="OnHomingForwardStarted" HorizontalAlignment="Right" Width="60" Background="Transparent" BorderThickness="0">
+                    <Button.Style>
+                        <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
+                            <Style.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter Property="Opacity" Value="0.5"></Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                    <materialDesign:PackIcon Kind="ChevronDoubleRight" HorizontalAlignment="Center" VerticalAlignment="Center" Width="40" Height="40" Foreground="Gainsboro" />
+                </Button>
+            </UniformGrid>
         </Grid>
     </UserControl.Resources>
 
@@ -94,7 +119,7 @@
                     </Border>
                 </Grid>
 
-                <Grid Grid.Column="1" Grid.Row="1" Visibility="{Binding HardwareMotorType.SupportsHoming,Converter={StaticResource BoolToVisibilityConverter}}">
+                <Grid Grid.Column="1" Grid.Row="1" Visibility="Visible">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="20*"/>
                         <ColumnDefinition Width="115*"/>
@@ -102,7 +127,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Grid Grid.Column="1">
-                        <Border BorderBrush="Gray" BorderThickness="1 0 1 1" CornerRadius="0 0 20 20" Style="{StaticResource TechWidgetBorderCenter}">
+                        <Border BorderBrush="Gray" BorderThickness="1 0 1 1" CornerRadius="0 0 20 20" Style="{StaticResource TechWidgetBorderCenterNoHover}">
                             <Grid>
                                 <ContentControl>
                                     <ContentControl.Style>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
index 9e76667dd..7a8f8309f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorElementEditor.xaml.cs
@@ -143,12 +143,6 @@ namespace Tango.MachineStudio.Technician.Editors
             MotorItem.RaiseAction(MotorActionType.BackwardReleased);
         }
 
-        private void OnHomingStarted(object sender, RoutedEventArgs e)
-        {
-            AnimateLeft();
-            MotorItem.RaiseAction(MotorActionType.HomingStarted);
-        }
-
         private void OnHomingStopped(object sender, RoutedEventArgs e)
         {
             StopAnimation();
@@ -187,5 +181,17 @@ namespace Tango.MachineStudio.Technician.Editors
         {
 
         }
+
+        private void OnHomingBackwardStarted(object sender, RoutedEventArgs e)
+        {
+            AnimateLeft();
+            MotorItem.RaiseAction(MotorActionType.HomingBackwardStarted);
+        }
+
+        private void OnHomingForwardStarted(object sender, RoutedEventArgs e)
+        {
+            AnimateRight();
+            MotorItem.RaiseAction(MotorActionType.HomingForwardStarted);
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
index 5d9954605..3ca4c19e0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MotorGroupElementEditor.xaml.cs
@@ -146,7 +146,7 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnHomingStarted(object sender, RoutedEventArgs e)
         {
-            MotorGroupItem.RaiseAction(MotorActionType.HomingStarted);
+            MotorGroupItem.RaiseAction(MotorActionType.HomingForwardStarted);
             AnimateLeft();
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
index 6de37f3a2..76ff39d9c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ThreadMotionElementEditor.xaml.cs
@@ -133,7 +133,7 @@ namespace Tango.MachineStudio.Technician.Editors
 
         private void OnHomingStarted(object sender, RoutedEventArgs e)
         {
-            ThreadMotionItem.RaiseAction(MotorActionType.HomingStarted);
+            ThreadMotionItem.RaiseAction(MotorActionType.HomingForwardStarted);
             AnimateLeft();
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorActionType.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorActionType.cs
index 57dabbbb2..e42c87627 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorActionType.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MotorActionType.cs
@@ -15,7 +15,8 @@ namespace Tango.MachineStudio.Technician.TechItems
         ForwardReleased,
         BackwardPressed,
         BackwardReleased,
-        HomingStarted,
+        HomingForwardStarted,
+        HomingBackwardStarted,
         HomingStopped,
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index b0dac90f1..a02e09e9a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1262,7 +1262,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                             MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         });
                     }
-                    else if (action == MotorActionType.HomingStarted)
+                    else if (action == MotorActionType.HomingForwardStarted || action == MotorActionType.HomingBackwardStarted)
                     {
                         item.HomingProgress = 0;
                         item.IsHoming = true;
@@ -1272,6 +1272,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         {
                             MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                             Speed = item.Speed,
+                            Direction = action == MotorActionType.HomingBackwardStarted ? MotorDirection.Backward : MotorDirection.Forward
                         })
                         .Subscribe((response) =>
                         {
@@ -1353,7 +1354,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                             Index = item.TechDispenser.Code,
                         });
                     }
-                    else if (action == MotorActionType.HomingStarted)
+                    else if (action == MotorActionType.HomingForwardStarted || action == MotorActionType.HomingBackwardStarted)
                     {
                         item.HomingProgress = 0;
                         item.IsHoming = true;
@@ -1363,6 +1364,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         {
                             Index = item.TechDispenser.Code,
                             Speed = item.Speed,
+                            Direction = action == MotorActionType.HomingBackwardStarted ? MotorDirection.Backward : MotorDirection.Forward
                         })
                         .Subscribe((response) =>
                         {