Mercurial > hg > orthanc-stone
diff Applications/Generic/NativeStoneApplicationRunner.cpp @ 1068:04a95ee91327 broker
recovery of OrthancStoneSingleFrame
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 15 Oct 2019 19:36:57 +0200 |
parents | b537002f83a9 |
children | 8d3936f06541 |
line wrap: on
line diff
--- a/Applications/Generic/NativeStoneApplicationRunner.cpp Tue Oct 15 18:11:40 2019 +0200 +++ b/Applications/Generic/NativeStoneApplicationRunner.cpp Tue Oct 15 19:36:57 2019 +0200 @@ -36,6 +36,7 @@ #include <Core/OrthancException.h> #include <Plugins/Samples/Common/OrthancHttpConnection.h> +#include <boost/make_shared.hpp> #include <boost/program_options.hpp> namespace OrthancStone @@ -97,7 +98,7 @@ DeclareCommandLineOptions(options); // application specific options - application_.DeclareStartupOptions(options); + application_->DeclareStartupOptions(options); boost::program_options::variables_map parameters; bool error = false; @@ -206,23 +207,21 @@ oracle.Start(); { - Deprecated::OracleWebService webService(oracle, webServiceParameters, context); - - context.SetWebService(webService); + context.SetWebService(boost::make_shared<Deprecated::OracleWebService>(oracle, webServiceParameters, context)); context.SetOrthancBaseUrl(webServiceParameters.GetUrl()); Deprecated::OracleDelayedCallExecutor delayedExecutor(oracle, context); context.SetDelayedCallExecutor(delayedExecutor); - application_.Initialize(&context, statusBar, parameters); + application_->Initialize(&context, statusBar, parameters); { NativeStoneApplicationContext::GlobalMutexLocker locker(context); - locker.SetCentralWidget(application_.GetCentralWidget()); + locker.SetCentralWidget(application_->GetCentralWidget()); locker.GetCentralViewport().SetStatusBar(statusBar); } - std::string title = application_.GetTitle(); + std::string title = application_->GetTitle(); if (title.empty()) { title = "Stone of Orthanc"; @@ -243,7 +242,7 @@ } LOG(WARNING) << "The application is stopping"; - application_.Finalize(); + application_->Finalize(); } catch (Orthanc::OrthancException& e) {