Create EverestControlsPlotOptions

Similar to MisfitsOptions, also improved imports

Author: eilskra

src/ert/gui/plotting/plot_window.py

@@ -13,12 +13,10 @@
 from PyQt6.QtCore import pyqtSlot as Slot
 from PyQt6.QtWidgets import (
     QApplication,
-    QButtonGroup,
     QDialog,
     QHBoxLayout,
     QLabel,
     QMainWindow,
-    QRadioButton,
     QSplitter,
     QStyle,
     QTabWidget,
@@ -60,7 +58,7 @@
 from .utils.qt_creator import create_group_box, create_group_layout, create_side_panel
 from .widgets.data_type_keys_widget import DataTypeKeysWidget
 from .widgets.everest_control_selection_widget import EverestControlSelectionWidget
-from .widgets.plot_controls.misfits_options import MisfitsOptions
+from .widgets.plot_controls import EverestControlsPlotOptions, MisfitsOptions
 from .widgets.plot_ensemble_selection_widget import EnsembleSelectionWidget
 from .widgets.plot_widget import Plotter, PlotWidget
 
@@ -322,26 +320,8 @@ def __init__(
                 create_group_layout([self._ensemble_selection_widget]),
             )
 
-            self._display_over_batches_radio = QRadioButton("batches")
-            self._display_over_batches_radio.setObjectName("display_over_batches_radio")
-            self._display_over_batches_radio.setChecked(True)
-            self._display_over_controls_radio = QRadioButton("controls")
-            self._display_over_controls_radio.setObjectName(
-                "display_over_controls_radio"
-            )
-            self._display_over_button_group = QButtonGroup(self)
-            self._display_over_button_group.addButton(self._display_over_batches_radio)
-            self._display_over_button_group.addButton(self._display_over_controls_radio)
-            self._display_over_button_group.buttonClicked.connect(self.updatePlot)
-
-            self._display_over_group = create_group_box(
-                "X-axis:",
-                create_group_layout(
-                    [
-                        self._display_over_batches_radio,
-                        self._display_over_controls_radio,
-                    ]
-                ),
+            self._everest_controls_plot_options = EverestControlsPlotOptions(
+                self.updatePlot
             )
 
             self._misfits_options = MisfitsOptions(self.updatePlot)
@@ -350,15 +330,15 @@ def __init__(
             right_layout = create_group_layout(
                 [
                     self._ensemble_group,
-                    self._display_over_group,
+                    self._everest_controls_plot_options.get_widget(),
                     self._everest_controls_group,
                     self._misfits_options.get_widget(),
                 ]
             )
             right_container.setLayout(right_layout)
 
             self._everest_controls_group.setVisible(False)
-            self._display_over_group.setVisible(False)
+            self._everest_controls_plot_options.get_widget().setVisible(False)
             self._misfits_options.get_widget().setVisible(False)
             self._data_type_keys_widget.selectDefault()
 
@@ -436,7 +416,7 @@ def updatePlot(self, layer: int | None = None) -> None:
 
         is_everest_ensemble = plot_widget.name == ENSEMBLE and self.is_everest
         self._everest_controls_group.setVisible(is_gradient_plot or is_controls_plot)
-        self._display_over_group.setVisible(is_controls_plot)
+        self._everest_controls_plot_options.get_widget().setVisible(is_controls_plot)
         self._ensemble_selection_widget.apply_ensemble_filtering(
             require_func_eval=is_objective_plot
             or is_everest_ensemble
@@ -576,7 +556,9 @@ def fetch_data(
                 key,
                 layer,
             )
-            plot_context.by_batch = self._display_over_batches_radio.isChecked()
+            plot_context.by_batch = (
+                self._everest_controls_plot_options.is_batches_selected()
+            )
 
             plot_context.scatter_plot = self._misfits_options.scatter_checkbox_state
             plot_context.box_plot = self._misfits_options.box_checkbox_state

src/ert/gui/plotting/widgets/plot_controls/__init__.py

@@ -0,0 +1,7 @@
+from .everest_controls_plot_options import EverestControlsPlotOptions
+from .misfits_options import MisfitsOptions
+
+__all__ = [
+    "EverestControlsPlotOptions",
+    "MisfitsOptions",
+]

src/ert/gui/plotting/widgets/plot_controls/everest_controls_plot_options.py

@@ -0,0 +1,39 @@
+from collections.abc import Callable
+
+from PyQt6.QtWidgets import (
+    QButtonGroup,
+    QGroupBox,
+    QRadioButton,
+)
+
+from ert.gui.plotting.utils.qt_creator import create_group_box, create_group_layout
+
+
+class EverestControlsPlotOptions:
+    def __init__(self, connection_point: Callable[..., object]) -> None:
+
+        self._display_over_batches_radio = QRadioButton("batches")
+        self._display_over_batches_radio.setObjectName("display_over_batches_radio")
+        self._display_over_batches_radio.setChecked(True)
+        self._display_over_controls_radio = QRadioButton("controls")
+        self._display_over_controls_radio.setObjectName("display_over_controls_radio")
+        self._display_over_button_group = QButtonGroup()
+        self._display_over_button_group.addButton(self._display_over_batches_radio)
+        self._display_over_button_group.addButton(self._display_over_controls_radio)
+        self._display_over_button_group.buttonClicked.connect(connection_point)
+
+        self._display_over_group = create_group_box(
+            "X-axis:",
+            create_group_layout(
+                [
+                    self._display_over_batches_radio,
+                    self._display_over_controls_radio,
+                ]
+            ),
+        )
+
+    def get_widget(self) -> QGroupBox:
+        return self._display_over_group
+
+    def is_batches_selected(self) -> bool:
+        return self._display_over_batches_radio.isChecked()

tests/ert/unit_tests/gui/plotting/widgets/test_everest_controls_plot_options.py

@@ -0,0 +1,33 @@
+from unittest.mock import Mock
+
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QRadioButton
+
+from ert.gui.plotting.widgets.plot_controls.everest_controls_plot_options import (
+    EverestControlsPlotOptions,
+)
+
+
+def test_that_everest_controls_plot_options_initializes_with_expected_default_state(
+    qtbot,
+):
+    options = EverestControlsPlotOptions(Mock())
+    qtbot.addWidget(options.get_widget())
+
+    assert options.is_batches_selected() is True
+
+
+def test_that_toggling_everest_controls_plot_options_invokes_the_connection_point(
+    qtbot,
+):
+    connection_point = Mock()
+    options = EverestControlsPlotOptions(connection_point)
+    widget = options.get_widget()
+    qtbot.addWidget(widget)
+    widget.show()
+
+    controls_radio = widget.findChild(QRadioButton, "display_over_controls_radio")
+    assert controls_radio is not None
+    qtbot.mouseClick(controls_radio, Qt.MouseButton.LeftButton)
+
+    connection_point.assert_called()