Feature #557 line, eclv, equivalance testing bounds, revision series, and contour - plotly to matplotlib

metplotpy/plots/bar/bar_config.py

@@ -111,30 +111,6 @@ def __init__(self, parameters: dict) -> None:
             self.legend_orientation = 'h'
         self.show_legend = self._get_show_legend()
 
-
-    def _get_plot_disp(self) -> list:
-        """
-        Retrieve the values that determine whether to display a particular series
-        and convert them to bool if needed
-
-        Args:
-
-        Returns:
-                A list of boolean values indicating whether or not to
-                display the corresponding series
-            """
-
-        plot_display_config_vals = self.get_config_value('plot_disp')
-        plot_display_bools = []
-        for val in plot_display_config_vals:
-            if isinstance(val, bool):
-                plot_display_bools.append(val)
-
-            if isinstance(val, str):
-                plot_display_bools.append(val.upper() == 'TRUE')
-
-        return self.create_list_by_series_ordering(plot_display_bools)
-
     def _get_fcst_vars(self, index):
         """
            Retrieve a list of the inner keys (fcst_vars) to the fcst_var_val dictionary.

metplotpy/plots/base_plot.py

@@ -28,6 +28,17 @@
 from . import constants
 
 
+###
+# Global matplotlib default setting overrides
+###
+
+# set default for dashed lines to be longer and wider spaced
+plt.rcParams['lines.dashed_pattern'] = [10, 10]
+
+# Turn off spines globally
+plt.rcParams['axes.spines.top'] = False
+plt.rcParams['axes.spines.right'] = False
+
 turn_on_logging = strtobool('LOG_BASE_PLOT')
 # Log when Chrome is downloaded at runtime
 if turn_on_logging:
@@ -401,28 +412,20 @@ def _add_legend(self, ax: plt.Axes, handles_and_labels=None) -> None:
 
     def _add_xaxis(self, ax: plt.Axes, fontproperties: FontProperties, label=None, grid_on=None) -> None:
         """
-        Configures and adds x-axis to the plot
+        Configures and adds x-axis to the plot. Handles vertical plot by switching x and y axis.
         """
+        is_vert = getattr(self.config_obj, 'vert_plot', False)
         if label is None:
-            label = self.config_obj.xaxis
+            label = self.config_obj.xaxis if not is_vert else self.config_obj.yaxis_1
 
         if grid_on is None:
             grid_on = self.config_obj.grid_on
 
         ax.set_xlabel(label, fontproperties=fontproperties,
                       labelpad=abs(self.config_obj.parameters['xlab_offset']) * constants.PIXELS_TO_POINTS)
 
-        if self.config_obj.indy_label:
-            # use the indices as tick locations
-            xtick_locs = np.arange(len(self.config_obj.indy_label))
-            if self.config_obj.indy_vals:
-                # Use the actual numeric values from indy_vals as tick locations
-                try:
-                    xtick_locs = [float(i) for i in self.config_obj.indy_vals]
-                # if they are not numeric, revert to using the indices
-                except ValueError:
-                    pass
-
+        if self.config_obj.indy_label and not is_vert:
+            xtick_locs = self._get_xtick_locs()
             ax.set_xticks(xtick_locs, self.config_obj.indy_label)
 
         ax.tick_params(axis="x", direction="in", which="both", labelrotation=self.config_obj.x_tickangle)
@@ -431,30 +434,73 @@ def _add_xaxis(self, ax: plt.Axes, fontproperties: FontProperties, label=None, g
                     linestyle='-', linewidth=self.config_obj.parameters['grid_lwd'])
             ax.set_axisbelow(True)
 
-        if self.config_obj.xaxis_reverse:
-            ax.invert_xaxis()
+        if not is_vert:
+            if len(self.config_obj.parameters['xlim']) > 0:
+                # TODO: support xlim_step? only used for line plots
+                ax.set_xlim(self.config_obj.parameters['xlim'])
+            elif getattr(self.config_obj, 'start_from_zero', False):
+                xtick_locs = self._get_xtick_locs()
+                if len(xtick_locs) > 0:
+                    ax.set_xlim(min(xtick_locs), max(xtick_locs))
+
+            if self.config_obj.xaxis_reverse:
+                ax.invert_xaxis()
+        else:
+            if len(self.config_obj.parameters['ylim']) > 0:
+                ax.set_xlim(self.config_obj.parameters['ylim'])
 
     def _add_yaxis(self, ax: plt.Axes, fontproperties: FontProperties, label=None, grid_on=None) -> None:
         """
