Profiling and performance optimizations..

3 files changed, 22 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 7d83fa032..9ee8471ec 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -28,6 +28,14 @@ namespace Tango.MachineStudio.UI.ViewModels
         private LogManager logManager = LogManager.Default;
         public IStudioApplicationManager ApplicationManager { get; set; }
 
+        private bool _isLoading;
+
+        public bool IsLoading
+        {
+            get { return _isLoading; }
+            set { _isLoading = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LoadingViewVM"/> class.
         /// </summary>
@@ -48,6 +56,8 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// </summary>
         private void Load()
         {
+            IsLoading = true;
+
             ThreadsHelper.StartStaThread(() =>
             {
                 try
@@ -57,6 +67,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                     {
                         _studioModuleLoader.LoadModules();
                         _navigationManager.NavigateTo(NavigationView.LoginView);
+                        IsLoading = false;
                     });
                 }
                 catch (Exception ex)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 23be8d274..4fcebe3dd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -49,7 +49,6 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             Scanner = scanner;
             ConnectCommand = new RelayCommand(Connect,(x) => SelectedMachine != null);
-            Scanner.Start();
         }
 
         /// <summary>
@@ -59,10 +58,17 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             if (SelectedMachine != null)
             {
+                Scanner.Stop();
                 Accept();
             }
         }
 
+        protected override void Cancel()
+        {
+            Scanner.Stop();
+            base.Cancel();
+        }
+
         /// <summary>
         /// Called when the dialog has been shown.
         /// </summary>
@@ -70,6 +76,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             base.OnShow();
             Scanner.AvailableMachines.Clear();
+            Scanner.Start();
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs
index ed771f00a..92e0eb9b5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ShutdownViewVM.cs
@@ -3,13 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.SharedUI;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
     /// <summary>
     /// Represents the Machine Studio shutdown view, view model.
     /// </summary>
-    public class ShutdownViewVM
+    public class ShutdownViewVM : ViewModel
     {
+
     }
 }