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

fix Merge shapefiles tool in fTools (fix #7570)

Browse Source
This commit is contained in:
Alexander Bruy 2013-04-11 15:22:03 +04:00
parent 6ebedbc59d
commit f8834f201a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/plugins/fTools/tools/doMergeShapes.py
View File

@ -283,8 +283,12 @@ class ShapeMergeThread( QThread ):
self.geom = newLayer.wkbType() self.geom = newLayer.wkbType()
vprovider = newLayer.dataProvider() vprovider = newLayer.dataProvider()
fields = QgsFields()
for f in mergedFields:
fields.append(f)
writer = QgsVectorFileWriter( self.outputFileName, self.outputEncoding, writer = QgsVectorFileWriter( self.outputFileName, self.outputEncoding,
mergedFields, self.geom, self.crs ) fields, self.geom, self.crs )
shapeIndex = 0 shapeIndex = 0
for fileName in self.shapes: for fileName in self.shapes:
@ -308,8 +312,8 @@ class ShapeMergeThread( QThread ):
# fill available attributes with values # fill available attributes with values
fieldIndex = 0 fieldIndex = 0
for v in inFeat.attributes(): for v in inFeat.attributes():
if fieldMap.has_key(shapeIndex) and fieldMap[shapeIndex].has_key(layerIndex): if fieldMap.has_key(shapeIndex) and fieldMap[shapeIndex].has_key(fieldIndex):
mergedAttrs[ fieldMap[shapeIndex][layerIndex] ] = v mergedAttrs[ fieldMap[shapeIndex][fieldIndex] ] = v
fieldIndex += 1 fieldIndex += 1
inGeom = QgsGeometry( inFeat.geometry() ) inGeom = QgsGeometry( inFeat.geometry() )