Merge pull request #1236 from aharfoot/master

fix identation in Processing Dissolve tool (fix #9764) add polylines support
qgis · Mar 13, 2014 · e5597e2 · e5597e2
2 parents 551648f + ed5f778
commit e5597e2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/python/plugins/processing/algs/ftools/Dissolve.py b/python/plugins/processing/algs/ftools/Dissolve.py
@@ -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)
@@ -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'