From e66cd269ad02302f2a5a4ec377112cd61789647e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 16 Apr 2018 17:45:25 +0300 Subject: Application Logs & Embedded Logs on Logging Module! --- .../ViewModels/ApplicationLogsViewVM.cs | 75 ++++++++-- .../ViewModels/EmbeddedLogsViewVM.cs | 158 +++++++++++++++++++++ 2 files changed, 224 insertions(+), 9 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels') 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 _logFiles; + private INotificationProvider _notification; - private ObservableCollection _logs; - public ObservableCollection Logs + private ControlledObservableCollection _realTimeLogs; + private List _pausedLogs; + + private ControlledObservableCollection _logs; + public ControlledObservableCollection 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(_logFiles.Select(x => x.DateTime).OrderBy(x => x)); + _realTimeLogs = new ControlledObservableCollection(); + _pausedLogs = new List(); + + 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 logs = new List(); + List logs = new List(); - 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(logs); } } } 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 new file mode 100644 index 000000000..126f61402 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs @@ -0,0 +1,158 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core.Commands; +using Tango.Integration.Operation; +using Tango.Logging; +using Tango.MachineStudio.Common.Notifications; +using Tango.MachineStudio.Common.StudioApplication; +using Tango.MachineStudio.Logging.Navigation; +using Tango.MachineStudio.Logging.Parsing; +using Tango.SharedUI; + +namespace Tango.MachineStudio.Logging.ViewModels +{ + public class EmbeddedLogsViewVM : ViewModel + { + private EmbeddedLogFileParser _parser; + private List _logFiles; + private INotificationProvider _notification; + + private ControlledObservableCollection _realTimeLogs; + private List _pausedLogs; + + private ControlledObservableCollection _logs; + public ControlledObservableCollection Logs + { + get { return _logs; } + set { _logs = value; RaisePropertyChangedAuto(); } + } + + private ObservableCollection _dates; + public ObservableCollection Dates + { + get { return _dates; } + set { _dates = value; RaisePropertyChangedAuto(); } + } + + private DateTime _selectedDate; + public DateTime SelectedDate + { + get { return _selectedDate; } + set { _selectedDate = value; RaisePropertyChangedAuto(); OnSelectedDateChanged(); } + } + + private DateTime _minDate; + public DateTime MinDate + { + get { return _minDate; } + set { _minDate = value; RaisePropertyChangedAuto(); } + } + + private DateTime _maxDate; + public DateTime MaxDate + { + get { return _maxDate; } + set { _maxDate = value; RaisePropertyChangedAuto(); } + } + + + private bool _isRealTime; + public bool IsRealTime + { + get { return _isRealTime; } + 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 RelayCommand ToggleRealTimePaused { get; set; } + + public EmbeddedLogsViewVM(LoggingNavigationManager navigation, IStudioApplicationManager application, INotificationProvider notification) + { + _notification = notification; + + NavigateToHomeCommand = new RelayCommand(() => navigation.NavigateTo(LoggingNavigationView.HomeView)); + + _parser = new EmbeddedLogFileParser(); + + _logFiles = _parser.GetLogFiles(); + Dates = new ObservableCollection(_logFiles.Select(x => x.DateTime).OrderBy(x => x)); + + _realTimeLogs = new ControlledObservableCollection(); + _pausedLogs = new List(); + + IsRealTime = true; + RealTimePaused = true; + + SelectedDate = Dates.Last(); + + MinDate = Dates.Min(); + MaxDate = Dates.Max(); + + MachineOperator.EmbeddedLogManager.NewLog += EmbeddedLogManager_NewLog; + + ToggleRealTimePaused = new RelayCommand(() => RealTimePaused = !RealTimePaused); + } + + private void EmbeddedLogManager_NewLog(object sender, LogItemBase log) + { + if (!RealTimePaused) + { + InvokeUI(() => + { + _realTimeLogs.Insert(0, log); + }); + } + else + { + _pausedLogs.Add(log); + } + } + + private async void OnSelectedDateChanged() + { + if (IsRealTime) + { + Logs = _realTimeLogs; + } + else + { + List logs = new List(); + + using (_notification.PushTaskItem("Loading embedded device logs...")) + { + await Task.Factory.StartNew(() => + { + foreach (var logFile in _logFiles.Where(x => x.DateTime.Date == SelectedDate.Date)) + { + logs.AddRange(_parser.Parse(logFile)); + } + }); + } + + Logs = new ControlledObservableCollection(logs); + } + } + } +} -- cgit v1.3.1