diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-06-15 23:18:51 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-06-15 23:18:51 +0300 |
| commit | f0bcdcdbfa78ba705b8fa44591fa594a425352a9 (patch) | |
| tree | d5476a7259fc5d6061d819ae5f1df5b78c904856 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 84700eb44cffe4b503a9ad22b1dfa8c703f356d2 (diff) | |
| download | Tango-f0bcdcdbfa78ba705b8fa44591fa594a425352a9.tar.gz Tango-f0bcdcdbfa78ba705b8fa44591fa594a425352a9.zip | |
Implemented TouchLoadingPanel
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs | 6 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs | 5 |
2 files changed, 2 insertions, 9 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 233751ddb..554bd704c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -128,10 +128,8 @@ namespace Tango.PPC.UI.PPCApplication var settings = SettingsManager.Default.GetOrCreate<PPCSettings>(); ; - using (ObservablesContext db = ObservablesContext.CreateDefault()) - { - Machine = db.Machines.SingleOrDefault(x => x.SerialNumber == settings.MachineSerialNumber); - } + ObservablesEntitiesAdapter.Instance.Initialize(); + Machine = ObservablesEntitiesAdapter.Instance.Machines.FirstOrDefault(); }); ApplicationStarted?.Invoke(this, new EventArgs()); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs index f6b06ca61..5bc02f829 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs @@ -36,11 +36,6 @@ namespace Tango.PPC.UI.ViewModels /// </summary> public async override void OnApplicationStarted() { - await Task.Factory.StartNew(() => - { - ObservablesEntitiesAdapter.Instance.Initialize(); - }); - ApplicationManager.ModulesInitialized += (_, __) => { NavigationManager.NavigateTo(NavigationView.HomeModule); |