Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2D/PanSceneTracker.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/Scene2D/PanSceneTracker.cpp Wed Oct 28 20:06:55 2020 +0100 +++ b/OrthancStone/Sources/Scene2D/PanSceneTracker.cpp Wed Oct 28 20:14:34 2020 +0100 @@ -28,12 +28,12 @@ namespace OrthancStone { - PanSceneTracker::PanSceneTracker(boost::shared_ptr<IViewport> viewport, + PanSceneTracker::PanSceneTracker(boost::weak_ptr<IViewport> viewport, const PointerEvent& event) : OneGesturePointerTracker(viewport) { - std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); + std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); originalSceneToCanvas_ = lock->GetController().GetSceneToCanvasTransform(); originalCanvasToScene_ = lock->GetController().GetCanvasToSceneTransform(); @@ -46,7 +46,7 @@ { ScenePoint2D p = event.GetMainPosition().Apply(originalCanvasToScene_); - std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); + std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); lock->GetController().SetSceneToCanvasTransform( AffineTransform2D::Combine( @@ -58,7 +58,7 @@ void PanSceneTracker::Cancel() { - std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); + std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); lock->GetController().SetSceneToCanvasTransform(originalSceneToCanvas_); } }