Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Scene2DViewport/OneGesturePointerTracker.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 | 646e581e115b |
line wrap: on
line diff
--- a/OrthancStone/Sources/Scene2DViewport/OneGesturePointerTracker.cpp Wed Oct 28 20:06:55 2020 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/OneGesturePointerTracker.cpp Wed Oct 28 20:14:34 2020 +0100 @@ -28,13 +28,22 @@ namespace OrthancStone { - OneGesturePointerTracker::OneGesturePointerTracker(boost::shared_ptr<IViewport> viewport) : + OneGesturePointerTracker::OneGesturePointerTracker(boost::weak_ptr<IViewport> viewport) : alive_(true), currentTouchCount_(1), viewport_(viewport) { } + IViewport::ILock* OneGesturePointerTracker::GetViewportLock() + { + boost::shared_ptr<IViewport> viewport = viewport_.lock(); + if (viewport) + return viewport->Lock(); + else + return nullptr; + } + void OneGesturePointerTracker::PointerUp(const PointerEvent& event) { // pointer up is only called for the LAST up event in case of a multi-touch