Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/MeasureTrackers.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 | a5326ce4f24b |
children |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureTrackers.h Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Scene2DViewport/MeasureTrackers.h Mon Mar 30 14:23:46 2020 +0200 @@ -40,13 +40,13 @@ virtual void Cancel() ORTHANC_OVERRIDE; virtual bool IsAlive() const ORTHANC_OVERRIDE; protected: - CreateMeasureTracker(IViewport& viewport); + CreateMeasureTracker(boost::shared_ptr<IViewport> viewport); ~CreateMeasureTracker(); protected: boost::shared_ptr<CreateMeasureCommand> command_; - IViewport& viewport_; + boost::shared_ptr<IViewport> viewport_; bool alive_; private: @@ -59,13 +59,13 @@ virtual void Cancel() ORTHANC_OVERRIDE; virtual bool IsAlive() const ORTHANC_OVERRIDE; protected: - EditMeasureTracker(IViewport& viewport, const PointerEvent& e); + EditMeasureTracker(boost::shared_ptr<IViewport> viewport, const PointerEvent& e); ~EditMeasureTracker(); protected: boost::shared_ptr<EditMeasureCommand> command_; - IViewport& viewport_; + boost::shared_ptr<IViewport> viewport_; bool alive_; ScenePoint2D GetOriginalClickPosition() const