Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/OneGesturePointerTracker.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 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/OneGesturePointerTracker.h Wed Mar 04 09:44:34 2020 +0100 +++ b/Framework/Scene2DViewport/OneGesturePointerTracker.h Wed Mar 04 09:45:38 2020 +0100 @@ -22,6 +22,11 @@ #include "IFlexiblePointerTracker.h" +#include "../Viewport/IViewport.h" + +#include <boost/shared_ptr.hpp> +#include <boost/weak_ptr.hpp> + namespace OrthancStone { /** @@ -39,16 +44,15 @@ class OneGesturePointerTracker : public IFlexiblePointerTracker { public: - OneGesturePointerTracker(boost::weak_ptr<ViewportController> controllerW); + OneGesturePointerTracker(IViewport& viewport); virtual void PointerUp(const PointerEvent& event) ORTHANC_OVERRIDE; virtual void PointerDown(const PointerEvent& event) ORTHANC_OVERRIDE; virtual bool IsAlive() const ORTHANC_OVERRIDE; protected: - boost::shared_ptr<ViewportController> GetController(); + IViewport& viewport_; private: - boost::weak_ptr<ViewportController> controllerW_; bool alive_; int currentTouchCount_; };