Merge 328f22e into 656cd1c

gwhat/HydroCalc2.py

@@ -42,6 +42,7 @@
 from gwhat.widgets.buttons import ToolBarWidget
 from gwhat.brf_mod import BRFManager
 from gwhat.widgets.buttons import OnOffToolButton
+from gwhat.widgets.layout import VSep
 
 # mpl.rc('font', **{'family': 'sans-serif', 'sans-serif': ['Arial']})
 
@@ -246,19 +247,19 @@ def _setup_toolbar(self):
         self.btn_home.setToolTip('Reset original view.')
         self.btn_home.clicked.connect(self.home)
 
-        self.btn_pan = OnOffToolButton('pan')
+        self.btn_pan = OnOffToolButton('pan', size='normal')
         self.btn_pan.setToolTip(
             'Pan axes with the left mouse button and zoom with the right')
         self.btn_pan.sig_value_changed.connect(self.pan_is_active_changed)
 
-        self.btn_zoom_to_rect = OnOffToolButton('zoom_to_rect')
+        self.btn_zoom_to_rect = OnOffToolButton('zoom_to_rect', size='normal')
         self.btn_pan.setToolTip(
             "Zoom in to the rectangle with the left mouse button and zoom"
             " out with the right mouse button.")
         self.btn_zoom_to_rect.sig_value_changed.connect(
             self.zoom_is_active_changed)
 
-        self.btn_wl_style = OnOffToolButton('showDataDots')
+        self.btn_wl_style = OnOffToolButton('showDataDots', size='normal')
         self.btn_wl_style.setToolTip(
             '<p>Show water lvl data as dots instead of a continuous line</p>')
         self.btn_wl_style.sig_value_changed.connect(self.setup_wl_style)
@@ -276,13 +277,13 @@ def _setup_toolbar(self):
         # dformat: False -> Excel Numeric Date Format
         #          True -> Matplotlib Date Format
 
-        self.btn_show_glue = OnOffToolButton('show_glue_wl')
+        self.btn_show_glue = OnOffToolButton('show_glue_wl', size='normal')
         self.btn_show_glue.setToolTip(
             """Show or hide GLUE water level 05/95 envelope.""")
         self.btn_show_glue.sig_value_changed.connect(self.draw_glue_wl)
         self.btn_show_glue.setValue(True, silent=True)
 
-        self.btn_show_weather = OnOffToolButton('show_meteo')
+        self.btn_show_weather = OnOffToolButton('show_meteo', size='normal')
         self.btn_show_weather.setToolTip("""Show or hide weather data.""")
         self.btn_show_weather.sig_value_changed.connect(self.draw_weather)
         self.btn_show_weather.setValue(True, silent=True)
@@ -398,13 +399,13 @@ def __initUI__(self):
 
         self.right_panel.setSpacing(15)
 
-        # -------------------------------------------------------- MAIN GRID --
+        # ---- Setup the main layout
 
         mainGrid = QGridLayout(self)
 
         mainGrid.addWidget(toolbar, 0, 0)
         mainGrid.addWidget(self.fig_frame_widget, 1, 0, 2, 1)
-        mainGrid.addWidget(myqt.VSep(), 0, 1, 3, 1)
+        mainGrid.addWidget(VSep(), 0, 1, 3, 1)
         mainGrid.addWidget(self.right_panel, 0, 2, 2, 1)
 
         mainGrid.setContentsMargins(10, 10, 10, 10)  # (L, T, R, B)

gwhat/HydroPrint2.py

@@ -30,15 +30,13 @@
 
 import gwhat.hydrograph4 as hydrograph
 import gwhat.mplFigViewer3 as mplFigViewer
-from gwhat.meteo.weather_viewer import WeatherViewer
 from gwhat.colors2 import ColorsReader, ColorsSetupWin
-
 from gwhat.common import QToolButtonNormal, QToolButtonSmall
 from gwhat.common import icons
 import gwhat.common.widgets as myqt
 from gwhat.common.utils import find_unique_filename
 from gwhat.projet.reader_waterlvl import load_waterlvl_measures
-from gwhat.widgets.layout import OnOffToggleWidget
+from gwhat.widgets.layout import OnOffToggleWidget, VSep
 from gwhat.gwrecharge.glue import GLUEDataFrameBase
 
 
@@ -57,8 +55,6 @@ def __init__(self, datamanager, parent=None):
         self.dmngr.wldsetChanged.connect(self.wldset_changed)
         self.dmngr.wxdsetChanged.connect(self.wxdset_changed)
 
