comparison Framework/Scene2DViewport/MeasureTrackers.h @ 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 c71ef52602a0
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
19 **/ 19 **/
20 20
21 #pragma once 21 #pragma once
22 22
23 #include "IFlexiblePointerTracker.h" 23 #include "IFlexiblePointerTracker.h"
24 #include "../../Framework/Scene2D/Scene2D.h" 24 #include "../Scene2D/Scene2D.h"
25 #include "../../Framework/Scene2D/PointerEvent.h" 25 #include "../Scene2D/PointerEvent.h"
26 26
27 #include "MeasureTools.h" 27 #include "MeasureTool.h"
28 #include "MeasureCommands.h" 28 #include "MeasureCommands.h"
29 29
30 #include <vector> 30 #include <vector>
31 31
32 namespace OrthancStone 32 namespace OrthancStone
35 { 35 {
36 public: 36 public:
37 virtual void Cancel() ORTHANC_OVERRIDE; 37 virtual void Cancel() ORTHANC_OVERRIDE;
38 virtual bool IsAlive() const ORTHANC_OVERRIDE; 38 virtual bool IsAlive() const ORTHANC_OVERRIDE;
39 protected: 39 protected:
40 CreateMeasureTracker(ViewportControllerWPtr controllerW); 40 CreateMeasureTracker(boost::weak_ptr<ViewportController> controllerW);
41 41
42 ~CreateMeasureTracker(); 42 ~CreateMeasureTracker();
43 43
44 protected: 44 protected:
45 CreateMeasureCommandPtr command_; 45 boost::shared_ptr<CreateMeasureCommand> command_;
46 ViewportControllerWPtr controllerW_; 46 boost::weak_ptr<ViewportController> controllerW_;
47 bool alive_; 47 bool alive_;
48 Scene2DPtr GetScene(); 48 boost::shared_ptr<Scene2D> GetScene();
49 49
50 private: 50 private:
51 bool commitResult_; 51 bool commitResult_;
52 }; 52 };
53 } 53 }