From 02bc7f8e417b1c24eb35764167ad068452a36e2a Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 18 Jul 2018 13:22:21 +0300
Subject: Added finalization stage to job progress. Fixed issue with process
 parameters indices.

---
 .../ViewModels/MainViewVM.cs                       |  11 +
 .../Views/MainView.xaml                            | 556 +++++++++++----------
 2 files changed, 291 insertions(+), 276 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index d904c2e90..749a09023 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1185,6 +1185,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     });
                 };
 
+                _jobHandler.Finalizing += (_, __) => 
+                {
+                    _speech.SpeakInfo("Finalizing job...");
+                    LogManager.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
+                    _eventLogger.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
+                };
+
                 _jobHandler.Completed += (x, e) =>
                 {
                     LogManager.Log(String.Format("Job {0} has completed.", RunningJob.Name));
@@ -1328,9 +1335,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 ProcessParametersTablesGroup group = new ProcessParametersTablesGroup();
 
                 List<ProcessParametersTable> tables = new List<ProcessParametersTable>();
+
+                int index = 0;
+
                 foreach (var table in RmlProcessParametersTableGroup.ProcessParametersTables)
                 {
                     var newTable = table.CloneEntity();
+                    newTable.TableIndex = index++;
                     newTable.ProcessParametersTablesGroup = group;
                     tables.Add(newTable);
                 }
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 4830b67ed..a7348d869 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
@@ -93,316 +93,320 @@
                         </Style>
                     </Grid.Style>
                     <Border BorderBrush="#404040" BorderThickness="0 0 0 1" Padding="20">
-                        <DockPanel>
-                            <Grid DockPanel.Dock="Left" MinWidth="190" VerticalAlignment="Center" Margin="0 0 0 0">
-                                <StackPanel Orientation="Vertical"  Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <ProgressBar  Foreground="#FF6464" Width="50" Height="50" HorizontalAlignment="Center" VerticalAlignment="Center" IsIndeterminate="True" Style="{StaticResource MaterialDesignCircularProgressBar}" Value="0" />
-                                    <TextBlock Margin="0 10 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontStyle="Italic" FontWeight="DemiBold" Foreground="#FF6464" TextWrapping="Wrap">
+                        <Grid>
+                            <DockPanel>
+                                <Grid DockPanel.Dock="Left" MinWidth="190" VerticalAlignment="Center" Margin="0 0 0 0">
+                                    <StackPanel Orientation="Vertical"  Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <ProgressBar  Foreground="#FF6464" Width="50" Height="50" HorizontalAlignment="Center" VerticalAlignment="Center" IsIndeterminate="True" Style="{StaticResource MaterialDesignCircularProgressBar}" Value="0" />
+                                        <TextBlock Margin="0 10 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontStyle="Italic" FontWeight="DemiBold" Foreground="#FF6464" TextWrapping="Wrap">
                                 <Run Text="Running '"></Run>
                                 <Run Text="{Binding RunningJob.Name}"></Run>
                                 <Run Text="'..."></Run>
-                                    </TextBlock>
-                                </StackPanel>
-                            </Grid>
-                            <StackPanel DockPanel.Dock="Right" VerticalAlignment="Center" Margin="0 20 0 0">
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock VerticalAlignment="Center" FontSize="30" FontFamily="{StaticResource digital-7}" Margin="0 0 40 0" Foreground="#FF6464" Width="100" Text="{Binding RunningJobStatus.RemainingTime,StringFormat=hh\\:mm\\:ss}"></TextBlock>
-
-                                    <Button Height="40" Width="170" Command="{Binding StopJobCommand}" Background="#FF6464" BorderBrush="#FF6464">
-                                        <StackPanel Orientation="Horizontal">
-                                            <materialDesign:PackIcon VerticalAlignment="Center" Width="24" Height="24" Kind="Stop" />
-                                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">STOP</TextBlock>
-                                        </StackPanel>
-                                    </Button>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </Grid>
+                                <StackPanel DockPanel.Dock="Right" VerticalAlignment="Center" Margin="0 20 0 0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock VerticalAlignment="Center" FontSize="30" FontFamily="{StaticResource digital-7}" Margin="0 0 40 0" Foreground="#FF6464" Width="100" Text="{Binding RunningJobStatus.RemainingTime,StringFormat=hh\\:mm\\:ss}"></TextBlock>
+
+                                        <Button Height="40" Width="170" Command="{Binding StopJobCommand}" Background="#FF6464" BorderBrush="#FF6464">
+                                            <StackPanel Orientation="Horizontal">
+                                                <materialDesign:PackIcon VerticalAlignment="Center" Width="24" Height="24" Kind="Stop" />
+                                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">STOP</TextBlock>
+                                            </StackPanel>
+                                        </Button>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                            <Grid>
                                 <Grid>
-                                    <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 RunningJobStatus.CurrentUnitSegments}" Margin="0 0 60 0">
-                                                <ItemsControl.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid ClipToBounds="False">
-                                                            <Grid.ToolTip>
-                                                                <ToolTip Background="White" Padding="0" Visibility="{Binding IsInterSegment,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                                    <Border BorderThickness="1" BorderBrush="#202020" CornerRadius="3" Padding="5">
-                                                                        <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" SelectedIndex="-1" 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">
+                                    <Grid>
+                                        <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 RunningJobStatus.CurrentUnitSegments}" Margin="0 0 60 0">
+                                                    <ItemsControl.ItemsPanel>
+                                                        <ItemsPanelTemplate>
+                                                            <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
+                                                        </ItemsPanelTemplate>
+                                                    </ItemsControl.ItemsPanel>
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <Grid ClipToBounds="False">
+                                                                <Grid.ToolTip>
+                                                                    <ToolTip Background="White" Padding="0" Visibility="{Binding IsInterSegment,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                                        <Border BorderThickness="1" BorderBrush="#202020" CornerRadius="3" Padding="5">
+                                                                            <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" SelectedIndex="-1" 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">
+                                                                                                    </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">
+                                                                                                    </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">
+                                                                                                    </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">
+                                                                                                    </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">
+                                                                                                    </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>
+                                                                                                    </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>
+                                                                                                                        </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>
-                                                                    </Border>
-                                                                </ToolTip>
-                                                            </Grid.ToolTip>
-                                                            <Grid.Width>
-                                                                <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
-                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJobStatus.CurrentUnitTotalProgress"></Binding>
-                                                                    <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth"></Binding>
-                                                                    <Binding Path="Length"></Binding>
-                                                                </MultiBinding>
-                                                            </Grid.Width>
-
-                                                            <StackPanel Margin="0 0 0 0" ClipToBounds="False">
-
-                                                                <StackPanel Margin="0 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                                    <Canvas Height="19">
-                                                                    <TextBlock Canvas.Top="0" Canvas.Left="-7" Margin="0 0 0 0" FontSize="10" HorizontalAlignment="Right">
+                                                                                                                                </TextBlock>
+                                                                                                                            </Setter.Value>
+                                                                                                                        </Setter>
+                                                                                                                    </DataTrigger>
+                                                                                                                </Style.Triggers>
+                                                                                                            </Style>
+                                                                                                        </Label.Style>
+                                                                                                    </Label>
+                                                                                                </DataTemplate>
+                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                        </DataGridTemplateColumn>
+                                                                                    </DataGrid.Columns>
+                                                                                </DataGrid>
+                                                                            </StackPanel>
+                                                                        </Border>
+                                                                    </ToolTip>
+                                                                </Grid.ToolTip>
+                                                                <Grid.Width>
+                                                                    <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
+                                                                        <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJobStatus.CurrentUnitTotalProgress"></Binding>
+                                                                        <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth"></Binding>
+                                                                        <Binding Path="Length"></Binding>
+                                                                    </MultiBinding>
+                                                                </Grid.Width>
+
+                                                                <StackPanel Margin="0 0 0 0" ClipToBounds="False">
+
+                                                                    <StackPanel Margin="0 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                                        <Canvas Height="19">
+                                                                            <TextBlock Canvas.Top="0" Canvas.Left="-7" Margin="0 0 0 0" FontSize="10" HorizontalAlignment="Right">
                                                                                 <Run Text="{Binding Length,Mode=OneWay,StringFormat=0}"></Run>
                                                                                 <Run FontSize="7" Text="m"></Run>
