*1. Implement Real Progress on Machine Emulator.

*2. Add ParameterIgnore to Observable Entity validation props.
*3. Block logging of similar continous job status events from embedded. (Add counter for embedded logs).
*6. Make font size larger on Research module.
*7. Open jobs on double click.
*9. Add default sorting to job events. (NOT WORKING)
*10. Add tool tips for job progress.
*12. Test PPC Job Progress
*13. Fix issue with inversed color conversion.

1 files changed, 175 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index fd3b2289d..d8da5a804 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -5,8 +5,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:dispensing="clr-namespace:Tango.BL.Dispensing;assembly=Tango.BL"
              xmlns:localConverters="clr-namespace:Tango.MachineStudio.Developer.Converters"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
              xmlns:global="clr-namespace:Tango.MachineStudio.Developer"
@@ -35,6 +37,9 @@
         <localConverters:JobProgressToPositionConverter x:Key="JobProgressToPositionConverter" />
         <localConverters:BrushStopToOffsetValueConverter x:Key="BrushStopToOffsetValueConverter" />
         <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
+        <converters:IsNotConverter x:Key="IsNotConverter" />
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
+        <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
 
 
         <SolidColorBrush x:Key="SideBarBackground" Color="White">
@@ -42,6 +47,12 @@
         </SolidColorBrush>
 
         <Color x:Key="dummyColor">Transparent</Color>
+
+        <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="dispensing:DispenserStepDivisions"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
     </UserControl.Resources>
 
 
@@ -110,7 +121,7 @@
                                     <Border Margin="0 10 0 0" VerticalAlignment="Bottom" Width="1200" BorderBrush="#404040" BorderThickness="0" ClipToBounds="False">
                                         <Grid ClipToBounds="False" >
 
-                                            <ItemsControl ClipToBounds="False" x:Name="runningJobBrushList" ItemsSource="{Binding RunningJobSegments}" Margin="0 0 60 0">
+                                            <ItemsControl ClipToBounds="False" x:Name="runningJobBrushList" ItemsSource="{Binding RunningJobStatus.CurrentUnitSegments}" Margin="0 0 60 0">
                                                 <ItemsControl.ItemsPanel>
                                                     <ItemsPanelTemplate>
                                                         <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
@@ -119,10 +130,169 @@
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate>
                                                         <Grid ClipToBounds="False">