-        self.weather_avg_graph = WeatherViewer(self)
-
         self.page_setup_win = PageSetupWin(self)
         self.page_setup_win.newPageSetupSent.connect(self.layout_changed)
 
@@ -103,10 +99,6 @@ def __initUI__(self):
         btn_bestfit_time = QToolButtonNormal(icons.get_icon('fit_x'))
         btn_bestfit_time.setToolTip('Best fit the time scale')
 
-        btn_weather_normals = QToolButtonNormal(icons.get_icon('meteo'))
-        btn_weather_normals.setToolTip(
-                'Show current weather dataset normals...')
-
         self.btn_page_setup = QToolButtonNormal(icons.get_icon('page_setup'))
         self.btn_page_setup.setToolTip('Show the page setup window')
         self.btn_page_setup.clicked.connect(self.page_setup_win.show)
@@ -143,13 +135,10 @@ def __initUI__(self):
         # LAYOUT :
 
         btn_list = [btn_save, btn_draw,
-                    self.btn_load_layout, self.btn_save_layout,
-                    myqt.VSep(),
-                    btn_bestfit_waterlvl, btn_bestfit_time,
-                    myqt.VSep(), btn_weather_normals, self.btn_page_setup,
-                    btn_color_pick,
-                    myqt.VSep(),
-                    zoom_pan]
+                    self.btn_load_layout, self.btn_save_layout, VSep(),
+                    btn_bestfit_waterlvl, btn_bestfit_time, VSep(),
+                    self.btn_page_setup, btn_color_pick,
+                    VSep(), zoom_pan]
 
         subgrid_toolbar = QGridLayout()
         toolbar_widget = QWidget()
@@ -217,7 +206,7 @@ def __initUI__(self):
         mainGrid = QGridLayout()
 
         mainGrid.addWidget(self.grid_layout_widget, 0, 0)
-        mainGrid.addWidget(myqt.VSep(), 0, 1)
+        mainGrid.addWidget(VSep(), 0, 1)
         mainGrid.addWidget(self.right_panel, 0, 2)
 
         mainGrid.setContentsMargins(10, 10, 10, 10)  # (L, T, R, B)
@@ -235,7 +224,6 @@ def __initUI__(self):
         btn_bestfit_time.clicked.connect(self.best_fit_time)
         btn_draw.clicked.connect(self.draw_hydrograph)
         btn_save.clicked.connect(self.select_save_path)
-        btn_weather_normals.clicked.connect(self.show_weather_averages)
 
         # Hydrograph Layout :
 
@@ -452,16 +440,6 @@ def update_colors(self):
         self.hydrograph.update_colors()
         self.hydrograph_scrollarea.load_mpl_figure(self.hydrograph)
 
-    def show_weather_averages(self):
-        if self.wxdset is None:
-            msg = 'Please import a valid weather data file first.'
-            self.emit_warning(msg)
-            return
-
-        self.weather_avg_graph.save_fig_dir = self.workdir
-        self.weather_avg_graph.set_weather_dataset(self.wxdset)
-        self.weather_avg_graph.show()
-
     # ---- Datasets Handlers
 
     @property
@@ -632,7 +610,6 @@ def update_graph_layout_parameter(self):
         # language :
 
         self.hydrograph.language = self.language_box.currentText()
-        self.weather_avg_graph.set_lang(self.language_box.currentText())
 
         # Scales :
 
@@ -1079,7 +1056,7 @@ def show(self):
     ft.setPointSize(11)
     app.setFont(ft)
 
-    pf = "C:/Users/jsgosselin/Desktop/2018 ACFAS/ACFAS2018/ACFAS2018.gwt"
+    pf = 'C:/Users/jsgosselin/GWHAT/Projects/Example/Example.gwt'
     pr = ProjetReader(pf)
     dm = DataManager()
     dm.set_projet(pr)

gwhat/brf_mod/kgs_gui.py

@@ -36,7 +36,7 @@
 # ---- Imports: Local
 
 import gwhat.common.widgets as myqt
-from gwhat.common.widgets import VSep
+from gwhat.widgets.layout import VSep, HSep
 from gwhat.common import StyleDB, QToolButtonNormal, QToolButtonSmall
 from gwhat.common import icons
 from gwhat import brf_mod as bm
@@ -473,7 +473,7 @@ def __initGUI__(self):
                 self.tbar.addWidget(btn, 1, self.tbar.columnCount())
 
         row = self.tbar.columnCount()
