aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-09-05 15:08:10 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-09-05 15:08:10 +0300
commit3c717c1430b17c479e3ccbf3715512f9b4334c53 (patch)
tree750904e077a23852e2838474dd203973b8d6c32b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
parent332be5196027097bcd6c0ffb8f988f1493c5437c (diff)
downloadTango-3c717c1430b17c479e3ccbf3715512f9b4334c53.tar.gz
Tango-3c717c1430b17c479e3ccbf3715512f9b4334c53.zip
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
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs7
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml.cs7
2 files changed, 12 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs
index e1e16592b..e07f597f6 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ShutdownView.xaml.cs
@@ -27,9 +27,14 @@ namespace Tango.MachineStudio.UI.Views
InitializeComponent();
}
- public void OnNavigated()
+ public void OnNavigatedTo()
{
progressRing.IsActive = true;
}
+
+ public void OnNavigatedFrom()
+ {
+
+ }
}
}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml.cs
index deb4dfdbe..b9c15da68 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml.cs
@@ -35,9 +35,14 @@ namespace Tango.MachineStudio.UI.Views
};
}
- public void OnNavigated()
+ public void OnNavigatedTo()
{
_vm.OnNavigatedInto();
}
+
+ public void OnNavigatedFrom()
+ {
+
+ }
}
}