Skip to content

Commit

Permalink
Merge pull request #2481 from nyalldawson/processing
Browse files Browse the repository at this point in the history 
Processing enhancements and fixes
  • Loading branch information
@alexbruy
alexbruy committed Nov 18, 2015
2 parents e0bedc2 + d0625b8 commit f7bdd66
Show file tree
Hide file tree
Showing 6 changed files with 214 additions and 13 deletions.
5 changes: 4 additions & 1 deletion python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
View file
Expand Up @@ -131,6 +131,8 @@
from Datasources2Vrt import Datasources2Vrt
from CheckValidity import CheckValidity
from OrientedMinimumBoundingBox import OrientedMinimumBoundingBox
from Smooth import Smooth
from ReverseLineDirection import ReverseLineDirection

pluginPath = os.path.normpath(os.path.join(
os.path.split(os.path.dirname(__file__))[0], os.pardir))
Expand Down Expand Up @@ -179,7 +181,8 @@ def __init__(self):
SelectByExpression(), HypsometricCurves(),
SplitLinesWithLines(), CreateConstantRaster(),
FieldsMapper(), SelectByAttributeSum(), Datasources2Vrt(),
CheckValidity(), OrientedMinimumBoundingBox()
CheckValidity(), OrientedMinimumBoundingBox(), Smooth(),
ReverseLineDirection()
]

if hasMatplotlib:
Expand Down
84 changes: 84 additions & 0 deletions python/plugins/processing/algs/qgis/ReverseLineDirection.py
View file
@@ -0,0 +1,84 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
ReverseLineDirection.py
-----------------------
Date : November 2015
Copyright : (C) 2015 by Nyall Dawson
Email : nyall dot dawson 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. *
* *
***************************************************************************
"""

__author__ = 'Nyall Dawson'
__date__ = 'November 2015'
__copyright__ = '(C) 2015, Nyall Dawson'

# This will get replaced with a git SHA1 when you do a git archive323

__revision__ = '$Format:%H$'

from qgis.core import QGis, QgsGeometry, QgsFeature
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
from processing.core.parameters import ParameterVector, ParameterNumber
from processing.core.outputs import OutputVector
from processing.tools import dataobjects, vector


class ReverseLineDirection(GeoAlgorithm):

INPUT_LAYER = 'INPUT_LAYER'
OUTPUT_LAYER = 'OUTPUT_LAYER'

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Reverse line direction')
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_LINE]))
self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Reversed')))

def processAlgorithm(self, progress):
layer = dataobjects.getObjectFromUri(
self.getParameterValue(self.INPUT_LAYER))
provider = layer.dataProvider()

writer = self.getOutputFromName(
self.OUTPUT_LAYER).getVectorWriter(
layer.fields().toList(),
provider.geometryType(),
layer.crs())

outFeat = QgsFeature()

features = vector.features(layer)
total = 100.0 / float(len(features))
current = 0

for inFeat in features:
inGeom = inFeat.constGeometry()
attrs = inFeat.attributes()

outGeom = None
if inGeom and not inGeom.isEmpty():
reversedLine = inGeom.geometry().reversed()
if reversedLine is None:
raise GeoAlgorithmExecutionException(
self.tr('Error reversing line'))
outGeom = QgsGeometry(reversedLine)

outFeat.setGeometry(outGeom)
outFeat.setAttributes(attrs)
writer.addFeature(outFeat)
current += 1
progress.setPercentage(int(current * total))

del writer
89 changes: 89 additions & 0 deletions python/plugins/processing/algs/qgis/Smooth.py
View file
@@ -0,0 +1,89 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
Smooth.py
---------
Date : November 2015
Copyright : (C) 2015 by Nyall Dawson
Email : nyall dot dawson 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. *
* *
***************************************************************************
"""

__author__ = 'Nyall Dawson'
__date__ = 'November 2015'
__copyright__ = '(C) 2015, Nyall Dawson'

# This will get replaced with a git SHA1 when you do a git archive323

__revision__ = '$Format:%H$'

from qgis.core import QGis, QgsGeometry, QgsFeature
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
from processing.core.parameters import ParameterVector, ParameterNumber
from processing.core.outputs import OutputVector
from processing.tools import dataobjects, vector


