Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
identation errors and wrong file paths
  • Loading branch information
Maximilian Krambach committed Mar 22, 2016
1 parent 2f97ec6 commit 097b181
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 11 deletions.
24 changes: 15 additions & 9 deletions python/plugins/processing/algs/qgis/Dissolve.py
Expand Up @@ -93,9 +93,11 @@ def processAlgorithm(self, progress):
if len(errors) != 0:
for error in errors:
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
self.tr('ValidateGeometry() error: One or '
'more input features have invalid '
'geometry: ') + error.what())
self.tr('ValidateGeometry()'
'error: One or more '
'input features have '
'invalid geometry: ')
+ error.what())
continue
outFeat.setGeometry(tmpInGeom)
first = False
Expand All @@ -108,9 +110,11 @@ def processAlgorithm(self, progress):
if len(errors) != 0:
for error in errors:
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
self.tr('ValidateGeometry() error: One or '
'more input features have invalid '
'geometry: ') + error.what())
self.tr('ValidateGeometry()'
'error:One or more input'
'features have invalid '
'geometry: ')
+ error.what())
continue
try:
tmpOutGeom = QgsGeometry(tmpOutGeom.combine(tmpInGeom))
Expand Down Expand Up @@ -142,9 +146,11 @@ def processAlgorithm(self, progress):
if len(errors) != 0:
for error in errors:
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
self.tr('ValidateGeometry() error: One or '
'more input features have invalid '
'geometry: ') + error.what())
self.tr('ValidateGeometry() '
'error: One or more input'
'features have invalid '
'geometry: ')
+ error.what())

if attrDict[unicode(tempItem).strip()] is None:
# keep attributes of first feature
Expand Down
Expand Up @@ -208,7 +208,7 @@ tests:
DISSOLVE_ALL: 'True'
FIELD: None
INPUT:
name: nullGeometryDissolve.gml
name: custom/nullGeometryDissolve.gml
type: vector
results:
OUTPUT:
Expand All @@ -222,9 +222,10 @@ tests:
DISSOLVE_ALL: 'True'
FIELD: None
INPUT:
name: PolygonDissolveTest.gml
name: custom/PolygonDissolveTest.gml
type: vector
results:
OUTPUT:
type: vector
name: expected/PolygonDissolveTest_output.gml

0 comments on commit 097b181

Please sign in to comment.