Mercurial > hg > orthanc-stone

diff Framework/Scene2D/CairoCompositor.h @ 848:80829436ce0c am-mainline
starting to re-implement radiography editor with latest framework
author: Alain Mazy <alain@mazy.be>
date: Thu, 13 Jun 2019 16:47:02 +0200
parents: c237e0625065
children: 6e79e8c9021c
--- a/Framework/Scene2D/CairoCompositor.h	Wed Jun 12 09:52:25 2019 +0200
+++ b/Framework/Scene2D/CairoCompositor.h	Thu Jun 13 16:47:02 2019 +0200
@@ -29,6 +29,7 @@
 namespace OrthancStone
 {
   class CairoCompositor :
+    public ICompositor,
     private Internals::CompositorHelper::IRendererFactory,
     private Internals::ICairoContextProvider
   {
@@ -44,16 +45,6 @@
 
     virtual cairo_t* GetCairoContext();
 
-    virtual unsigned int GetCairoWidth()
-    {
-      return canvas_.GetWidth();
-    }
-
-    virtual unsigned int GetCairoHeight()
-    {
-      return canvas_.GetHeight();
-    }
-    
     virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer);
 
   public:
@@ -63,6 +54,16 @@
     
     ~CairoCompositor();
 
+    virtual unsigned int GetWidth() const
+    {
+      return canvas_.GetWidth();
+    }
+
+    virtual unsigned int GetHeight() const
+    {
+      return canvas_.GetHeight();
+    }
+
     const CairoSurface& GetCanvas() const
     {
       return canvas_;
@@ -78,7 +79,7 @@
                  Orthanc::Encoding codepage);
 #endif
 
-    void Refresh();
+    virtual void Refresh();
 
     Orthanc::ImageAccessor* RenderText(size_t fontIndex,
                                        const std::string& utf8) const;