Mercurial > hg > orthanc-stone

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