comparison Framework/Scene2DViewport/ViewportController.h @ 842:2b245953b44b

removed some c++11 for older compilers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 12 Jun 2019 09:52:25 +0200
parents e42b491f1fb2
children e3c56d4f863f
comparison
equal deleted inserted replaced
841:266e2b0b9abc 842:2b245953b44b
85 /** 85 /**
86 This method returns the list of measure tools containing the supplied point 86 This method returns the list of measure tools containing the supplied point
87 (in scene coords). A tracker can then be requested from the chosen 87 (in scene coords). A tracker can then be requested from the chosen
88 measure tool, if needed 88 measure tool, if needed
89 */ 89 */
90 std::vector<boost::shared_ptr<MeasureTool>> HitTestMeasureTools(ScenePoint2D p); 90 std::vector<boost::shared_ptr<MeasureTool> > HitTestMeasureTools(ScenePoint2D p);
91 91
92 /** 92 /**
93 With this method, the object takes ownership of the supplied tracker and 93 With this method, the object takes ownership of the supplied tracker and
94 updates it according to user interaction 94 updates it according to user interaction
95 */ 95 */
170 double GetAngleTopTextLabelDistanceS() const; 170 double GetAngleTopTextLabelDistanceS() const;
171 171
172 private: 172 private:
173 double GetCanvasToSceneFactor() const; 173 double GetCanvasToSceneFactor() const;
174 174
175 std::vector<boost::shared_ptr<TrackerCommand>> commandStack_; 175 std::vector<boost::shared_ptr<TrackerCommand> > commandStack_;
176 176
177 /** 177 /**
178 This is always between >= 0 and <= undoStack_.size() and gives the 178 This is always between >= 0 and <= undoStack_.size() and gives the
179 position where the controller is in the undo stack. 179 position where the controller is in the undo stack.
180 - If numAppliedCommands_ > 0, one can undo 180 - If numAppliedCommands_ > 0, one can undo
181 - If numAppliedCommands_ < numAppliedCommands_.size(), one can redo 181 - If numAppliedCommands_ < numAppliedCommands_.size(), one can redo
182 */ 182 */
183 size_t numAppliedCommands_; 183 size_t numAppliedCommands_;
184 std::vector<boost::shared_ptr<MeasureTool>> measureTools_; 184 std::vector<boost::shared_ptr<MeasureTool> > measureTools_;
185 boost::shared_ptr<Scene2D> scene_; 185 boost::shared_ptr<Scene2D> scene_;
186 boost::shared_ptr<IFlexiblePointerTracker> tracker_; 186 boost::shared_ptr<IFlexiblePointerTracker> tracker_;
187 187
188 // this is cached 188 // this is cached
189 mutable double canvasToSceneFactor_; 189 mutable double canvasToSceneFactor_;
190 }; 190 };