Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/MeasureTrackers.cpp @ 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 | 30deba7bc8e2 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureTrackers.cpp Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Scene2DViewport/MeasureTrackers.cpp Mon Mar 30 14:23:46 2020 +0200 @@ -24,7 +24,7 @@ namespace OrthancStone { - CreateMeasureTracker::CreateMeasureTracker(IViewport& viewport) + CreateMeasureTracker::CreateMeasureTracker(boost::shared_ptr<IViewport> viewport) : viewport_(viewport) , alive_(true) , commitResult_(true) @@ -48,7 +48,7 @@ // to the undo stack // otherwise, we simply undo it - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); if (commitResult_) @@ -59,12 +59,12 @@ lock->Invalidate(); } - EditMeasureTracker::EditMeasureTracker(IViewport& viewport, const PointerEvent& e) + EditMeasureTracker::EditMeasureTracker(boost::shared_ptr<IViewport> viewport, const PointerEvent& e) : viewport_(viewport) , alive_(true) , commitResult_(true) { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); originalClickPosition_ = e.GetMainPosition().Apply( @@ -88,7 +88,7 @@ // to the undo stack // otherwise, we simply undo it - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); if (commitResult_)