Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/LayerHolder.cpp @ 891:0aff28f15ea2
new abstraction: IViewport
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 10 Jul 2019 18:18:42 +0200 |
parents | e42b491f1fb2 |
children | 52b1c6ff10c5 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LayerHolder.cpp Wed Jul 10 15:23:13 2019 +0200 +++ b/Framework/Scene2DViewport/LayerHolder.cpp Wed Jul 10 18:18:42 2019 +0200 @@ -43,18 +43,18 @@ { assert(baseLayerIndex_ == -1); - baseLayerIndex_ = GetScene()->GetMaxDepth() + 100; + baseLayerIndex_ = GetScene().GetMaxDepth() + 100; for (int i = 0; i < polylineLayerCount_; ++i) { std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer()); - GetScene()->SetLayer(baseLayerIndex_ + i, layer.release()); + GetScene().SetLayer(baseLayerIndex_ + i, layer.release()); } for (int i = 0; i < textLayerCount_; ++i) { std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer()); - GetScene()->SetLayer( + GetScene().SetLayer( baseLayerIndex_ + polylineLayerCount_ + i, layer.release()); } @@ -72,7 +72,7 @@ return (baseLayerIndex_ != -1); } - boost::shared_ptr<Scene2D> LayerHolder::GetScene() + Scene2D& LayerHolder::GetScene() { boost::shared_ptr<ViewportController> controller = controllerW_.lock(); ORTHANC_ASSERT(controller.get() != 0, "Zombie attack!"); @@ -83,8 +83,8 @@ { for (int i = 0; i < textLayerCount_ + polylineLayerCount_; ++i) { - ORTHANC_ASSERT(GetScene()->HasLayer(baseLayerIndex_ + i), "No layer"); - GetScene()->DeleteLayer(baseLayerIndex_ + i); + ORTHANC_ASSERT(GetScene().HasLayer(baseLayerIndex_ + i), "No layer"); + GetScene().DeleteLayer(baseLayerIndex_ + i); } baseLayerIndex_ = -1; } @@ -93,9 +93,9 @@ { using namespace Orthanc; ORTHANC_ASSERT(baseLayerIndex_ != -1); - ORTHANC_ASSERT(GetScene()->HasLayer(GetPolylineLayerIndex(index))); + ORTHANC_ASSERT(GetScene().HasLayer(GetPolylineLayerIndex(index))); ISceneLayer* layer = - &(GetScene()->GetLayer(GetPolylineLayerIndex(index))); + &(GetScene().GetLayer(GetPolylineLayerIndex(index))); PolylineSceneLayer* concreteLayer = dynamic_cast<PolylineSceneLayer*>(layer); @@ -108,9 +108,9 @@ { using namespace Orthanc; ORTHANC_ASSERT(baseLayerIndex_ != -1); - ORTHANC_ASSERT(GetScene()->HasLayer(GetTextLayerIndex(index))); + ORTHANC_ASSERT(GetScene().HasLayer(GetTextLayerIndex(index))); ISceneLayer* layer = - &(GetScene()->GetLayer(GetTextLayerIndex(index))); + &(GetScene().GetLayer(GetTextLayerIndex(index))); TextSceneLayer* concreteLayer = dynamic_cast<TextSceneLayer*>(layer);