Implemented NavigationControl for better performance!!!

Redesign of machine studio module initialization.

1 files changed, 6 insertions, 20 deletions

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 442d11cdd..df1f97f23 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
@@ -26,6 +26,7 @@ using System.Threading;
 using Tango.Core.Helpers;
 using Tango.SharedUI.Helpers;
 using Tango.Logging;
+using static Tango.SharedUI.Controls.NavigationControl;
 
 namespace Tango.MachineStudio.UI.Views
 {
@@ -44,15 +45,8 @@ namespace Tango.MachineStudio.UI.Views
             _loader.ModulesLoaded += Loader_ModulesLoaded;
         }
 
-        public void NavigateToModule(IStudioModule module)
-        {
-            TransitionControl.AutoNavigate(module != null ? module.Name : "Home");
-        }
-
         private void Loader_ModulesLoaded(object sender, EventArgs e)
         {
-            TransitionControl.Controls.RemoveAll((x) => x.Tag.ToString() != "Home");
-
             Task.Factory.StartNew(() =>
             {
                 LogManager.Default.Log("Loading modules views...");
@@ -74,15 +68,12 @@ namespace Tango.MachineStudio.UI.Views
 
                     ThreadsHelper.InvokeUI(() =>
                     {
-                        Grid grid = new Grid();
-                        grid.Children.Add(module.MainView);
-
-                        TransitionControl.Controls.Add(new ContentControl()
+                        if (!TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
                         {
-                            Tag = module.Name,
-                            Content = grid,
-                            Visibility = Visibility.Hidden,
-                        });
+                            FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
+                            NavigationControl.SetNavigationName(view, module.Name);
+                            TransitionControl.Elements.Add(view);
+                        }
 
                         _loader.UserModules.Add(module);
                     });
@@ -92,11 +83,6 @@ namespace Tango.MachineStudio.UI.Views
                     Thread.Sleep(100);
                 }
 
-                ThreadsHelper.InvokeUI(() =>
-                {
-                    TransitionControl.RefreshControls();
-                });
-
                 item.Pop();
             });
         }