Feature #558 bar, box, histogram, revision_box

.github/workflows/unit_tests.yaml

@@ -144,15 +144,24 @@ jobs:
           # Note: upload-artifact v4 nested paths differently, usually named by 'name' provided in upload
           OUTPUT_DIR="${{ runner.workspace }}/artifacts/test_output_${OUTPUT_BRANCH}_${{ matrix.python-version }}"
           TRUTH_DIR="${{ runner.workspace }}/artifacts/test_output_${TRUTH_BRANCH}_${{ matrix.python-version }}"
+          DIFF_DIR="${{ runner.workspace }}/diff_${{ matrix.python-version }}"
 
           echo "Comparing $OUTPUT_DIR and $TRUTH_DIR"
 
           # Ensure directories exist before running script
           if [ -d "$OUTPUT_DIR" ] && [ -d "$TRUTH_DIR" ]; then
             export METPLUS_DIFF_SKIP_KEYWORDS=".html,_rank.png"
-            python METplus/metplus/util/diff_util.py "$TRUTH_DIR" "$OUTPUT_DIR" --debug --save_diff
+            python METplus/metplus/util/diff_util.py "$TRUTH_DIR" "$OUTPUT_DIR" --debug --save_diff --diff_dir "$DIFF_DIR"
           else
             echo "One or both data directories are missing."
             ls ${{ runner.workspace }}/artifacts
             exit 1
           fi
+
+      - name: Upload diff artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: diff_${{ matrix.python-version }}
+          path: ${{ runner.workspace }}/diff_${{ matrix.python-version }}
+          if-no-files-found: ignore

metplotpy/plots/bar/bar_config.py

@@ -17,9 +17,8 @@
 
 import itertools
 
-from ..config_plotly import Config
-from .. import constants_plotly as constants
-from .. import util_plotly as util
+from ..config import Config
+from .. import constants as constants
 
 import metcalcpy.util.utils as utils
 
@@ -53,12 +52,12 @@ def __init__(self, parameters: dict) -> None:
         # caption parameters
         self.caption_size = int(constants.DEFAULT_CAPTION_FONTSIZE
                                 * self.get_config_value('caption_size'))
-        self.caption_offset = self.parameters['caption_offset'] - 3.1
+        self.caption_offset = self.parameters['caption_offset'] * constants.DEFAULT_CAPTION_Y_OFFSET
 
         ##############################################
         # title parameters
         self.title_font_size = self.parameters['title_size'] * constants.DEFAULT_TITLE_FONT_SIZE
-        self.title_offset = self.parameters['title_offset'] * constants.DEFAULT_TITLE_OFFSET
+        self.title_offset = 1.0 + abs(self.parameters['title_offset']) * constants.DEFAULT_TITLE_OFFSET
         self.y_title_font_size = self.parameters['ylab_size'] + constants.DEFAULT_TITLE_FONTSIZE
 
         ##############################################
@@ -76,7 +75,6 @@ def __init__(self, parameters: dict) -> None:
         if self.x_tickangle in constants.XAXIS_ORIENTATION.keys():
             self.x_tickangle = constants.XAXIS_ORIENTATION[self.x_tickangle]
         self.x_tickfont_size = self.parameters['xtlab_size'] + constants.DEFAULT_TITLE_FONTSIZE
-        self.xaxis = util.apply_weight_style(self.xaxis, self.parameters['xlab_weight'])
 
         ##############################################
         # x2-axis parameters
@@ -141,15 +139,13 @@ def _get_plot_disp(self) -> list:
     def _get_fcst_vars(self, index):
         """
            Retrieve a list of the inner keys (fcst_vars) to the fcst_var_val dictionary.
-
            Args:
               index: identifier used to differentiate between fcst_var_val_1 and
                      fcst_var_val_2 config settings
            Returns:
                a list containing all the fcst variables requested in the
                fcst_var_val setting in the config file.  This will be
                used to subset the input data that corresponds to a particular series.
-
         """
 
         fcst_var_val_dict = self.get_config_value('fcst_var_val_1')
@@ -183,38 +179,6 @@ def _get_plot_stat(self) -> str:
                              " Supported values are sum, mean, and median.")
         return stat_to_plot
 
-    def _config_consistency_check(self) -> bool:
-        """
-            Checks that the number of settings defined for plot_ci,
-            plot_disp, series_order, user_legend colors, and series_symbols
-            are consistent.
-
-            Args:
-
-            Returns:
-                True if the number of settings for each of the above
-                settings is consistent with the number of
-                series (as defined by the cross product of the model
-                and vx_mask defined in the series_val_1 setting)
-
-        """
-        # Determine the number of series based on the number of
-        # permutations from the series_var setting in the
-        # config file
-
-        # Numbers of values for other settings for series
-        num_plot_disp = len(self.plot_disp)
-        num_series_ord = len(self.series_ordering)
-        num_colors = len(self.colors_list)
-        num_legends = len(self.user_legends)
-        status = False
-
-        if self.num_series == num_plot_disp == \
-                num_series_ord == num_colors \
-                == num_legends :
-            status = True
-        return status
-
     def _get_user_legends(self, legend_label_type: str = '') -> list:
         """
         Retrieve the text that is to be displayed in the legend at the bottom of the plot.
@@ -267,8 +231,8 @@ def get_series_y(self) -> list:
         for x in reversed(list(all_fields_values_orig.keys())):
             all_fields_values[x] = all_fields_values_orig.get(x)
 
-        if self._get_fcst_vars("1"):
-            all_fields_values['fcst_var'] = list(self._get_fcst_vars("1").keys())
+        if self.get_fcst_vars_keys(1):
+            all_fields_values['fcst_var'] = self.get_fcst_vars_keys(1)
 
         all_fields_values['stat_name'] = self.get_config_value('list_stat_1')
         return utils.create_permutations_mv(all_fields_values, 0)
@@ -301,12 +265,9 @@ def calculate_number_of_series(self) -> int:
         """
         # Retrieve the lists from the series_val_1 dictionary
         series_vals_list = self.series_vals_1.copy()
-        if isinstance(self.fcst_var_val_1, list) is True:
-            fcst_vals = self.fcst_var_val_1
-        elif isinstance(self.fcst_var_val_1, dict) is True:
-            fcst_vals = list(self.fcst_var_val_1.values())
-        fcst_vals_flat = [item for sublist in fcst_vals for item in sublist]
-        series_vals_list.append(fcst_vals_flat)
+        fcst_vals = list(self.fcst_var_val_1.values())
+        fcst_vals = [item for sublist in fcst_vals for item in sublist]
+        series_vals_list.append(fcst_vals)
 
         # Utilize itertools' product() to create the cartesian product of all elements
         # in the lists to produce all permutations of the series_val values and the