Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Viewport/DefaultViewportInteractor.h @ 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 |
---|---|
34 int windowingLayer_; | 34 int windowingLayer_; |
35 MouseAction leftButtonAction_; | 35 MouseAction leftButtonAction_; |
36 MouseAction middleButtonAction_; | 36 MouseAction middleButtonAction_; |
37 MouseAction rightButtonAction_; | 37 MouseAction rightButtonAction_; |
38 | 38 |
39 IFlexiblePointerTracker* CreateTrackerInternal(boost::shared_ptr<IViewport> viewport, | 39 IFlexiblePointerTracker* CreateTrackerInternal(boost::weak_ptr<IViewport> viewport, |
40 MouseAction action, | 40 MouseAction action, |
41 const PointerEvent& event, | 41 const PointerEvent& event, |
42 unsigned int viewportWidth, | 42 unsigned int viewportWidth, |
43 unsigned int viewportHeight); | 43 unsigned int viewportHeight); |
44 | 44 |
89 void SetRightButtonAction(MouseAction action) | 89 void SetRightButtonAction(MouseAction action) |
90 { | 90 { |
91 rightButtonAction_ = action; | 91 rightButtonAction_ = action; |
92 } | 92 } |
93 | 93 |
94 virtual IFlexiblePointerTracker* CreateTracker(boost::shared_ptr<IViewport> viewport, | 94 virtual IFlexiblePointerTracker* CreateTracker(boost::weak_ptr<IViewport> viewport, |
95 const PointerEvent& event, | 95 const PointerEvent& event, |
96 unsigned int viewportWidth, | 96 unsigned int viewportWidth, |
97 unsigned int viewportHeight) ORTHANC_OVERRIDE; | 97 unsigned int viewportHeight) ORTHANC_OVERRIDE; |
98 }; | 98 }; |
99 } | 99 } |