From 35cef16ffc96b06f68f122361ea84030169bb730 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 10 Feb 2020 13:33:02 +0200
Subject: Some fixes on transport layer. Fix on machine operator upgrade
 firmware.. Fix on SessionFileLogger. Fix on PPC jobs view. Fix on Tech
 Catalog View.

---
 .../Tango.PPC.Browser/ViewModels/BrowserViewVM.cs  |  17 ++-
 .../PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml |  14 +-
 .../Tango.PPC.Technician/Views/CatalogView.xaml    | 151 +++++++++++----------
 3 files changed, 99 insertions(+), 83 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/ViewModels/BrowserViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/ViewModels/BrowserViewVM.cs
index 9650aa342..0f5a49639 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/ViewModels/BrowserViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/ViewModels/BrowserViewVM.cs
@@ -1,4 +1,5 @@
-using System;
+using CefSharp;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -95,6 +96,20 @@ namespace Tango.PPC.Browser.ViewModels
 
         }
 
+        public override void OnApplicationShuttingDown()
+        {
+            base.OnApplicationShuttingDown();
+
+            try
+            {
+                Cef.Shutdown();
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error shutting down cef.");
+            }
+        }
+
         private void Go()
         {
             if (View != null)
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
index cabcb44b9..94abe6b83 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
@@ -214,14 +214,14 @@
                             <touch:LightTouchDataGridColumn Width="1*" Header="Name" SortMember="Name" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='40',IsAsync=True}"></controls:FastTextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='40'}"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="117" Header="Length (m)" SortMember="Length">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Length,StringFormat=0.0,IsAsync=True}"></controls:FastTextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding Length,StringFormat=0.0}"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -235,7 +235,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter},IsAsync=True}"></controls:FastTextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -314,21 +314,21 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter},IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="1*" Header="Name" SortMember="Name" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='40',IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding Name,Converter={StaticResource StringEllipsisConverter},ConverterParameter='40'}" HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="117" Header="Length (m)" SortMember="Length">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Length,StringFormat=0.0,IsAsync=True}"></controls:FastTextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding Length,StringFormat=0.0}"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
@@ -342,7 +342,7 @@
                             <touch:LightTouchDataGridColumn Width="100" Header="Updated" SortMember="LastUpdated">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter},IsAsync=True}"></controls:FastTextBlock>
+                                        <TextBlock IsHitTestVisible="False" Text="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></TextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml
index 0eab521e1..8f4bc9f0b 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml
@@ -23,100 +23,101 @@
             <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold">Technician</TextBlock>
         </Border>
 
-        <Grid Grid.Row="1" VerticalAlignment="Top" Margin="20">
+        <touch:LightTouchScrollViewer Grid.Row="1">
+            <Grid Grid.Row="1" VerticalAlignment="Top" Margin="20">
+                <StackPanel Margin="30 0 30 0" DockPanel.Dock="Bottom" VerticalAlignment="Center">
 
-            <StackPanel Margin="30 0 30 0" DockPanel.Dock="Bottom" VerticalAlignment="Center">
+                    <StackPanel.Resources>
+                        <Style TargetType="touch:TouchButton" x:Key="ButtonMenu">
+                            <Setter Property="Padding" Value="10"></Setter>
+                            <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
+                            <Setter Property="Height" Value="140"></Setter>
+                            <Setter Property="Background" Value="Transparent"></Setter>
+                            <Setter Property="BorderBrush" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
+                            <Setter Property="BorderThickness" Value="1"></Setter>
+                            <Setter Property="Foreground" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
+                            <Setter Property="EnableDropShadow" Value="False"></Setter>
+                            <Setter Property="CornerRadius" Value="5"></Setter>
+                            <Setter Property="Margin" Value="0 0 0 20"></Setter>
+                            <Setter Property="RippleBrush" Value="#4BB8B8B8"></Setter>
+                        </Style>
+                    </StackPanel.Resources>
 
-                <StackPanel.Resources>
-                    <Style TargetType="touch:TouchButton" x:Key="ButtonMenu">
-                        <Setter Property="Padding" Value="10"></Setter>
-                        <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
-                        <Setter Property="Height" Value="140"></Setter>
-                        <Setter Property="Background" Value="Transparent"></Setter>
-                        <Setter Property="BorderBrush" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
-                        <Setter Property="BorderThickness" Value="1"></Setter>
-                        <Setter Property="Foreground" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
-                        <Setter Property="EnableDropShadow" Value="False"></Setter>
-                        <Setter Property="CornerRadius" Value="5"></Setter>
-                        <Setter Property="Margin" Value="0 0 0 20"></Setter>
-                        <Setter Property="RippleBrush" Value="#4BB8B8B8"></Setter>
-                    </Style>
-                </StackPanel.Resources>
+                    <TextBlock Margin="0 20 0 40" Foreground="{StaticResource TangoGrayTextBrush}">The technician module enables additional diagnostic tools.</TextBlock>
 
