Move dimensionality-specific styles to PlotConfig

PlotConfigFactory existed only to build a PlotConfig and then override
a few statistics line styles based on the dimensionality of the
selected key.

Author: MagnusSletten

src/ert/gui/plotting/plot_window.py

@@ -45,14 +45,15 @@
     HISTOGRAM,
     MISFITS,
     SHARED_PLOT_MAP,
+    STATISTICS,
     STD_DEV,
 )
 from ert.gui.utils import is_everest_application
 from ert.services import ServerBootFail
 from ert.utils import log_duration
 
 from .plot_api import EnsembleObject, PlotApi, PlotApiKeyDefinition
-from .utils import PlotConfigFactory, PlotContext
+from .utils import PlotConfig, PlotContext
 from .utils.observation_locations import transform_observation_locations
 from .utils.plot_color_palettes import TABLEAU_10_COLOR_CYCLE
 from .utils.plot_types import ObservationPlotLocations
@@ -536,7 +537,11 @@ def fetch_data(
                 except BaseException as e:
                     handle_exception(e)
 
-            plot_config = PlotConfigFactory.create_plot_config_for_key(key_def)
+            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))

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

@@ -8,7 +8,6 @@
 register_matplotlib_converters()
 
 from .plot_config import PlotConfig
-from .plot_config_factory import PlotConfigFactory
 from .plot_context import PlotContext
 from .plot_style import PlotStyle
 from .plot_tools import ConditionalAxisFormatter, PlotTools
@@ -26,7 +25,6 @@
     "LineTooltipManager",
     "ObservationPlotLocations",
     "PlotConfig",
-    "PlotConfigFactory",
     "PlotContext",
     "PlotStyle",
     "PlotTools",

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

@@ -76,6 +76,27 @@ def __init__(
         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 get_number_of_colors(self) -> int:
         return len(self._line_color_cycle_colors)
 

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

@@ -203,3 +203,41 @@ def test_plot_config():
     assert plot_config.get_statistics_style(
         "std"
     ) != copy_of_plot_config.get_statistics_style("std")
+
+
+def test_that_two_dimensional_keys_draw_mean_and_p10_p90_as_lines():
+    plot_config = PlotConfig()
+    plot_config.set_statistics_styles_for_dimensionality(1)
+
+    plot_config.set_statistics_styles_for_dimensionality(2)
+
+    mean_style = plot_config.get_statistics_style("mean")
+    assert mean_style.line_style == "-"
+    assert not mean_style.marker
+
+    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_one_dimensional_keys_draw_mean_and_std_with_markers():
+    plot_config = PlotConfig()
+    plot_config.set_statistics_styles_for_dimensionality(2)
+
+    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"
+
+    std_style = plot_config.get_statistics_style("std")
+    assert std_style.line_style == "--"
+    assert std_style.marker == "D"
+
+    p10p90_style = plot_config.get_statistics_style("p10-p90")
+    assert not p10p90_style.line_style
+    assert not p10p90_style.marker