1 files changed, 15 insertions, 14 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 c56ca5541..b0bc613bd 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
@@ -57,6 +57,16 @@ namespace Tango.MachineStudio.Logging.ViewModels
             }
         }
 
+        private bool _displayDebug;
+        /// <summary>
+        /// Gets or sets a value indicating whether display debug logs.
+        /// </summary>
+        public bool DisplayDebug
+        {
+            get { return _displayDebug; }
+            set { _displayDebug = value; RaisePropertyChangedAuto(); }
+        }
+
         private LogItemBase _selectedLog;
         public LogItemBase SelectedLog
         {
@@ -169,21 +179,12 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void LogManager_NewLog(object sender, LogItemBase log)
         {
+            if (log.Category == LogCategory.Debug && !DisplayDebug) return;
+
             if (!RealTimePaused)
             {
                 InvokeUI(() =>
                 {
-                    if (_is_debug)
-                    {
-                        if (_realTimeLogs.Count > 1000)
-                        {
-                            for (int i = 998; i < _realTimeLogs.Count; i++)
-                            {
-                                _realTimeLogs.RemoveAt(i);
-                            }
-                        }
-                    }
-
                     _realTimeLogs.Insert(0, log);
                 });
             }
@@ -225,10 +226,10 @@ namespace Tango.MachineStudio.Logging.ViewModels
             if (SelectedLog != null && !_dialog_shown)
             {
                 _dialog_shown = true;
-                _notification.ShowModalDialog<LogDetailsViewVM, ApplicationLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => 
+                _notification.ShowModalDialog<LogDetailsViewVM, ApplicationLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) =>
                 {
-                    
-                }, () => 
+
+                }, () =>
                 {
                     _dialog_shown = false;
                 });