diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-05 15:08:10 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-05 15:08:10 +0300 |
| commit | 3c717c1430b17c479e3ccbf3715512f9b4334c53 (patch) | |
| tree | 750904e077a23852e2838474dd203973b8d6c32b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 332be5196027097bcd6c0ffb8f988f1493c5437c (diff) | |
| download | Tango-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')
3 files changed, 13 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 6ffcf96b5..d2e87309d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("3.4.42.18238")] +[assembly: AssemblyVersion("3.4.43.18238")] [assembly: ComVisible(false)]
\ No newline at end of file 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() + { + + } } } |