Mercurial > hg > orthanc-stone
comparison Framework/Scene2DViewport/ViewportController.h @ 893:0c5201499af8
Fixes to TrackerSampleApp following IViewport refactoring (FusionMprSdl not working yet)
Removal of the useless scene_ inside ViewportController
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 15 Jul 2019 12:48:19 +0200 |
parents | 0aff28f15ea2 |
children | a911f5bb48da |
comparison
equal
deleted
inserted
replaced
892:50cd372e2460 | 893:0c5201499af8 |
---|---|
179 return viewport_.GetScene(); | 179 return viewport_.GetScene(); |
180 } | 180 } |
181 | 181 |
182 const Scene2D& GetScene() const | 182 const Scene2D& GetScene() const |
183 { | 183 { |
184 return scene_; | 184 return const_cast<IViewport&>(viewport_).GetScene(); |
185 } | 185 } |
186 | 186 |
187 private: | 187 private: |
188 double GetCanvasToSceneFactor() const; | 188 double GetCanvasToSceneFactor() const; |
189 | 189 |
195 std::vector<boost::shared_ptr<MeasureTool> > measureTools_; | 195 std::vector<boost::shared_ptr<MeasureTool> > measureTools_; |
196 boost::shared_ptr<IFlexiblePointerTracker> tracker_; | 196 boost::shared_ptr<IFlexiblePointerTracker> tracker_; |
197 | 197 |
198 // this is cached | 198 // this is cached |
199 mutable double canvasToSceneFactor_; | 199 mutable double canvasToSceneFactor_; |
200 | 200 |
201 | |
202 // Refactoring on 2019-07-10: Removing shared_ptr from scene | 201 // Refactoring on 2019-07-10: Removing shared_ptr from scene |
203 IViewport& viewport_; | 202 IViewport& viewport_; |
204 const Scene2D& scene_; // As long as the viewport exists, its associated scene too | |
205 }; | 203 }; |
206 } | 204 } |