comparison Framework/Deprecated/Loaders/LoaderCache.h @ 1226:05d05cba0f4f broker

explicitely tagging LockingEmitter as deprecated
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 08 Dec 2019 11:57:46 +0100
parents 16738485e457
children 0ca50d275b9a
comparison
equal deleted inserted replaced
1225:16738485e457 1226:05d05cba0f4f
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 **/ 19 **/
20 20
21 #pragma once 21 #pragma once
22 22
23 #include "../../Messages/LockingEmitter.h" 23 #include "../Messages/LockingEmitter.h"
24 #include "../../Volumes/DicomVolumeImageMPRSlicer.h" 24 #include "../../Volumes/DicomVolumeImageMPRSlicer.h"
25 #include "OrthancSeriesVolumeProgressiveLoader.h" 25 #include "OrthancSeriesVolumeProgressiveLoader.h"
26 #include "OrthancMultiframeVolumeLoader.h" 26 #include "OrthancMultiframeVolumeLoader.h"
27 #include "DicomStructureSetLoader.h" 27 #include "DicomStructureSetLoader.h"
28 28
47 { 47 {
48 public: 48 public:
49 #if ORTHANC_ENABLE_WASM == 1 49 #if ORTHANC_ENABLE_WASM == 1
50 LoaderCache(OrthancStone::WebAssemblyOracle& oracle); 50 LoaderCache(OrthancStone::WebAssemblyOracle& oracle);
51 #else 51 #else
52 LoaderCache(OrthancStone::ThreadedOracle& oracle, OrthancStone::Deprecated::LockingEmitter& lockingEmitter); 52 LoaderCache(OrthancStone::ThreadedOracle& oracle, LockingEmitter& lockingEmitter);
53 #endif 53 #endif
54 54
55 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> 55 boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader>
56 GetSeriesVolumeProgressiveLoader (std::string seriesUuid); 56 GetSeriesVolumeProgressiveLoader (std::string seriesUuid);
57 57
82 void DebugDisplayObjRefCounts(); 82 void DebugDisplayObjRefCounts();
83 #if ORTHANC_ENABLE_WASM == 1 83 #if ORTHANC_ENABLE_WASM == 1
84 OrthancStone::WebAssemblyOracle& oracle_; 84 OrthancStone::WebAssemblyOracle& oracle_;
85 #else 85 #else
86 OrthancStone::ThreadedOracle& oracle_; 86 OrthancStone::ThreadedOracle& oracle_;
87 OrthancStone::Deprecated::LockingEmitter& lockingEmitter_; 87 LockingEmitter& lockingEmitter_;
88 #endif 88 #endif
89 89
90 std::map<std::string, boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> > 90 std::map<std::string, boost::shared_ptr<OrthancSeriesVolumeProgressiveLoader> >
91 seriesVolumeProgressiveLoaders_; 91 seriesVolumeProgressiveLoaders_;
92 std::map<std::string, boost::shared_ptr<OrthancMultiframeVolumeLoader> > 92 std::map<std::string, boost::shared_ptr<OrthancMultiframeVolumeLoader> >