Mercurial > hg > orthanc-stone
comparison Framework/Scene2D/ZoomSceneTracker.h @ 1305:a5326ce4f24b broker
Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 04 Mar 2020 09:45:38 +0100 |
parents | 2d8ab34c8c91 |
children | ab81ee8fce1f |
comparison
equal
deleted
inserted
replaced
1304:b7fa67bf87fa | 1305:a5326ce4f24b |
---|---|
21 | 21 |
22 #pragma once | 22 #pragma once |
23 | 23 |
24 | 24 |
25 #include "../Scene2DViewport/OneGesturePointerTracker.h" | 25 #include "../Scene2DViewport/OneGesturePointerTracker.h" |
26 #include "../Viewport/IViewport.h" | |
26 #include "Internals/FixedPointAligner.h" | 27 #include "Internals/FixedPointAligner.h" |
28 | |
29 #include <boost/weak_ptr.hpp> | |
27 | 30 |
28 namespace OrthancStone | 31 namespace OrthancStone |
29 { | 32 { |
30 class ZoomSceneTracker : public OneGesturePointerTracker | 33 class ZoomSceneTracker : public OneGesturePointerTracker |
31 { | 34 { |
32 public: | 35 public: |
33 ZoomSceneTracker(boost::weak_ptr<ViewportController> controllerW, | 36 ZoomSceneTracker(IViewport& viewport, |
34 const PointerEvent& event, | 37 const PointerEvent& event, |
35 unsigned int canvasHeight); | 38 unsigned int canvasHeight); |
36 | 39 |
37 virtual void PointerMove(const PointerEvent& event) ORTHANC_OVERRIDE; | 40 virtual void PointerMove(const PointerEvent& event) ORTHANC_OVERRIDE; |
38 virtual void Cancel() ORTHANC_OVERRIDE; | 41 virtual void Cancel() ORTHANC_OVERRIDE; |