From 856a23723afcc9d48c0f019dc33a259ac6c279ed Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 12 Jul 2018 14:03:47 +0300 Subject: Implemented continuous request timeouts. Implemented continuous request abort exception. Added log object for real time logs. Some work on PPC & Machine Studio. --- .../Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs | 4 ++++ .../Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs | 4 ++++ 2 files changed, 8 insertions(+) (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 eb172069e..2bb96c1e5 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 @@ -94,6 +94,8 @@ namespace Tango.MachineStudio.Logging.ViewModels public RelayCommand ToggleRealTimePaused { get; set; } + public RelayCommand ClearRealTimeLogsCommand { get; set; } + public ApplicationLogsViewVM(LoggingNavigationManager navigation, INotificationProvider notification) { _notification = notification; @@ -122,6 +124,8 @@ namespace Tango.MachineStudio.Logging.ViewModels LogManager.NewLog += LogManager_NewLog; ToggleRealTimePaused = new RelayCommand(() => RealTimePaused = !RealTimePaused); + + ClearRealTimeLogsCommand = new RelayCommand(() => { _realTimeLogs.Clear(); }); } private void LogManager_NewLog(object sender, LogItemBase log) 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 8cf4edcb3..ba18cbdb1 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 @@ -96,6 +96,8 @@ namespace Tango.MachineStudio.Logging.ViewModels public RelayCommand ToggleRealTimePaused { get; set; } + public RelayCommand ClearRealTimeLogsCommand { get; set; } + public EmbeddedLogsViewVM(LoggingNavigationManager navigation, IStudioApplicationManager application, INotificationProvider notification) { _notification = notification; @@ -124,6 +126,8 @@ namespace Tango.MachineStudio.Logging.ViewModels MachineOperator.EmbeddedLogManager.NewLog += EmbeddedLogManager_NewLog; ToggleRealTimePaused = new RelayCommand(() => RealTimePaused = !RealTimePaused); + + ClearRealTimeLogsCommand = new RelayCommand(() => { _realTimeLogs.Clear(); }); } private void EmbeddedLogManager_NewLog(object sender, LogItemBase log) -- cgit v1.3.1