From 69bbedacee151090d5d0b6665b3a1614e65f1997 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 16 Jul 2018 20:01:10 +0300 Subject: Added color conversion to Machine Studio. Fixed issue with segments cloning. --- .../Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs | 1 + .../Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs | 1 + .../Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs | 1 + 3 files changed, 3 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging') 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 2bb96c1e5..2b12b1670 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 @@ -173,6 +173,7 @@ namespace Tango.MachineStudio.Logging.ViewModels if (SelectedLog != null) { _notification.ShowModalDialog(new LogDetailsViewVM(SelectedLog), (x) => { }, () => { }); + SelectedLog = null; } } } 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 ba18cbdb1..1895dd230 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 @@ -175,6 +175,7 @@ namespace Tango.MachineStudio.Logging.ViewModels if (SelectedLog != null) { _notification.ShowModalDialog(new LogDetailsViewVM(SelectedLog), (x) => { }, () => { }); + SelectedLog = null; } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs index c4f391c55..98fcf12db 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs @@ -181,6 +181,7 @@ namespace Tango.MachineStudio.Logging.ViewModels if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted) { _notification.ShowModalDialog(new EventDetailsViewVM(SelectedEvent), (x) => { }, () => { }); + SelectedEvent = null; } } -- cgit v1.3.1