comparison Framework/Scene2DViewport/LayerHolder.cpp @ 911:64e5f3ff6360 am-dev

Merge
author Alain Mazy <alain@mazy.be>
date Thu, 18 Jul 2019 10:50:59 +0200
parents 52b1c6ff10c5
children 32eaf4929b08
comparison
equal deleted inserted replaced
903:ef6e425dc79f 911:64e5f3ff6360
28 namespace OrthancStone 28 namespace OrthancStone
29 { 29 {
30 LayerHolder::LayerHolder( 30 LayerHolder::LayerHolder(
31 boost::weak_ptr<ViewportController> controllerW, 31 boost::weak_ptr<ViewportController> controllerW,
32 int polylineLayerCount, 32 int polylineLayerCount,
33 int textLayerCount) 33 int textLayerCount,
34 int infoTextCount)
34 : textLayerCount_(textLayerCount) 35 : textLayerCount_(textLayerCount)
35 , polylineLayerCount_(polylineLayerCount) 36 , polylineLayerCount_(polylineLayerCount)
37 , infoTextCount_(infoTextCount)
36 , controllerW_(controllerW) 38 , controllerW_(controllerW)
37 , baseLayerIndex_(-1) 39 , baseLayerIndex_(-1)
38 { 40 {
39 41
40 } 42 }