From 84719f60fc638bf39d2c74012da852cfec3757ea Mon Sep 17 00:00:00 2001 From: TatianaBurek Date: Fri, 11 Feb 2022 12:18:40 -0700 Subject: [PATCH] add custom lines #140 --- metplotpy/plots/bar/bar.py | 5 +++-- metplotpy/plots/box/box.py | 5 +++-- metplotpy/plots/eclv/eclv.py | 4 ++++ metplotpy/plots/ens_ss/ens_ss.py | 4 ++++ metplotpy/plots/histogram/hist.py | 6 ++++++ metplotpy/plots/line/line.py | 2 +- metplotpy/plots/reliability_diagram/reliability.py | 3 +++ metplotpy/plots/roc_diagram/roc_diagram.py | 7 +++++++ 8 files changed, 31 insertions(+), 5 deletions(-) diff --git a/metplotpy/plots/bar/bar.py b/metplotpy/plots/bar/bar.py index 98c7f59f..24cb55a2 100644 --- a/metplotpy/plots/bar/bar.py +++ b/metplotpy/plots/bar/bar.py @@ -165,8 +165,9 @@ def _create_figure(self): # add custom lines if len(self.series_list) > 0: self._add_lines( - sorted(self.series_list[0].series_data[self.config_obj.indy_var].unique()), - self.config_obj) + self.config_obj, + sorted(self.series_list[0].series_data[self.config_obj.indy_var].unique()) + ) # apply y axis limits self._yaxis_limits() diff --git a/metplotpy/plots/box/box.py b/metplotpy/plots/box/box.py index 53a4fada..28fb001b 100644 --- a/metplotpy/plots/box/box.py +++ b/metplotpy/plots/box/box.py @@ -177,8 +177,9 @@ def _create_figure(self): # add custom lines if len(self.series_list) > 0: self._add_lines( - sorted(self.series_list[0].series_data[self.config_obj.indy_var].unique()), - self.config_obj) + self.config_obj, + sorted(self.series_list[0].series_data[self.config_obj.indy_var].unique()) + ) # apply y axis limits self._yaxis_limits() diff --git a/metplotpy/plots/eclv/eclv.py b/metplotpy/plots/eclv/eclv.py index 38117fe7..9b4d39bd 100644 --- a/metplotpy/plots/eclv/eclv.py +++ b/metplotpy/plots/eclv/eclv.py @@ -155,6 +155,10 @@ def _create_figure(self): for series_points in series.series_points: n_stats = list(map(add, n_stats, series_points['nstat'])) + # add custom lines + if len(self.series_list) > 0: + self._add_lines(self.config_obj) + # apply y axis limits self._yaxis_limits() diff --git a/metplotpy/plots/ens_ss/ens_ss.py b/metplotpy/plots/ens_ss/ens_ss.py index d069a1b3..6b54582d 100644 --- a/metplotpy/plots/ens_ss/ens_ss.py +++ b/metplotpy/plots/ens_ss/ens_ss.py @@ -210,6 +210,10 @@ def _create_figure(self): self._draw_series(self.series_list[i]) i = i + counter + # add custom lines + if len(self.series_list) > 0: + self._add_lines(self.config_obj) + # apply y axis limits self._yaxis_limits() self._y2axis_limits() diff --git a/metplotpy/plots/histogram/hist.py b/metplotpy/plots/histogram/hist.py index 40c28e55..bb851eba 100644 --- a/metplotpy/plots/histogram/hist.py +++ b/metplotpy/plots/histogram/hist.py @@ -221,6 +221,12 @@ def _create_figure(self): for series in self.series_list: self._draw_series(series) + # add custom lines + if len(self.series_list) > 0: + self._add_lines( + self.config_obj + ) + def _draw_series(self, series: HistSeries) -> None: """ Draws the formatted Bar on the plot diff --git a/metplotpy/plots/line/line.py b/metplotpy/plots/line/line.py index 9556d8c8..5a3e97cf 100644 --- a/metplotpy/plots/line/line.py +++ b/metplotpy/plots/line/line.py @@ -212,7 +212,7 @@ def _create_figure(self): n_stats = list(map(add, n_stats, series.series_points['nstat'])) # add custom lines - self._add_lines(x_points_index, self.config_obj) + self._add_lines(self.config_obj, x_points_index) # apply y axis limits self._yaxis_limits() diff --git a/metplotpy/plots/reliability_diagram/reliability.py b/metplotpy/plots/reliability_diagram/reliability.py index bb934a8d..a4da7f93 100644 --- a/metplotpy/plots/reliability_diagram/reliability.py +++ b/metplotpy/plots/reliability_diagram/reliability.py @@ -156,6 +156,9 @@ def _create_figure(self): # it isn't requested (as set in the config file) if series.plot_disp: self._draw_series(series, x_points_index_adj) + # add custom lines + if len(self.series_list) > 0: + self._add_lines(self.config_obj) def _draw_series(self, series: ReliabilitySeries, x_points_index_adj: list) -> None: """ diff --git a/metplotpy/plots/roc_diagram/roc_diagram.py b/metplotpy/plots/roc_diagram/roc_diagram.py index a57a118f..1a03c777 100644 --- a/metplotpy/plots/roc_diagram/roc_diagram.py +++ b/metplotpy/plots/roc_diagram/roc_diagram.py @@ -85,6 +85,10 @@ def __init__(self, parameters): # create binary versions of the plot. self.figure = self._create_figure() + # add custom lines + if len(self.series_list) > 0: + self._add_lines(self.config_obj) + def _read_input_data(self): """ Read the input data file (either CTC or PCT linetype) @@ -315,6 +319,7 @@ def _create_figure(self): secondary_y=False ) + def add_trace_copy(trace): """Adds separate traces for markers and a legend. This is a fix for not printing 'Aa' in the legend @@ -332,6 +337,8 @@ def add_trace_copy(trace): if self.config_obj.add_point_thresholds: fig.for_each_trace(add_trace_copy) + + return fig def save_to_file(self):