diff Framework/Scene2DViewport/LineMeasureTool.h @ 1331:ab81ee8fce1f broker

- Viewport is not passed and stored as a shared_ptr instead of raw reference. - ViewportController can now be injected with an undo stack (not a ctor param anymore, as a preparation for the move of the undo stack to an interactor) - Added (temp) flag to disable emscripten events registration in the WebAssemblyViewport (because legacy client code deals with them directly) - Added emscripten_clear_timeout in ~WebGLViewportsRegistry - Removed GenericToolbox::HoldingRef whose responsibility is better served with proper callback un-registration.
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 30 Mar 2020 14:23:46 +0200
parents 9b126de2cde2
children
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LineMeasureTool.h	Mon Mar 30 08:47:30 2020 +0200
+++ b/Framework/Scene2DViewport/LineMeasureTool.h	Mon Mar 30 14:23:46 2020 +0200
@@ -38,7 +38,7 @@
   class LineMeasureTool : public MeasureTool
   {
   public:
-    static boost::shared_ptr<LineMeasureTool> Create(IViewport& viewport);
+    static boost::shared_ptr<LineMeasureTool> Create(boost::shared_ptr<IViewport> viewport);
 
     ~LineMeasureTool();
 
@@ -67,7 +67,7 @@
     LineHighlightArea LineHitTest(ScenePoint2D p);
 
   private:
-    LineMeasureTool(IViewport& viewport);
+    LineMeasureTool(boost::shared_ptr<IViewport> viewport);
 
     virtual void        RefreshScene() ORTHANC_OVERRIDE;
     void                RemoveFromScene();