Mercurial > hg > orthanc-stone
diff Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp @ 1314:9b126de2cde2 broker
Since the observer system now uses shared_ptr and many registrations are
done in the constructors, and since we cannot called shared_from_this() in
the constructors, it is mandatory to split construction from registration.
This has been done by making many ctors protected and replacing them
by factory methods that directly return shared_ptrs + added PostConstructor
method when base classes perform shared_from_this() calls too.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 16 Mar 2020 11:19:50 +0100 |
parents | 9bea7e15b519 |
children | cbfdba08e039 |
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp Mon Mar 16 11:12:39 2020 +0100 +++ b/Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp Mon Mar 16 11:19:50 2020 +0100 @@ -446,22 +446,34 @@ , sorter_(new OrthancStone::BasicFetchingItemsSorter::Factory) , volumeImageReadyInHighQuality_(false) { + } + + boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> + OrthancSeriesVolumeProgressiveLoader::Create( + OrthancStone::ILoadersContext& loadersContext, + const boost::shared_ptr<OrthancStone::DicomVolumeImage>& volume) + { std::auto_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext.Lock()); - // TODO => Move this out of constructor WHY? - Register<OrthancStone::OrthancRestApiCommand::SuccessMessage>( - lock->GetOracleObservable(), + boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> obj( + new OrthancSeriesVolumeProgressiveLoader(loadersContext,volume)); + + obj->Register<OrthancStone::OrthancRestApiCommand::SuccessMessage>( + lock->GetOracleObservable(), &OrthancSeriesVolumeProgressiveLoader::LoadGeometry); - Register<OrthancStone::GetOrthancImageCommand::SuccessMessage>( + obj->Register<OrthancStone::GetOrthancImageCommand::SuccessMessage>( lock->GetOracleObservable(), &OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent); - Register<OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>( + obj->Register<OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>( lock->GetOracleObservable(), &OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent); + + return obj; } + OrthancSeriesVolumeProgressiveLoader::~OrthancSeriesVolumeProgressiveLoader() { LOG(TRACE) << "OrthancSeriesVolumeProgressiveLoader::~OrthancSeriesVolumeProgressiveLoader()";