# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1558538744 -7200
# Node ID 774681b2c77c841d13d898bb98eb249dec1c5765
# Parent  8c97c381f242e9230ee9267eca9388a97dab5fac
simplification

diff -r 8c97c381f242 -r 774681b2c77c Samples/Sdl/Loader.cpp
--- a/Samples/Sdl/Loader.cpp	Wed May 22 17:05:38 2019 +0200
+++ b/Samples/Sdl/Loader.cpp	Wed May 22 17:25:44 2019 +0200
@@ -82,72 +82,71 @@
   };
 
 
+  class InvalidExtractedSlice : public IVolumeSlicer::ExtractedSlice
+  {
+  public:
+    virtual bool IsValid()
+    {
+      return false;
+    }
+
+    virtual uint64_t GetRevision()
+    {
+      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
+    }
+
+    virtual ISceneLayer* CreateSceneLayer()
+    {
+      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
+    }
+  };
+
 
   class DicomVolumeImageOrthogonalSlice : public IVolumeSlicer::ExtractedSlice
   {
   private:
-    CoordinateSystem3D  cuttingPlane_;
-    bool                isInitialized_;
-    bool                valid_;
-    VolumeProjection    projection_;
-    unsigned int        sliceIndex_;
-    uint64_t            revision_;
-
-    void Initialize()
-    {
-      if (!isInitialized_)
-      {
-        valid_ = DetectSlice(projection_, sliceIndex_, revision_, cuttingPlane_);
-        isInitialized_ = true;
-      }
-    }
+    const ImageBuffer3D&        image_;
+    const VolumeImageGeometry&  geometry_;
+    bool                        valid_;
+    VolumeProjection            projection_;
+    unsigned int                sliceIndex_;
 
   protected:
-    virtual const ImageBuffer3D& GetImage() const = 0;
-
-    virtual const VolumeImageGeometry& GetGeometry() const = 0;
-
-    // WARNING - This cannot be invoked from the constructor, hence lazy "Initialize()"
-    virtual bool DetectSlice(VolumeProjection& projection,
-                             unsigned int& sliceIndex,
-                             uint64_t& revision,
-                             const CoordinateSystem3D& cuttingPlane) const = 0;
+    virtual uint64_t GetRevisionInternal(VolumeProjection projection,
+                                         unsigned int sliceIndex) const = 0;
 
     virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection,
                                                               unsigned int sliceIndex) const = 0;
 
   public:
-    DicomVolumeImageOrthogonalSlice(const CoordinateSystem3D& cuttingPlane) :
-      cuttingPlane_(cuttingPlane),
-      isInitialized_(false)
+    DicomVolumeImageOrthogonalSlice(const ImageBuffer3D& image,
+                                    const VolumeImageGeometry& geometry,
+                                    const CoordinateSystem3D& cuttingPlane) :
+      image_(image),
+      geometry_(geometry)
     {
+      valid_ = geometry_.DetectSlice(projection_, sliceIndex_, cuttingPlane);
     }
 
     virtual bool IsValid()
     {
-      Initialize();
-
       return valid_;
     }
 
     virtual uint64_t GetRevision()
     {
-      Initialize();
-
       if (!valid_)
       {
         throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
       }
       else
       {
-        return revision_;
+        return GetRevisionInternal(projection_, sliceIndex_);
       }
     }
 
     virtual ISceneLayer* CreateSceneLayer()
     {
-      Initialize();
-
       if (!valid_)
       {
         throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
@@ -157,11 +156,12 @@
         std::auto_ptr<TextureBaseSceneLayer> texture;
         
         {
-          ImageBuffer3D::SliceReader reader(GetImage(), projection_, sliceIndex_);
-          texture.reset(GetDicomParameters(projection_, sliceIndex_).CreateTexture(reader.GetAccessor()));
+          const DicomInstanceParameters& parameters = GetDicomParameters(projection_, sliceIndex_);
+          ImageBuffer3D::SliceReader reader(image_, projection_, sliceIndex_);
+          texture.reset(parameters.CreateTexture(reader.GetAccessor()));
         }
 
-        const CoordinateSystem3D& system = GetGeometry().GetProjectionGeometry(projection_);
+        const CoordinateSystem3D& system = geometry_.GetProjectionGeometry(projection_);
 
         double x0, y0, x1, y1;
         system.ProjectPoint(x0, y0, system.GetOrigin());
@@ -177,7 +177,7 @@
         }
         
         Vector tmp;
-        GetGeometry().GetVoxelDimensions(projection_);
+        geometry_.GetVoxelDimensions(projection_);
         texture->SetPixelSpacing(tmp[0], tmp[1]);
 
         // texture->SetLinearInterpolation(linearInterpolation_);   // TODO
@@ -199,40 +199,18 @@
       const DicomSeriesVolumeImage&  that_;
 
     protected:
-      virtual const ImageBuffer3D& GetImage() const 
-      {
-        return that_.GetImage();
-      }
-
-      virtual const VolumeImageGeometry& GetGeometry() const
+      virtual uint64_t GetRevisionInternal(VolumeProjection projection,
+                                           unsigned int sliceIndex) const
       {
-        return that_.GetGeometry();
-      }
-
-      virtual bool DetectSlice(VolumeProjection& projection,
-                               unsigned int& sliceIndex,
-                               uint64_t& revision,
-                               const CoordinateSystem3D& cuttingPlane) const
-      {
-        if (!that_.HasGeometry() ||
-            !that_.GetGeometry().DetectSlice(projection, sliceIndex, cuttingPlane))
+        if (projection == VolumeProjection_Axial)
         {
-          return false;
+          return that_.GetSliceRevision(sliceIndex);
         }
         else
         {
-          if (projection == VolumeProjection_Axial)
-          {
-            revision = that_.GetSliceRevision(sliceIndex);
-          }
-          else
-          {
-            // For coronal and sagittal projections, we take the global
-            // revision of the volume
-            revision = that_.GetRevision();
-          }
-
-          return true;
+          // For coronal and sagittal projections, we take the global
+          // revision of the volume
+          return that_.GetRevision();
         }
       }
 
@@ -245,7 +223,7 @@
     public:
       Slice(const DicomSeriesVolumeImage& that,
             const CoordinateSystem3D& plane) :
-        DicomVolumeImageOrthogonalSlice(plane),
+        DicomVolumeImageOrthogonalSlice(that.GetImage(), that.GetGeometry(), plane),
         that_(that)
       {
       }
@@ -497,7 +475,14 @@
 
     virtual IVolumeSlicer::ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const
     {
-      return new Slice(*this, cuttingPlane);
+      if (HasGeometry())
+      {
+        return new Slice(*this, cuttingPlane);
+      }
+      else
+      {
+        return new InvalidExtractedSlice;
+      }
     }
   };