Mercurial > hg > orthanc-stone
comparison 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 |
comparison
equal
deleted
inserted
replaced
1605:b3c439d96d3e | 1606:874e178f34e9 |
---|---|
26 | 26 |
27 #include "../StoneException.h" | 27 #include "../StoneException.h" |
28 | 28 |
29 namespace OrthancStone | 29 namespace OrthancStone |
30 { | 30 { |
31 OneGesturePointerTracker::OneGesturePointerTracker(boost::shared_ptr<IViewport> viewport) : | 31 OneGesturePointerTracker::OneGesturePointerTracker(boost::weak_ptr<IViewport> viewport) : |
32 alive_(true), | 32 alive_(true), |
33 currentTouchCount_(1), | 33 currentTouchCount_(1), |
34 viewport_(viewport) | 34 viewport_(viewport) |
35 { | 35 { |
36 } | |
37 | |
38 IViewport::ILock* OneGesturePointerTracker::GetViewportLock() | |
39 { | |
40 boost::shared_ptr<IViewport> viewport = viewport_.lock(); | |
41 if (viewport) | |
42 return viewport->Lock(); | |
43 else | |
44 return nullptr; | |
36 } | 45 } |
37 | 46 |
38 void OneGesturePointerTracker::PointerUp(const PointerEvent& event) | 47 void OneGesturePointerTracker::PointerUp(const PointerEvent& event) |
39 { | 48 { |
40 // pointer up is only called for the LAST up event in case of a multi-touch | 49 // pointer up is only called for the LAST up event in case of a multi-touch |