Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #9511 on release-3_6 #9521

Merged
merged 2 commits into from
Mar 14, 2019
Merged

Backport #9511 on release-3_6 #9521

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3712020
[processing] Fix exception in IDW interpolation
nyalldawson Mar 13, 2019
80f0098
[processing] Fix IDW parameter value creation
nyalldawson Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions python/plugins/processing/algs/qgis/ui/InterpolationWidgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,18 @@
from qgis.PyQt import uic
from qgis.PyQt.QtCore import pyqtSignal
from qgis.PyQt.QtWidgets import (QTreeWidgetItem,
QComboBox
)
QComboBox)
from qgis.core import (QgsApplication,
QgsMapLayer,
QgsMapLayerProxyModel,
QgsWkbTypes,
QgsRectangle,
QgsReferencedRectangle,
QgsCoordinateReferenceSystem,
QgsProcessingUtils,
QgsProcessingParameterNumber,
QgsProcessingParameterDefinition
)
from qgis.core import QgsFieldProxyModel
QgsProcessingParameterDefinition,
QgsFieldProxyModel)
from qgis.gui import QgsDoubleSpinBox
from qgis.analysis import QgsInterpolator

from processing.gui.wrappers import WidgetWrapper, DIALOG_STANDARD
Expand Down Expand Up @@ -203,11 +201,11 @@ def value(self):
else:
inputType = QgsInterpolator.SourceBreakLines

layers += '{}::~::{:d}::~::{:d}::~::{:d}::|::'.format(layer.source(),
interpolationSource,
fieldIndex,
inputType)
return layers[:-1]
layers += '{}::~::{:d}::~::{:d}::~::{:d}::|::'.format(layer.source(),
interpolationSource,
fieldIndex,
inputType)
return layers[:-len('::|::')]


class InterpolationDataWidgetWrapper(WidgetWrapper):
Expand Down