Skip to content

Commit d8c8033

Browse files
author
alexbruy
committed
allow users to enter path to shapefiles manually in Merge shapefiles tool (apply #2897)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13963 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1314419 commit d8c8033

File tree

1 file changed

+27
-12
lines changed

1 file changed

+27
-12
lines changed

python/plugins/fTools/tools/doMergeShapes.py

+27-12
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def __init__( self, iface ):
1717
self.iface = iface
1818

1919
self.mergeThread = None
20+
self.inputFiles = None
2021

2122
self.btnOk = self.buttonBox.button( QDialogButtonBox.Ok )
2223
self.btnClose = self.buttonBox.button( QDialogButtonBox.Close )
@@ -32,18 +33,18 @@ def inputDir( self ):
3233
if inDir.isEmpty():
3334
return
3435

35-
workDir = QDir( inDir )
36-
workDir.setFilter( QDir.Files | QDir.NoSymLinks | QDir.NoDotAndDotDot )
37-
nameFilter = QStringList() << "*.shp" << "*.SHP"
38-
workDir.setNameFilters( nameFilter )
39-
self.inputFiles = workDir.entryList()
40-
if self.inputFiles.count() == 0:
41-
QMessageBox.warning( self, self.tr( "No shapefiles found" ),
42-
self.tr( "There are no shapefiles in this directory. Please select another one." ) )
43-
self.inputFiles = None
44-
return
45-
46-
self.progressFiles.setRange( 0, self.inputFiles.count() )
36+
#workDir = QDir( inDir )
37+
#workDir.setFilter( QDir.Files | QDir.NoSymLinks | QDir.NoDotAndDotDot )
38+
#nameFilter = QStringList() << "*.shp" << "*.SHP"
39+
#workDir.setNameFilters( nameFilter )
40+
#self.inputFiles = workDir.entryList()
41+
#if self.inputFiles.count() == 0:
42+
# QMessageBox.warning( self, self.tr( "No shapefiles found" ),
43+
# self.tr( "There are no shapefiles in this directory. Please select another one." ) )
44+
# self.inputFiles = None
45+
# return
46+
47+
#self.progressFiles.setRange( 0, self.inputFiles.count() )
4748
self.leInputDir.setText( inDir )
4849

4950
def outFile( self ):
@@ -56,6 +57,20 @@ def reject( self ):
5657
QDialog.reject( self )
5758

5859
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+
5974
outFile = QFile( self.outFileName )
6075
if outFile.exists():
6176
if not QgsVectorFileWriter.deleteShapeFile( self.outFileName ):

0 commit comments

Comments
 (0)