-        self.tbar.addWidget(myqt.HSep(), 0, 0, 1, row+1)
+        self.tbar.addWidget(HSep(), 0, 0, 1, row+1)
         self.tbar.setColumnStretch(row, 100)
         self.tbar.setContentsMargins(10, 0, 10, 10)  # (l, t, r, b)
 
@@ -798,7 +798,7 @@ def __initGUI__(self):
         layout.addWidget(self._markersize['label'], row, 1)
         layout.addWidget(self._markersize['widget'], row, 2)
         row += 1
-        layout.addWidget(myqt.HSep(), row, 1, 1, 2)
+        layout.addWidget(HSep(), row, 1, 1, 2)
         row += 1
         layout.addLayout(axlayout, row, 1, 1, 2)
         row += 1

gwhat/common/icons.py

@@ -89,17 +89,17 @@
               'show_glue_wl': 'show_glue_wl',
               'show_meteo': 'show_meteo'}
 
-ICON_SIZES = {'iconSize': (32, 32),
-              'iconSize2': (20, 20)}
+ICON_SIZES = {'large': (32, 32),
+              'normal': (28, 28),
+              'small': (20, 20)}
 
 
 def get_icon(name):
     return QIcon(os.path.join(dirname, ICON_NAMES[name]))
 
 
 def get_iconsize(size):
-    w, h = ICON_SIZES[size]
-    return QSize(w, h)
+    return QSize(*ICON_SIZES[size])
 
 
 class QToolButtonBase(QToolButton):
@@ -128,13 +128,13 @@ def __init__(self, Qicon, *args, **kargs):
 class QToolButtonNormal(QToolButtonBase):
     def __init__(self, Qicon, *args, **kargs):
         super(QToolButtonNormal, self).__init__(Qicon, *args, **kargs)
-        self.setIconSize(QSize(28, 28))
+        self.setIconSize(get_iconsize('normal'))
 
 
 class QToolButtonSmall(QToolButtonBase):
     def __init__(self, Qicon, *args, **kargs):
         super(QToolButtonSmall, self).__init__(Qicon, *args, **kargs)
-        self.setIconSize(QSize(20, 20))
+        self.setIconSize(get_iconsize('small'))
 
 
 class QToolButtonVRectSmall(QToolButtonBase):

gwhat/common/styles.py

@@ -19,20 +19,14 @@
 class StyleDB(object):
     def __init__(self):
 
-        # ---------------------------------------------------------- frame ----
+        # ---- frame
 
         self.frame = 22
         self.HLine = 52
         self.VLine = 53
-
-        self.size1 = 32
-
-        self.iconSize = QSize(32, 32)
-        self.iconSize2 = QSize(20, 20)
-
         self.sideBarWidth = 275
 
-        # --------------------------------------------------------- colors ----
+        # ----- colors
 
         self.red = '#C83737'
         self.lightgray = '#E6E6E6'
@@ -57,7 +51,6 @@ def __init__(self):
         elif platform.system() == 'Linux':
             self.fontfamily =  "Ubuntu"
 
-
 #        self.fontSize1.setPointSize(11)
 
         # 17 = QtGui.QFrame.Box | QtGui.QFrame.Plain

gwhat/common/widgets.py

@@ -87,21 +87,6 @@ def __init__(self, *args, **kargs):
                           Qt.AlignVCenter)
 
 
-# ============================================================ Separators =====
-
-
-class HSep(QFrame):                               # horizontal separators
-    def __init__(self, parent=None):
-        super(HSep, self).__init__(parent)
-        self.setFrameStyle(52)
-
-
-class VSep(QFrame):                                 # vertical separators
-    def __init__(self, parent=None):
-        super(VSep, self).__init__(parent)
-        self.setFrameStyle(53)
-
-
 # ========================================================= Messsage Box ======
 
 

gwhat/gwrecharge/gwrecharge_gui.py

@@ -20,7 +20,8 @@
 # ---- Imports: local
 
 from gwhat.widgets.buttons import ExportDataButton
-from gwhat.common.widgets import QFrameLayout, QDoubleSpinBox, HSep
+from gwhat.common.widgets import QFrameLayout, QDoubleSpinBox
+from gwhat.widgets.layout import HSep
 from gwhat.gwrecharge.gwrecharge_calc2 import RechgEvalWorker
 from gwhat.gwrecharge.gwrecharge_plot_results import FigureStackManager
 from gwhat.gwrecharge.glue import GLUEDataFrameBase

