diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py index d03b6cbb10c..15dd19eb528 100644 --- a/python/plugins/processing/gui/ConfigDialog.py +++ b/python/plugins/processing/gui/ConfigDialog.py @@ -32,8 +32,9 @@ from PyQt4 import uic from PyQt4.QtCore import Qt, QEvent, QPyNullVariant from PyQt4.QtGui import (QFileDialog, QDialog, QIcon, QStyle, QStandardItemModel, QStandardItem, QMessageBox, QStyledItemDelegate, - QLineEdit, QSpinBox, QDoubleSpinBox, QWidget, QToolButton, QHBoxLayout, + QLineEdit, QWidget, QToolButton, QHBoxLayout, QComboBox) +from qgis.gui import QgsDoubleSpinBox, QgsSpinBox from processing.core.ProcessingConfig import ProcessingConfig, Setting from processing.core.Processing import Processing @@ -198,11 +199,11 @@ class SettingDelegate(QStyledItemDelegate): else: value = self.convertValue(index.model().data(index, Qt.EditRole)) if isinstance(value, (int, long)): - spnBox = QSpinBox(parent) + spnBox = QgsSpinBox(parent) spnBox.setRange(-999999999, 999999999) return spnBox elif isinstance(value, float): - spnBox = QDoubleSpinBox(parent) + spnBox = QgsDoubleSpinBox(parent) spnBox.setRange(-999999999.999999, 999999999.999999) spnBox.setDecimals(6) return spnBox diff --git a/python/plugins/processing/gui/NumberInputPanel.py b/python/plugins/processing/gui/NumberInputPanel.py index c7010602ddd..a286bfd4c5d 100644 --- a/python/plugins/processing/gui/NumberInputPanel.py +++ b/python/plugins/processing/gui/NumberInputPanel.py @@ -61,6 +61,7 @@ class NumberInputPanel(BASE, WIDGET): self.spnValue.setMinimum(-99999999) self.spnValue.setValue(float(number)) + self.spnValue.setClearValue(float(number)) self.btnCalc.clicked.connect(self.showNumberInputDialog) diff --git a/python/plugins/processing/ui/widgetNumberSelector.ui b/python/plugins/processing/ui/widgetNumberSelector.ui index 0a8b9211dac..720e4b88d65 100644 --- a/python/plugins/processing/ui/widgetNumberSelector.ui +++ b/python/plugins/processing/ui/widgetNumberSelector.ui @@ -21,7 +21,7 @@ 0 - + 6 @@ -45,6 +45,14 @@ + + + QgsDoubleSpinBox + QDoubleSpinBox +
qgis.gui
+ 1 +
+