Mercurial > hg > orthanc-stone

diff Framework/Layers/OrthancFrameLayerSource.h @ 89:f244018a4e4b wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGGY- trying to remove IVolumeSlicesObserver
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 26 May 2017 18:27:59 +0200
parents 02c3a7a4938f
children 5945e81734a3
line wrap: on
line diff
--- a/Framework/Layers/OrthancFrameLayerSource.h	Fri May 26 16:11:52 2017 +0200
+++ b/Framework/Layers/OrthancFrameLayerSource.h	Fri May 26 18:27:59 2017 +0200
@@ -23,7 +23,6 @@
 
 #include "LayerSourceBase.h"
 #include "../Toolbox/IWebService.h"
-#include "../Toolbox/IVolumeSlicesObserver.h"
 #include "../Toolbox/OrthancSlicesLoader.h"
 
 namespace OrthancStone
@@ -36,7 +35,6 @@
     std::string             instanceId_;
     unsigned int            frame_;
     OrthancSlicesLoader     loader_;
-    IVolumeSlicesObserver*  observer2_;
 
     virtual void NotifyGeometryReady(const OrthancSlicesLoader& loader);
 
@@ -52,13 +50,19 @@
                                        const Slice& slice);
 
   public:
-    using LayerSourceBase::SetObserver;
-
     OrthancFrameLayerSource(IWebService& orthanc,
                             const std::string& instanceId,
                             unsigned int frame);
 
-    void SetObserver(IVolumeSlicesObserver& observer);
+    virtual size_t GetSliceCount() const
+    {
+      return loader_.GetSliceCount();
+    }
+
+    virtual const Slice& GetSlice(size_t slice) const 
+    {
+      return loader_.GetSlice(slice);
+    }
 
     virtual bool GetExtent(double& x1,
                            double& y1,