Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/ViewportController.h @ 1308:adf234ecaa00 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 8a28a9bf8876 c38c89684d83
children ab81ee8fce1f
comparison
equal deleted inserted replaced
1307:8a28a9bf8876 1308:adf234ecaa00
24 24
25 #include "../Messages/IObservable.h" 25 #include "../Messages/IObservable.h"
26 #include "../Scene2D/Scene2D.h" 26 #include "../Scene2D/Scene2D.h"
27 #include "../Scene2DViewport/IFlexiblePointerTracker.h" 27 #include "../Scene2DViewport/IFlexiblePointerTracker.h"
28 28
29 #include <Core/Compatibility.h>
30
29 #include <boost/enable_shared_from_this.hpp> 31 #include <boost/enable_shared_from_this.hpp>
30 #include <stack> 32 #include <stack>
31 33
32 namespace OrthancStone 34 namespace OrthancStone
33 { 35 {
230 double GetCanvasToSceneFactor() const; 232 double GetCanvasToSceneFactor() const;
231 233
232 IViewport& viewport_; 234 IViewport& viewport_;
233 boost::weak_ptr<UndoStack> undoStackW_; // Global stack, possibly shared by all viewports 235 boost::weak_ptr<UndoStack> undoStackW_; // Global stack, possibly shared by all viewports
234 std::vector<boost::shared_ptr<MeasureTool> > measureTools_; 236 std::vector<boost::shared_ptr<MeasureTool> > measureTools_;
235 boost::shared_ptr<IFlexiblePointerTracker> activeTracker_; // TODO - Couldn't this be a "std::auto_ptr"? 237 boost::shared_ptr<IFlexiblePointerTracker> activeTracker_; // TODO - Couldn't this be a "std::unique_ptr"?
236 238
237 std::auto_ptr<Scene2D> scene_; 239 std::unique_ptr<Scene2D> scene_;
238 240
239 // this is cached 241 // this is cached
240 double canvasToSceneFactor_; 242 double canvasToSceneFactor_;
241 }; 243 };
242 } 244 }