-                                                                    </TextBlock>
+                                                                            </TextBlock>
+                                                                        </Canvas>
+                                                                        <materialDesign:PackIcon HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5" Kind="Triangle" Width="12" Height="12">
+                                                                            <materialDesign:PackIcon.RenderTransform>
+                                                                                <RotateTransform Angle="180" />
+                                                                            </materialDesign:PackIcon.RenderTransform>
+                                                                        </materialDesign:PackIcon>
+                                                                    </StackPanel>
+
+                                                                    <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center">
+                                                                        <Rectangle.Fill>
+                                                                            <MultiBinding Converter="{StaticResource SegmentToBrushConverterMulti}">
+                                                                                <Binding Path="."></Binding>
+                                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob"></Binding>
+                                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob.Length"></Binding>
+                                                                            </MultiBinding>
+                                                                        </Rectangle.Fill>
+                                                                    </Rectangle>
+
+                                                                    <Canvas Height="30" HorizontalAlignment="Center" Width="80">
+                                                                        <Label Padding="0" Margin="0">
+                                                                            <Label.Style>
+                                                                                <Style TargetType="Label">
+                                                                                    <Setter Property="Content" Value="{x:Null}"></Setter>
+                                                                                    <Style.Triggers>
+                                                                                        <DataTrigger Binding="{Binding Started}" Value="True">
+                                                                                            <Setter Property="Content">
+                                                                                                <Setter.Value>
+                                                                                                    <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="#FF6464" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
+                                                                                                </Setter.Value>
+                                                                                            </Setter>
+                                                                                        </DataTrigger>
+                                                                                        <DataTrigger Binding="{Binding Completed}" Value="True">
+                                                                                            <Setter Property="Content">
+                                                                                                <Setter.Value>
+                                                                                                    <materialDesign:PackIcon Margin="30 10 0 0" HorizontalAlignment="Center" Width="24" Height="24" Kind="Check" Foreground="#47FF00" />
+                                                                                                </Setter.Value>
+                                                                                            </Setter>
+                                                                                        </DataTrigger>
+                                                                                    </Style.Triggers>
+                                                                                </Style>
+                                                                            </Label.Style>
+                                                                        </Label>
                                                                     </Canvas>
