diff Framework/Layers/FrameRenderer.h @ 728:8190213e2279 am-dev

Merged default into am-dev
author Alain Mazy <am@osimis.io>
date Tue, 21 May 2019 13:25:58 +0200
parents 4f2416d519b4
children
line wrap: on
line diff
--- a/Framework/Layers/FrameRenderer.h	Thu May 16 19:10:38 2019 +0200
+++ b/Framework/Layers/FrameRenderer.h	Tue May 21 13:25:58 2019 +0200
@@ -25,31 +25,31 @@
 
 #include "../Toolbox/Slice.h"
 
-namespace OrthancStone
+namespace Deprecated
 {
   class FrameRenderer : public ILayerRenderer
   {
   private:
-    CoordinateSystem3D            framePlane_;
+    OrthancStone::CoordinateSystem3D            framePlane_;
     double                        pixelSpacingX_;
     double                        pixelSpacingY_;
     RenderStyle                   style_;
     bool                          isFullQuality_;
-    std::auto_ptr<CairoSurface>   display_;
+    std::auto_ptr<OrthancStone::CairoSurface>   display_;
 
   protected:
-    virtual CairoSurface* GenerateDisplay(const RenderStyle& style) = 0;
+    virtual OrthancStone::CairoSurface* GenerateDisplay(const RenderStyle& style) = 0;
 
   public:
-    FrameRenderer(const CoordinateSystem3D& framePlane,
+    FrameRenderer(const OrthancStone::CoordinateSystem3D& framePlane,
                   double pixelSpacingX,
                   double pixelSpacingY,
                   bool isFullQuality);
 
-    virtual bool RenderLayer(CairoContext& context,
+    virtual bool RenderLayer(OrthancStone::CairoContext& context,
                              const ViewportGeometry& view);
 
-    virtual const CoordinateSystem3D& GetLayerPlane()
+    virtual const OrthancStone::CoordinateSystem3D& GetLayerPlane()
     {
       return framePlane_;
     }
@@ -63,7 +63,7 @@
 
     // TODO: Avoid cloning the "frame"
     static ILayerRenderer* CreateRenderer(const Orthanc::ImageAccessor& frame,
-                                          const Slice& framePlane,
+                                          const Deprecated::Slice& framePlane,
                                           bool isFullQuality);
   };
 }