2. Update PPC DB Schema and Liquid Types. ***

3. Test preferred index on PPC. ***
3.1. Add Has_Pigment to Liquid Type. ***
4. Add "Use Preferred Index to Machine Studio. ***
4. Enable KeepAlive by default. ***
4. Disable upload HW for TCP by default. ***

2 files changed, 51 insertions, 13 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
index 2099b12d9..3d0ee2461 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
@@ -34,6 +34,16 @@ namespace Tango.MachineStudio.Developer
         /// </summary>
         public int GradientResolutionCM { get; set; }
 
+        private bool _usePreferredLiquidVolumeIndex;
+        /// <summary>
+        /// Gets or sets a value indicating whether to use the preferred liquid volume index.
+        /// </summary>
+        public bool UsePreferredLiquidVolumeIndex
+        {
+            get { return _usePreferredLiquidVolumeIndex; }
+            set { _usePreferredLiquidVolumeIndex = value;  RaisePropertyChangedAuto(); }
+        }
+
         public DeveloperModuleSettings()
         {
             ProcessParametersIndices = new List<ParameterIndex>();
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 8a5ec94fa..95f88d1ea 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
@@ -28,7 +28,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" x:Name="control">
 
     <UserControl.Resources>
 
@@ -249,7 +249,17 @@
         <DataTemplate x:Key="Volume_Template">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                 <StackPanel VerticalAlignment="Center">
-                    <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center">
+                    <ItemsControl VerticalAlignment="Center">
+                        <ItemsControl.Style>
+                            <Style TargetType="ItemsControl">
+                                <Setter Property="ItemsSource" Value="{Binding LiquidVolumes}"></Setter>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Settings.UsePreferredLiquidVolumeIndex}" Value="True">
+                                        <Setter Property="ItemsSource" Value="{Binding LiquidVolumesOrdered}"></Setter>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ItemsControl.Style>
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
@@ -785,16 +795,16 @@
 
                                                         </StackPanel>
 
-                                                        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal" Margin="0 40 40 0">
+                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 40 180 0">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="10 -2 10 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="DimGray">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="DimGray">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
-                                                        <Grid HorizontalAlignment="Right" Margin="0 0 0 0" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                        <Grid HorizontalAlignment="Right" Margin="0 0 0 0">
                                                             <StackPanel HorizontalAlignment="Right" Margin="0 0 0 0">
                                                                 <StackPanel Margin="0 10 0 0"  Orientation="Horizontal" VerticalAlignment="Center">
-                                                                    <ItemsControl ItemsSource="{Binding LiquidTypesRmls}">
+                                                                    <ItemsControl ItemsSource="{Binding LiquidTypesRmls}" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
                                                                         <ItemsControl.ItemsPanel>
                                                                             <ItemsPanelTemplate>
                                                                                 <WrapPanel IsItemsHost="True"></WrapPanel>
@@ -821,12 +831,20 @@
                                                                         </ItemsControl.ItemTemplate>
                                                                     </ItemsControl>
 
-                                                                    <Button Command="{Binding SaveLiquidFactorsCommand}" HorizontalAlignment="Right" Margin="0 20 0 0" Style="{StaticResource MaterialDesignFlatButton}">
-                                                                        <StackPanel Orientation="Horizontal">
-                                                                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="Harddisk"></materialDesign:PackIcon>
-                                                                            <TextBlock Margin="10 0 0 0">SAVE FACTORS</TextBlock>
+                                                                    <StackPanel Margin="0 20 0 0">
+                                                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 0 0 5" ToolTip="Sort the liquid volumes by their liquid type preferred index">
+                                                                            <Viewbox Width="25">
+                                                                                <ToggleButton IsChecked="{Binding Settings.UsePreferredLiquidVolumeIndex}" />
+                                                                            </Viewbox>
+                                                                            <TextBlock Margin="5 0 0 0" FontSize="10">Use Preferred Index</TextBlock>
                                                                         </StackPanel>
-                                                                    </Button>
+                                                                        <Button  Command="{Binding SaveLiquidFactorsCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                                            <StackPanel Orientation="Horizontal">
+                                                                                <materialDesign:PackIcon VerticalAlignment="Center" Kind="Harddisk"></materialDesign:PackIcon>
+                                                                                <TextBlock Margin="10 0 0 0">SAVE FACTORS</TextBlock>
+                                                                            </StackPanel>
+                                                                        </Button>
+                                                                    </StackPanel>
                                                                 </StackPanel>
                                                             </StackPanel>
                                                         </Grid>
@@ -1030,7 +1048,17 @@
                                                                                                     <DataTrigger Binding="{Binding ElementName=toggleExpand,Path=IsChecked}" Value="True">
                                                                                                         <Setter Property="Content">
                                                                                                             <Setter.Value>
-                                                                                                                <DataGrid ItemsSource="{Binding LiquidVolumes}" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" Background="Transparent" SelectionUnit="FullRow">
+                                                                                                                <DataGrid AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" Background="Transparent" SelectionUnit="FullRow">
+                                                                                                                    <DataGrid.Style>
+                                                                                                                        <Style TargetType="DataGrid" BasedOn="{StaticResource {x:Type DataGrid}}">
+                                                                                                                            <Setter Property="ItemsSource" Value="{Binding LiquidVolumes}"></Setter>
+                                                                                                                            <Style.Triggers>
+                                                                                                                                <DataTrigger Binding="{Binding Source={x:Reference control},Path=DataContext.Settings.UsePreferredLiquidVolumeIndex}" Value="True">
+                                                                                                                                    <Setter Property="ItemsSource" Value="{Binding LiquidVolumesOrdered}"></Setter>
+                                                                                                                                </DataTrigger>
+                                                                                                                            </Style.Triggers>
+                                                                                                                        </Style>
+                                                                                                                    </DataGrid.Style>
                                                                                                                     <DataGrid.CellStyle>
                                                                                                                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                                                                                                             <Setter Property="BorderThickness" Value="0"/>
@@ -1042,7 +1070,7 @@
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <Grid x:Name="t0">
-                                                                                                                                        <Polygon x:Name="t1" Points="0,0 15,0 0,15 0,0" Margin="-15 -11 0 0">
+                                                                                                                                        <Polygon x:Name="t1" Points="0,0 15,0 0,15 0,0" Margin="-15 -9 0 0">
                                                                                                                                             <Polygon.Fill>
                                                                                                                                                 <SolidColorBrush x:Name="t2" Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},FallbackValue={StaticResource dummyColor}}" />
                                                                                                                                             </Polygon.Fill>