Mercurial > hg > orthanc-stone

comparison Framework/SmartLoader.cpp @ 714:d2c0e347ddc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecating DicomFrameConverter
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 20 May 2019 16:26:34 +0200
parents 42dadae61fa9
children 4f2416d519b4
comparison
equal deleted inserted replaced
713:e63c8b9b7b02 714:d2c0e347ddc2
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::auto_ptr<Deprecated::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:
188 188
189 189
190 190
191 // create the slice in the cache with "empty" data 191 // create the slice in the cache with "empty" data
192 boost::shared_ptr<CachedSlice> cachedSlice(new CachedSlice(IObserver::GetBroker())); 192 boost::shared_ptr<CachedSlice> cachedSlice(new CachedSlice(IObserver::GetBroker()));
193 cachedSlice->slice_.reset(new Slice(instanceId, frame)); 193 cachedSlice->slice_.reset(new Deprecated::Slice(instanceId, frame));
194 cachedSlice->status_ = CachedSliceStatus_ScheduledToLoad; 194 cachedSlice->status_ = CachedSliceStatus_ScheduledToLoad;
195 std::string sliceKeyId = instanceId + ":" + boost::lexical_cast<std::string>(frame); 195 std::string sliceKeyId = instanceId + ":" + boost::lexical_cast<std::string>(frame);
196 196
197 LOG(WARNING) << "Will preload: " << sliceKeyId; 197 LOG(WARNING) << "Will preload: " << sliceKeyId;
198 198
226 { 226 {
227 const DicomSeriesVolumeSlicer& source = 227 const DicomSeriesVolumeSlicer& source =
228 dynamic_cast<const DicomSeriesVolumeSlicer&>(message.GetOrigin()); 228 dynamic_cast<const DicomSeriesVolumeSlicer&>(message.GetOrigin());
229 229
230 // save/replace the slice in cache 230 // save/replace the slice in cache
231 const Slice& slice = source.GetSlice(0); // TODO handle GetSliceCount() 231 const Deprecated::Slice& slice = source.GetSlice(0); // TODO handle GetSliceCount()
232 std::string sliceKeyId = (slice.GetOrthancInstanceId() + ":" + 232 std::string sliceKeyId = (slice.GetOrthancInstanceId() + ":" +
233 boost::lexical_cast<std::string>(slice.GetFrame())); 233 boost::lexical_cast<std::string>(slice.GetFrame()));
234 234
235 LOG(WARNING) << "Geometry ready: " << sliceKeyId; 235 LOG(WARNING) << "Geometry ready: " << sliceKeyId;
236 236
247 247
248 248
249 void SmartLoader::OnFrameReady(const DicomSeriesVolumeSlicer::FrameReadyMessage& message) 249 void SmartLoader::OnFrameReady(const DicomSeriesVolumeSlicer::FrameReadyMessage& message)
250 { 250 {
251 // save/replace the slice in cache 251 // save/replace the slice in cache
252 const Slice& slice = message.GetSlice(); 252 const Deprecated::Slice& slice = message.GetSlice();
253 std::string sliceKeyId = (slice.GetOrthancInstanceId() + ":" + 253 std::string sliceKeyId = (slice.GetOrthancInstanceId() + ":" +
254 boost::lexical_cast<std::string>(slice.GetFrame())); 254 boost::lexical_cast<std::string>(slice.GetFrame()));
255 255
256 LOG(WARNING) << "Image ready: " << sliceKeyId; 256 LOG(WARNING) << "Image ready: " << sliceKeyId;
257 257
271 void SmartLoader::OnLayerReady(const IVolumeSlicer::LayerReadyMessage& message) 271 void SmartLoader::OnLayerReady(const IVolumeSlicer::LayerReadyMessage& message)
272 { 272 {
273 const DicomSeriesVolumeSlicer& source = 273 const DicomSeriesVolumeSlicer& source =
274 dynamic_cast<const DicomSeriesVolumeSlicer&>(message.GetOrigin()); 274 dynamic_cast<const DicomSeriesVolumeSlicer&>(message.GetOrigin());
275 275
276 const Slice& slice = source.GetSlice(0); // TODO handle GetSliceCount() ? 276 const Deprecated::Slice& slice = source.GetSlice(0); // TODO handle GetSliceCount() ?
277 std::string sliceKeyId = (slice.GetOrthancInstanceId() + ":" + 277 std::string sliceKeyId = (slice.GetOrthancInstanceId() + ":" +
278 boost::lexical_cast<std::string>(slice.GetFrame())); 278 boost::lexical_cast<std::string>(slice.GetFrame()));
279 279
280 LOG(WARNING) << "Layer ready: " << sliceKeyId; 280 LOG(WARNING) << "Layer ready: " << sliceKeyId;
281 281