Mercurial > hg > orthanc-stone

comparison Framework/Deprecated/SmartLoader.cpp @ 1299:c38c89684d83 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 17:21:24 +0100
parents 7ec8fea061b9
children 257f2c9a02ac
comparison
equal deleted inserted replaced
1297:6ab03e429f06 1299:c38c89684d83
59 return FrameRenderer::CreateRenderer(*that_.image_, *that_.slice_, isFull); 59 return FrameRenderer::CreateRenderer(*that_.image_, *that_.slice_, isFull);
60 } 60 }
61 }; 61 };
62 62
63 unsigned int sliceIndex_; 63 unsigned int sliceIndex_;
64 std::auto_ptr<Slice> slice_; 64 std::unique_ptr<Slice> slice_;
65 boost::shared_ptr<Orthanc::ImageAccessor> image_; 65 boost::shared_ptr<Orthanc::ImageAccessor> image_;
66 SliceImageQuality effectiveQuality_; 66 SliceImageQuality effectiveQuality_;
67 CachedSliceStatus status_; 67 CachedSliceStatus status_;
68 68
69 public: 69 public:
189 189
190 LOG(WARNING) << "Will preload: " << sliceKeyId; 190 LOG(WARNING) << "Will preload: " << sliceKeyId;
191 191
192 cachedSlices_[sliceKeyId] = boost::shared_ptr<CachedSlice>(cachedSlice); 192 cachedSlices_[sliceKeyId] = boost::shared_ptr<CachedSlice>(cachedSlice);
193 193
194 std::auto_ptr<IVolumeSlicer> layerSource(new DicomSeriesVolumeSlicer); 194 std::unique_ptr<IVolumeSlicer> layerSource(new DicomSeriesVolumeSlicer);
195 dynamic_cast<DicomSeriesVolumeSlicer*>(layerSource.get())->Connect(orthancApiClient_); 195 dynamic_cast<DicomSeriesVolumeSlicer*>(layerSource.get())->Connect(orthancApiClient_);
196 dynamic_cast<DicomSeriesVolumeSlicer*>(layerSource.get())->SetImageQuality(imageQuality_); 196 dynamic_cast<DicomSeriesVolumeSlicer*>(layerSource.get())->SetImageQuality(imageQuality_);
197 Register<IVolumeSlicer::GeometryReadyMessage>(*layerSource, &SmartLoader::OnLayerGeometryReady); 197 Register<IVolumeSlicer::GeometryReadyMessage>(*layerSource, &SmartLoader::OnLayerGeometryReady);
198 Register<DicomSeriesVolumeSlicer::FrameReadyMessage>(*layerSource, &SmartLoader::OnFrameReady); 198 Register<DicomSeriesVolumeSlicer::FrameReadyMessage>(*layerSource, &SmartLoader::OnFrameReady);
199 Register<IVolumeSlicer::LayerReadyMessage>(*layerSource, &SmartLoader::OnLayerReady); 199 Register<IVolumeSlicer::LayerReadyMessage>(*layerSource, &SmartLoader::OnLayerReady);