Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/CreateLineMeasureCommand.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 | 9b126de2cde2 |
children |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/CreateLineMeasureCommand.cpp Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Scene2DViewport/CreateLineMeasureCommand.cpp Mon Mar 30 14:23:46 2020 +0200 @@ -26,13 +26,13 @@ namespace OrthancStone { CreateLineMeasureCommand::CreateLineMeasureCommand( - IViewport& viewport, + boost::shared_ptr<IViewport> viewport, ScenePoint2D point) : CreateMeasureCommand(viewport) , measureTool_(LineMeasureTool::Create(viewport)) { - std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); ViewportController& controller = lock->GetController(); controller.AddMeasureTool(measureTool_); measureTool_->Set(point, point);