diff 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
line wrap: on
line diff
--- a/Framework/Layers/OrthancFrameLayerSource.cpp	Mon Nov 05 16:18:27 2018 +0100
+++ b/Framework/Layers/OrthancFrameLayerSource.cpp	Tue Nov 06 14:21:02 2018 +0100
@@ -52,21 +52,20 @@
   void OrthancFrameLayerSource::OnSliceImageReady(const OrthancSlicesLoader::SliceImageReadyMessage& message)
   {
     // first notify that the image is ready (targeted to, i.e: an image cache)
-    LayerSourceBase::NotifyImageReady(message.image_, message.effectiveQuality_, message.slice_);
+    LayerSourceBase::NotifyImageReady(message.GetImage(), message.GetEffectiveQuality(), message.GetSlice());
 
     // then notify that the layer is ready for render
-    bool isFull = (message.effectiveQuality_ == SliceImageQuality_FullPng || message.effectiveQuality_ == SliceImageQuality_FullPam);
-    std::auto_ptr<Orthanc::ImageAccessor> accessor(new Orthanc::ImageAccessor());
-    message.image_->GetReadOnlyAccessor(*accessor);
+    bool isFull = (message.GetEffectiveQuality() == SliceImageQuality_FullPng ||
+                   message.GetEffectiveQuality() == SliceImageQuality_FullPam);
 
-    LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(accessor.release(), message.slice_, isFull),
-                                      message.slice_.GetGeometry(), false);
+    LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(message.GetImage(), message.GetSlice(), isFull),
+                                      message.GetSlice().GetGeometry(), false);
 
   }
 
   void OrthancFrameLayerSource::OnSliceImageError(const OrthancSlicesLoader::SliceImageErrorMessage& message)
   {
-    LayerSourceBase::NotifyLayerReady(NULL, message.slice_.GetGeometry(), true);
+    LayerSourceBase::NotifyLayerReady(NULL, message.GetSlice().GetGeometry(), true);
   }
 
   OrthancFrameLayerSource::OrthancFrameLayerSource(MessageBroker& broker, OrthancApiClient& orthanc) :