Skip to content

Commit 1ff2ad3

Browse files
author
Sandro Santilli
committedOct 14, 2014
[TopoViewer] fix layer visibility after QgsLegendInterface API changes
It was broken with 2.4, whereas QgsLegendInterface::moveLayer started forcing layer visibility on (undocumented behaviour). Fixes #11382
·
ltr-3_40archive/master_2
1 parent cc3579e commit 1ff2ad3

File tree

1 file changed

+12
-12
lines changed
  • python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview

1 file changed

+12
-12
lines changed
 

‎python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ def run(item, action, mainwindow):
114114
layer = QgsVectorLayer(uri.uri(), u'%s.face_mbr' % toponame, provider)
115115
layer.loadNamedStyle(os.path.join(template_dir, 'face_mbr.qml'))
116116
registry.addMapLayers([layer])
117+
legend.moveLayer(layer, group)
117118
legend.setLayerVisible(layer, False)
118119
legend.setLayerExpanded(layer, False)
119-
legend.moveLayer(layer, group)
120120
face_extent = layer.extent()
121121

122122
# face geometry
@@ -129,9 +129,9 @@ def run(item, action, mainwindow):
129129
layer.setExtent(face_extent)
130130
layer.loadNamedStyle(os.path.join(template_dir, 'face.qml'))
131131
registry.addMapLayers([layer])
132+
legend.moveLayer(layer, group)
132133
legend.setLayerVisible(layer, False)
133134
legend.setLayerExpanded(layer, False)
134-
legend.moveLayer(layer, group)
135135

136136
# face_seed
137137
sql = u'SELECT face_id, ST_PointOnSurface(topology.ST_GetFaceGeometry(%s, face_id)) as geom ' \
@@ -143,9 +143,9 @@ def run(item, action, mainwindow):
143143
layer.setExtent(face_extent)
144144
layer.loadNamedStyle(os.path.join(template_dir, 'face_seed.qml'))
145145
registry.addMapLayers([layer])
146+
legend.moveLayer(layer, group)
146147
legend.setLayerVisible(layer, False)
147148
legend.setLayerExpanded(layer, False)
148-
legend.moveLayer(layer, group)
149149

150150
# TODO: add polygon0, polygon1 and polygon2 ?
151151

@@ -162,9 +162,9 @@ def run(item, action, mainwindow):
162162
layer = QgsVectorLayer(uri.uri(), u'%s.node' % toponame, provider)
163163
layer.loadNamedStyle(os.path.join(template_dir, 'node.qml'))
164164
registry.addMapLayers([layer])
165+
legend.moveLayer(layer, group)
165166
legend.setLayerVisible(layer, False)
166167
legend.setLayerExpanded(layer, False)
167-
legend.moveLayer(layer, group)
168168
node_extent = layer.extent()
169169

170170
# node labels
@@ -175,9 +175,9 @@ def run(item, action, mainwindow):
175175
layer.setExtent(node_extent)
176176
layer.loadNamedStyle(os.path.join(template_dir, 'node_label.qml'))
177177
registry.addMapLayers([layer])
178+
legend.moveLayer(layer, group)
178179
legend.setLayerVisible(layer, False)
179180
legend.setLayerExpanded(layer, False)
180-
legend.moveLayer(layer, group)
181181

182182
# EDGES
183183
group = legend.addGroup(u'Edges', False, supergroup)
@@ -190,9 +190,9 @@ def run(item, action, mainwindow):
190190
uri.setWkbType( QGis.WKBLineString )
191191
layer = QgsVectorLayer(uri.uri(), u'%s.edge' % toponame, provider)
192192
registry.addMapLayers([layer])
193+
legend.moveLayer(layer, group)
193194
legend.setLayerVisible(layer, False)
194195
legend.setLayerExpanded(layer, False)
195-
legend.moveLayer(layer, group)
196196
edge_extent = layer.extent()
197197

198198
# directed edge
@@ -203,9 +203,9 @@ def run(item, action, mainwindow):
203203
layer.setExtent(edge_extent)
204204
layer.loadNamedStyle(os.path.join(template_dir, 'edge.qml'))
205205
registry.addMapLayers([layer])
206+
legend.moveLayer(layer, group)
206207
legend.setLayerVisible(layer, False)
207208
legend.setLayerExpanded(layer, False)
208-
legend.moveLayer(layer, group)
209209

210210

211211
# edge labels
@@ -216,9 +216,9 @@ def run(item, action, mainwindow):
216216
layer.setExtent(edge_extent)
217217
layer.loadNamedStyle(os.path.join(template_dir, 'edge_label.qml'))
218218
registry.addMapLayers([layer])
219+
legend.moveLayer(layer, group)
219220
legend.setLayerVisible(layer, False)
220221
legend.setLayerExpanded(layer, False)
221-
legend.moveLayer(layer, group)
222222

223223
# face_left
224224
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
@@ -228,9 +228,9 @@ def run(item, action, mainwindow):
228228
layer.setExtent(edge_extent)
229229
layer.loadNamedStyle(os.path.join(template_dir, 'face_left.qml'))
230230
registry.addMapLayers([layer])
231+
legend.moveLayer(layer, group)
231232
legend.setLayerVisible(layer, False)
232233
legend.setLayerExpanded(layer, False)
233-
legend.moveLayer(layer, group)
234234

235235
# face_right
236236
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
@@ -240,9 +240,9 @@ def run(item, action, mainwindow):
240240
layer.setExtent(edge_extent)
241241
layer.loadNamedStyle(os.path.join(template_dir, 'face_right.qml'))
242242
registry.addMapLayers([layer])
243+
legend.moveLayer(layer, group)
243244
legend.setLayerVisible(layer, False)
244245
legend.setLayerExpanded(layer, False)
245-
legend.moveLayer(layer, group)
246246

247247
# next_left
248248
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
@@ -252,9 +252,9 @@ def run(item, action, mainwindow):
252252
layer.setExtent(edge_extent)
253253
layer.loadNamedStyle(os.path.join(template_dir, 'next_left.qml'))
254254
registry.addMapLayers([layer])
255+
legend.moveLayer(layer, group)
255256
legend.setLayerVisible(layer, False)
256257
legend.setLayerExpanded(layer, False)
257-
legend.moveLayer(layer, group)
258258

259259
# next_right
260260
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
@@ -264,9 +264,9 @@ def run(item, action, mainwindow):
264264
layer.setExtent(edge_extent)
265265
layer.loadNamedStyle(os.path.join(template_dir, 'next_right.qml'))
266266
registry.addMapLayers([layer])
267+
legend.moveLayer(layer, group)
267268
legend.setLayerVisible(layer, False)
268269
legend.setLayerExpanded(layer, False)
269-
legend.moveLayer(layer, group)
270270

271271
finally:
272272
# restore canvas render flag

0 commit comments

Comments
 (0)
Please sign in to comment.