Improvements to machine studio view models and navigation system.

Improvements to tech board selection and edit modes handling.

2 files changed, 7 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index bb5c6458b..9a494f862 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -397,7 +397,7 @@
                         </Grid.RowDefinitions>
 
                         <Grid Grid.Row="1">
-                            <controls:NavigationControl x:Name="TransitionControl" TransitionAlwaysFades="True" TransitionType="Zoom">
+                            <controls:NavigationControl x:Name="NavigationControl" TransitionAlwaysFades="True" TransitionType="Zoom">
                                 <Grid controls:NavigationControl.NavigationName="Home">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="150"/>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
index 7ed119abd..ca8d7066c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
@@ -38,10 +38,14 @@ namespace Tango.MachineStudio.UI.Views
     {
         private DefaultStudioModuleLoader _loader;
 
+        public static MainView Instance { get; set; }
+
         public MainView() : base()
         {
             InitializeComponent();
 
+            Instance = this;
+
             _loader = TangoIOC.Default.GetInstance<IStudioModuleLoader>() as DefaultStudioModuleLoader;
             _loader.ModulesLoaded += Loader_ModulesLoaded;
         }
@@ -69,11 +73,11 @@ namespace Tango.MachineStudio.UI.Views
 
                     ThreadsHelper.InvokeUI(() =>
                     {
-                        if (!TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
+                        if (!NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
                         {
                             FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
                             NavigationControl.SetNavigationName(view, module.Name);
-                            TransitionControl.Elements.Add(view);
+                            NavigationControl.Elements.Add(view);
                         }
 
                         _loader.UserModules.Add(module);