gwhat/mainwindow.py

@@ -43,7 +43,7 @@
 app.setFont(ft)
 
 from gwhat import __namever__, __appname__
-splash.showMessage("Starting %s." % __namever__)
+splash.showMessage("Starting %s..." % __namever__)
 
 # ---- Standard library imports
 
@@ -97,10 +97,11 @@ def __init__(self, parent=None):
 
         # Setup the project and data managers :
 
-        splash.showMessage("Initializing project and data managers.")
+        splash.showMessage("Initializing project and data managers...")
         self.pmanager = ProjetManager(self)
         self.pmanager.currentProjetChanged.connect(self.new_project_loaded)
         self.dmanager = DataManager(parent=self, pm=self.pmanager)
+        self.dmanager.setMaximumWidth(250)
 
         # Generate the GUI :
 
@@ -123,22 +124,22 @@ def __initUI__(self):
 
         # download weather data :
 
-        splash.showMessage("Initializing download weather data.")
+        splash.showMessage("Initializing download weather data...")
         self.tab_dwnld_data = DwnldWeatherWidget(self)
         self.tab_dwnld_data.set_workdir(self.projectdir)
 
         # gapfill weather data :
 
-        splash.showMessage("Initializing gapfill weather data.")
+        splash.showMessage("Initializing gapfill weather data...")
         self.tab_fill_weather_data = GapFillWeatherGUI(self)
         self.tab_fill_weather_data.set_workdir(self.projectdir)
 
         # hydrograph :
 
-        splash.showMessage("Initializing plot hydrograph.")
+        splash.showMessage("Initializing plot hydrograph...")
         self.tab_hydrograph = HydroPrint.HydroprintGUI(self.dmanager)
 
-        splash.showMessage("Initializing analyse hydrograph.")
+        splash.showMessage("Initializing analyse hydrograph...")
         self.tab_hydrocalc = HydroCalc.WLCalc(self.dmanager)
         self.tab_hydrocalc.rechg_eval_widget.sig_new_gluedf.connect(
             self.tab_hydrograph.glue_wl_changed)
@@ -156,7 +157,7 @@ def __initUI__(self):
 
         # ---- Main Console
 
-        splash.showMessage("Initializing main window.")
+        splash.showMessage("Initializing main window...")
         self.main_console = QTextEdit()
         self.main_console.setReadOnly(True)
         self.main_console.setLineWrapMode(QTextEdit.NoWrap)

gwhat/meteo/dwnld_weather_data.py

@@ -33,6 +33,7 @@
 from gwhat.common import StyleDB, QToolButtonNormal, QToolButtonSmall
 from gwhat.common import icons
 import gwhat.common.widgets as myqt
+from gwhat.widgets.layout import VSep
 from gwhat.widgets.buttons import DropDownButton
 from gwhat.common.utils import calc_dist_from_coord
 from gwhat.meteo.search_weather_data import WeatherStationBrowser
@@ -202,14 +203,14 @@ def __initUI__(self):
         self.btn_selectRaw.setIcon(icons.get_icon('openFile'))
         self.btn_selectRaw.setToolTip(
                 "Select and concatenate raw weather data files.")
-        self.btn_selectRaw.setIconSize(icons.get_iconsize('iconSize2'))
+        self.btn_selectRaw.setIconSize(icons.get_iconsize('small'))
         self.btn_selectRaw.clicked.connect(self.btn_selectRaw_isClicked)
 
         self.btn_saveMerge = QPushButton('Save')
         self.btn_saveMerge.setToolTip(
                 "Save the concatenated weather dataset in a csv file.")
         self.btn_saveMerge.setIcon(icons.get_icon('save'))
-        self.btn_saveMerge.setIconSize(icons.get_iconsize('iconSize2'))
+        self.btn_saveMerge.setIconSize(icons.get_iconsize('small'))
         self.btn_saveMerge.clicked.connect(self.btn_saveMerge_isClicked)
 
         rightPanel_grid = QGridLayout()
@@ -239,7 +240,7 @@ def __initUI__(self):
 
         main_grid.addLayout(toolbar, 0, 0)
         main_grid.addWidget(self.station_table, 1, 0)
-        main_grid.addWidget(myqt.VSep(), 0, 1, 2, 1)
+        main_grid.addWidget(VSep(), 0, 1, 2, 1)
 
         main_grid.addWidget(display_label, 0, 2)
         main_grid.addWidget(rightPanel_widg, 1, 2)