Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add a tool to show a distribution plot of the models #368

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b75bfe5
Implement a matplotlib tool to display models distribution
jnsebgosselin Mar 4, 2021
884cda9
ModelsDistplotWidget: improve info results
jnsebgosselin Mar 4, 2021
fc42467
Update file header
jnsebgosselin Mar 4, 2021
907860a
ModelsDistplotWidget: improve results display
jnsebgosselin Mar 4, 2021
bd79020
ModelsDistplotWidget: change range sub-title style
jnsebgosselin Mar 4, 2021
7362c3e
Add ModelsDistplotWidget to RechgEvalWidget
jnsebgosselin Mar 4, 2021
20736d4
RechgEvalWidget: close child windows when closing
jnsebgosselin Mar 4, 2021
58679ce
Add models_dist icon
jnsebgosselin Mar 4, 2021
438164c
TEMP COMMIT
jnsebgosselin Mar 12, 2021
a58a9f9
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Mar 12, 2021
0d6bbed
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Mar 16, 2021
3716bfc
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Mar 16, 2021
cae4b9f
ModelsDistplotWidget: tweak some the precision
jnsebgosselin Mar 17, 2021
a87cc38
ModelsDistplotWidget: improve info text for the cutoff rmse
jnsebgosselin Mar 17, 2021
b611f71
ModelsDistplotWidget: add the option to change the bins number
jnsebgosselin Mar 17, 2021
978a311
Complete some missing docstrings
jnsebgosselin Mar 17, 2021
3422275
ModelsDistplotFigure: change how the top margin is calculated
jnsebgosselin Mar 17, 2021
44c82af
ModelsDistplotCursor: save state when clearing/restoring
jnsebgosselin Mar 17, 2021
9b14da7
Update treshold info after a new glue_dataset is set
jnsebgosselin Mar 17, 2021
2bbc7bb
Correct git commit mistake
jnsebgosselin Mar 17, 2021
63f7f83
ModelsDistplotWidget: rework bins layout
jnsebgosselin Mar 18, 2021
6035acd
ModelsDistplotFigure: improve how ymax is calculated
jnsebgosselin Mar 18, 2021
647515d
update if __name__ == '__main__':
jnsebgosselin Mar 31, 2021
4c1475a
ModelsDistplotWidget: add structure to set rmse treshold
jnsebgosselin Mar 31, 2021
19fe3a9
ModelsDistplotWidget: add the possibility to clear treshold with righ…
jnsebgosselin Mar 31, 2021
9ed9e85
ModelsDistplotWidget: add a combobox to set treshold
jnsebgosselin Mar 31, 2021
21e20a8
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Mar 31, 2021
821c071
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Apr 1, 2021
8ba4b44
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Apr 1, 2021
b65d0ad
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Apr 6, 2021
b6d3c65
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Apr 6, 2021
1b396e4
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Apr 19, 2021
3ef190b
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Apr 21, 2021
18dedcd
Make raise window if button is clicked again
jnsebgosselin Apr 21, 2021
6651cd6
Improve size of text in the figure
jnsebgosselin Apr 22, 2021
871075a
ModelsDistplotWidget: add copy to clipboard functionality
jnsebgosselin Apr 23, 2021
b8c2d7a
ModelsDistplotFigure: force integers on the y-axis
jnsebgosselin Apr 23, 2021
014f5e2
ModelsDistplotFigure: take into account dpi when setting borderpad
jnsebgosselin Apr 23, 2021
b4e9caa
Complete a missing docstring
jnsebgosselin Apr 23, 2021
1f7399e
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Apr 23, 2021
d28e371
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Jun 29, 2021
cd4b4de
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Feb 4, 2022
5ac1529
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Feb 4, 2022
49a48d2
Merge remote-tracking branch 'refs/remotes/origin/master' into add_mo…
jnsebgosselin Feb 7, 2022
9ca4cf4
Merge branch 'master' into add_models_distplot
jnsebgosselin Mar 7, 2022
156ee0b
Merge branch 'master' into add_models_distplot
jnsebgosselin Mar 8, 2022
0d31738
Merge branch 'master' into add_models_distplot
jnsebgosselin Mar 14, 2022
0b3a836
Merge branch 'master' into add_models_distplot
jnsebgosselin Mar 28, 2022
2ef4462
Merge branch 'master' into add_models_distplot
jnsebgosselin Jul 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions gwhat/gwrecharge/gwrecharge_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from gwhat.gwrecharge.gwrecharge_calc2 import RechgEvalWorker
from gwhat.gwrecharge.gwrecharge_plot_results import FigureStackManager
from gwhat.gwrecharge.glue import GLUEDataFrameBase
from gwhat.gwrecharge.models_distplot import ModelsDistplotWidget
from gwhat.utils.icons import QToolButtonSmall, get_iconsize, get_icon
from gwhat.utils.qthelpers import create_toolbutton

Expand All @@ -40,6 +41,8 @@ def __init__(self, parent=None):

self.wxdset = None
self.wldset = None

self.modelsdistplot = ModelsDistplotWidget()
self.figstack = FigureStackManager()

self.progressbar = QProgressBar()
Expand Down Expand Up @@ -336,9 +339,18 @@ def setup_toolbar(self):

self.btn_save_glue = ExportGLUEButton(self.wxdset)

self.btn_modelsdistplot = create_toolbutton(
parent=self,
icon='models_dist',
tip='Display the model distribution plot.',
triggered=self.modelsdistplot.show,
iconsize=get_iconsize('normal')
)

layout = QGridLayout(toolbar)
layout.addWidget(btn_calib, 0, 0)
layout.addWidget(self.btn_show_result, 0, 1)
layout.addWidget(self.btn_modelsdistplot, 0, 2)
layout.addWidget(self.btn_save_glue, 0, 3)
layout.setContentsMargins(10, 0, 10, 0)

Expand All @@ -351,6 +363,7 @@ def set_wldset(self, wldset):
gluedf = None if wldset is None else wldset.get_glue_at(-1)
self._setup_ranges_from_wldset(gluedf)
self.figstack.set_gluedf(gluedf)
self.modelsdistplot.set_gluedf(gluedf)
self.btn_save_glue.set_model(gluedf)

def set_wxdset(self, wxdset):
Expand Down Expand Up @@ -486,12 +499,14 @@ def receive_glue_calcul(self, glue_dataframe):

self.btn_save_glue.set_model(glue_dataframe)
self.figstack.set_gluedf(glue_dataframe)
self.modelsdistplot.set_gluedf(glue_dataframe)
self.progressbar.hide()
self.setEnabled(True)

def close(self):
"""Extend Qt method to close child windows."""
self.figstack.close()
self.modelsdistplot.close()
super().close()


Expand Down
Loading