sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ftools,gdaltools] Errors in Merge Shapefiles and Split vector layer

Browse Source 
* Fix #8120
* Fix #8119
This commit is contained in:
Matthias Kuhn 2013-06-20 09:04:01 +02:00
parent 1842287649
commit 09a9a81bb0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ class Dialog( QDialog, Ui_Dialog ):
nameFilter = [ "*.shp", "*.SHP" ]
workDir.setNameFilters( nameFilter )
self.inputFiles = workDir.entryList()
if self.inputFiles.count() == 0:
if len( self.inputFiles ) == 0:
QMessageBox.warning( self, self.tr( "No shapefiles found" ),
self.tr( "There are no shapefiles in this directory. Please select another one." ) )
self.inputFiles = None
@ -69,7 +69,7 @@ class Dialog( QDialog, Ui_Dialog ):
settings.setValue( "/fTools/lastShapeDir", inDir )
self.progressFiles.setRange( 0, self.inputFiles.count() )
self.progressFiles.setRange( 0, len( self.inputFiles ) )
self.leInputDir.setText( inDir )
def outFile( self ):
@ -121,7 +121,7 @@ class Dialog( QDialog, Ui_Dialog ):
nameFilter = [ "*.shp" << "*.SHP" ]
workDir.setNameFilters( nameFilter )
self.inputFiles = workDir.entryList()
if self.inputFiles.count() == 0:
if len( self.inputFiles ) == 0:
QMessageBox.warning( self, self.tr( "No shapefiles found" ),
self.tr( "There are no shapefiles in this directory. Please select another one." ) )
self.inputFiles = None
@ -143,7 +143,7 @@ class Dialog( QDialog, Ui_Dialog ):
QMessageBox.warning( self, self.tr( "No shapefiles found" ),
self.tr( "There are no shapefiles with the given geometry type. Please select an available geometry type." ) )
return
self.progressFiles.setRange( 0, self.inputFiles.count() )
self.progressFiles.setRange( 0, len( self.inputFiles ) )
outFile = QFile( self.outFileName )
if outFile.exists():

2
python/plugins/fTools/tools/doVectorSplit.py
View File

@ -172,7 +172,7 @@ class SplitThread(QThread):
for i in unique:
check = QFile(baseName + "_" + unicode(i.strip()) + ".shp")
check = QFile(baseName + "_" + unicode(i).strip() + ".shp")
fName = check.fileName()
if check.exists():
if not QgsVectorFileWriter.deleteShapeFile(fName):