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

[processing] Allow restricting fields to date/time types

Browse Source
This commit is contained in:
Nyall Dawson 2016-11-30 15:04:21 +10:00
parent b0662f908a
commit 08505b388a
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/plugins/processing/core/parameters.py
View File

@ -1339,6 +1339,7 @@ class ParameterTableField(Parameter):
DATA_TYPE_NUMBER = 0 DATA_TYPE_NUMBER = 0
DATA_TYPE_STRING = 1 DATA_TYPE_STRING = 1
DATA_TYPE_DATETIME = 2
DATA_TYPE_ANY = -1 DATA_TYPE_ANY = -1
def __init__(self, name='', description='', parent=None, datatype=-1, def __init__(self, name='', description='', parent=None, datatype=-1,
@ -1376,6 +1377,8 @@ class ParameterTableField(Parameter):
return 'numeric' return 'numeric'
elif self.datatype == self.DATA_TYPE_STRING: elif self.datatype == self.DATA_TYPE_STRING:
return 'string' return 'string'
elif self.datatype == self.DATA_TYPE_DATETIME:
return 'datetime'
else: else:
return 'any' return 'any'
@ -1397,6 +1400,9 @@ class ParameterTableField(Parameter):
elif definition.lower().strip().startswith('field string'): elif definition.lower().strip().startswith('field string'):
parent = definition.strip()[len('field string') + 1:] parent = definition.strip()[len('field string') + 1:]
datatype = ParameterTableField.DATA_TYPE_STRING datatype = ParameterTableField.DATA_TYPE_STRING
elif definition.lower().strip().startswith('field datetime'):
parent = definition.strip()[len('field datetime') + 1:]
datatype = ParameterTableField.DATA_TYPE_DATETIME
else: else:
parent = definition.strip()[len('field') + 1:] parent = definition.strip()[len('field') + 1:]
datatype = ParameterTableField.DATA_TYPE_ANY datatype = ParameterTableField.DATA_TYPE_ANY

5
python/plugins/processing/gui/wrappers.py
View File

@ -1022,7 +1022,8 @@ class TableFieldWidgetWrapper(WidgetWrapper):
widget.setFilters(QgsFieldProxyModel.Numeric) widget.setFilters(QgsFieldProxyModel.Numeric)
elif self.param.datatype == ParameterTableField.DATA_TYPE_STRING: elif self.param.datatype == ParameterTableField.DATA_TYPE_STRING:
widget.setFilters(QgsFieldProxyModel.String) widget.setFilters(QgsFieldProxyModel.String)
elif self.param.datatype == ParameterTableField.DATA_TYPE_DATETIME:
widget.setFilters(QgsFieldProxyModel.Date | QgsFieldProxyModel.Time)
return widget return widget
else: else:
widget = QComboBox() widget = QComboBox()
@ -1067,6 +1068,8 @@ class TableFieldWidgetWrapper(WidgetWrapper):
elif self.param.datatype == ParameterTableField.DATA_TYPE_NUMBER: elif self.param.datatype == ParameterTableField.DATA_TYPE_NUMBER:
fieldTypes = [QVariant.Int, QVariant.Double, QVariant.LongLong, fieldTypes = [QVariant.Int, QVariant.Double, QVariant.LongLong,
QVariant.UInt, QVariant.ULongLong] QVariant.UInt, QVariant.ULongLong]
elif self.param.datatype == ParameterTableField.DATA_TYPE_DATETIME:
fieldTypes = [QVariant.Date, QVariant.Time, QVariant.DateTime]
fieldNames = set() fieldNames = set()
for field in self._layer.fields(): for field in self._layer.fields():

1
python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
View File

@ -140,6 +140,7 @@ class ModelerParameterDefinitionDialog(QDialog):
self.datatypeCombo.addItem(self.tr('Any'), -1) self.datatypeCombo.addItem(self.tr('Any'), -1)
self.datatypeCombo.addItem(self.tr('Number'), 0) self.datatypeCombo.addItem(self.tr('Number'), 0)
self.datatypeCombo.addItem(self.tr('String'), 1) self.datatypeCombo.addItem(self.tr('String'), 1)
self.datatypeCombo.addItem(self.tr('Date/time'), 2)
self.verticalLayout.addWidget(self.datatypeCombo) self.verticalLayout.addWidget(self.datatypeCombo)
if self.param is not None and self.param.datatype is not None: if self.param is not None and self.param.datatype is not None: