Mercurial > hg > orthanc-stone

diff Framework/Deprecated/Loaders/LoaderCache.cpp @ 1314:9b126de2cde2 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4f8db2d202c8
line wrap: on
line diff
--- a/Framework/Deprecated/Loaders/LoaderCache.cpp	Mon Mar 16 11:12:39 2020 +0100
+++ b/Framework/Deprecated/Loaders/LoaderCache.cpp	Mon Mar 16 11:19:50 2020 +0100
@@ -83,7 +83,7 @@
         boost::shared_ptr<OrthancStone::DicomVolumeImage> volumeImage(new OrthancStone::DicomVolumeImage);
         boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> loader;
       
-        loader.reset(new OrthancSeriesVolumeProgressiveLoader(loadersContext_, volumeImage));
+        loader = OrthancSeriesVolumeProgressiveLoader::Create(loadersContext_, volumeImage);
         loader->LoadSeries(seriesUuid);
         seriesVolumeProgressiveLoaders_[seriesUuid] = loader;
       }
@@ -144,7 +144,7 @@
         boost::shared_ptr<OrthancStone::DicomVolumeImage> volumeImage(new OrthancStone::DicomVolumeImage);
         boost::shared_ptr<OrthancMultiframeVolumeLoader> loader;
         {
-          loader.reset(new OrthancMultiframeVolumeLoader(loadersContext_, volumeImage));
+          loader = OrthancMultiframeVolumeLoader::Create(loadersContext_, volumeImage);
           loader->LoadInstance(instanceUuid);
         }
         multiframeVolumeLoaders_[instanceUuid] = loader;
@@ -241,7 +241,7 @@
 
         boost::shared_ptr<DicomStructureSetLoader> loader;
         {
-          loader.reset(new DicomStructureSetLoader(loadersContext_));
+          loader = DicomStructureSetLoader::Create(loadersContext_);
           loader->LoadInstance(inInstanceUuid, initiallyVisibleStructures);
         }
         dicomStructureSetLoaders_[entryKey] = loader;