From 4e81425d99f39b8edc10660d72566c6c1408810d Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Thu, 23 Aug 2018 14:52:22 +0300
Subject: changes on other computers

---
 .../ViewModels/MainViewVM.cs                       | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index f8320e1f2..f164d7f14 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using Tango.BL;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.Core.DI;
@@ -547,8 +548,13 @@ namespace Tango.MachineStudio.UI.ViewModels
                             {
                                 try
                                 {
-                                    var configuration = ApplicationManager.ConnectedMachine.Machine.Configuration;
-                                    await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(configuration.HardwareVersion, configuration);
+                                    using (ObservablesContext db = ObservablesContext.CreateDefault())
+                                    {
+                                        var config = db.Adapter.GetConfiguration(s => s.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid);
+                                        var hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
+
+                                        await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(hw, config);
+                                    }
                                     NotificationProvider.ShowInfo("Hardware configuration uploaded successfully.");
                                 }
                                 catch (Exception ex)
@@ -623,20 +629,19 @@ namespace Tango.MachineStudio.UI.ViewModels
             {
                 LogManager.Log(String.Format("Starting module '{0}'...", module.Name));
 
-                if (!(MainView.Self as MainView).TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
+                if (!(MainView.Self as MainView).NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
                 {
                     LogManager.Log("Module was not initialized. Initializing...");
 
                     FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
                     NavigationControl.SetNavigationName(view, module.Name);
-                    (MainView.Self as MainView).TransitionControl.Elements.Add(view);
+                    (MainView.Self as MainView).NavigationControl.Elements.Add(view);
                 }
             }
 
             foreach (var m in StudioModuleLoader.AllModules.Where(x => x != module && !x.InNewWindow))
             {
                 m.IsLoaded = false;
-                TangoIOC.Default.GetModuleViewModels(m).ToList().ForEach(x => x.OnNavigatedFrom());
             }
 
             if (module != null)
@@ -646,15 +651,13 @@ namespace Tango.MachineStudio.UI.ViewModels
                 IsModuleLoaded = true;
 
                 LogManager.Log(String.Format("Navigating to module '{0}'...", module.Name));
-                (MainView.Self as MainView).TransitionControl.NavigateTo(module.Name);
-
-                TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(x => x.OnNavigatedTo());
+                (MainView.Self as MainView).NavigationControl.NavigateTo(module.Name);
             }
             else
             {
                 IsModuleLoaded = false;
                 LogManager.Log(String.Format("Navigating to Home..."));
-                (MainView.Self as MainView).TransitionControl.NavigateTo("Home");
+                (MainView.Self as MainView).NavigationControl.NavigateTo("Home");
             }
         }
 
@@ -674,16 +677,16 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                 LogManager.Log(String.Format("Starting module '{0}' in new window...", module.Name));
 
-                if (!(MainView.Self as MainView).TransitionControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
+                if (!(MainView.Self as MainView).NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))
                 {
                     LogManager.Log("Module was not initialized. Initializing...");
                     FrameworkElement v = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
                     NavigationControl.SetNavigationName(v, module.Name);
-                    (MainView.Self as MainView).TransitionControl.Elements.Add(v);
+                    (MainView.Self as MainView).NavigationControl.Elements.Add(v);
                 }
 
                 LogManager.Log("Detaching module view...");
-                var view = (MainView.Self as MainView).TransitionControl.GetAndDetach(module.Name);
+                var view = (MainView.Self as MainView).NavigationControl.GetAndDetach(module.Name);
 
                 ModuleWindowVM vm = new ModuleWindowVM(module);
                 ModuleWindow window = new ModuleWindow(this, vm, view);
@@ -694,7 +697,6 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                     window.grid.Children.Remove(view);
                     module.InNewWindow = false;
-                    TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(v => v.OnNavigatedFrom());
                 };
 
                 window.Owner = MainWindow.Instance;
@@ -702,8 +704,6 @@ namespace Tango.MachineStudio.UI.ViewModels
                 LogManager.Log("Opening new window...");
                 window.Show();
 
-                TangoIOC.Default.GetModuleViewModels(module).ToList().ForEach(x => x.OnNavigatedTo());
-
                 (_applicationManager as DefaultStudioApplicationManager).RegisterOpenedWindow(window);
             }
             catch (Exception ex)
-- 
cgit v1.3.1