Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Scene2DViewport/EditAngleMeasureTracker.cpp @ 1606:874e178f34e9
- ViewportController now has weak ptr to Viewport
- Measuring tools + related commands and all trackers now store only a weak_ptr to the Viewport and lock() on demand for usage
- LayerHolder and FixedPoint aligner store only a weak_ptr to the Viewport, too
- Fixed float/double warning in GrayscaleWindowingSceneTracker
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 28 Oct 2020 20:14:34 +0100 |
parents | 8563ea5d8ae4 |
children | 9ac2a65d4172 |
comparison
equal
deleted
inserted
replaced
1605:b3c439d96d3e | 1606:874e178f34e9 |
---|---|
26 | 26 |
27 namespace OrthancStone | 27 namespace OrthancStone |
28 { | 28 { |
29 EditAngleMeasureTracker::EditAngleMeasureTracker( | 29 EditAngleMeasureTracker::EditAngleMeasureTracker( |
30 boost::shared_ptr<MeasureTool> measureTool, | 30 boost::shared_ptr<MeasureTool> measureTool, |
31 boost::shared_ptr<IViewport> viewport, | 31 boost::weak_ptr<IViewport> viewport, |
32 const PointerEvent& e) | 32 const PointerEvent& e) |
33 : EditMeasureTracker(viewport, e) | 33 : EditMeasureTracker(viewport, e) |
34 { | 34 { |
35 ScenePoint2D scenePos; | 35 ScenePoint2D scenePos; |
36 | 36 |
37 { | 37 { |
38 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); | 38 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
39 ViewportController& controller = lock->GetController(); | 39 ViewportController& controller = lock->GetController(); |
40 scenePos = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform()); | 40 scenePos = e.GetMainPosition().Apply(controller.GetScene().GetCanvasToSceneTransform()); |
41 } | 41 } |
42 | 42 |
43 modifiedZone_ = dynamic_cast<AngleMeasureTool&>(*measureTool).AngleHitTest(scenePos); | 43 modifiedZone_ = dynamic_cast<AngleMeasureTool&>(*measureTool).AngleHitTest(scenePos); |
49 | 49 |
50 } | 50 } |
51 | 51 |
52 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e) | 52 void EditAngleMeasureTracker::PointerMove(const PointerEvent& e) |
53 { | 53 { |
54 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); | 54 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); |
55 | 55 |
56 ViewportController& controller = lock->GetController(); | 56 ViewportController& controller = lock->GetController(); |
57 const Scene2D& scene = controller.GetScene(); | 57 const Scene2D& scene = controller.GetScene(); |
58 | 58 |
59 ScenePoint2D scenePos = e.GetMainPosition().Apply( | 59 ScenePoint2D scenePos = e.GetMainPosition().Apply( |