comparison Framework/Scene2DViewport/LayerHolder.h @ 1305:a5326ce4f24b broker

Trackers and measuring tools now use the viewport instead of ViewportController, so that proper locks can be used
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 09:45:38 +0100
parents 7ec8fea061b9
children ab81ee8fce1f
comparison
equal deleted inserted replaced
1304:b7fa67bf87fa 1305:a5326ce4f24b
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 boost::weak_ptr<ViewportController> controllerW, 46 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 boost::weak_ptr<ViewportController> controllerW_; 104 IViewport& viewport_;
105 int baseLayerIndex_; 105 int baseLayerIndex_;
106 }; 106 };
107 } 107 }
108 108