Mercurial > hg > orthanc-stone
comparison 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 |
comparison
equal
deleted
inserted
replaced
1329:8d3e669f01a2 | 1331:ab81ee8fce1f |
---|---|
24 #include <boost/ref.hpp> | 24 #include <boost/ref.hpp> |
25 | 25 |
26 namespace OrthancStone | 26 namespace OrthancStone |
27 { | 27 { |
28 CreateLineMeasureCommand::CreateLineMeasureCommand( | 28 CreateLineMeasureCommand::CreateLineMeasureCommand( |
29 IViewport& viewport, | 29 boost::shared_ptr<IViewport> viewport, |
30 ScenePoint2D point) | 30 ScenePoint2D point) |
31 : CreateMeasureCommand(viewport) | 31 : CreateMeasureCommand(viewport) |
32 , measureTool_(LineMeasureTool::Create(viewport)) | 32 , measureTool_(LineMeasureTool::Create(viewport)) |
33 { | 33 { |
34 | 34 |
35 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); | 35 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); |
36 ViewportController& controller = lock->GetController(); | 36 ViewportController& controller = lock->GetController(); |
37 controller.AddMeasureTool(measureTool_); | 37 controller.AddMeasureTool(measureTool_); |
38 measureTool_->Set(point, point); | 38 measureTool_->Set(point, point); |
39 lock->Invalidate(); | 39 lock->Invalidate(); |
40 } | 40 } |