Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/ViewportController.h @ 1203:f3bb9a6dd949 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
locking abstraction in IViewport
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 29 Nov 2019 21:22:21 +0100
parents e713f1a99861
children 00e6bff9ea39
line wrap: on
line diff
--- a/Framework/Scene2DViewport/ViewportController.h	Fri Nov 29 11:03:41 2019 +0100
+++ b/Framework/Scene2DViewport/ViewportController.h	Fri Nov 29 21:22:21 2019 +0100
@@ -112,10 +112,10 @@
     void SetActiveTracker(boost::shared_ptr<IFlexiblePointerTracker> tracker);
 
     /** Forwarded to the underlying scene */
-    const AffineTransform2D& GetCanvasToSceneTransform() const;
+    AffineTransform2D GetCanvasToSceneTransform() const;
 
     /** Forwarded to the underlying scene */
-    const AffineTransform2D& GetSceneToCanvasTransform() const;
+    AffineTransform2D GetSceneToCanvasTransform() const;
 
     /** Forwarded to the underlying scene, and broadcasted to the observers */
     void SetSceneToCanvasTransform(const AffineTransform2D& transform);
@@ -172,14 +172,9 @@
     /** forwarded to the UndoStack */
     bool CanRedo() const;
 
-    Scene2D& GetScene()
+    IViewport& GetViewport() const
     {
-      return viewport_.GetScene();
-    }
-
-    const Scene2D& GetScene() const
-    {
-      return const_cast<IViewport&>(viewport_).GetScene();
+      return viewport_;
     }
 
   private: