@@ -17,6 +17,7 @@ def __init__( self, iface ):
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 )
@@ -32,18 +33,18 @@ def inputDir( self ):
32
33
if inDir .isEmpty ():
33
34
return
34
35
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() )
47
48
self .leInputDir .setText ( inDir )
48
49
49
50
def outFile ( self ):
@@ -56,6 +57,20 @@ def reject( self ):
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 ):
0 commit comments