Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/CreateAngleMeasureTracker.cpp @ 1331:ab81ee8fce1f broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- 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 CreateAngleMeasureTracker::CreateAngleMeasureTracker( 28 CreateAngleMeasureTracker::CreateAngleMeasureTracker(
29 IViewport& viewport, 29 boost::shared_ptr<IViewport> viewport,
30 const PointerEvent& e) 30 const PointerEvent& e)
31 : CreateMeasureTracker(viewport) 31 : CreateMeasureTracker(viewport)
32 , state_(CreatingSide1) 32 , state_(CreatingSide1)
33 { 33 {
34 ScenePoint2D point = e.GetMainPosition(); 34 ScenePoint2D point = e.GetMainPosition();
35 { 35 {
36 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); 36 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
37 Scene2D& scene = lock->GetController().GetScene(); 37 Scene2D& scene = lock->GetController().GetScene();
38 point = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform()); 38 point = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform());
39 } 39 }
40 command_.reset(new CreateAngleMeasureCommand(viewport, point)); 40 command_.reset(new CreateAngleMeasureCommand(viewport, point));
41 } 41 }
53 "PointerMove: active_ == false"); 53 "PointerMove: active_ == false");
54 } 54 }
55 55
56 56
57 { 57 {
58 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); 58 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
59 ViewportController& controller = lock->GetController(); 59 ViewportController& controller = lock->GetController();
60 60
61 ScenePoint2D scenePos = event.GetMainPosition().Apply( 61 ScenePoint2D scenePos = event.GetMainPosition().Apply(
62 controller.GetScene().GetCanvasToSceneTransform()); 62 controller.GetScene().GetCanvasToSceneTransform());
63 63