From 07e686eb253ffd29f36dbe530b3a17633e02b353 Mon Sep 17 00:00:00 2001 From: Roy Date: Sat, 10 Feb 2018 02:13:37 +0200 Subject: Added support for motor controllers. --- .../ViewModels/MainViewVM.cs | 33 ++-------------------- 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs') diff --git a/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs index 174b408bc..0cf824d28 100644 --- a/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/Utilities/Tango.Synchronization.UI/ViewModels/MainViewVM.cs @@ -131,10 +131,10 @@ namespace Tango.Synchronization.UI.ViewModels /// public MainViewVM() { - MainViewLogger logger = new MainViewLogger(); - logger.NewLog += (output) => + SimpleStringLogger logger = new SimpleStringLogger(LogCategory.Critical, LogCategory.Error, LogCategory.General, LogCategory.Warning); + logger.LogReceived += (sender,log) => { - Log += output + Environment.NewLine; + Log += log.ToString() + Environment.NewLine; }; LogManager.RegisterLogger(logger); @@ -301,32 +301,5 @@ namespace Tango.Synchronization.UI.ViewModels MessageBox.Show(message, "Tango", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly); } #endregion - - #region Custom Logger - - public class MainViewLogger : ILogger - { - public bool Enabled { get; set; } - public bool Immediate { get; set; } - public event Action NewLog; - - public MainViewLogger() - { - Enabled = true; - Immediate = true; - } - - public void OnError(LogItemBase output) - { - NewLog?.Invoke(output.TimeStamp.ToTimeString() + ": " + output.GetMessage()); - } - - public void OnTrace(LogItemBase output) - { - NewLog?.Invoke(output.TimeStamp.ToTimeString() + ": " + output.GetMessage()); - } - } - - #endregion } } -- cgit v1.3.1