Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/ViewportController.h @ 1232:a28861abf888 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
viewports for WebAssembly
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Dec 2019 17:46:33 +0100
parents 6f3f1ef347a3
children 964c89e15e7e
line wrap: on
line diff
--- a/Framework/Scene2DViewport/ViewportController.h	Mon Dec 09 14:41:37 2019 +0100
+++ b/Framework/Scene2DViewport/ViewportController.h	Mon Dec 09 17:46:33 2019 +0100
@@ -111,6 +111,8 @@
 
     ViewportController();
 
+    ViewportController(const Scene2D& scene /* will be cloned */);
+
     ViewportController(boost::weak_ptr<UndoStack> undoStackW);
 
     ~ViewportController();
@@ -210,12 +212,12 @@
 
     const Scene2D& GetScene() const
     {
-      return scene_;
+      return *scene_;
     }
 
     Scene2D& GetScene()
     {
-      return scene_;
+      return *scene_;
     }
 
     bool HasActiveTracker() const
@@ -230,7 +232,7 @@
     std::vector<boost::shared_ptr<MeasureTool> >  measureTools_;
     boost::shared_ptr<IFlexiblePointerTracker>    activeTracker_;  // TODO - Couldn't this be a "std::auto_ptr"?
 
-    Scene2D   scene_;
+    std::auto_ptr<Scene2D>   scene_;
 
     // this is cached
     double  canvasToSceneFactor_;