Implemented FSE/PPC Logs.

4 files changed, 10 insertions, 10 deletions

diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/ApplicationLogItemView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/ApplicationLogItemView.xaml
index 844bdc992..6abda9b6d 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/ApplicationLogItemView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/ApplicationLogItemView.xaml
@@ -11,14 +11,14 @@
     <DockPanel Margin="10">
 
         <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-            <material:PackIcon Width="42" Height="42" VerticalAlignment="Center" Style="{StaticResource FSE_LogIcon}" />
+            <material:PackIcon DataContext="{Binding LogItem}" Width="42" Height="42" VerticalAlignment="Center" Style="{StaticResource FSE_LogIcon}" />
             <TextBlock VerticalAlignment="Center" Text="{Binding LogItem.Message}" TextWrapping="NoWrap" Height="22" TextTrimming="CharacterEllipsis" Width="700" Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}"></TextBlock>
         </StackPanel>
 
         <Grid Margin="0 10 0 0" DockPanel.Dock="Top">
             <controls:TableGrid RowHeight="30">
                 <TextBlock Text="Time Stamp:" FontWeight="SemiBold" />
-                <TextBlock Text="{Binding LogItem.TimeStamp,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}"></TextBlock>
+                <TextBlock Text="{Binding LogItem.TimeStamp,StringFormat='HH:mm:ss.fff'}"></TextBlock>
                 <TextBlock Text="Category:" FontWeight="SemiBold" />
                 <TextBlock Text="{Binding LogItem.Category}"></TextBlock>
                 <TextBlock Text="File:" FontWeight="SemiBold" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/MachineLogItemView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/FirmwareLogItemView.xaml
index 776e6d893..49d67f205 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/MachineLogItemView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/FirmwareLogItemView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Tango.FSE.Common.Dialogs.MachineLogItemView"
+<UserControl x:Class="Tango.FSE.Common.Dialogs.FirmwareLogItemView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -7,18 +7,18 @@
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.FSE.Common.Dialogs"
              mc:Ignorable="d" 
-             Width="800" Height="500" d:DataContext="{d:DesignInstance Type=local:MachineLogItemViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+             Width="800" Height="500" d:DataContext="{d:DesignInstance Type=local:FirmwareLogItemViewVM, IsDesignTimeCreatable=False}" Background="{StaticResource FSE_PrimaryBackgroundLightBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
     <DockPanel Margin="10">
 
         <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-            <material:PackIcon Width="42" Height="42" VerticalAlignment="Center" Style="{StaticResource FSE_LogIcon}" />
+            <material:PackIcon DataContext="{Binding LogItem}" Width="42" Height="42" VerticalAlignment="Center" Style="{StaticResource FSE_LogIcon}" />
             <TextBlock VerticalAlignment="Center" Text="{Binding LogItem.Message}" TextWrapping="NoWrap" Height="22" TextTrimming="CharacterEllipsis" Width="700" Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}"></TextBlock>
         </StackPanel>
 
         <Grid Margin="0 10 0 0" DockPanel.Dock="Top">
             <controls:TableGrid RowHeight="30">
                 <TextBlock Text="Time Stamp:" FontWeight="SemiBold" />
-                <TextBlock Text="{Binding LogItem.TimeStamp,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}"></TextBlock>
+                <TextBlock Text="{Binding LogItem.TimeStamp,StringFormat='HH:mm:ss.fff'}"></TextBlock>
                 <TextBlock Text="Category:" FontWeight="SemiBold" />
                 <TextBlock Text="{Binding LogItem.Category}"></TextBlock>
                 <TextBlock Text="File:" FontWeight="SemiBold" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/MachineLogItemView.xaml.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/FirmwareLogItemView.xaml.cs
index 97103c34e..6e7556c40 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/MachineLogItemView.xaml.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/FirmwareLogItemView.xaml.cs
@@ -18,9 +18,9 @@ namespace Tango.FSE.Common.Dialogs
     /// <summary>
     /// Interaction logic for ApplicationLogItemView.xaml
     /// </summary>
-    public partial class MachineLogItemView : UserControl
+    public partial class FirmwareLogItemView : UserControl
     {
-        public MachineLogItemView()
+        public FirmwareLogItemView()
         {
             InitializeComponent();
         }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/MachineLogItemViewVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/FirmwareLogItemViewVM.cs
index 2ac7a7b3a..1ee76e381 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/MachineLogItemViewVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Dialogs/FirmwareLogItemViewVM.cs
@@ -7,11 +7,11 @@ using Tango.Integration.Logging;
 
 namespace Tango.FSE.Common.Dialogs
 {
-    public class MachineLogItemViewVM : FSEDialogViewVM
+    public class FirmwareLogItemViewVM : FSEDialogViewVM
     {
         public EmbeddedLogItem LogItem { get; set; }
 
-        public MachineLogItemViewVM()
+        public FirmwareLogItemViewVM()
         {
             CanClose = false;
             OKText = "CLOSE";