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

1 files changed, 11 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
index d7af7200e..5ef543347 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs
@@ -141,7 +141,8 @@ namespace Tango.SharedUI.Controls
 
         public interface INavigationView
         {
-            void OnNavigated();
+            void OnNavigatedTo();
+            void OnNavigatedFrom();
         }
 
         #endregion
@@ -388,10 +389,16 @@ namespace Tango.SharedUI.Controls
                     {
                         completed = true;
 
-                        INavigationView navigationView = toElement.Element as INavigationView;
-                        if (navigationView != null)
+                        INavigationView fromNavigationView = fromElement.Element as INavigationView;
+                        INavigationView toNavigationView = toElement.Element as INavigationView;
+
+                        if (fromNavigationView != null)
+                        {
+                            fromNavigationView.OnNavigatedFrom();
+                        }
+                        if (toNavigationView != null)
                         {
-                            navigationView.OnNavigated();
+                            toNavigationView.OnNavigatedTo();
                         }
 
                         INavigationViewModel fromVM = fromElement.Element.DataContext as INavigationViewModel;