Decouple statistics styling from dimensionality

Statistics styles were derived from the plot dimensionality, but they
are only read by the statistics plotter, which is always
dimensionality 2. The remaining branches were dead code.

Replace the coupling with an explicit selection of which statistics to
draw. This also simplifies statistics styling in general: each
statistic has a fixed style and is only turned on or off. The default
selection reproduces the previous appearance.

Author: MagnusSletten

src/ert/gui/plotting/plot_window.py

@@ -58,6 +58,7 @@
 from .utils.plot_color_palettes import TABLEAU_10_COLOR_CYCLE
 from .utils.plot_types import ObservationPlotLocations
 from .utils.qt_creator import create_group_box, create_group_layout, create_side_panel
+from .utils.statistics_style import DEFAULT_ENABLED_STATISTICS
 from .widgets.data_type_keys_widget import DataTypeKeysWidget
 from .widgets.everest_control_selection_widget import EverestControlSelectionWidget
 from .widgets.plot_controls import (
@@ -538,13 +539,13 @@ def fetch_data(
                     handle_exception(e)
 
             plot_config = PlotConfig(title=key_def.key)
-            if selected_tab == STATISTICS:
-                plot_config.set_statistics_styles_for_dimensionality(
-                    key_def.dimensionality
-                )
             plot_config.set_title(self._titles.get(key_def.key, key_def.key))
             plot_config.set_x_label(self._x_labels.get(key_def.key))
             plot_config.set_y_label(self._y_labels.get(key_def.key))
+            if selected_tab == STATISTICS:
+                plot_config.set_statistics_options(
+                    DEFAULT_ENABLED_STATISTICS, fill_bands=False
+                )
             plot_config.set_legend_enabled(self._general_options.legend_checkbox_state)
             plot_config.set_grid_enabled(self._general_options.grid_checkbox_state)
             plot_config.set_line_color_cycle(self._general_options.get_color_cycle())

src/ert/gui/plotting/utils/plot_config.py

@@ -5,6 +5,12 @@
 
 from .plot_color_palettes import TABLEAU_10_COLOR_CYCLE
 from .plot_style import PlotStyle
+from .statistics_style import (
+    BAND_AREA_STYLE,
+    BAND_STATISTICS,
+    STATISTIC_LABELS,
+    STATISTICS_LINE_STYLES,
+)
 
 
 class PlotConfig:
@@ -63,39 +69,28 @@ def __init__(
         self._grid_enabled = True
 
         self._statistics_style = {
-            "mean": PlotStyle("Mean", line_style=""),
-            "p50": PlotStyle("P50", line_style=""),
-            "min-max": PlotStyle("Min/Max", line_style=""),
-            "p10-p90": PlotStyle("P10-P90", line_style=""),
-            "p33-p67": PlotStyle("P33-P67", line_style=""),
-            "std": PlotStyle("Std dev", line_style=""),
+            statistic: PlotStyle(label, line_style="")
+            for statistic, label in STATISTIC_LABELS.items()
         }
 
         self._std_dev_factor = 1  # sigma 1 is default std dev
 
         self.flip_response_axis = False
         self.flip_observation_axis = False
 
-    def set_statistics_styles_for_dimensionality(self, dimensionality: int) -> None:
-        mean_style = self._statistics_style["mean"]
-        p10p90_style = self._statistics_style["p10-p90"]
-        std_style = self._statistics_style["std"]
-
-        mean_style.line_style = ""
-        mean_style.marker = ""
-        p10p90_style.line_style = ""
-        p10p90_style.marker = ""
-        std_style.line_style = ""
-        std_style.marker = ""
-
-        if dimensionality == 2:
-            mean_style.line_style = "-"
-            p10p90_style.line_style = "--"
-        elif dimensionality == 1:
-            mean_style.line_style = "-"
-            mean_style.marker = "o"
-            std_style.line_style = "--"
-            std_style.marker = "D"
+    def set_statistics_options(
+        self,
+        enabled_statistics: set[str],
+        *,
+        fill_bands: bool,
+    ) -> None:
+        for statistic, style in self._statistics_style.items():
+            if statistic not in enabled_statistics:
+                style.line_style = ""
+            elif fill_bands and statistic in BAND_STATISTICS:
+                style.line_style = BAND_AREA_STYLE
+            else:
+                style.line_style = STATISTICS_LINE_STYLES[statistic]
 
     def get_number_of_colors(self) -> int:
         return len(self._line_color_cycle_colors)

src/ert/gui/plotting/utils/statistics_style.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+STATISTIC_LABELS = {
+    "mean": "Mean",
+    "p50": "P50",
+    "std": "Std dev",
+    "min-max": "Min/Max",
+    "p10-p90": "P10-P90",
+    "p33-p67": "P33-P67",
+}
+
+BAND_STATISTICS = {"std", "min-max", "p10-p90", "p33-p67"}
+
+BAND_AREA_STYLE = "#"
+
+# Line style each statistic is drawn with while enabled.
+STATISTICS_LINE_STYLES = {
+    "mean": "-",
+    "p50": "--",
+    "std": "--",
+    "min-max": "--",
+    "p10-p90": "--",
+    "p33-p67": "--",
+}
+
+DEFAULT_ENABLED_STATISTICS = {"mean", "p10-p90"}

tests/ert/unit_tests/gui/plottery/test_plot_style.py

@@ -1,7 +1,10 @@
 import math
 
+import pytest
+
 from ert.gui.plotting.utils import PlotConfig, PlotStyle
 from ert.gui.plotting.utils.plot_tools import ConditionalAxisFormatter
+from ert.gui.plotting.utils.statistics_style import STATISTIC_LABELS
 
 
 def test_conditional_axis_formatter():
@@ -205,39 +208,39 @@ def test_plot_config():
     ) != copy_of_plot_config.get_statistics_style("std")
 
 
-def test_that_two_dimensional_keys_draw_mean_and_p10_p90_as_lines():
+def test_that_the_mean_is_drawn_solid_and_the_other_statistics_dashed():
+    plot_config = PlotConfig()
+
+    plot_config.set_statistics_options({"mean", "p10-p90"}, fill_bands=False)
+
+    assert plot_config.get_statistics_style("mean").line_style == "-"
+    assert plot_config.get_statistics_style("p10-p90").line_style == "--"
+
+
+def test_that_a_deselected_statistic_has_neither_line_style_nor_marker():
     plot_config = PlotConfig()
-    plot_config.set_statistics_styles_for_dimensionality(1)
 
-    plot_config.set_statistics_styles_for_dimensionality(2)
+    plot_config.set_statistics_options(set(), fill_bands=False)
 
     mean_style = plot_config.get_statistics_style("mean")
-    assert mean_style.line_style == "-"
+    assert not mean_style.line_style
     assert not mean_style.marker
+    assert not mean_style.is_visible()
 
-    p10p90_style = plot_config.get_statistics_style("p10-p90")
-    assert p10p90_style.line_style == "--"
-    assert not p10p90_style.marker
 
-    std_style = plot_config.get_statistics_style("std")
-    assert not std_style.line_style
-    assert not std_style.marker
+def test_that_filling_bands_draws_selected_band_statistics_as_areas():
+    plot_config = PlotConfig()
 
+    plot_config.set_statistics_options({"mean", "p33-p67"}, fill_bands=True)
 
-def test_that_one_dimensional_keys_draw_mean_and_std_with_markers():
-    plot_config = PlotConfig()
-    plot_config.set_statistics_styles_for_dimensionality(2)
+    assert plot_config.get_statistics_style("p33-p67").line_style == "#"
+    assert plot_config.get_statistics_style("mean").line_style == "-"
 
-    plot_config.set_statistics_styles_for_dimensionality(1)
 
-    mean_style = plot_config.get_statistics_style("mean")
-    assert mean_style.line_style == "-"
-    assert mean_style.marker == "o"
+@pytest.mark.parametrize("statistic", sorted(STATISTIC_LABELS))
+def test_that_every_statistic_is_visible_when_enabled(statistic):
+    plot_config = PlotConfig()
 
-    std_style = plot_config.get_statistics_style("std")
-    assert std_style.line_style == "--"
-    assert std_style.marker == "D"
+    plot_config.set_statistics_options({statistic}, fill_bands=False)
 
-    p10p90_style = plot_config.get_statistics_style("p10-p90")
-    assert not p10p90_style.line_style
-    assert not p10p90_style.marker
+    assert plot_config.get_statistics_style(statistic).is_visible()