make fileDialog function more efficient

rifqiharrys · Jul 24, 2021 · f34e358 · f34e358
1 parent 6400b5f
commit f34e358
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/sdb_gui.py b/sdb_gui.py
@@ -98,8 +98,6 @@ def __init__(self):
             'Support Vector Machines': self.svmOptionWindow
         }
 
-        self.working_dir = os.path.abspath(Path.home())
-
         self.dir_dict = {
             'image': os.path.abspath(Path.home()),
             'sample': os.path.abspath(Path.home()),
@@ -156,7 +154,7 @@ def initUI(self):
         '''
 
         self.setGeometry(300, 100, 480, 640)
-        self.setWindowTitle('Satellite Derived Bathymetry (v3.1.1)')
+        self.setWindowTitle('Satellite Derived Bathymetry (v3.1.2)')
         self.setWindowIcon(QIcon(resource_path('icons/satellite.png')))
 
         loadImageButton = QPushButton('Load Image')
@@ -308,14 +306,14 @@ def str2bool(self, v):
         return v in ('True')
 
 
-    def fileDialog(self, command, window_text, work_dir, dir_key, file_type, text_browser):
+    def fileDialog(self, command, window_text, dir_key, file_type, text_browser):
         '''
         Showing file dialog, whether opening file or saving.
         '''
 
         fileFilter = 'All Files (*.*) ;; ' + file_type
         selectedFilter = file_type
-        fname = command(self, window_text, work_dir, fileFilter, selectedFilter)
+        fname = command(self, window_text, self.dir_dict[dir_key], fileFilter, selectedFilter)
 
         text_browser.setText(fname[0])
         self.dir_dict[dir_key] = os.path.splitext(fname[0])[0]
@@ -345,7 +343,6 @@ def loadImageWindow(self):
             lambda: self.fileDialog(
                 command=QFileDialog.getOpenFileName,
                 window_text='Open Image File',
-                work_dir=self.dir_dict['image'],
                 dir_key='image',
                 file_type='GeoTIFF (*.tif)',
                 text_browser=self.imglocList
@@ -426,7 +423,6 @@ def loadSampleWindow(self):
             lambda: self.fileDialog(
                 command=QFileDialog.getOpenFileName,
                 window_text='Open Depth Sample File',
-                work_dir=self.dir_dict['sample'],
                 dir_key='sample',
                 file_type='ESRI Shapefile (*.shp)',
                 text_browser=self.samplelocList
@@ -1087,7 +1083,6 @@ def saveOptionWindow(self):
             lambda:self.fileDialog(
                 command=QFileDialog.getSaveFileName,
                 window_text='Save File',
-                work_dir=self.dir_dict['save'],
                 dir_key='save',
                 file_type=self.dataTypeCB.currentText(),
                 text_browser=self.savelocList