-        Configures and adds y-axis to the plot
+        Configures and adds y-axis to the plot. Handles vertical plot by switching x and y axis.
         """
+        is_vert = getattr(self.config_obj, 'vert_plot', False)
         if label is None:
-            label = self.config_obj.yaxis_1
+            label = self.config_obj.yaxis_1 if not is_vert else self.config_obj.xaxis
+
         if grid_on is None:
             grid_on = self.config_obj.grid_on
+
         ax.set_ylabel(label, fontproperties=fontproperties,
                       labelpad=abs(self.config_obj.parameters['ylab_offset']) * constants.PIXELS_TO_POINTS)
         ax.tick_params(axis="y", direction="in", which="both", labelrotation=self.config_obj.y_tickangle)
 
         # set y limits if defined in config or if min/max are provided
-        if len(self.config_obj.parameters['ylim']) > 0:
+        if not is_vert and len(self.config_obj.parameters['ylim']) > 0:
             ax.set_ylim(self.config_obj.parameters['ylim'])
 
         # add grid lines if requested
         if grid_on:
             ax.grid(True, which='major', axis='y', color=self.config_obj.blended_grid_col, linestyle='-', linewidth=self.config_obj.parameters['grid_lwd'])
             ax.set_axisbelow(True)
 
+        if not is_vert:
+            if len(self.config_obj.parameters['ylim']) > 0:
+                ax.set_ylim(self.config_obj.parameters['ylim'])
+        else:
+            if self.config_obj.indy_label:
+                xtick_locs = self._get_xtick_locs()
+                ax.set_yticks(xtick_locs, self.config_obj.indy_label)
+
+                if getattr(self.config_obj, 'start_from_zero', False):
+                    if len(xtick_locs) > 0:
+                        ax.set_ylim(min(xtick_locs), max(xtick_locs))
+
+            if self.config_obj.xaxis_reverse:
+                ax.invert_yaxis()
+
+    def _get_xtick_locs(self):
+        # use the indices as tick locations
+        xtick_locs = np.arange(len(self.config_obj.indy_label))
+        if self.config_obj.indy_vals:
+            # Use the actual numeric values from indy_vals as tick locations
+            try:
+                xtick_locs = [float(i) for i in self.config_obj.indy_vals]
+            # if they are not numeric, revert to using the indices
+            except ValueError:
+                pass
+
+        return xtick_locs
+
     def _add_x2axis(self, ax, n_stats, fontproperties: FontProperties) -> None:
         """
         Creates x2axis based on the properties from the config file.
@@ -472,14 +518,24 @@ def _add_x2axis(self, ax, n_stats, fontproperties: FontProperties) -> None:
         if not self.config_obj.show_nstats:
             return
 
-        ax_top = ax.secondary_xaxis('top')
-        ax_top.set_xlabel('NStats', fontproperties=fontproperties,
-                          labelpad=abs(self.config_obj.parameters['x2lab_offset']) * constants.PIXELS_TO_POINTS)
-        current_locs = ax.get_xticks()
-        ax_top.set_xticks(current_locs, n_stats, size=self.config_obj.x2_tickfont_size)
+        label_args = {
+            'fontproperties': fontproperties,
+            'labelpad': abs(self.config_obj.parameters['x2lab_offset']) * constants.PIXELS_TO_POINTS,
+        }
+
+        if not self.config_obj.vert_plot:
+            ax_top = ax.secondary_xaxis('top')
+            ax_top.set_xlabel('NStats', **label_args)
+            current_locs = ax.get_xticks()
+            ax_top.set_xticks(current_locs, n_stats, size=self.config_obj.x2_tickfont_size)
 
-        # this doesn't appear to be working to add ticks at the top
-        ax_top.tick_params(axis="x", direction="in", labelrotation=self.config_obj.x2_tickangle)
+            # this doesn't appear to be working to add ticks at the top
+            ax_top.tick_params(axis="x", direction="in", labelrotation=self.config_obj.x2_tickangle)
+        else:
+            ax_right = ax.secondary_yaxis('right')
+            ax_right.set_ylabel('NStats', **label_args)
+            current_locs = ax.get_yticks()
+            ax_right.set_yticks(current_locs, n_stats, size=self.config_obj.x2_tickfont_size)
 
     def _add_y2axis(self, ax: plt.Axes, fontproperties: Union[FontProperties, None]):
         """
@@ -495,6 +551,19 @@ def _add_y2axis(self, ax: plt.Axes, fontproperties: Union[FontProperties, None])
 
         return ax_right
 
+    def _sync_yaxes(self, ax, ax2, yaxis_min: Union[float, None], yaxis_max: Union[float, None]):
+        if not self.config_obj.sync_yaxes or self.config_obj.vert_plot:
+            return
+
+        # set y limits if defined in config or if min/max are provided
+        if len(self.config_obj.parameters['ylim']) > 0:
+            yaxis_min = self.config_obj.parameters['ylim'][0]
+            yaxis_max = self.config_obj.parameters['ylim'][1]
+
+        if yaxis_min is not None and yaxis_max is not None:
+            ax.set_ylim(yaxis_min, yaxis_max)
+            ax2.set_ylim(yaxis_min, yaxis_max)
+
     def _add_lines(self, ax: plt.Axes, config_obj: Config, x_points_index: Union[list, None] = None) -> None:
         """Adds custom horizontal and/or vertical line to the plot.
            All line's metadata is in the config_obj.lines