+                                                            <Grid.ToolTip>
+                                                                <ToolTip Background="White" BorderThickness="1" BorderBrush="#202020">
+                                                                    <StackPanel Background="White">
+                                                                        <ItemsControl ItemsSource="{Binding BrushStops[0].LiquidVolumes}" VerticalAlignment="Center">
+                                                                            <ItemsControl.ItemsPanel>
+                                                                                <ItemsPanelTemplate>
+                                                                                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                                                                                </ItemsPanelTemplate>
+                                                                            </ItemsControl.ItemsPanel>
+                                                                            <ItemsControl.ItemTemplate>
+                                                                                <DataTemplate>
+                                                                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                        <ContentControl.Foreground>
+                                                                                            <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                        </ContentControl.Foreground>
+                                                                                        <TextBlock Foreground="#202020" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
+                                                                                    </ContentControl>
+                                                                                </DataTemplate>
+                                                                            </ItemsControl.ItemTemplate>
+                                                                        </ItemsControl>
+
+                                                                        <DataGrid Margin="0 10 0 0" IsReadOnly="True" ItemsSource="{Binding BrushStops[0].LiquidVolumes}" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" Background="Transparent" SelectionUnit="FullRow">
+                                                                            <DataGrid.CellStyle>
+                                                                                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                                                                    <Setter Property="BorderThickness" Value="0"/>
+                                                                                    <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                                                                </Style>
+                                                                            </DataGrid.CellStyle>
+                                                                            <DataGrid.Columns>
+                                                                                <DataGridTemplateColumn Header="IDS PACK">
+                                                                                    <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.Fill>
+                                                                                                        <SolidColorBrush x:Name="t2" Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},FallbackValue={StaticResource dummyColor}}" />
+                                                                                                    </Polygon.Fill>
+                                                                                                </Polygon>
+                                                                                                <TextBlock FontWeight="SemiBold" TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+                                                                                            </Grid>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="D/F">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                            </TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="STEP">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
+                                                                                                <ComboBox.ItemContainerStyle>
+                                                                                                    <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
+                                                                                                        <Setter Property="Background" Value="#ECECEC"></Setter>
+                                                                                                    </Style>
+                                                                                                </ComboBox.ItemContainerStyle>
+                                                                                                <ComboBox.ItemTemplate>
+                                                                                                    <DataTemplate>
+                                                                                                        <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                                                                                    </DataTemplate>
+                                                                                                </ComboBox.ItemTemplate>
+                                                                                            </ComboBox>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="MAX NL / CM">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding LiquidMaxNanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                            </TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="VOLUME">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding Volume,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="%" Foreground="Gray"></Run>
+                                                                                            </TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="FORMULA">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding IdsPack.IdsPackFormula.Name}"></Run>
+                                                                                            </TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="NL / CM">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding NanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                            </TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="NL / SEC">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding NanoliterPerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
+                                                                                            </TextBlock>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                                <DataGridTemplateColumn Header="PULSE / SEC">
+                                                                                    <DataGridTemplateColumn.CellTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <Label VerticalAlignment="Center">
+                                                                                                <Label.Style>
+                                                                                                    <Style TargetType="Label">
+                                                                                                        <Setter Property="Content">
+                                                                                                            <Setter.Value>
+                                                                                                                <TextBlock>
+                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                </TextBlock>
+                                                                                                            </Setter.Value>
+                                                                                                        </Setter>
+                                                                                                        <Style.Triggers>
+                                                                                                            <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
+                                                                                                                <Setter Property="Content" Value="Auto"></Setter>
+                                                                                                            </DataTrigger>
+                                                                                                            <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
+                                                                                                                <Setter Property="Content">
+                                                                                                                    <Setter.Value>
+                                                                                                                        <TextBlock>
+                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                        </TextBlock>
+                                                                                                                    </Setter.Value>
+                                                                                                                </Setter>
+                                                                                                            </DataTrigger>
+                                                                                                        </Style.Triggers>
+                                                                                                    </Style>
+                                                                                                </Label.Style>
+                                                                                            </Label>
+                                                                                        </DataTemplate>
+                                                                                    </DataGridTemplateColumn.CellTemplate>
+                                                                                </DataGridTemplateColumn>
+                                                                            </DataGrid.Columns>
+                                                                        </DataGrid>
+                                                                    </StackPanel>
+                                                                </ToolTip>
+                                                            </Grid.ToolTip>
                                                             <Grid.Width>
                                                                 <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
-                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob"></Binding>
-                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob.Length"></Binding>
+                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJobStatus.CurrentUnitTotalProgress"></Binding>
                                                                     <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth"></Binding>
                                                                     <Binding Path="Length"></Binding>
                                                                 </MultiBinding>
@@ -197,7 +367,7 @@
 
                                             <StackPanel Margin="0 -5 -70 0" HorizontalAlignment="Right">
                                                 <TextBlock FontSize="14">
-                                                                                <Run Text="{Binding RunningJob.Length,Mode=OneWay,StringFormat=N2}"></Run>
+                                                                                <Run Text="{Binding RunningJobStatus.CurrentUnitTotalProgress,Mode=OneWay,StringFormat=N2}"></Run>
                                                                                 <Run FontSize="13" Text="m"></Run>
                                                                                 <Run></Run>
                                                                                 <Run Foreground="#FF6464">x</Run><Run Foreground="#FF6464" FontSize="16" FontWeight="SemiBold" Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
@@ -211,7 +381,7 @@
 
                                             </Border>
 
-                                            <Canvas x:Name="jobProgressCanvas">
+                                            <Canvas x:Name="jobProgressCanvas" Width="{Binding ElementName=runningJobBrushList,Path=ActualWidth}" HorizontalAlignment="Left">
                                                 <Grid Canvas.Top="0">
                                                     <Canvas.Left>
                                                         <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}">