-                <TextBlock Margin="0 20 0 40" Foreground="{StaticResource TangoGrayTextBrush}">The technician module enables additional diagnostic tools.</TextBlock>
-
-                <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="LoggingView" Style="{StaticResource ButtonMenu}">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                        <Image Source="../Images/logging.png" Width="80" Height="80" />
-                        <StackPanel Margin="10 0 0 0">
-                            <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Logging</TextBlock>
-                            <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
+                    <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="LoggingView" Style="{StaticResource ButtonMenu}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                            <Image Source="../Images/logging.png" Width="80" Height="80" />
+                            <StackPanel Margin="10 0 0 0">
+                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Logging</TextBlock>
+                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
                                  Display and investigate issues using application and embedded device logs.
-                            </TextBlock>
+                                </TextBlock>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
-                </touch:TouchButton>
+                    </touch:TouchButton>
 
-                <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="SystemView" Style="{StaticResource ButtonMenu}">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                        <Image Source="../Images/system.png" Width="80" Height="80" />
-                        <StackPanel Margin="10 0 0 0">
-                            <TextBlock FontSize="{StaticResource TangoTitleFontSize}">System</TextBlock>
-                            <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
+                    <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="SystemView" Style="{StaticResource ButtonMenu}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                            <Image Source="../Images/system.png" Width="80" Height="80" />
+                            <StackPanel Margin="10 0 0 0">
+                                <TextBlock FontSize="{StaticResource TangoTitleFontSize}">System</TextBlock>
+                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
                                  Display system properties, perform system actions, reset, shutdown etc...
-                            </TextBlock>
+                                </TextBlock>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
-                </touch:TouchButton>
+                    </touch:TouchButton>
 
-                <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="DispensersView" Style="{StaticResource ButtonMenu}">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                        <Image Source="../Images/dispensers.png" Width="80" Height="80" />
-                        <StackPanel Margin="10 0 0 0">
-                            <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Dispensers</TextBlock>
-                            <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
+                    <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="DispensersView" Style="{StaticResource ButtonMenu}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                            <Image Source="../Images/dispensers.png" Width="80" Height="80" />
+                            <StackPanel Margin="10 0 0 0">
+                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Dispensers</TextBlock>
+                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
                                  Perform manual dispensers homing priming.
-                            </TextBlock>
+                                </TextBlock>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
-                </touch:TouchButton>
+                    </touch:TouchButton>
 
-                <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="PackagesView" Style="{StaticResource ButtonMenu}">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                        <Image Source="../Images/packages.png" Width="80" Height="80" />
-                        <StackPanel Margin="10 0 0 0">
-                            <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Installed Packages</TextBlock>
-                            <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
+                    <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="PackagesView" Style="{StaticResource ButtonMenu}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                            <Image Source="../Images/packages.png" Width="80" Height="80" />
+                            <StackPanel Margin="10 0 0 0">
+                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Installed Packages</TextBlock>
+                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
                                  View the history of update packages installation.
-                            </TextBlock>
+                                </TextBlock>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
-                </touch:TouchButton>
+                    </touch:TouchButton>
 
-                <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="UpdatesView" Style="{StaticResource ButtonMenu}">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                        <Image Source="../Images/sync.png" Width="80" Height="80" />
-                        <StackPanel Margin="10 0 0 0">
-                            <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Updates &amp; Synchronization</TextBlock>
-                            <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
+                    <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="UpdatesView" Style="{StaticResource ButtonMenu}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                            <Image Source="../Images/sync.png" Width="80" Height="80" />
+                            <StackPanel Margin="10 0 0 0">
+                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Updates &amp; Synchronization</TextBlock>
+                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
                                  View the current status and history of update and synchronization operations.
-                            </TextBlock>
+                                </TextBlock>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
-                </touch:TouchButton>
+                    </touch:TouchButton>
 
-                <touch:TouchButton Command="{Binding BrowserCommand}" Style="{StaticResource ButtonMenu}">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                        <Image Source="../Images/browser.png" RenderOptions.BitmapScalingMode="Fant" Width="80" Height="80" />
-                        <StackPanel Margin="10 0 0 0">
-                            <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Browser</TextBlock>
-                            <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
+                    <touch:TouchButton Command="{Binding BrowserCommand}" Style="{StaticResource ButtonMenu}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                            <Image Source="../Images/browser.png" RenderOptions.BitmapScalingMode="Fant" Width="80" Height="80" />
+                            <StackPanel Margin="10 0 0 0">
+                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Browser</TextBlock>
+                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" Width="580">
                                  Open the browser module and navigate the web.
-                            </TextBlock>
+                                </TextBlock>
+                            </StackPanel>
                         </StackPanel>
-                    </StackPanel>
-                </touch:TouchButton>
-            </StackPanel>
-        </Grid>
+                    </touch:TouchButton>
+                </StackPanel>
+            </Grid>
+        </touch:LightTouchScrollViewer>
     </Grid>
 </UserControl>
-- 
cgit v1.3.1