Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/LayerHolder.cpp @ 1308:adf234ecaa00 broker
Merge
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 04 Mar 2020 10:21:54 +0100 |
parents | a5326ce4f24b 257f2c9a02ac |
children | ab81ee8fce1f |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LayerHolder.cpp Wed Mar 04 10:07:37 2020 +0100 +++ b/Framework/Scene2DViewport/LayerHolder.cpp Wed Mar 04 10:21:54 2020 +0100 @@ -44,23 +44,23 @@ void LayerHolder::CreateLayers() { std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); + ViewportController& controller = lock->GetController(); + Scene2D& scene = controller.GetScene(); assert(baseLayerIndex_ == -1); - baseLayerIndex_ = lock->GetController().GetScene().GetMaxDepth() + 100; + baseLayerIndex_ = scene.GetMaxDepth() + 100; for (int i = 0; i < polylineLayerCount_; ++i) { - std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer()); - lock->GetController().GetScene().SetLayer(baseLayerIndex_ + i, layer.release()); + std::unique_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer()); + scene.SetLayer(baseLayerIndex_ + i, layer.release()); } for (int i = 0; i < textLayerCount_; ++i) { - std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer()); - lock->GetController().GetScene().SetLayer( - baseLayerIndex_ + polylineLayerCount_ + i, - layer.release()); + std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer()); + scene.SetLayer(baseLayerIndex_ + polylineLayerCount_ + i, layer.release()); } lock->Invalidate(); }