sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-24 00:04:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6255 from slarosa/fix_16476

Browse Source 
[dbmanager] porting of dae921c to 3: fixes #16476
This commit is contained in:
Luigi Pirelli 2018-02-03 13:18:15 +01:00 committed by GitHub
commit 6f09f1745a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/plugins/db_manager/db_plugins/vlayers/connector.py
View File

@ -96,6 +96,9 @@ class VLayerRegistry(object):
lid = self.layers.get(l) lid = self.layers.get(l)
if lid is None: if lid is None:
return lid return lid
if lid not in QgsProject.instance().mapLayers().keys():
self.layers.pop(l)
return None
return QgsProject.instance().mapLayer(lid) return QgsProject.instance().mapLayer(lid)
@ -249,12 +252,16 @@ class VLayerConnector(DBConnector):
def getTableRowCount(self, table): def getTableRowCount(self, table):
t = table[1] t = table[1]
l = VLayerRegistry.instance().getLayer(t) l = VLayerRegistry.instance().getLayer(t)
if not l or not l.isValid():
return None
return l.featureCount() return l.featureCount()
def getTableFields(self, table): def getTableFields(self, table):
""" return list of columns in table """ """ return list of columns in table """
t = table[1] t = table[1]
l = VLayerRegistry.instance().getLayer(t) l = VLayerRegistry.instance().getLayer(t)
if not l or not l.isValid():
return []
# id, name, type, nonnull, default, pk # id, name, type, nonnull, default, pk
n = l.dataProvider().fields().size() n = l.dataProvider().fields().size()
f = [(i, f.name(), f.typeName(), False, None, False) f = [(i, f.name(), f.typeName(), False, None, False)
@ -280,6 +287,8 @@ class VLayerConnector(DBConnector):
l = QgsProject.instance().mapLayer(t) l = QgsProject.instance().mapLayer(t)
else: else:
l = VLayerRegistry.instance().getLayer(t) l = VLayerRegistry.instance().getLayer(t)
if not l or not l.isValid():
return None
e = l.extent() e = l.extent()
r = (e.xMinimum(), e.yMinimum(), e.xMaximum(), e.yMaximum()) r = (e.xMinimum(), e.yMinimum(), e.xMaximum(), e.yMaximum())
return r return r

5
python/plugins/db_manager/layer_preview.py
View File

@ -113,15 +113,16 @@ class LayerPreview(QgsMapCanvas):
else: else:
vl = table.toMapLayer() vl = table.toMapLayer()
if not vl.isValid(): if vl and not vl.isValid():
vl.deleteLater() vl.deleteLater()
vl = None vl = None
# remove old layer (if any) and set new # remove old layer (if any) and set new
if self.currentLayer: if self.currentLayer:
if not QgsProject.instance().layerTreeRoot().findLayer(self.currentLayer.id()):
QgsProject.instance().removeMapLayers([self.currentLayer.id()]) QgsProject.instance().removeMapLayers([self.currentLayer.id()])
if vl: if vl and vl.isValid():
self.setLayers([vl]) self.setLayers([vl])
QgsProject.instance().addMapLayers([vl], False) QgsProject.instance().addMapLayers([vl], False)
self.zoomToFullExtent() self.zoomToFullExtent()