-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3346 from nyalldawson/processing
Some processing features + fixes
- Loading branch information
Showing
21 changed files
with
678 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| # -*- coding: utf-8 -*- | ||
|
|
||
| """ | ||
| *************************************************************************** | ||
| Smooth.py | ||
| --------- | ||
| Date : July 2016 | ||
| Copyright : (C) 2016 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__ = 'July 2016' | ||
| __copyright__ = '(C) 2016, Nyall Dawson' | ||
|
|
||
| # This will get replaced with a git SHA1 when you do a git archive323 | ||
|
|
||
| __revision__ = '$Format:%H$' | ||
|
|
||
| import os | ||
|
|
||
| from qgis.core import QgsFeature | ||
|
|
||
| from qgis.PyQt.QtGui import QIcon | ||
|
|
||
| from processing.core.GeoAlgorithm import GeoAlgorithm | ||
| from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException | ||
| from processing.core.parameters import ParameterVector | ||
| from processing.core.outputs import OutputVector | ||
| from processing.tools import dataobjects, vector | ||
|
|
||
| pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0] | ||
|
|
||
|
|
||
| class MergeLines(GeoAlgorithm): | ||
|
|
||
| INPUT_LAYER = 'INPUT_LAYER' | ||
| OUTPUT_LAYER = 'OUTPUT_LAYER' | ||
|
|
||
| def getIcon(self): | ||
| return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'to_lines.png')) | ||
|
|
||
| def defineCharacteristics(self): | ||
| self.name, self.i18n_name = self.trAlgorithm('Merge lines') | ||
| 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('Merged'))) | ||
|
|
||
| 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()) | ||
|
|
||
| features = vector.features(layer) | ||
| total = 100.0 / len(features) | ||
|
|
||
| for current, inFeat in enumerate(features): | ||
| outFeat = QgsFeature() | ||
| attrs = inFeat.attributes() | ||
| outFeat.setAttributes(attrs) | ||
|
|
||
| inGeom = inFeat.geometry() | ||
| if inGeom: | ||
| outGeom = inGeom.mergeLines() | ||
| if outGeom is None: | ||
| raise GeoAlgorithmExecutionException( | ||
| self.tr('Error merging lines')) | ||
|
|
||
| outFeat.setGeometry(outGeom) | ||
|
|
||
| writer.addFeature(outFeat) | ||
| progress.setPercentage(int(current * total)) | ||
|
|
||
| del writer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
python/plugins/processing/tests/testdata/dissolve_polys.gfs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <GMLFeatureClassList> | ||
| <GMLFeatureClass> | ||
| <Name>dissolve_polys</Name> | ||
| <ElementPath>dissolve_polys</ElementPath> | ||
| <GeometryType>3</GeometryType> | ||
| <SRSName>EPSG:4326</SRSName> | ||
| <DatasetSpecificInfo> | ||
| <FeatureCount>10</FeatureCount> | ||
| <ExtentXMin>-1.00000</ExtentXMin> | ||
| <ExtentXMax>9.16296</ExtentXMax> | ||
| <ExtentYMin>-3.00000</ExtentYMin> | ||
| <ExtentYMax>6.08868</ExtentYMax> | ||
| </DatasetSpecificInfo> | ||
| <PropertyDefn> | ||
| <Name>name</Name> | ||
| <ElementPath>name</ElementPath> | ||
| <Type>String</Type> | ||
| <Width>2</Width> | ||
| </PropertyDefn> | ||
| <PropertyDefn> | ||
| <Name>intval</Name> | ||
| <ElementPath>intval</ElementPath> | ||
| <Type>Integer</Type> | ||
| </PropertyDefn> | ||
| <PropertyDefn> | ||
| <Name>floatval</Name> | ||
| <ElementPath>floatval</ElementPath> | ||
| <Type>Real</Type> | ||
| </PropertyDefn> | ||
| </GMLFeatureClass> | ||
| </GMLFeatureClassList> |
Oops, something went wrong.