aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-08-23 11:07:15 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-08-23 11:07:15 +0300
commita8718859eea4329ec9ecd3f7155e0001aa610c3d (patch)
tree6bd3d16da02cd66923698cbfd3fe4d25fb425974 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels
parentee43df835127c733d4eeb2c18b2b2fbc7bbf044b (diff)
downloadTango-a8718859eea4329ec9ecd3f7155e0001aa610c3d.tar.gz
Tango-a8718859eea4329ec9ecd3f7155e0001aa610c3d.zip
Added ObservablesContextAdapter and it's interactions.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index bac916771..183cdb247 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -271,7 +271,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
{
InitCollections().Wait();
Machine = _db.Machines.Where(x => x.Guid == SelectedMachine.Guid).Include(x => x.Organization).SingleOrDefault(x => x.Guid == SelectedMachine.Guid);
- Configuration = _db.GetConfiguration(x => x.Guid == Machine.ConfigurationGuid);
+ Configuration = _db.Adapter.GetConfiguration(x => x.Guid == Machine.ConfigurationGuid);
SetHistory();
@@ -300,7 +300,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
{
CanWork = false;
- SelectedHistoryConfiguration = _db.GetConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
+ SelectedHistoryConfiguration = _db.Adapter.GetConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
Configuration = SelectedHistoryConfiguration;
Machine.Configuration = Configuration;
@@ -688,7 +688,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
await Task.Factory.StartNew(() =>
{
var version = _db.MachineVersions.Where(x => x.Guid == Machine.MachineVersion.Guid).Include(x => x.DefaultConfiguration).FirstOrDefault();
- var version_config = _db.GetConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
+ var version_config = _db.Adapter.GetConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
Configuration = version_config.Clone();
Machine.Configuration = Configuration;
});