aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-19 13:55:25 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-19 13:55:25 +0300
commit4f81c6ce6c3b836bbfdb86532199aa37382b6147 (patch)
treedf5f62f54feafd06fac8c3672d6706d19198c789 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
parent90fa13d3f55a5ad704ce34b508f15b4abada6872 (diff)
downloadTango-4f81c6ce6c3b836bbfdb86532199aa37382b6147.tar.gz
Tango-4f81c6ce6c3b836bbfdb86532199aa37382b6147.zip
Some improvements and fixes to machine studio logging module.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs13
1 files changed, 10 insertions, 3 deletions
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 1895dd230..3f6775b75 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
@@ -21,6 +21,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
private EmbeddedLogFileParser _parser;
private List<LogFile> _logFiles;
private INotificationProvider _notification;
+ private bool _dialog_shown;
private ControlledObservableCollection<LogItemBase> _realTimeLogs;
private List<LogItemBase> _pausedLogs;
@@ -172,10 +173,16 @@ namespace Tango.MachineStudio.Logging.ViewModels
private void OnSelectedLogChanged()
{
- if (SelectedLog != null)
+ if (SelectedLog != null && !_dialog_shown)
{
- _notification.ShowModalDialog<LogDetailsViewVM, EmbeddedLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => { }, () => { });
- SelectedLog = null;
+ _dialog_shown = true;
+ _notification.ShowModalDialog<LogDetailsViewVM, EmbeddedLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) =>
+ {
+
+ }, () =>
+ {
+ _dialog_shown = false;
+ });
}
}
}