[QGIS Commit] r10096 - trunk/qgis/python/plugins/fTools/tools

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Feb 2 20:11:44 EST 2009


Author: cfarmer
Date: 2009-02-02 20:11:43 -0500 (Mon, 02 Feb 2009)
New Revision: 10096

Modified:
   trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py
Log:
updates to geoprocessing: fix for some intersection cases


Modified: trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py	2009-02-02 23:00:43 UTC (rev 10095)
+++ trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py	2009-02-03 01:11:43 UTC (rev 10096)
@@ -467,8 +467,8 @@
 				tmpGeom = QgsGeometry( inFeatB.geometry() )
 				if geom.intersects( tmpGeom ):
 					atMapB = inFeatB.attributeMap()
-					geom = geom.intersection( tmpGeom )
-					outFeat.setGeometry( geom )
+					int_geom = geom.intersection( tmpGeom )
+					outFeat.setGeometry( int_geom )
 					outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
 					writer.addFeature( outFeat )
 		del writer
@@ -515,13 +515,13 @@
 					tmpGeom = QgsGeometry( inFeatB.geometry() )
 					if geom.intersects( tmpGeom ):
 						found = True
-						diffGeom = diffGeom.difference( tmpGeom )
-						geom = geom.intersection( tmpGeom )
-						outFeat.setGeometry( geom )
+						diff_geom = diff_geom.difference( tmpGeom )
+						int_geom = geom.intersection( tmpGeom )
+						outFeat.setGeometry( int_geom )
 						outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
 						writer.addFeature( outFeat )
 				if found:
-					outFeat.setGeometry( diffGeom )
+					outFeat.setGeometry( diff_geom )
 					outFeat.setAttributeMap( atMapA )
 					writer.addFeature( outFeat )
 		length = len( vproviderA.fields().values() )



More information about the QGIS-commit mailing list