mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-19 00:04:52 -04:00
[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
This commit is contained in:
parent
cc3579e2a2
commit
1ff2ad3cc3
@ -114,9 +114,9 @@ def run(item, action, mainwindow):
|
|||||||
layer = QgsVectorLayer(uri.uri(), u'%s.face_mbr' % toponame, provider)
|
layer = QgsVectorLayer(uri.uri(), u'%s.face_mbr' % toponame, provider)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'face_mbr.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'face_mbr.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
face_extent = layer.extent()
|
face_extent = layer.extent()
|
||||||
|
|
||||||
# face geometry
|
# face geometry
|
||||||
@ -129,9 +129,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(face_extent)
|
layer.setExtent(face_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'face.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'face.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
# face_seed
|
# face_seed
|
||||||
sql = u'SELECT face_id, ST_PointOnSurface(topology.ST_GetFaceGeometry(%s, face_id)) as geom ' \
|
sql = u'SELECT face_id, ST_PointOnSurface(topology.ST_GetFaceGeometry(%s, face_id)) as geom ' \
|
||||||
@ -143,9 +143,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(face_extent)
|
layer.setExtent(face_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'face_seed.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'face_seed.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
# TODO: add polygon0, polygon1 and polygon2 ?
|
# TODO: add polygon0, polygon1 and polygon2 ?
|
||||||
|
|
||||||
@ -162,9 +162,9 @@ def run(item, action, mainwindow):
|
|||||||
layer = QgsVectorLayer(uri.uri(), u'%s.node' % toponame, provider)
|
layer = QgsVectorLayer(uri.uri(), u'%s.node' % toponame, provider)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'node.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'node.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
node_extent = layer.extent()
|
node_extent = layer.extent()
|
||||||
|
|
||||||
# node labels
|
# node labels
|
||||||
@ -175,9 +175,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(node_extent)
|
layer.setExtent(node_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'node_label.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'node_label.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
# EDGES
|
# EDGES
|
||||||
group = legend.addGroup(u'Edges', False, supergroup)
|
group = legend.addGroup(u'Edges', False, supergroup)
|
||||||
@ -190,9 +190,9 @@ def run(item, action, mainwindow):
|
|||||||
uri.setWkbType( QGis.WKBLineString )
|
uri.setWkbType( QGis.WKBLineString )
|
||||||
layer = QgsVectorLayer(uri.uri(), u'%s.edge' % toponame, provider)
|
layer = QgsVectorLayer(uri.uri(), u'%s.edge' % toponame, provider)
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
edge_extent = layer.extent()
|
edge_extent = layer.extent()
|
||||||
|
|
||||||
# directed edge
|
# directed edge
|
||||||
@ -203,9 +203,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(edge_extent)
|
layer.setExtent(edge_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'edge.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'edge.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
|
|
||||||
# edge labels
|
# edge labels
|
||||||
@ -216,9 +216,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(edge_extent)
|
layer.setExtent(edge_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'edge_label.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'edge_label.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
# face_left
|
# face_left
|
||||||
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
||||||
@ -228,9 +228,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(edge_extent)
|
layer.setExtent(edge_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'face_left.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'face_left.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
# face_right
|
# face_right
|
||||||
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
||||||
@ -240,9 +240,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(edge_extent)
|
layer.setExtent(edge_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'face_right.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'face_right.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
# next_left
|
# next_left
|
||||||
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
||||||
@ -252,9 +252,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(edge_extent)
|
layer.setExtent(edge_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'next_left.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'next_left.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
# next_right
|
# next_right
|
||||||
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
|
||||||
@ -264,9 +264,9 @@ def run(item, action, mainwindow):
|
|||||||
layer.setExtent(edge_extent)
|
layer.setExtent(edge_extent)
|
||||||
layer.loadNamedStyle(os.path.join(template_dir, 'next_right.qml'))
|
layer.loadNamedStyle(os.path.join(template_dir, 'next_right.qml'))
|
||||||
registry.addMapLayers([layer])
|
registry.addMapLayers([layer])
|
||||||
|
legend.moveLayer(layer, group)
|
||||||
legend.setLayerVisible(layer, False)
|
legend.setLayerVisible(layer, False)
|
||||||
legend.setLayerExpanded(layer, False)
|
legend.setLayerExpanded(layer, False)
|
||||||
legend.moveLayer(layer, group)
|
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
# restore canvas render flag
|
# restore canvas render flag
|
||||||
|
Loading…
x
Reference in New Issue
Block a user