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

[processing] Allow data type for numeric inputs to be specified

Browse Source
This commit is contained in:
Nyall Dawson 2019-03-08 15:06:32 +10:00
parent 9f6ddaf5c5
commit 82b186f00f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,6 +229,14 @@ class ModelerParameterDefinitionDialog(QDialog):
self.parentCombo.setCurrentIndex(idx) self.parentCombo.setCurrentIndex(idx)
idx += 1 idx += 1
self.verticalLayout.addWidget(self.parentCombo) self.verticalLayout.addWidget(self.parentCombo)
else:
self.verticalLayout.addWidget(QLabel(self.tr('Number type')))
self.type_combo = QComboBox()
self.type_combo.addItem(self.tr('Float'), QgsProcessingParameterNumber.Double)
self.type_combo.addItem(self.tr('Integer'), QgsProcessingParameterNumber.Integer)
if self.param:
self.type_combo.setCurrentIndex(self.type_combo.findData(self.param.dataType()))
self.verticalLayout.addWidget(self.type_combo)
self.verticalLayout.addWidget(QLabel(self.tr('Min value'))) self.verticalLayout.addWidget(QLabel(self.tr('Min value')))
self.minTextBox = QLineEdit() self.minTextBox = QLineEdit()
@ -245,7 +253,7 @@ class ModelerParameterDefinitionDialog(QDialog):
if self.param is not None: if self.param is not None:
default = self.param.defaultValue() default = self.param.defaultValue()
if self.param.dataType() == QgsProcessingParameterNumber.Integer: if self.param.dataType() == QgsProcessingParameterNumber.Integer:
default = int(math.floor(default)) default = int(math.floor(float(default)))
if default: if default:
self.defaultTextBox.setText(str(default)) self.defaultTextBox.setText(str(default))
self.verticalLayout.addWidget(self.defaultTextBox) self.verticalLayout.addWidget(self.defaultTextBox)
@ -445,7 +453,9 @@ class ModelerParameterDefinitionDialog(QDialog):
self.param.setParentParameterName(parent) self.param.setParentParameterName(parent)
elif (self.paramType == parameters.PARAMETER_NUMBER or elif (self.paramType == parameters.PARAMETER_NUMBER or
isinstance(self.param, QgsProcessingParameterNumber)): isinstance(self.param, QgsProcessingParameterNumber)):
self.param = QgsProcessingParameterNumber(name, description, QgsProcessingParameterNumber.Double,
type = self.type_combo.currentData()
self.param = QgsProcessingParameterNumber(name, description, type,
self.defaultTextBox.text()) self.defaultTextBox.text())
try: try:
vmin = self.minTextBox.text().strip() vmin = self.minTextBox.text().strip()