class Smooth(GeoAlgorithm):

INPUT_LAYER = 'INPUT_LAYER'
OUTPUT_LAYER = 'OUTPUT_LAYER'
ITERATIONS = 'ITERATIONS'
OFFSET = 'OFFSET'

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Smooth geometry')
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POLYGON, ParameterVector.VECTOR_TYPE_LINE]))
self.addParameter(ParameterNumber(self.ITERATIONS,
self.tr('Iterations'), default=1, minValue=1, maxValue=10))
self.addParameter(ParameterNumber(self.OFFSET,
self.tr('Offset'), default=0.25, minValue=0.0, maxValue=0.5))
self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Smoothed')))

def processAlgorithm(self, progress):
layer = dataobjects.getObjectFromUri(
self.getParameterValue(self.INPUT_LAYER))
provider = layer.dataProvider()
iterations = self.getParameterValue(self.ITERATIONS)
offset = self.getParameterValue(self.OFFSET)

writer = self.getOutputFromName(
self.OUTPUT_LAYER).getVectorWriter(
layer.fields().toList(),
provider.geometryType(),
layer.crs())

outFeat = QgsFeature()

features = vector.features(layer)
total = 100.0 / float(len(features))
current = 0

for inFeat in features:
inGeom = inFeat.constGeometry()
attrs = inFeat.attributes()

outGeom = inGeom.smooth(iterations, offset)
if outGeom is None:
raise GeoAlgorithmExecutionException(
self.tr('Error smoothing geometry'))

outFeat.setGeometry(outGeom)
outFeat.setAttributes(attrs)
writer.addFeature(outFeat)
current += 1
progress.setPercentage(int(current * total))

del writer
7 changes: 4 additions & 3 deletions python/plugins/processing/gui/ConfigDialog.py
View file
Expand Up @@ -32,8 +32,9 @@
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
Expand Down Expand Up @@ -198,11 +199,11 @@ def createEditor(
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
Expand Down
32 changes: 24 additions & 8 deletions python/plugins/processing/gui/NumberInputPanel.py
View file
Expand Up @@ -29,6 +29,7 @@

from PyQt4 import uic

from math import log10, floor
from processing.gui.NumberInputDialog import NumberInputDialog

pluginPath = os.path.split(os.path.dirname(__file__))[0]
Expand All @@ -45,16 +46,22 @@ def __init__(self, number, minimum, maximum, isInteger):
self.isInteger = isInteger
if self.isInteger:
self.spnValue.setDecimals(0)
if maximum == 0 or maximum:
self.spnValue.setMaximum(maximum)
else:
self.spnValue.setMaximum(99999999)
if minimum == 0 or minimum:
self.spnValue.setMinimum(minimum)
else:
self.spnValue.setMinimum(-99999999)
else:
#Guess reasonable step value
if (maximum == 0 or maximum) and (minimum == 0 or minimum):
self.spnValue.setSingleStep(self.calculateStep(minimum, maximum))

if maximum == 0 or maximum:
self.spnValue.setMaximum(maximum)
else:
self.spnValue.setMaximum(99999999)
if minimum == 0 or minimum:
self.spnValue.setMinimum(minimum)
else:
self.spnValue.setMinimum(-99999999)

self.spnValue.setValue(float(number))
self.spnValue.setClearValue(float(number))

self.btnCalc.clicked.connect(self.showNumberInputDialog)

Expand All @@ -66,3 +73,12 @@ def showNumberInputDialog(self):

def getValue(self):
return self.spnValue.value()

def calculateStep(self, minimum, maximum):
valueRange = maximum - minimum
if valueRange <= 1.0:
step = valueRange / 10.0
# round to 1 significant figure
return round(step, -int(floor(log10(step))))
else:
return 1.0
10 changes: 9 additions & 1 deletion python/plugins/processing/ui/widgetNumberSelector.ui
View file
Expand Up @@ -21,7 +21,7 @@
<number>0</number>
</property>
<item>
<widget class="QDoubleSpinBox" name="spnValue">
<widget class="QgsDoubleSpinBox" name="spnValue">
<property name="decimals">
<number>6</number>
</property>
Expand All @@ -45,6 +45,14 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgis.gui</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

0 comments on commit f7bdd66

Please sign in to comment.