Mercurial > hg > orthanc-stone

comparison Framework/Scene2DViewport/LayerHolder.cpp @ 1308:adf234ecaa00 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents a5326ce4f24b 257f2c9a02ac
children ab81ee8fce1f
comparison
equal deleted inserted replaced
1307:8a28a9bf8876 1308:adf234ecaa00
42 } 42 }
43 43
44 void LayerHolder::CreateLayers() 44 void LayerHolder::CreateLayers()
45 { 45 {
46 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock()); 46 std::unique_ptr<IViewport::ILock> lock(viewport_.Lock());
47 ViewportController& controller = lock->GetController();
48 Scene2D& scene = controller.GetScene();
47 49
48 assert(baseLayerIndex_ == -1); 50 assert(baseLayerIndex_ == -1);
49 51
50 baseLayerIndex_ = lock->GetController().GetScene().GetMaxDepth() + 100; 52 baseLayerIndex_ = scene.GetMaxDepth() + 100;
51 53
52 for (int i = 0; i < polylineLayerCount_; ++i) 54 for (int i = 0; i < polylineLayerCount_; ++i)
53 { 55 {
54 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer()); 56 std::unique_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer());
55 lock->GetController().GetScene().SetLayer(baseLayerIndex_ + i, layer.release()); 57 scene.SetLayer(baseLayerIndex_ + i, layer.release());
56 } 58 }
57 59
58 for (int i = 0; i < textLayerCount_; ++i) 60 for (int i = 0; i < textLayerCount_; ++i)
59 { 61 {
60 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer()); 62 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer());
61 lock->GetController().GetScene().SetLayer( 63 scene.SetLayer(baseLayerIndex_ + polylineLayerCount_ + i, layer.release());
62 baseLayerIndex_ + polylineLayerCount_ + i,
63 layer.release());
64 } 64 }
65 lock->Invalidate(); 65 lock->Invalidate();
66 } 66 }
67 67
68 void LayerHolder::CreateLayersIfNeeded() 68 void LayerHolder::CreateLayersIfNeeded()