Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/LayerHolder.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 a5326ce4f24b
children 2a11bbf7f6b0
comparison
equal deleted inserted replaced
1329:8d3e669f01a2 1331:ab81ee8fce1f
41 /** 41 /**
42 This ctor merely stores the scene and layer counts. No layer creation 42 This ctor merely stores the scene and layer counts. No layer creation
43 performed at this time 43 performed at this time
44 */ 44 */
45 LayerHolder( 45 LayerHolder(
46 IViewport& viewport, 46 boost::shared_ptr<IViewport> viewport,
47 int polylineLayerCount, int textLayerCount, int infoTextCount = 0); 47 int polylineLayerCount, int textLayerCount, int infoTextCount = 0);
48 48
49 /** 49 /**
50 This actually creates the layers 50 This actually creates the layers
51 */ 51 */
99 int GetInfoTextLayerIndex(int index = 0); 99 int GetInfoTextLayerIndex(int index = 0);
100 100
101 int textLayerCount_; 101 int textLayerCount_;
102 int polylineLayerCount_; 102 int polylineLayerCount_;
103 int infoTextCount_; 103 int infoTextCount_;
104 IViewport& viewport_; 104 boost::shared_ptr<IViewport> viewport_;
105 int baseLayerIndex_; 105 int baseLayerIndex_;
106 }; 106 };
107 } 107 }
108 108