mirror of
https://github.com/qgis/QGIS.git
synced 2025-12-15 00:07:25 -05:00
[processing] Use native QGIS map layer combobox
Switches the custom map layer combo box used in the run algorithm dialog across to the standard QGIS map layer combo box
This commit is contained in:
Nyall Dawson
parent
5c3aea33b8
commit
f78f2a05c6
@ -1,90 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
***************************************************************************
|
||||
InputLayerSelectorPanel.py
|
||||
---------------------
|
||||
Date : August 2012
|
||||
Copyright : (C) 2012 by Victor Olaya
|
||||
Email : volayaf at gmail dot com
|
||||
***************************************************************************
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
***************************************************************************
|
||||
"""
|
||||
from builtins import str
|
||||
|
||||
__author__ = 'Victor Olaya'
|
||||
__date__ = 'August 2012'
|
||||
__copyright__ = '(C) 2012, Victor Olaya'
|
||||
|
||||
# This will get replaced with a git SHA1 when you do a git archive
|
||||
|
||||
__revision__ = '$Format:%H$'
|
||||
|
||||
import os
|
||||
|
||||
from qgis.PyQt import uic
|
||||
from qgis.PyQt.QtCore import QSettings, pyqtSignal
|
||||
from qgis.PyQt.QtGui import QIcon
|
||||
from qgis.PyQt.QtWidgets import QFileDialog
|
||||
from processing.tools import dataobjects
|
||||
|
||||
pluginPath = os.path.split(os.path.dirname(__file__))[0]
|
||||
WIDGET, BASE = uic.loadUiType(
|
||||
os.path.join(pluginPath, 'ui', 'widgetLayerSelector.ui'))
|
||||
|
||||
|
||||
class InputLayerSelectorPanel(BASE, WIDGET):
|
||||
|
||||
valueChanged = pyqtSignal()
|
||||
|
||||
def __init__(self, options, param):
|
||||
super(InputLayerSelectorPanel, self).__init__(None)
|
||||
self.setupUi(self)
|
||||
|
||||
self.btnIterate.setIcon(
|
||||
QIcon(os.path.join(pluginPath, 'images', 'iterate.png')))
|
||||
self.btnIterate.hide()
|
||||
|
||||
self.param = param
|
||||
|
||||
for (name, value) in options:
|
||||
self.cmbText.addItem(name, value)
|
||||
|
||||
self.btnSelect.clicked.connect(self.showSelectionDialog)
|
||||
self.cmbText.currentIndexChanged.connect(self.valueChanged.emit)
|
||||
|
||||
def showSelectionDialog(self):
|
||||
settings = QSettings()
|
||||
text = str(self.cmbText.currentText())
|
||||
if os.path.isdir(text):
|
||||
path = text
|
||||
elif os.path.isdir(os.path.dirname(text)):
|
||||
path = os.path.dirname(text)
|
||||
elif settings.contains('/Processing/LastInputPath'):
|
||||
path = str(settings.value('/Processing/LastInputPath'))
|
||||
else:
|
||||
path = ''
|
||||
|
||||
filename, selected_filter = QFileDialog.getOpenFileName(self, self.tr('Select file'),
|
||||
path, self.tr('All files (*.*);;') + self.param.getFileFilter())
|
||||
if filename:
|
||||
settings.setValue('/Processing/LastInputPath',
|
||||
os.path.dirname(str(filename)))
|
||||
filename = dataobjects.getRasterSublayer(filename, self.param)
|
||||
self.cmbText.addItem(filename, filename)
|
||||
self.cmbText.setCurrentIndex(self.cmbText.count() - 1)
|
||||
|
||||
def update(self, options):
|
||||
self.cmbText.clear()
|
||||
for (name, value) in options:
|
||||
self.cmbText.addItem(name, value)
|
||||
self.valueChanged.emit()
|
||||
|
||||
def getValue(self):
|
||||
return self.cmbText.itemData(self.cmbText.currentIndex())
|
||||
@ -34,15 +34,17 @@ import locale
|
||||
import os
|
||||
from functools import cmp_to_key
|
||||
|
||||
from qgis.core import QgsCoordinateReferenceSystem, QgsVectorLayer, QgsApplication
|
||||
from qgis.PyQt.QtWidgets import QCheckBox, QComboBox, QLineEdit, QPlainTextEdit, QWidget, QHBoxLayout, QToolButton
|
||||
from qgis.core import QgsCoordinateReferenceSystem, QgsVectorLayer, QgsApplication, QgsWkbTypes, QgsMapLayerProxyModel
|
||||
from qgis.PyQt.QtWidgets import QCheckBox, QComboBox, QLineEdit, QPlainTextEdit, QWidget, QHBoxLayout, QToolButton, QFileDialog
|
||||
from qgis.gui import (QgsFieldExpressionWidget,
|
||||
QgsExpressionLineEdit,
|
||||
QgsProjectionSelectionWidget,
|
||||
QgsGenericProjectionSelector,
|
||||
QgsFieldComboBox,
|
||||
QgsFieldProxyModel)
|
||||
from qgis.PyQt.QtCore import pyqtSignal, QObject, QVariant
|
||||
QgsFieldProxyModel,
|
||||
QgsMapLayerComboBox
|
||||
)
|
||||
from qgis.PyQt.QtCore import pyqtSignal, QObject, QVariant, QSettings
|
||||
|
||||
from processing.gui.NumberInputPanel import NumberInputPanel, ModellerNumberInputPanel
|
||||
from processing.gui.InputLayerSelectorPanel import InputLayerSelectorPanel
|
||||
@ -156,6 +158,26 @@ class WidgetWrapper(QObject):
|
||||
def refresh(self):
|
||||
pass
|
||||
|
||||
def getFileName(self, initial_value=''):
|
||||
"""Shows a file open dialog"""
|
||||
settings = QSettings()
|
||||
if os.path.isdir(initial_value):
|
||||
path = initial_value
|
||||
elif os.path.isdir(os.path.dirname(initial_value)):
|
||||
path = os.path.dirname(initial_value)
|
||||
elif settings.contains('/Processing/LastInputPath'):
|
||||
path = str(settings.value('/Processing/LastInputPath'))
|
||||
else:
|
||||
path = ''
|
||||
|
||||
filename, selected_filter = QFileDialog.getOpenFileName(self.widget, self.tr('Select file'),
|
||||
path, self.tr(
|
||||
'All files (*.*);;') + self.param.getFileFilter())
|
||||
if filename:
|
||||
settings.setValue('/Processing/LastInputPath',
|
||||
os.path.dirname(str(filename)))
|
||||
return filename, selected_filter
|
||||
|
||||
|
||||
class BasicWidgetWrapper(WidgetWrapper):
|
||||
|
||||
@ -534,13 +556,31 @@ class RasterWidgetWrapper(WidgetWrapper):
|
||||
|
||||
def createWidget(self):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
layers = dataobjects.getRasterLayers()
|
||||
items = []
|
||||
widget = QWidget()
|
||||
layout = QHBoxLayout()
|
||||
layout.setMargin(0)
|
||||
layout.setContentsMargins(0, 0, 0, 0)
|
||||
layout.setSpacing(2)
|
||||
self.combo = QgsMapLayerComboBox()
|
||||
layout.addWidget(self.combo)
|
||||
btn = QToolButton()
|
||||
btn.setText('...')
|
||||
btn.setToolTip(self.tr("Select file"))
|
||||
btn.clicked.connect(self.selectFile)
|
||||
layout.addWidget(btn)
|
||||
|
||||
widget.setLayout(layout)
|
||||
if self.param.optional:
|
||||
items.append((self.NOT_SELECTED, None))
|
||||
for layer in layers:
|
||||
items.append((getExtendedLayerName(layer), layer))
|
||||
return InputLayerSelectorPanel(items, self.param)
|
||||
self.combo.setAllowEmptyLayer(True)
|
||||
if ProcessingConfig.getSetting(ProcessingConfig.SHOW_CRS_DEF):
|
||||
self.combo.setShowCrs(True)
|
||||
|
||||
self.combo.setFilters(QgsMapLayerProxyModel.RasterLayer)
|
||||
self.combo.setExcludedProviders(['grass'])
|
||||
|
||||
self.combo.currentIndexChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
self.combo.currentTextChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
return widget
|
||||
elif self.dialogType == DIALOG_BATCH:
|
||||
return BatchInputSelectionPanel(self.param, self.row, self.col, self.dialog)
|
||||
else:
|
||||
@ -553,14 +593,14 @@ class RasterWidgetWrapper(WidgetWrapper):
|
||||
widget.setEditText("")
|
||||
return widget
|
||||
|
||||
def refresh(self):
|
||||
items = []
|
||||
layers = dataobjects.getRasterLayers()
|
||||
if self.param.optional:
|
||||
items.append((self.NOT_SELECTED, None))
|
||||
for layer in layers:
|
||||
items.append((getExtendedLayerName(layer), layer))
|
||||
self.widget.update(items)
|
||||
def selectFile(self):
|
||||
filename, selected_filter = self.getFileName(self.combo.currentText())
|
||||
if filename:
|
||||
filename = dataobjects.getRasterSublayer(filename, self.param)
|
||||
items = self.combo.additionalItems()
|
||||
items.append(filename)
|
||||
self.combo.setAdditionalItems(items)
|
||||
self.combo.setCurrentIndex(self.combo.findText(filename))
|
||||
|
||||
def setValue(self, value):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
@ -572,7 +612,14 @@ class RasterWidgetWrapper(WidgetWrapper):
|
||||
|
||||
def value(self):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
return self.widget.getValue()
|
||||
try:
|
||||
layer = self.combo.currentLayer()
|
||||
if layer:
|
||||
return layer
|
||||
else:
|
||||
return self.combo.currentText()
|
||||
except:
|
||||
return self.combo.currentText()
|
||||
elif self.dialogType == DIALOG_BATCH:
|
||||
return self.widget.getText()
|
||||
else:
|
||||
@ -615,16 +662,43 @@ class VectorWidgetWrapper(WidgetWrapper):
|
||||
|
||||
def createWidget(self):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
layers = dataobjects.getVectorLayers(self.param.datatype)
|
||||
items = []
|
||||
widget = QWidget()
|
||||
layout = QHBoxLayout()
|
||||
layout.setMargin(0)
|
||||
layout.setContentsMargins(0, 0, 0, 0)
|
||||
layout.setSpacing(2)
|
||||
self.combo = QgsMapLayerComboBox()
|
||||
layout.addWidget(self.combo)
|
||||
btn = QToolButton()
|
||||
btn.setText('...')
|
||||
btn.setToolTip(self.tr("Select file"))
|
||||
btn.clicked.connect(self.selectFile)
|
||||
layout.addWidget(btn)
|
||||
|
||||
widget.setLayout(layout)
|
||||
|
||||
filters = QgsMapLayerProxyModel.Filters()
|
||||
if self.param.datatype == [-1] or -1 in self.param.datatype:
|
||||
filters = QgsMapLayerProxyModel.HasGeometry
|
||||
if QgsWkbTypes.PointGeometry in self.param.datatype:
|
||||
filters |= QgsMapLayerProxyModel.PointLayer
|
||||
if QgsWkbTypes.LineGeometry in self.param.datatype:
|
||||
filters |= QgsMapLayerProxyModel.LineLayer
|
||||
if QgsWkbTypes.PolygonGeometry in self.param.datatype:
|
||||
filters |= QgsMapLayerProxyModel.PolygonLayer
|
||||
|
||||
if self.param.optional:
|
||||
items.append((self.NOT_SELECTED, None))
|
||||
for layer in layers:
|
||||
items.append((getExtendedLayerName(layer), layer))
|
||||
widget = InputLayerSelectorPanel(items, self.param)
|
||||
widget.name = self.param.name
|
||||
widget.valueChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
self.combo.setAllowEmptyLayer(True)
|
||||
if ProcessingConfig.getSetting(ProcessingConfig.SHOW_CRS_DEF):
|
||||
self.combo.setShowCrs(True)
|
||||
|
||||
self.combo.setFilters(filters)
|
||||
self.combo.setExcludedProviders(['grass'])
|
||||
|
||||
self.combo.currentIndexChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
self.combo.currentTextChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
return widget
|
||||
|
||||
elif self.dialogType == DIALOG_BATCH:
|
||||
widget = BatchInputSelectionPanel(self.param, self.row, self.col, self.dialog)
|
||||
widget.valueChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
@ -639,18 +713,14 @@ class VectorWidgetWrapper(WidgetWrapper):
|
||||
widget.setEditText("")
|
||||
return widget
|
||||
|
||||
def _populate(self, widget):
|
||||
items = []
|
||||
layers = dataobjects.getVectorLayers(self.param.datatype)
|
||||
layers.sort(key=lambda lay: lay.name())
|
||||
if self.param.optional:
|
||||
items.append((self.NOT_SELECTED, None))
|
||||
for layer in layers:
|
||||
items.append((getExtendedLayerName(layer), layer))
|
||||
self.widget.update(items)
|
||||
|
||||
def refresh(self):
|
||||
self._populate(self.widget)
|
||||
def selectFile(self):
|
||||
filename, selected_filter = self.getFileName(self.combo.currentText())
|
||||
if filename:
|
||||
filename = dataobjects.getRasterSublayer(filename, self.param)
|
||||
items = self.combo.additionalItems()
|
||||
items.append(filename)
|
||||
self.combo.setAdditionalItems(items)
|
||||
self.combo.setCurrentIndex(self.combo.findText(filename))
|
||||
|
||||
def setValue(self, value):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
@ -663,9 +733,13 @@ class VectorWidgetWrapper(WidgetWrapper):
|
||||
def value(self):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
try:
|
||||
return self.widget.itemData(self.widget.currentIndex())
|
||||
layer = self.combo.currentLayer()
|
||||
if layer:
|
||||
return layer
|
||||
else:
|
||||
return self.combo.currentText()
|
||||
except:
|
||||
return self.widget.getValue()
|
||||
return self.combo.currentText()
|
||||
elif self.dialogType == DIALOG_BATCH:
|
||||
return self.widget.value()
|
||||
else:
|
||||
@ -809,16 +883,31 @@ class TableWidgetWrapper(WidgetWrapper):
|
||||
|
||||
def createWidget(self):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
widget = QComboBox()
|
||||
layers = dataobjects.getTables()
|
||||
layers.sort(key=lambda lay: lay.name())
|
||||
widget = QWidget()
|
||||
layout = QHBoxLayout()
|
||||
layout.setMargin(0)
|
||||
layout.setContentsMargins(0, 0, 0, 0)
|
||||
layout.setSpacing(2)
|
||||
self.combo = QgsMapLayerComboBox()
|
||||
layout.addWidget(self.combo)
|
||||
btn = QToolButton()
|
||||
btn.setText('...')
|
||||
btn.setToolTip(self.tr("Select file"))
|
||||
btn.clicked.connect(self.selectFile)
|
||||
layout.addWidget(btn)
|
||||
|
||||
widget.setLayout(layout)
|
||||
|
||||
if self.param.optional:
|
||||
widget.addItem(self.NOT_SELECTED, None)
|
||||
for layer in layers:
|
||||
widget.addItem(layer.name(), layer)
|
||||
widget.currentIndexChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
widget.name = self.param.name
|
||||
self.combo.setAllowEmptyLayer(True)
|
||||
|
||||
self.combo.setFilters(QgsMapLayerProxyModel.VectorLayer)
|
||||
self.combo.setExcludedProviders(['grass'])
|
||||
|
||||
self.combo.currentIndexChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
self.combo.currentTextChanged.connect(lambda: self.widgetValueHasChanged.emit(self))
|
||||
return widget
|
||||
|
||||
elif self.dialogType == DIALOG_BATCH:
|
||||
return BatchInputSelectionPanel(self.param, self.row, self.col, self.dialog)
|
||||
else:
|
||||
@ -833,6 +922,15 @@ class TableWidgetWrapper(WidgetWrapper):
|
||||
widget.addItem(self.dialog.resolveValueDescription(layer), layer)
|
||||
return widget
|
||||
|
||||
def selectFile(self):
|
||||
filename, selected_filter = self.getFileName(self.combo.currentText())
|
||||
if filename:
|
||||
filename = dataobjects.getRasterSublayer(filename, self.param)
|
||||
items = self.combo.additionalItems()
|
||||
items.append(filename)
|
||||
self.combo.setAdditionalItems(items)
|
||||
self.combo.setCurrentIndex(self.combo.findText(filename))
|
||||
|
||||
def setValue(self, value):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
pass # TODO
|
||||
@ -844,9 +942,13 @@ class TableWidgetWrapper(WidgetWrapper):
|
||||
def value(self):
|
||||
if self.dialogType == DIALOG_STANDARD:
|
||||
try:
|
||||
return self.widget.itemData(self.widget.currentIndex())
|
||||
layer = self.combo.currentLayer()
|
||||
if layer:
|
||||
return layer
|
||||
else:
|
||||
return self.combo.currentText()
|
||||
except:
|
||||
return self.widget.getValue()
|
||||
return self.combo.currentText()
|
||||
elif self.dialogType == DIALOG_BATCH:
|
||||
return self.widget.value()
|
||||
else:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user