Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp @ 1571:85e117739eca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Sep 2020 17:46:39 +0200
parents 314b6dc507d9
children 8563ea5d8ae4
comparison
equal deleted inserted replaced
1570:9a04f42098a3 1571:85e117739eca
98 } 98 }
99 99
100 PolylineSceneLayer* LayerHolder::GetPolylineLayer(int index /*= 0*/) 100 PolylineSceneLayer* LayerHolder::GetPolylineLayer(int index /*= 0*/)
101 { 101 {
102 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 102 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
103 Scene2D& scene = lock->GetController().GetScene(); 103 const Scene2D& scene = lock->GetController().GetScene();
104 104
105 using namespace Orthanc; 105 using namespace Orthanc;
106 ORTHANC_ASSERT(baseLayerIndex_ != -1); 106 ORTHANC_ASSERT(baseLayerIndex_ != -1);
107 ORTHANC_ASSERT(scene.HasLayer(GetPolylineLayerIndex(index))); 107 ORTHANC_ASSERT(scene.HasLayer(GetPolylineLayerIndex(index)));
108 ISceneLayer* layer = &(scene.GetLayer(GetPolylineLayerIndex(index))); 108 ISceneLayer* layer = &(scene.GetLayer(GetPolylineLayerIndex(index)));
115 } 115 }
116 116
117 TextSceneLayer* LayerHolder::GetTextLayer(int index /*= 0*/) 117 TextSceneLayer* LayerHolder::GetTextLayer(int index /*= 0*/)
118 { 118 {
119 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock()); 119 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
120 Scene2D& scene = lock->GetController().GetScene(); 120 const Scene2D& scene = lock->GetController().GetScene();
121 121
122 using namespace Orthanc; 122 using namespace Orthanc;
123 ORTHANC_ASSERT(baseLayerIndex_ != -1); 123 ORTHANC_ASSERT(baseLayerIndex_ != -1);
124 ORTHANC_ASSERT(scene.HasLayer(GetTextLayerIndex(index))); 124 ORTHANC_ASSERT(scene.HasLayer(GetTextLayerIndex(index)));
125 ISceneLayer* layer = &(scene.GetLayer(GetTextLayerIndex(index))); 125 ISceneLayer* layer = &(scene.GetLayer(GetTextLayerIndex(index)));