Skip to content

Commit

Permalink
Merge pull request #1236 from aharfoot/master
Browse files Browse the repository at this point in the history
fix identation in Processing Dissolve tool (fix #9764)
add polylines support
  • Loading branch information
alexbruy committed Mar 13, 2014
2 parents 551648f + ed5f778 commit e5597e2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions python/plugins/processing/algs/ftools/Dissolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ def processAlgorithm(self, progress):
except:
raise GeoAlgorithmExecutionException(
'Geometry exception while dissolving')
outFeat.setAttributes(attrs)
writer.addFeature(outFeat)
outFeat.setAttributes(attrs)
writer.addFeature(outFeat)
else:
unique = vector.getUniqueValues(vlayerA, int(field))
nFeat = nFeat * len(unique)
Expand Down Expand Up @@ -125,7 +125,8 @@ def defineCharacteristics(self):
self.name = 'Dissolve'
self.group = 'Vector geometry tools'
self.addParameter(ParameterVector(Dissolve.INPUT, 'Input layer',
[ParameterVector.VECTOR_TYPE_POLYGON]))
[ParameterVector.VECTOR_TYPE_POLYGON,
ParameterVector.VECTOR_TYPE_LINE]))
self.addParameter(ParameterBoolean(Dissolve.DISSOLVE_ALL,
'Dissolve all (do not use field)', True))
self.addParameter(ParameterTableField(Dissolve.FIELD, 'Unique ID field'
Expand Down

0 comments on commit e5597e2

Please sign in to comment.