Mercurial > hg > orthanc-stone
diff Framework/Scene2DViewport/LayerHolder.cpp @ 818:e42b491f1fb2
Removed typedefs to shared_ptr by making them explicit. Removed using namespace
directives to make usage more explicit, too.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 29 May 2019 10:51:28 +0200 |
parents | 712ff6ff3c19 |
children | 0aff28f15ea2 |
line wrap: on
line diff
--- a/Framework/Scene2DViewport/LayerHolder.cpp Wed May 29 08:36:13 2019 +0200 +++ b/Framework/Scene2DViewport/LayerHolder.cpp Wed May 29 10:51:28 2019 +0200 @@ -25,12 +25,10 @@ #include "../Scene2DViewport/ViewportController.h" #include "../StoneException.h" -using namespace Orthanc; - namespace OrthancStone { LayerHolder::LayerHolder( - ViewportControllerWPtr controllerW, + boost::weak_ptr<ViewportController> controllerW, int polylineLayerCount, int textLayerCount) : textLayerCount_(textLayerCount) @@ -74,9 +72,9 @@ return (baseLayerIndex_ != -1); } - OrthancStone::Scene2DPtr LayerHolder::GetScene() + boost::shared_ptr<Scene2D> LayerHolder::GetScene() { - ViewportControllerPtr controller = controllerW_.lock(); + boost::shared_ptr<ViewportController> controller = controllerW_.lock(); ORTHANC_ASSERT(controller.get() != 0, "Zombie attack!"); return controller->GetScene(); } @@ -93,6 +91,7 @@ PolylineSceneLayer* LayerHolder::GetPolylineLayer(int index /*= 0*/) { + using namespace Orthanc; ORTHANC_ASSERT(baseLayerIndex_ != -1); ORTHANC_ASSERT(GetScene()->HasLayer(GetPolylineLayerIndex(index))); ISceneLayer* layer = @@ -107,6 +106,7 @@ TextSceneLayer* LayerHolder::GetTextLayer(int index /*= 0*/) { + using namespace Orthanc; ORTHANC_ASSERT(baseLayerIndex_ != -1); ORTHANC_ASSERT(GetScene()->HasLayer(GetTextLayerIndex(index))); ISceneLayer* layer = @@ -121,6 +121,7 @@ int LayerHolder::GetPolylineLayerIndex(int index /*= 0*/) { + using namespace Orthanc; ORTHANC_ASSERT(index < polylineLayerCount_); return baseLayerIndex_ + index; } @@ -128,6 +129,7 @@ int LayerHolder::GetTextLayerIndex(int index /*= 0*/) { + using namespace Orthanc; ORTHANC_ASSERT(index < textLayerCount_); // the text layers are placed right after the polyline layers