From 3c717c1430b17c479e3ccbf3715512f9b4334c53 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 5 Sep 2018 15:08:10 +0300 Subject: Optimized use of color conversion in machine studio. Improved color conversion memory leak. Added dispenser step division to brush stops. Machine Studio 3.4.43 --- .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 6 +++++- .../Tango.MachineStudio.Developer/Views/JobView.xaml.cs | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 0a9bba69e..e04b1539a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -515,6 +515,10 @@ namespace Tango.MachineStudio.Developer.ViewModels /// public ISuggestionProvider MachinesProvider { get; set; } + /// + /// Gets or sets a value indicating whether the job details view is visible. + /// + public bool IsJobVisible { get; set; } #endregion #region Commands @@ -771,7 +775,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { while (true) { - if (!_disable_gamut_check && IsVisible && ActiveJob != null && ActiveJob.Segments != null) + if (!_disable_gamut_check && IsJobVisible && ActiveJob != null && ActiveJob.Segments != null) { try { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs index e6a528612..bcab1c673 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs @@ -23,13 +23,14 @@ using Tango.Settings; using Tango.Core; using Tango.SharedUI.Editors; using static Tango.MachineStudio.Developer.DeveloperModuleSettings; +using static Tango.SharedUI.Controls.NavigationControl; namespace Tango.MachineStudio.Developer.Views { /// /// Interaction logic for JobView.xaml /// - public partial class JobView : UserControl + public partial class JobView : UserControl, INavigationView { private MainViewVM _vm; private DispatcherTimer _jobBrushTimer; @@ -265,5 +266,15 @@ namespace Tango.MachineStudio.Developer.Views { _vm.OnHivePopupClosed(); } + + public void OnNavigatedTo() + { + _vm.IsJobVisible = true; + } + + public void OnNavigatedFrom() + { + _vm.IsJobVisible = false; + } } } -- cgit v1.3.1