Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp @ 1742:911cd9a11ad3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed "using namespace Orthanc"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 30 Jan 2021 12:30:09 +0100
parents 9ac2a65d4172
children 3889ae96d2e9
comparison
equal deleted inserted replaced
1741:62377949e739 1742:911cd9a11ad3
113 PolylineSceneLayer* LayerHolder::GetPolylineLayer(int index /*= 0*/) 113 PolylineSceneLayer* LayerHolder::GetPolylineLayer(int index /*= 0*/)
114 { 114 {
115 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); 115 std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
116 const Scene2D& scene = lock->GetController().GetScene(); 116 const Scene2D& scene = lock->GetController().GetScene();
117 117
118 using namespace Orthanc;
119 ORTHANC_ASSERT(baseLayerIndex_ != -1); 118 ORTHANC_ASSERT(baseLayerIndex_ != -1);
120 ORTHANC_ASSERT(scene.HasLayer(GetPolylineLayerIndex(index))); 119 ORTHANC_ASSERT(scene.HasLayer(GetPolylineLayerIndex(index)));
121 ISceneLayer* layer = &(scene.GetLayer(GetPolylineLayerIndex(index))); 120 ISceneLayer* layer = &(scene.GetLayer(GetPolylineLayerIndex(index)));
122 121
123 PolylineSceneLayer* concreteLayer = 122 PolylineSceneLayer* concreteLayer =
130 TextSceneLayer* LayerHolder::GetTextLayer(int index /*= 0*/) 129 TextSceneLayer* LayerHolder::GetTextLayer(int index /*= 0*/)
131 { 130 {
132 std::unique_ptr<IViewport::ILock> lock(GetViewportLock()); 131 std::unique_ptr<IViewport::ILock> lock(GetViewportLock());
133 const Scene2D& scene = lock->GetController().GetScene(); 132 const Scene2D& scene = lock->GetController().GetScene();
134 133
135 using namespace Orthanc;
136 ORTHANC_ASSERT(baseLayerIndex_ != -1); 134 ORTHANC_ASSERT(baseLayerIndex_ != -1);
137 ORTHANC_ASSERT(scene.HasLayer(GetTextLayerIndex(index))); 135 ORTHANC_ASSERT(scene.HasLayer(GetTextLayerIndex(index)));
138 ISceneLayer* layer = &(scene.GetLayer(GetTextLayerIndex(index))); 136 ISceneLayer* layer = &(scene.GetLayer(GetTextLayerIndex(index)));
139 137
140 TextSceneLayer* concreteLayer = 138 TextSceneLayer* concreteLayer =
144 return concreteLayer; 142 return concreteLayer;
145 } 143 }
146 144
147 int LayerHolder::GetPolylineLayerIndex(int index /*= 0*/) 145 int LayerHolder::GetPolylineLayerIndex(int index /*= 0*/)
148 { 146 {
149 using namespace Orthanc;
150 ORTHANC_ASSERT(index < polylineLayerCount_); 147 ORTHANC_ASSERT(index < polylineLayerCount_);
151 return baseLayerIndex_ + index; 148 return baseLayerIndex_ + index;
152 } 149 }
153 150
154 int LayerHolder::GetTextLayerIndex(int index /*= 0*/) 151 int LayerHolder::GetTextLayerIndex(int index /*= 0*/)
155 { 152 {
156 using namespace Orthanc;
157 ORTHANC_ASSERT(index < textLayerCount_); 153 ORTHANC_ASSERT(index < textLayerCount_);
158 154
159 // the text layers are placed right after the polyline layers 155 // the text layers are placed right after the polyline layers
160 // this means they are drawn ON TOP 156 // this means they are drawn ON TOP
161 return baseLayerIndex_ + polylineLayerCount_ + index; 157 return baseLayerIndex_ + polylineLayerCount_ + index;