comparison Framework/Layers/OrthancFrameLayerSource.cpp @ 378:814fa32e2fcc

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Nov 2018 14:21:02 +0100
parents 8eb4fe74000f
children ba5ad93f935a
comparison
equal deleted inserted replaced
377:8eb4fe74000f 378:814fa32e2fcc
50 } 50 }
51 51
52 void OrthancFrameLayerSource::OnSliceImageReady(const OrthancSlicesLoader::SliceImageReadyMessage& message) 52 void OrthancFrameLayerSource::OnSliceImageReady(const OrthancSlicesLoader::SliceImageReadyMessage& message)
53 { 53 {
54 // first notify that the image is ready (targeted to, i.e: an image cache) 54 // first notify that the image is ready (targeted to, i.e: an image cache)
55 LayerSourceBase::NotifyImageReady(message.image_, message.effectiveQuality_, message.slice_); 55 LayerSourceBase::NotifyImageReady(message.GetImage(), message.GetEffectiveQuality(), message.GetSlice());
56 56
57 // then notify that the layer is ready for render 57 // then notify that the layer is ready for render
58 bool isFull = (message.effectiveQuality_ == SliceImageQuality_FullPng || message.effectiveQuality_ == SliceImageQuality_FullPam); 58 bool isFull = (message.GetEffectiveQuality() == SliceImageQuality_FullPng ||
59 std::auto_ptr<Orthanc::ImageAccessor> accessor(new Orthanc::ImageAccessor()); 59 message.GetEffectiveQuality() == SliceImageQuality_FullPam);
60 message.image_->GetReadOnlyAccessor(*accessor);
61 60
62 LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(accessor.release(), message.slice_, isFull), 61 LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(message.GetImage(), message.GetSlice(), isFull),
63 message.slice_.GetGeometry(), false); 62 message.GetSlice().GetGeometry(), false);
64 63
65 } 64 }
66 65
67 void OrthancFrameLayerSource::OnSliceImageError(const OrthancSlicesLoader::SliceImageErrorMessage& message) 66 void OrthancFrameLayerSource::OnSliceImageError(const OrthancSlicesLoader::SliceImageErrorMessage& message)
68 { 67 {
69 LayerSourceBase::NotifyLayerReady(NULL, message.slice_.GetGeometry(), true); 68 LayerSourceBase::NotifyLayerReady(NULL, message.GetSlice().GetGeometry(), true);
70 } 69 }
71 70
72 OrthancFrameLayerSource::OrthancFrameLayerSource(MessageBroker& broker, OrthancApiClient& orthanc) : 71 OrthancFrameLayerSource::OrthancFrameLayerSource(MessageBroker& broker, OrthancApiClient& orthanc) :
73 LayerSourceBase(broker), 72 LayerSourceBase(broker),
74 IObserver(broker), 73 IObserver(broker),