Implemented NavigationControl for better performance!!!

Redesign of machine studio module initialization.

4 files changed, 18 insertions, 16 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
index 9ac8de012..166a3212a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
@@ -35,9 +35,15 @@ namespace Tango.MachineStudio.Developer
         public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/developer.jpg");
 
         /// <summary>
-        /// Gets the module entry point view.
+        /// Gets the module entry point view type.
         /// </summary>
-        public override FrameworkElement MainView => new MainView();
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
 
         /// <summary>
         /// Gets the permission required to see and load this module.
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs
index e92546b47..ff8b0320d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Navigation/DeveloperNavigationManager.cs
@@ -16,7 +16,7 @@ namespace Tango.MachineStudio.Developer.Navigation
         public void NavigateTo(DeveloperNavigationView view)
         {
             LogManager.Log(String.Format("Navigating to view {0}...", view.ToString()));
-            MainView.Instance.TransitionControl.AutoNavigate(view.ToString());
+            MainView.Instance.TransitionControl.NavigateTo(view.ToString());
         }
     }
 }
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 036b01e34..377b15610 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
@@ -36,6 +36,8 @@ using System.Media;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.MachineStudio.Common.Speech;
 using Microsoft.Practices.ServiceLocation;
+using System.Threading;
+using Tango.SharedUI.Helpers;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -1361,7 +1363,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     _blockInvalidateCommands = false;
                     InvalidateRelayCommands();
 
+                    UIHelper.DoEvents();
                     _navigation.NavigateTo(DeveloperNavigationView.JobView);
+
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index c4915a4c8..a3ac2f3b9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -395,19 +395,11 @@
 
 
             <Grid Grid.Row="1">
-                <controls:MultiTransitionControl x:Name="TransitionControl" TransitionType="Slide">
-                    <controls:MultiTransitionControl.Controls>
-                        <ContentControl Tag="MachineJobSelectionView">
-                            <local:MachineJobSelectionView/>
-                        </ContentControl>
-                        <ContentControl Tag="JobView">
-                            <local:JobView/>
-                        </ContentControl>
-                        <ContentControl Tag="RunningJobView">
-                            <local:RunningJobView/>
-                        </ContentControl>
-                    </controls:MultiTransitionControl.Controls>
-                </controls:MultiTransitionControl>
+                <controls:NavigationControl x:Name="TransitionControl" TransitionType="Slide" KeepElementsAttached="True">
+                    <local:MachineJobSelectionView controls:NavigationControl.NavigationName="MachineJobSelectionView" />
+                    <local:JobView controls:NavigationControl.NavigationName="JobView" />
+                    <local:RunningJobView controls:NavigationControl.NavigationName="RunningJobView" />
+                </controls:NavigationControl>
             </Grid>
         </Grid>
     </Grid>