Mercurial > hg > orthanc-stone

comparison 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
comparison
equal deleted inserted replaced
1313:f30905f5d246 1314:9b126de2cde2
81 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock()); 81 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock());
82 82
83 boost::shared_ptr<OrthancStone::DicomVolumeImage> volumeImage(new OrthancStone::DicomVolumeImage); 83 boost::shared_ptr<OrthancStone::DicomVolumeImage> volumeImage(new OrthancStone::DicomVolumeImage);
84 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> loader; 84 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> loader;
85 85
86 loader.reset(new OrthancSeriesVolumeProgressiveLoader(loadersContext_, volumeImage)); 86 loader = OrthancSeriesVolumeProgressiveLoader::Create(loadersContext_, volumeImage);
87 loader->LoadSeries(seriesUuid); 87 loader->LoadSeries(seriesUuid);
88 seriesVolumeProgressiveLoaders_[seriesUuid] = loader; 88 seriesVolumeProgressiveLoaders_[seriesUuid] = loader;
89 } 89 }
90 else 90 else
91 { 91 {
142 { 142 {
143 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock()); 143 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock());
144 boost::shared_ptr<OrthancStone::DicomVolumeImage> volumeImage(new OrthancStone::DicomVolumeImage); 144 boost::shared_ptr<OrthancStone::DicomVolumeImage> volumeImage(new OrthancStone::DicomVolumeImage);
145 boost::shared_ptr<OrthancMultiframeVolumeLoader> loader; 145 boost::shared_ptr<OrthancMultiframeVolumeLoader> loader;
146 { 146 {
147 loader.reset(new OrthancMultiframeVolumeLoader(loadersContext_, volumeImage)); 147 loader = OrthancMultiframeVolumeLoader::Create(loadersContext_, volumeImage);
148 loader->LoadInstance(instanceUuid); 148 loader->LoadInstance(instanceUuid);
149 } 149 }
150 multiframeVolumeLoaders_[instanceUuid] = loader; 150 multiframeVolumeLoaders_[instanceUuid] = loader;
151 boost::shared_ptr<OrthancStone::DicomVolumeImageMPRSlicer> mprSlicer(new OrthancStone::DicomVolumeImageMPRSlicer(volumeImage)); 151 boost::shared_ptr<OrthancStone::DicomVolumeImageMPRSlicer> mprSlicer(new OrthancStone::DicomVolumeImageMPRSlicer(volumeImage));
152 dicomVolumeImageMPRSlicers_[instanceUuid] = mprSlicer; 152 dicomVolumeImageMPRSlicers_[instanceUuid] = mprSlicer;
239 { 239 {
240 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock()); 240 std::unique_ptr<OrthancStone::ILoadersContext::ILock> lock(loadersContext_.Lock());
241 241
242 boost::shared_ptr<DicomStructureSetLoader> loader; 242 boost::shared_ptr<DicomStructureSetLoader> loader;
243 { 243 {
244 loader.reset(new DicomStructureSetLoader(loadersContext_)); 244 loader = DicomStructureSetLoader::Create(loadersContext_);
245 loader->LoadInstance(inInstanceUuid, initiallyVisibleStructures); 245 loader->LoadInstance(inInstanceUuid, initiallyVisibleStructures);
246 } 246 }
247 dicomStructureSetLoaders_[entryKey] = loader; 247 dicomStructureSetLoaders_[entryKey] = loader;
248 } 248 }
249 return dicomStructureSetLoaders_[entryKey]; 249 return dicomStructureSetLoaders_[entryKey];