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

1 files changed, 66 insertions, 9 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 8ddc544c0..d51607004 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
@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
 using Tango.Logging;
+using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Logging.Navigation;
 using Tango.MachineStudio.Logging.Parsing;
 using Tango.SharedUI;
@@ -16,9 +17,13 @@ namespace Tango.MachineStudio.Logging.ViewModels
     {
         private ApplicationLogFileParser _parser;
         private List<LogFile> _logFiles;
+        private INotificationProvider _notification;
 
-        private ObservableCollection<MessageLogItem> _logs;
-        public ObservableCollection<MessageLogItem> Logs
+        private ControlledObservableCollection<LogItemBase> _realTimeLogs;
+        private List<LogItemBase> _pausedLogs;
+
+        private ControlledObservableCollection<LogItemBase> _logs;
+        public ControlledObservableCollection<LogItemBase> Logs
         {
             get { return _logs; }
             set { _logs = value; RaisePropertyChangedAuto(); }
@@ -60,10 +65,31 @@ namespace Tango.MachineStudio.Logging.ViewModels
             set { _isRealTime = value; RaisePropertyChangedAuto(); OnSelectedDateChanged(); }
         }
 
+        private bool _realTimePaused;
+        public bool RealTimePaused
+        {
+            get { return _realTimePaused; }
+            set
+            {
+                _realTimePaused = value;
+                RaisePropertyChangedAuto();
+
+                if (!_realTimePaused)
+                {
+                    _realTimeLogs.InsertRange(0, _pausedLogs);
+                    _pausedLogs.Clear();
+                }
+            }
+        }
+
         public RelayCommand NavigateToHomeCommand { get; set; }
 
-        public ApplicationLogsViewVM(LoggingNavigationManager navigation)
+        public RelayCommand ToggleRealTimePaused { get; set; }
+
+        public ApplicationLogsViewVM(LoggingNavigationManager navigation, INotificationProvider notification)
         {
+            _notification = notification;
+
             NavigateToHomeCommand = new RelayCommand(() => navigation.NavigateTo(LoggingNavigationView.HomeView));
 
             _parser = new ApplicationLogFileParser();
@@ -71,28 +97,59 @@ namespace Tango.MachineStudio.Logging.ViewModels
             _logFiles = _parser.GetLogFiles();
             Dates = new ObservableCollection<DateTime>(_logFiles.Select(x => x.DateTime).OrderBy(x => x));
 
+            _realTimeLogs = new ControlledObservableCollection<LogItemBase>();
+            _pausedLogs = new List<LogItemBase>();
+
+            IsRealTime = true;
+            RealTimePaused = true;
+
             SelectedDate = Dates.Last();
 
             MinDate = Dates.Min();
             MaxDate = Dates.Max();
+
+            LogManager.NewLog += LogManager_NewLog;
+
+            ToggleRealTimePaused = new RelayCommand(() => RealTimePaused = !RealTimePaused);
+        }
+
+        private void LogManager_NewLog(object sender, LogItemBase log)
+        {
+            if (!RealTimePaused)
+            {
+                InvokeUI(() =>
+                {
+                    _realTimeLogs.Insert(0, log);
+                });
+            }
+            else
+            {
+                _pausedLogs.Add(log);
+            }
         }
 
-        private void OnSelectedDateChanged()
+        private async void OnSelectedDateChanged()
         {
             if (IsRealTime)
             {
-                //Events = _realTimeEvents;
+                Logs = _realTimeLogs;
             }
             else
             {
-                List<MessageLogItem> logs = new List<MessageLogItem>();
+                List<LogItemBase> logs = new List<LogItemBase>();
 
-                foreach (var logFile in _logFiles.Where(x => x.DateTime.Date == SelectedDate.Date))
+                using (_notification.PushTaskItem("Loading application logs..."))
                 {
-                    logs.AddRange(_parser.Parse(logFile));
+                    await Task.Factory.StartNew(() =>
+                    {
+                        foreach (var logFile in _logFiles.Where(x => x.DateTime.Date == SelectedDate.Date))
+                        {
+                            logs.AddRange(_parser.Parse(logFile));
+                        }
+                    });
                 }
 
-                Logs = logs.ToObservableCollection();
+                Logs = new ControlledObservableCollection<LogItemBase>(logs);
             }
         }
     }