-                                                                    <materialDesign:PackIcon HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5" Kind="Triangle" Width="12" Height="12">
-                                                                        <materialDesign:PackIcon.RenderTransform>
-                                                                            <RotateTransform Angle="180" />
-                                                                        </materialDesign:PackIcon.RenderTransform>
-                                                                    </materialDesign:PackIcon>
                                                                 </StackPanel>
 
-                                                                <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center">
-                                                                    <Rectangle.Fill>
-                                                                        <MultiBinding Converter="{StaticResource SegmentToBrushConverterMulti}">
-                                                                            <Binding Path="."></Binding>
-                                                                            <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob"></Binding>
-                                                                            <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob.Length"></Binding>
-                                                                        </MultiBinding>
-                                                                    </Rectangle.Fill>
-                                                                </Rectangle>
-
-                                                                <Canvas Height="30" HorizontalAlignment="Center" Width="80">
-                                                                    <Label Padding="0" Margin="0">
-                                                                        <Label.Style>
-                                                                            <Style TargetType="Label">
-                                                                                <Setter Property="Content" Value="{x:Null}"></Setter>
-                                                                                <Style.Triggers>
-                                                                                    <DataTrigger Binding="{Binding Started}" Value="True">
-                                                                                        <Setter Property="Content">
-                                                                                            <Setter.Value>
-                                                                                                <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="#FF6464" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
-                                                                                            </Setter.Value>
-                                                                                        </Setter>
-                                                                                    </DataTrigger>
-                                                                                    <DataTrigger Binding="{Binding Completed}" Value="True">
-                                                                                        <Setter Property="Content">
-                                                                                            <Setter.Value>
-                                                                                                <materialDesign:PackIcon Margin="30 10 0 0" HorizontalAlignment="Center" Width="24" Height="24" Kind="Check" Foreground="#47FF00" />
-                                                                                            </Setter.Value>
-                                                                                        </Setter>
-                                                                                    </DataTrigger>
-                                                                                </Style.Triggers>
-                                                                            </Style>
-                                                                        </Label.Style>
-                                                                    </Label>
-                                                                </Canvas>
-                                                            </StackPanel>
-
-                                                            <Rectangle HorizontalAlignment="Right" Stroke="White" Margin="0 35 0 25" ></Rectangle>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-
-                                            <StackPanel Margin="-40 -5 0 0" HorizontalAlignment="Left">
-                                                <TextBlock FontSize="14">
+                                                                <Rectangle HorizontalAlignment="Right" Stroke="White" Margin="0 35 0 25" ></Rectangle>
+                                                            </Grid>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+
+                                                <StackPanel Margin="-40 -5 0 0" HorizontalAlignment="Left">
+                                                    <TextBlock FontSize="14">
                                                                                 <Run Text="0"></Run>
                                                                                 <Run FontSize="13" Text="m"></Run>