@@ -539,7 +608,10 @@ def _add_lines(self, ax: plt.Axes, config_obj: Config, x_points_index: Union[lis
                     self.logger.warning(msg)
                     print(f"WARNING: {msg}")
 
-    def _get_x_locs_and_width(self, x_points, index):
+    def _get_x_locs_and_width(self, x_points, index, stagger_scale=None):
+        if stagger_scale is None:
+            stagger_scale = constants.MPL_DEFAULT_BAR_WIDTH
+
         try:
             # Attempt to convert x_points to floats (handles numeric indy_vals)
             # Threshold values (e.g., ">5.0") will raise a ValueError/TypeError
@@ -565,7 +637,7 @@ def _get_x_locs_and_width(self, x_points, index):
         n = max(n_visible_series, 1)
 
         # Scale width and offset by min_spacing to ensure bars fit within the numeric gaps
-        width = (min_spacing * constants.MPL_DEFAULT_BAR_WIDTH) / n
+        width = (min_spacing * stagger_scale) / n
         offset = (index - (n - 1) / 2.0) * width
         x_locs = base + offset
         return x_locs, width

metplotpy/plots/box/box.py

@@ -200,19 +200,6 @@ def _add_custom_lines(self, ax):
         if len(self.series_list) > 0:
             self._add_lines(ax, self.config_obj, self.config_obj.indy_vals)
 
-    def _sync_yaxes(self, ax, ax2, yaxis_min: Union[float, None], yaxis_max: Union[float, None]):
-        if not self.config_obj.sync_yaxes:
-            return
-
-        # set y limits if defined in config or if min/max are provided
-        if len(self.config_obj.parameters['ylim']) > 0:
-            yaxis_min = self.config_obj.parameters['ylim'][0]
-            yaxis_max = self.config_obj.parameters['ylim'][1]
-
-        if yaxis_min is not None and yaxis_max is not None:
-            ax.set_ylim(yaxis_min, yaxis_max)
-            ax2.set_ylim(yaxis_min, yaxis_max)
-
     def _draw_series(self, ax: plt.Axes, ax2, series: BoxSeries, idx: int):
         """
         Draws the boxes on the plot

metplotpy/plots/box/box_config.py

@@ -155,29 +155,6 @@ def __init__(self, parameters: dict) -> None:
             self.showfliers = False
             self.boxpoints = False
 
-    def _get_plot_disp(self) -> list:
-        """
-        Retrieve the values that determine whether to display a particular series
-        and convert them to bool if needed
-
-        Args:
-
-        Returns:
-                A list of boolean values indicating whether or not to
-                display the corresponding series
-            """
-
-        plot_display_config_vals = self.get_config_value('plot_disp')
-        plot_display_bools = []
-        for val in plot_display_config_vals:
-            if isinstance(val, bool):
-                plot_display_bools.append(val)
-
-            if isinstance(val, str):
-                plot_display_bools.append(val.upper() == 'TRUE')
-
-        return self.create_list_by_series_ordering(plot_display_bools)
-
     def _get_fcst_vars(self, index):
         """
            Retrieve a list of the inner keys (fcst_vars) to the fcst_var_val dictionary.

metplotpy/plots/config.py

@@ -47,6 +47,7 @@ def __init__(self, parameters):
         self.title_color = constants.DEFAULT_TITLE_COLOR
         self.xaxis = self.get_config_value('xaxis')
         self.xaxis_reverse = False
+        self.vert_plot = False
         self.yaxis_1 = self.get_config_value('yaxis_1')
         self.yaxis_2 = self.get_config_value('yaxis_2')
         self.sync_yaxes = False
@@ -744,6 +745,29 @@ def _get_plot_resolution(self) -> int:
         # dpi used by matplotlib
         return dpi
 
+    def _get_plot_disp(self) -> list:
+        """
+        Retrieve the values that determine whether to display a particular series
+        and convert them to bool if needed
+
+        Args:
+
+        Returns:
+                A list of boolean values indicating whether or not to
+                display the corresponding series
+            """
+
+        plot_display_config_vals = self.get_config_value('plot_disp')
+        plot_display_bools = []
+        for val in plot_display_config_vals:
+            if isinstance(val, bool):
+                plot_display_bools.append(val)
+
+            if isinstance(val, str):
+                plot_display_bools.append(val.upper() == 'TRUE')
+
+        return self.create_list_by_series_ordering(plot_display_bools)
+
     def _convert_units_to_inches(self, value, units):
         units_lower = units.lower()
         if units_lower == 'mm':