Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

3 files changed, 57 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index ffb16fed4..eb172069e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -9,6 +9,7 @@ using Tango.Logging;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Logging.Navigation;
 using Tango.MachineStudio.Logging.Parsing;
+using Tango.MachineStudio.Logging.Views;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.Logging.ViewModels
@@ -29,6 +30,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
             set { _logs = value; RaisePropertyChangedAuto(); }
         }
 
+        private LogItemBase _selectedLog;
+        public LogItemBase SelectedLog
+        {
+            get { return _selectedLog; }
+            set { _selectedLog = value; RaisePropertyChangedAuto(); OnSelectedLogChanged(); }
+        }
+
         private ObservableCollection<DateTime> _dates;
         public ObservableCollection<DateTime> Dates
         {
@@ -155,5 +163,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
                 Logs = new ControlledObservableCollection<LogItemBase>(logs);
             }
         }
+
+        private void OnSelectedLogChanged()
+        {
+            if (SelectedLog != null)
+            {
+                _notification.ShowModalDialog<LogDetailsViewVM, ApplicationLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => { }, () => { });
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
index 959d294c7..8cf4edcb3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
@@ -11,6 +11,7 @@ using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.MachineStudio.Logging.Navigation;
 using Tango.MachineStudio.Logging.Parsing;
+using Tango.MachineStudio.Logging.Views;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.Logging.ViewModels
@@ -31,6 +32,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
             set { _logs = value; RaisePropertyChangedAuto(); }
         }
 
+        private LogItemBase _selectedLog;
+        public LogItemBase SelectedLog
+        {
+            get { return _selectedLog; }
+            set { _selectedLog = value; RaisePropertyChangedAuto(); OnSelectedLogChanged(); }
+        }
+
         private ObservableCollection<DateTime> _dates;
         public ObservableCollection<DateTime> Dates
         {
@@ -157,5 +165,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
                 Logs = new ControlledObservableCollection<LogItemBase>(logs);
             }
         }
+
+        private void OnSelectedLogChanged()
+        {
+            if (SelectedLog != null)
+            {
+                _notification.ShowModalDialog<LogDetailsViewVM, EmbeddedLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => { }, () => { });
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/LogDetailsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/LogDetailsViewVM.cs
new file mode 100644
index 000000000..873fdd6a1
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/LogDetailsViewVM.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Logging;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.Logging.ViewModels
+{
+    public class LogDetailsViewVM : DialogViewVM
+    {
+        public LogItemBase Log { get; set; }
+
+        public LogDetailsViewVM()
+        {
+
+        }
+
+        public LogDetailsViewVM(LogItemBase log) : this()
+        {
+            Log = log;
+        }
+    }
+}