Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/MeasureTool.h @ 1331:ab81ee8fce1f broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Viewport is not passed and stored as a shared_ptr instead of raw reference. - ViewportController can now be injected with an undo stack (not a ctor param anymore, as a preparation for the move of the undo stack to an interactor) - Added (temp) flag to disable emscripten events registration in the WebAssemblyViewport (because legacy client code deals with them directly) - Added emscripten_clear_timeout in ~WebGLViewportsRegistry - Removed GenericToolbox::HoldingRef whose responsibility is better served with proper callback un-registration.
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 30 Mar 2020 14:23:46 +0200
parents 9b126de2cde2
children
comparison
equal deleted inserted replaced
1329:8d3e669f01a2 1331:ab81ee8fce1f
111 A description of the measuring tool, useful in debug logs 111 A description of the measuring tool, useful in debug logs
112 */ 112 */
113 virtual std::string GetDescription() = 0; 113 virtual std::string GetDescription() = 0;
114 114
115 protected: 115 protected:
116 MeasureTool(IViewport& viewport); 116 MeasureTool(boost::shared_ptr<IViewport> viewport);
117 117
118 void PostConstructor(); 118 void PostConstructor();
119 119
120 /** 120 /**
121 The measuring tool may exist in a standalone fashion, without any available 121 The measuring tool may exist in a standalone fashion, without any available
139 139
140 /** 140 /**
141 Protected to allow sub-classes to use this weak pointer in factory methods 141 Protected to allow sub-classes to use this weak pointer in factory methods
142 (pass them to created objects) 142 (pass them to created objects)
143 */ 143 */
144 IViewport& viewport_; 144 boost::shared_ptr<IViewport> viewport_;
145 145
146 146
147 private: 147 private:
148 bool enabled_; 148 bool enabled_;
149 }; 149 };