-                                                </TextBlock>
-                                                <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="SubdirectoryArrowRight" Width="20" Height="20">
+                                                    </TextBlock>
+                                                    <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="SubdirectoryArrowRight" Width="20" Height="20">
 
-                                                </materialDesign:PackIcon>
-                                            </StackPanel>
+                                                    </materialDesign:PackIcon>
+                                                </StackPanel>
 
-                                            <StackPanel Margin="0 -5 -70 0" HorizontalAlignment="Right">
-                                                <TextBlock FontSize="14">
+                                                <StackPanel Margin="0 -5 -70 0" HorizontalAlignment="Right">
+                                                    <TextBlock FontSize="14">
                                                                                 <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>
-                                                </TextBlock>
-                                                <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="FlagCheckered" Width="20" Height="20">
-
-                                                </materialDesign:PackIcon>
-                                            </StackPanel>
-
-                                            <Border BorderBrush="#404040" BorderThickness="1" VerticalAlignment="Center" Height="30" Margin="0 11 60 0">
-
-                                            </Border>
-
-                                            <Canvas x:Name="jobProgressCanvas" Width="{Binding ElementName=runningJobBrushList,Path=ActualWidth}" HorizontalAlignment="Left">
-                                                <Grid Canvas.Top="0">
-                                                    <Canvas.Left>
-                                                        <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}">
-                                                            <Binding Path="RunningJobStatus.CurrentUnitTotalProgress" />
-                                                            <Binding Path="RunningJobStatus.CurrentUnitProgress" />
-                                                            <Binding ElementName="jobProgressCanvas" Path="ActualWidth" />
-                                                        </MultiBinding>
-                                                    </Canvas.Left>
-                                                    <materialDesign:PackIcon Kind="MapMarker" Foreground="#FF6464" Width="35" Height="35" Margin="-17 0 0 0" />
-                                                    <TextBlock Margin="-11 -23 0 0" FontSize="16" Foreground="#FF6464" VerticalAlignment="Top" Height="18" Text="{Binding RunningJobStatus.Progress,StringFormat=0.0}"></TextBlock>
-                                                </Grid>
-                                            </Canvas>
-                                        </Grid>
-                                    </Border>
+                                                    </TextBlock>
+                                                    <materialDesign:PackIcon HorizontalAlignment="Right" RenderTransformOrigin="0.5,0.5" Kind="FlagCheckered" Width="20" Height="20">
+
+                                                    </materialDesign:PackIcon>
+                                                </StackPanel>
+
+                                                <Border BorderBrush="#404040" BorderThickness="1" VerticalAlignment="Center" Height="30" Margin="0 11 60 0">
+
+                                                </Border>
+
+                                                <Canvas x:Name="jobProgressCanvas" Width="{Binding ElementName=runningJobBrushList,Path=ActualWidth}" HorizontalAlignment="Left">
+                                                    <Grid Canvas.Top="0">
+                                                        <Canvas.Left>
+                                                            <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}">
+                                                                <Binding Path="RunningJobStatus.CurrentUnitTotalProgress" />
+                                                                <Binding Path="RunningJobStatus.CurrentUnitProgress" />
+                                                                <Binding ElementName="jobProgressCanvas" Path="ActualWidth" />
+                                                            </MultiBinding>
+                                                        </Canvas.Left>
+                                                        <materialDesign:PackIcon Kind="MapMarker" Foreground="#FF6464" Width="35" Height="35" Margin="-17 0 0 0" />
+                                                        <TextBlock Margin="-11 -23 0 0" FontSize="16" Foreground="#FF6464" VerticalAlignment="Top" Height="18" Text="{Binding RunningJobStatus.Progress,StringFormat=0.0}"></TextBlock>
+                                                    </Grid>
+                                                </Canvas>
+                                            </Grid>
+                                        </Border>
+                                    </Grid>
                                 </Grid>
-                            </Grid>
-                        </DockPanel>
+                            </DockPanel>
+
+                            <TextBlock Visibility="{Binding RunningJobStatus.IsFinalizing,Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="-170 0 0 0" Background="#202020" FontSize="14" Height="30" Foreground="#FF6D6D">Finalizing...</TextBlock>
+                        </Grid>
                     </Border>
 
                     <ProgressBar IsIndeterminate="True" VerticalAlignment="Bottom" Height="3" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}"></ProgressBar>
-- 
cgit v1.3.1