fix_error_with_path.diff
| python/plugins/fTools/tools/doMergeShapes.py (working copy) | ||
|---|---|---|
| 17 | 17 |
self.iface = iface |
| 18 | 18 | |
| 19 | 19 |
self.mergeThread = None |
| 20 |
self.inputFiles = None |
|
| 20 | 21 | |
| 21 | 22 |
self.btnOk = self.buttonBox.button( QDialogButtonBox.Ok ) |
| 22 | 23 |
self.btnClose = self.buttonBox.button( QDialogButtonBox.Close ) |
| ... | ... | |
| 56 | 57 |
QDialog.reject( self ) |
| 57 | 58 | |
| 58 | 59 |
def accept( self ): |
| 60 |
if self.inputFiles is None: |
|
| 61 |
workDir = QDir( self.leInputDir.text() ) |
|
| 62 |
workDir.setFilter( QDir.Files | QDir.NoSymLinks | QDir.NoDotAndDotDot ) |
|
| 63 |
nameFilter = QStringList() << "*.shp" << "*.SHP" |
|
| 64 |
workDir.setNameFilters( nameFilter ) |
|
| 65 |
self.inputFiles = workDir.entryList() |
|
| 66 |
if self.inputFiles.count() == 0: |
|
| 67 |
QMessageBox.warning( self, self.tr( "No shapefiles found" ), |
|
| 68 |
self.tr( "There are no shapefiles in this directory. Please select another one." ) ) |
|
| 69 |
self.inputFiles = None |
|
| 70 |
return |
|
| 71 | ||
| 72 |
self.progressFiles.setRange( 0, self.inputFiles.count() ) |
|
| 73 | ||
| 59 | 74 |
outFile = QFile( self.outFileName ) |
| 60 | 75 |
if outFile.exists(): |
| 61 | 76 |
if not QgsVectorFileWriter.deleteShapeFile( self.outFileName ): |