comparison Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h @ 1308:adf234ecaa00 broker

Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 83af7e562b45 257f2c9a02ac
children 9bea7e15b519
comparison
equal deleted inserted replaced
1307:8a28a9bf8876 1308:adf234ecaa00
68 68
69 void Clear(); 69 void Clear();
70 70
71 void CheckSliceIndex(size_t index) const; 71 void CheckSliceIndex(size_t index) const;
72 72
73 std::auto_ptr<OrthancStone::VolumeImageGeometry> geometry_; 73 std::unique_ptr<OrthancStone::VolumeImageGeometry> geometry_;
74 std::vector<OrthancStone::DicomInstanceParameters*> slices_; 74 std::vector<OrthancStone::DicomInstanceParameters*> slices_;
75 std::vector<uint64_t> slicesRevision_; 75 std::vector<uint64_t> slicesRevision_;
76 76
77 public: 77 public:
78 ~SeriesGeometry() 78 ~SeriesGeometry()
111 OrthancStone::IOracle& oracle_; 111 OrthancStone::IOracle& oracle_;
112 bool active_; 112 bool active_;
113 unsigned int simultaneousDownloads_; 113 unsigned int simultaneousDownloads_;
114 SeriesGeometry seriesGeometry_; 114 SeriesGeometry seriesGeometry_;
115 boost::shared_ptr<OrthancStone::DicomVolumeImage> volume_; 115 boost::shared_ptr<OrthancStone::DicomVolumeImage> volume_;
116 std::auto_ptr<OrthancStone::IFetchingItemsSorter::IFactory> sorter_; 116 std::unique_ptr<OrthancStone::IFetchingItemsSorter::IFactory> sorter_;
117 std::auto_ptr<OrthancStone::IFetchingStrategy> strategy_; 117 std::unique_ptr<OrthancStone::IFetchingStrategy> strategy_;
118 std::vector<unsigned int> slicesQuality_; 118 std::vector<unsigned int> slicesQuality_;
119 bool volumeImageReadyInHighQuality_; 119 bool volumeImageReadyInHighQuality_;
120 120
121 121
122 public: 122 public: