sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

identation errors and wrong file paths

Browse Source
This commit is contained in:
Maximilian Krambach 2016-03-22 22:01:21 +01:00
parent 2f97ec670c
commit 097b18190c
8 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
python/plugins/processing/algs/qgis/Dissolve.py
View File

@ -93,9 +93,11 @@ class Dissolve(GeoAlgorithm):
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
@ -108,9 +110,11 @@ class Dissolve(GeoAlgorithm):
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))
@ -142,9 +146,11 @@ class Dissolve(GeoAlgorithm):
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

0
python/plugins/processing/tests/testdata/PolygonDissolveTest.gfs → python/plugins/processing/tests/testdata/custom/PolygonDissolveTest.gfs vendored
View File

0
python/plugins/processing/tests/testdata/PolygonDissolveTest.gml → python/plugins/processing/tests/testdata/custom/PolygonDissolveTest.gml vendored
View File

0
python/plugins/processing/tests/testdata/nullGeometryDissolve.gfs → python/plugins/processing/tests/testdata/custom/nullGeometryDissolve.gfs vendored
View File

0
python/plugins/processing/tests/testdata/nullGeometryDissolve.gml → python/plugins/processing/tests/testdata/custom/nullGeometryDissolve.gml vendored
View File

0
python/plugins/processing/tests/testdata/expected/nullgeometries_output.gml → python/plugins/processing/tests/testdata/expected/nullGeometryDissolve_output.gml vendored
View File

0
python/plugins/processing/tests/testdata/expected/nullgeometries_output.xsd → python/plugins/processing/tests/testdata/expected/nullGeometryDissolve_output.xsd vendored
View File

5
python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml vendored
View File

@ -208,7 +208,7 @@ tests:
DISSOLVE_ALL: 'True'
FIELD: None
INPUT:
name: nullGeometryDissolve.gml
name: custom/nullGeometryDissolve.gml
type: vector
results:
OUTPUT:
@ -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