sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

do not destroy layers created outside the dialog (fix #7903)

Browse Source
This commit is contained in:
Giuseppe Sucameli 2013-05-27 02:27:58 +02:00
parent cb1e47be2d
commit 61285a9d96
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
python/plugins/db_manager/dlg_import_vector.py
View File

@ -46,6 +46,9 @@ class DlgImportVector(QDialog, Ui_Dialog):
self.mode = self.ASK_FOR_INPUT_MODE if self.inLayer is None else self.HAS_INPUT_MODE
# used to delete the inlayer whether created inside this dialog
self.inLayerMustBeDestroyed = False
self.populateSchemas()
self.populateTables()
self.populateLayers()
@ -107,11 +110,13 @@ class DlgImportVector(QDialog, Ui_Dialog):
self.cboInputLayer.addItem( layer.name(), index )
def deleteInputLayer(self):
""" destroy the input layer instance, but only if it was
""" unset the input layer, then destroy it but only if it was
created from this dialog """
if self.mode == self.ASK_FOR_INPUT_MODE and self.inLayer:
self.inLayer.deleteLater()
if self.inLayerMustBeDestroyed:
self.inLayer.deleteLater()
self.inLayer = None
self.inLayerMustBeDestroyed = False
return True
return False
@ -119,7 +124,7 @@ class DlgImportVector(QDialog, Ui_Dialog):
vectorFormats = qgis.core.QgsProviderRegistry.instance().fileVectorFilters()
# get last used dir and format
settings = QSettings()
lastDir = settings.value("/db_manager/lastUsedDir", "").toString()
lastDir = settings.value("/db_manager/lastUsedDir", "").toString()
lastVectorFormat = settings.value("/UI/lastVectorFileFilter", "").toString()
# ask for a filename
filename = QFileDialog.getOpenFileName(self, "Choose the file to import", lastDir, vectorFormats, lastVectorFormat)
@ -159,10 +164,12 @@ class DlgImportVector(QDialog, Ui_Dialog):
return False
self.inLayer = layer
self.inLayerMustBeDestroyed = True
else:
legendIndex = self.cboInputLayer.itemData( index ).toInt()[0]
self.inLayer = iface.legendInterface().layers()[ legendIndex ]
self.inLayerMustBeDestroyed = False
# update the output table name
self.cboTable.setEditText(self.inLayer.name())