Mercurial > hg > orthanc-stone
comparison Framework/Scene2DViewport/CreateLineMeasureTracker.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 |
comparison
equal
deleted
inserted
replaced
1329:8d3e669f01a2 | 1331:ab81ee8fce1f |
---|---|
24 #include <Core/OrthancException.h> | 24 #include <Core/OrthancException.h> |
25 | 25 |
26 namespace OrthancStone | 26 namespace OrthancStone |
27 { | 27 { |
28 CreateLineMeasureTracker::CreateLineMeasureTracker( | 28 CreateLineMeasureTracker::CreateLineMeasureTracker( |
29 IViewport& viewport, | 29 boost::shared_ptr<IViewport> viewport, |
30 const PointerEvent& e) | 30 const PointerEvent& e) |
31 : CreateMeasureTracker(viewport) | 31 : CreateMeasureTracker(viewport) |
32 { | 32 { |
33 ScenePoint2D point = e.GetMainPosition(); | 33 ScenePoint2D point = e.GetMainPosition(); |
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 point = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform()); | 37 point = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform()); |
38 } | 38 } |
39 command_.reset(new CreateLineMeasureCommand(viewport, point)); | 39 command_.reset(new CreateLineMeasureCommand(viewport, point)); |
40 } | 40 } |
51 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, | 51 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError, |
52 "Internal error: wrong state in CreateLineMeasureTracker::" | 52 "Internal error: wrong state in CreateLineMeasureTracker::" |
53 "PointerMove: active_ == false"); | 53 "PointerMove: active_ == false"); |
54 } | 54 } |
55 | 55 |
56 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); | 56 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); |
57 ViewportController& controller = lock->GetController(); | 57 ViewportController& controller = lock->GetController(); |
58 | 58 |
59 ScenePoint2D scenePos = event.GetMainPosition().Apply( | 59 ScenePoint2D scenePos = event.GetMainPosition().Apply( |
60 controller.GetScene().GetCanvasToSceneTransform()); | 60 controller.GetScene().GetCanvasToSceneTransform()); |
61 | 61 |