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

[processing] If supported, use memory layers instead of shapefiles

Browse Source 
when writing to a temporary result

Avoids truncation of field names and other format specific
limitations
This commit is contained in:
Nyall Dawson 2016-08-14 13:32:38 +10:00
parent a064c0a160
commit 001ae44b67
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
python/plugins/processing/gui/OutputSelectionPanel.py
View File

@ -54,6 +54,8 @@ class OutputSelectionPanel(BASE, WIDGET):
SAVE_TO_TEMP_FILE = QCoreApplication.translate( SAVE_TO_TEMP_FILE = QCoreApplication.translate(
'OutputSelectionPanel', '[Save to temporary file]') 'OutputSelectionPanel', '[Save to temporary file]')
SAVE_TO_TEMP_LAYER = QCoreApplication.translate(
'OutputSelectionPanel', '[Create temporary layer]')
def __init__(self, output, alg): def __init__(self, output, alg):
super(OutputSelectionPanel, self).__init__(None) super(OutputSelectionPanel, self).__init__(None)
@ -63,7 +65,12 @@ class OutputSelectionPanel(BASE, WIDGET):
self.alg = alg self.alg = alg
if hasattr(self.leText, 'setPlaceholderText'): if hasattr(self.leText, 'setPlaceholderText'):
self.leText.setPlaceholderText(self.SAVE_TO_TEMP_FILE) if isinstance(output, OutputVector) \
and alg.provider.supportsNonFileBasedOutput():
# use memory layers for temporary files if supported
self.leText.setPlaceholderText(self.SAVE_TO_TEMP_LAYER)
else:
self.leText.setPlaceholderText(self.SAVE_TO_TEMP_FILE)
self.btnSelect.clicked.connect(self.selectOutput) self.btnSelect.clicked.connect(self.selectOutput)
@ -73,8 +80,14 @@ class OutputSelectionPanel(BASE, WIDGET):
else: else:
popupMenu = QMenu() popupMenu = QMenu()
actionSaveToTempFile = QAction( if isinstance(self.output, OutputVector) \
self.tr('Save to a temporary file'), self.btnSelect) and self.alg.provider.supportsNonFileBasedOutput():
# use memory layers for temporary files if supported
actionSaveToTempFile = QAction(
self.tr('Create temporary layer'), self.btnSelect)
else:
actionSaveToTempFile = QAction(
self.tr('Save to a temporary file'), self.btnSelect)
actionSaveToTempFile.triggered.connect(self.saveToTemporaryFile) actionSaveToTempFile.triggered.connect(self.saveToTemporaryFile)
popupMenu.addAction(actionSaveToTempFile) popupMenu.addAction(actionSaveToTempFile)
@ -90,10 +103,6 @@ class OutputSelectionPanel(BASE, WIDGET):
if isinstance(self.output, OutputVector) \ if isinstance(self.output, OutputVector) \
and self.alg.provider.supportsNonFileBasedOutput(): and self.alg.provider.supportsNonFileBasedOutput():
actionSaveToMemory = QAction(
self.tr('Save to memory layer'), self.btnSelect)
actionSaveToMemory.triggered.connect(self.saveToMemory)
popupMenu.addAction(actionSaveToMemory)
actionSaveToSpatialite = QAction( actionSaveToSpatialite = QAction(
self.tr('Save to Spatialite table...'), self.btnSelect) self.tr('Save to Spatialite table...'), self.btnSelect)
actionSaveToSpatialite.triggered.connect(self.saveToSpatialite) actionSaveToSpatialite.triggered.connect(self.saveToSpatialite)
@ -188,9 +197,6 @@ class OutputSelectionPanel(BASE, WIDGET):
'the_geom' if self.output.hasGeometry() else None) 'the_geom' if self.output.hasGeometry() else None)
self.leText.setText("spatialite:" + uri.uri()) self.leText.setText("spatialite:" + uri.uri())
def saveToMemory(self):
self.leText.setText('memory:')
def selectFile(self): def selectFile(self):
fileFilter = self.output.getFileFilter(self.alg) fileFilter = self.output.getFileFilter(self.alg)
@ -239,8 +245,13 @@ class OutputSelectionPanel(BASE, WIDGET):
fileName = result fileName = result
if fileName.startswith("[") and fileName.endswith("]"): if fileName.startswith("[") and fileName.endswith("]"):
fileName = fileName[1:-1] fileName = fileName[1:-1]
if fileName.strip() in ['', self.SAVE_TO_TEMP_FILE]: if fileName.strip() in ['', self.SAVE_TO_TEMP_FILE, self.SAVE_TO_TEMP_LAYER]:
value = None if isinstance(self.output, OutputVector) \
and self.alg.provider.supportsNonFileBasedOutput():
# use memory layers for temporary files if supported
value = 'memory:'
else:
value = None
elif fileName.startswith('memory:'): elif fileName.startswith('memory:'):
value = fileName value = fileName
elif fileName.startswith('postgis:'): elif fileName.startswith('postgis:'):