From a8718859eea4329ec9ecd3f7155e0001aa610c3d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 23 Aug 2018 11:07:15 +0300 Subject: Added ObservablesContextAdapter and it's interactions. --- .../Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index f96960883..55235b3c2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -1682,8 +1682,8 @@ namespace Tango.MachineStudio.Technician.ViewModels { using (ObservablesContext db = ObservablesContext.CreateDefault()) { - config = db.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone(); - hw = db.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone(); + config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone(); + hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone(); } }); @@ -1773,12 +1773,13 @@ namespace Tango.MachineStudio.Technician.ViewModels if (MachineOperator != null) { ObservablesContext db = ObservablesContext.CreateDefault(); + ObservablesContextAdapter adapter = new ObservablesContextAdapter(db); HardwareVersion hw = null; await Task.Factory.StartNew(() => { - hw = db.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid); + hw = adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid); }); foreach (var motorConfig in hw.HardwareMotors) -- cgit v1.3.1