From 210da48c6500d2712212221d5ad7c3082fffa0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Wed, 29 Nov 2017 12:05:58 -0500 Subject: [PATCH 1/2] Removed all `setConfirmOverwrite` --- gwhat/HydroCalc2.py | 1 - gwhat/HydroPrint2.py | 1 - gwhat/meteo/weather_viewer.py | 3 --- 3 files changed, 5 deletions(-) diff --git a/gwhat/HydroCalc2.py b/gwhat/HydroCalc2.py index 74a9a1918..745b1bfda 100644 --- a/gwhat/HydroCalc2.py +++ b/gwhat/HydroCalc2.py @@ -664,7 +664,6 @@ def save_mrc_tofile(self): # ---- get filename ---- dialog = QFileDialog() - dialog.setConfirmOverwrite(True) filename, ftype = dialog.getSaveFileName( caption="Save Results Summary", dir=filename, filter=('*.xlsx')) diff --git a/gwhat/HydroPrint2.py b/gwhat/HydroPrint2.py index 888ab5cf6..a75d0a4cb 100644 --- a/gwhat/HydroPrint2.py +++ b/gwhat/HydroPrint2.py @@ -747,7 +747,6 @@ def select_save_path(self): 'hydrograph_%s' % self.wldset['Well']) dialog = QFileDialog() - dialog.setConfirmOverwrite(True) fname, ftype = dialog.getSaveFileName( caption="Save Figure", dir=dialog_dir, filter=('*.pdf;;*.svg')) diff --git a/gwhat/meteo/weather_viewer.py b/gwhat/meteo/weather_viewer.py index 40076de0c..225255b35 100644 --- a/gwhat/meteo/weather_viewer.py +++ b/gwhat/meteo/weather_viewer.py @@ -236,7 +236,6 @@ def save_graph(self): ddir = os.path.join(self.save_fig_dir, defaultname) dialog = QFileDialog() - dialog.setConfirmOverwrite(True) filename, ftype = dialog.getSaveFileName( caption='Save graph', dir=ddir, filter='*.pdf;;*.svg') @@ -259,7 +258,6 @@ def save_normals(self): ddir = os.path.join(self.save_fig_dir, defaultname) dialog = QFileDialog() - dialog.setConfirmOverwrite(True) filename, ftype = dialog.getSaveFileName(caption='Save normals', dir=ddir, filter='*.xlsx;;*.xls;;*.csv') @@ -316,7 +314,6 @@ def select_export_file(self): ddir = os.path.join(self.save_fig_dir, defaultname) dialog = QFileDialog() - dialog.setConfirmOverwrite(True) filename, ftype = dialog.getSaveFileName( caption='Export %s' % time_frame, dir=ddir, From a52c78ae2984152da4a604c4db00f71e7904b3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Wed, 29 Nov 2017 13:06:39 -0500 Subject: [PATCH 2/2] Updated how getSaveFileName is called to respect qt5 API --- gwhat/HydroCalc2.py | 2 +- gwhat/HydroPrint2.py | 3 +-- gwhat/meteo/weather_viewer.py | 10 ++++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gwhat/HydroCalc2.py b/gwhat/HydroCalc2.py index 745b1bfda..cd7addde5 100644 --- a/gwhat/HydroCalc2.py +++ b/gwhat/HydroCalc2.py @@ -665,7 +665,7 @@ def save_mrc_tofile(self): dialog = QFileDialog() filename, ftype = dialog.getSaveFileName( - caption="Save Results Summary", dir=filename, filter=('*.xlsx')) + self, "Save Results Summary", filename, '*.xlsx') if not filename: return diff --git a/gwhat/HydroPrint2.py b/gwhat/HydroPrint2.py index a75d0a4cb..0231c2f96 100644 --- a/gwhat/HydroPrint2.py +++ b/gwhat/HydroPrint2.py @@ -748,8 +748,7 @@ def select_save_path(self): dialog = QFileDialog() fname, ftype = dialog.getSaveFileName( - caption="Save Figure", dir=dialog_dir, - filter=('*.pdf;;*.svg')) + self, "Save Figure", dialog_dir, '*.pdf;;*.svg') if fname: if fname[-4:] != ftype[1:]: diff --git a/gwhat/meteo/weather_viewer.py b/gwhat/meteo/weather_viewer.py index 225255b35..55ed3dbe1 100644 --- a/gwhat/meteo/weather_viewer.py +++ b/gwhat/meteo/weather_viewer.py @@ -237,7 +237,7 @@ def save_graph(self): dialog = QFileDialog() filename, ftype = dialog.getSaveFileName( - caption='Save graph', dir=ddir, filter='*.pdf;;*.svg') + self, 'Save graph', ddir, '*.pdf;;*.svg') if filename: if filename[-4:] != ftype[1:]: @@ -258,9 +258,8 @@ def save_normals(self): ddir = os.path.join(self.save_fig_dir, defaultname) dialog = QFileDialog() - filename, ftype = dialog.getSaveFileName(caption='Save normals', - dir=ddir, - filter='*.xlsx;;*.xls;;*.csv') + filename, ftype = dialog.getSaveFileName( + self, 'Save normals', ddir, '*.xlsx;;*.xls;;*.csv') hheader = ['', 'JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC', 'YEAR'] @@ -316,8 +315,7 @@ def select_export_file(self): dialog = QFileDialog() filename, ftype = dialog.getSaveFileName( - caption='Export %s' % time_frame, dir=ddir, - filter='*.xlsx;;*.xls;;*.csv') + self, 'Export %s' % time_frame, ddir, '*.xlsx;;*.xls;;*.csv') if filename: self.export_series_tofile(filename, time_frame)