comparison Framework/Scene2DViewport/OneGesturePointerTracker.cpp @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents e42b491f1fb2
children 6f3f1ef347a3 2d8ab34c8c91
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
21 21
22 #include "OneGesturePointerTracker.h" 22 #include "OneGesturePointerTracker.h"
23 23
24 #include <Core/OrthancException.h> 24 #include <Core/OrthancException.h>
25 25
26 #include <Framework/StoneException.h> 26 #include "../StoneException.h"
27
28 using namespace Orthanc;
29 27
30 namespace OrthancStone 28 namespace OrthancStone
31 { 29 {
32 OneGesturePointerTracker::OneGesturePointerTracker( 30 OneGesturePointerTracker::OneGesturePointerTracker(
33 ViewportControllerWPtr controllerW) 31 boost::weak_ptr<ViewportController> controllerW)
34 : controllerW_(controllerW) 32 : controllerW_(controllerW)
35 , alive_(true) 33 , alive_(true)
36 , currentTouchCount_(1) 34 , currentTouchCount_(1)
37 { 35 {
38 } 36 }
62 bool OneGesturePointerTracker::IsAlive() const 60 bool OneGesturePointerTracker::IsAlive() const
63 { 61 {
64 return alive_; 62 return alive_;
65 } 63 }
66 64
67 ViewportControllerPtr OneGesturePointerTracker::GetController() 65 boost::shared_ptr<ViewportController> OneGesturePointerTracker::GetController()
68 { 66 {
69 return controllerW_.lock(); 67 return controllerW_.lock();
70 } 68 }
71 } 69 }