Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/EditAngleMeasureTracker.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
comparison
equal deleted inserted replaced
1329:8d3e669f01a2 1331:ab81ee8fce1f
25 25
26 namespace OrthancStone 26 namespace OrthancStone
27 { 27 {
28 EditAngleMeasureTracker::EditAngleMeasureTracker( 28 EditAngleMeasureTracker::EditAngleMeasureTracker(
29 boost::shared_ptr<MeasureTool> measureTool, 29 boost::shared_ptr<MeasureTool> measureTool,
30 IViewport& viewport, 30 boost::shared_ptr<IViewport> viewport,
31 const PointerEvent& e) 31 const PointerEvent& e)
32 : EditMeasureTracker(viewport, e) 32 : EditMeasureTracker(viewport, e)
33 { 33 {
34 ScenePoint2D scenePos = e.GetMainPosition(); 34 ScenePoint2D scenePos = e.GetMainPosition();
35 { 35 {
36 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); 36 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
37 ViewportController& controller = lock->GetController(); 37 ViewportController& controller = lock->GetController();
38 scenePos = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform()); 38 scenePos = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform());
39 } 39 }
40 modifiedZone_ = dynamic_cast<AngleMeasureTool&>(*measureTool).AngleHitTest(scenePos); 40 modifiedZone_ = dynamic_cast<AngleMeasureTool&>(*measureTool).AngleHitTest(scenePos);
41 command_.reset(new EditAngleMeasureCommand(measureTool, viewport)); 41 command_.reset(new EditAngleMeasureCommand(measureTool, viewport));
46 46
47 } 47 }
48 48
49 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e) 49 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e)
50 { 50 {
51 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); 51 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
52 ViewportController& controller = lock->GetController(); 52 ViewportController& controller = lock->GetController();
53 Scene2D& scene = controller.GetScene(); 53 Scene2D& scene = controller.GetScene();
54 54
55 ScenePoint2D scenePos = e.GetMainPosition().Apply( 55 ScenePoint2D scenePos = e.GetMainPosition().Apply(
56 scene.GetCanvasToSceneTransform()); 56 scene.GetCanvasToSceneTransform());