Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.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 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.cpp Wed Oct 28 20:06:55 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/CreateAngleMeasureTracker.cpp Wed Oct 28 20:14:34 2020 +0100 @@ -26,7 +26,7 @@ namespace OrthancStone { - CreateAngleMeasureTracker::CreateAngleMeasureTracker(boost::shared_ptr<IViewport> viewport, + CreateAngleMeasureTracker::CreateAngleMeasureTracker(boost::weak_ptr<IViewport> viewport, const PointerEvent& e) : CreateMeasureTracker(viewport), state_(CreatingSide1) @@ -34,7 +34,7 @@ ScenePoint2D point; { - std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); + std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); Scene2D& scene = lock->GetController().GetScene(); point = e.GetMainPosition().Apply(scene.GetCanvasToSceneTransform()); } @@ -57,7 +57,7 @@ { - std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); + std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); ViewportController& controller = lock->GetController(); ScenePoint2D scenePos = event.GetMainPosition().Apply(