aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
diff options
context:
space:
mode:
authorRoy <roy.mail.net@gmail.com>2018-03-01 23:27:24 +0200
committerRoy <roy.mail.net@gmail.com>2018-03-01 23:27:24 +0200
commit65d7f918b273a572d2d9a1d08a2797ea76b10850 (patch)
tree9ec592ba65b765153b4e400d90f11d764dc98d00 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
parent7281ce18b916f327f263e938624e8c0d25374620 (diff)
downloadTango-65d7f918b273a572d2d9a1d08a2797ea76b10850.tar.gz
Tango-65d7f918b273a572d2d9a1d08a2797ea76b10850.zip
Another BL Optimization /:
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs6
1 files changed, 4 insertions, 2 deletions
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 934932438..31c20eda4 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
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
using System.Windows.Data;
using System.Windows.Media;
using Tango.Core.Commands;
-using Tango.BL.Observables;
+using Tango.BL.Entities;
using Tango.Integration.Operation;
using Tango.Integration.Services;
using Tango.Logging;
@@ -24,6 +24,7 @@ using Tango.MachineStudio.Developer.Views;
using Tango.Settings;
using Tango.SharedUI;
using Tango.Transport;
+using Tango.BL;
namespace Tango.MachineStudio.Developer.ViewModels
{
@@ -592,6 +593,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
LogManager.Log("Initializing machine Db context...");
_machineDbContext = ObservablesContext.CreateDefault();
+ Machines = _machineDbContext.Machines.ToObservableCollection();
+
if (SettingsManager.Default.MachineStudio.DeveloperModule.LastSelectedMachineGuid != null)
{
LogManager.Log("Setting last selected machine from settings...");
@@ -604,7 +607,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
SelectedMachineJob = SelectedMachine.Jobs.SingleOrDefault(x => x.Guid == SettingsManager.Default.MachineStudio.DeveloperModule.LastSelectedJobGuid);
}
-
_authentication = authentication;
_notification = notificationProvider;