diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-03-04 15:49:59 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-03-04 15:49:59 +0200 |
| commit | 1746d2c7f601f44c23399aa6d19661fb7ff937ec (patch) | |
| tree | 829c2a33a7b5c67696c683df5a11780fae620fae /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 56b984bf7c4785cd0bcfd45a174ea802c6d0d471 (diff) | |
| download | Tango-1746d2c7f601f44c23399aa6d19661fb7ff937ec.tar.gz Tango-1746d2c7f601f44c23399aa6d19661fb7ff937ec.zip | |
Fixed several issues with PPC.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index f7711318f..788d2b178 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -46,6 +46,7 @@ namespace Tango.PPC.UI.PPCApplication private IPPCModuleLoader _moduleLoader; private INotificationProvider _notificationProvider; private WatchDogServer _watchdogServer; + private ObservablesContext _machineContext; /// <summary> /// Occurs when a system restart is required. @@ -203,7 +204,8 @@ namespace Tango.PPC.UI.PPCApplication LogManager.Log("Initializing ObservablesStaticCollections..."); ObservablesStaticCollections.Instance.Initialize(); LogManager.Log("Loading machine from database..."); - _machine = new MachineBuilder(ObservablesContext.CreateDefault()).SetFirst().WithOrganization().WithConfiguration().WithSpools().Build(); + _machineContext = ObservablesContext.CreateDefault(); + _machine = new MachineBuilder(_machineContext).SetFirst().WithSettings().WithOrganization().WithConfiguration().WithSpools().WithCats().Build(); } initialized = true; @@ -301,7 +303,7 @@ namespace Tango.PPC.UI.PPCApplication LogManager.Log("Finalizing application initialization..."); LogManager.Log("Initializing Machine Provider..."); - _machineProvider.Init(_machine); + _machineProvider.Init(_machine, _machineContext); LogManager.Log("Applications initialization completed!"); |