Split settings groups in RftPlotter (#1180)

* Split selections into plot_type and ensembles * Renames Selections to Ensembles * removed print * Removed len > 0 to check if lists are not empty Co-authored-by: Øyvind Lind-Johansen <[email protected]>
equinor · Dec 5, 2022 · 0bc4814 · 0bc4814
1 parent 0ce2456
commit 0bc4814
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 28 deletions.
diff --git a/...iz_subsurface/plugins/_rft_plotter/_views/_map_view/_settings/_formation_plot_settings.py b/...iz_subsurface/plugins/_rft_plotter/_views/_map_view/_settings/_formation_plot_settings.py
@@ -25,8 +25,8 @@ def __init__(self, datamodel: RftPlotterDataModel) -> None:
         self._well_names = datamodel.well_names
 
     def layout(self) -> List[Component]:
-        ensemble = self._ensembles[0] if len(self._ensembles) > 0 else None
-        well = self._well_names[0] if len(self._well_names) > 0 else None
+        ensemble = self._ensembles[0] if self._ensembles else None
+        well = self._well_names[0] if self._well_names else None
         dates_in_well = self._datamodel.date_in_well(well) if well is not None else []
         return [
             wcc.Dropdown(
@@ -49,7 +49,7 @@ def layout(self) -> List[Component]:
                 id=self.register_component_unique_id(self.Ids.DATE),
                 options=[{"label": date, "value": date} for date in dates_in_well],
                 clearable=False,
-                value=dates_in_well[0] if len(dates_in_well) > 0 else None,
+                value=dates_in_well[0] if dates_in_well else None,
             ),
             wcc.RadioItems(
                 label="Plot simulations as",
@@ -154,7 +154,7 @@ def _update_date(
             well: str, current_date: str
         ) -> Tuple[List[Dict[str, str]], Optional[str]]:
             dates = self._datamodel.date_in_well(well)
-            first_date = dates[0] if len(dates) > 0 else None
+            first_date = dates[0] if dates else None
             available_dates = [{"label": date, "value": date} for date in dates]
             date = current_date if current_date in dates else first_date
             return available_dates, date
diff --git a/webviz_subsurface/plugins/_rft_plotter/_views/_misfit_per_real_view/_settings.py b/webviz_subsurface/plugins/_rft_plotter/_views/_misfit_per_real_view/_settings.py
@@ -20,7 +20,7 @@ def layout(self) -> List[Component]:
                 label="Ensembles",
                 id=self.register_component_unique_id(self.Ids.ENSEMBLES),
                 options=[{"label": ens, "value": ens} for ens in self._ensembles],
-                value=[self._ensembles[0] if len(self._ensembles) > 0 else None],
+                value=[self._ensembles[0] if self._ensembles else None],
                 clearable=False,
                 multi=True,
             ),

diff --git a/webviz_subsurface/plugins/_rft_plotter/_views/_parameter_response_view/_view.py b/webviz_subsurface/plugins/_rft_plotter/_views/_parameter_response_view/_view.py
@@ -103,7 +103,6 @@ def _update_selections_from_clickdata(
 
             clickdata = corr_vector_clickdata.get("points", [{}])[0].get("y")
             ls_clickdata = clickdata.split()
-            print("click dat ais: ", ls_clickdata)
             return ls_clickdata[0]
 
         @callback(

diff --git a/webviz_subsurface/plugins/_rft_plotter/_views/_sim_vs_obs_view/_settings/__init__.py b/webviz_subsurface/plugins/_rft_plotter/_views/_sim_vs_obs_view/_settings/__init__.py
@@ -1,2 +1,3 @@
-from ._selections import PlotType, Selections
+from ._ensembles import Ensembles
+from ._plot_type import PlotType, PlotTypeSettings
 from ._size_color_settings import SizeColorSettings
diff --git a/webviz_subsurface/plugins/_rft_plotter/_views/_sim_vs_obs_view/_settings/_ensembles.py b/webviz_subsurface/plugins/_rft_plotter/_views/_sim_vs_obs_view/_settings/_ensembles.py
@@ -0,0 +1,26 @@
+from typing import List
+
+import webviz_core_components as wcc
+from dash.development.base_component import Component
+from webviz_config.utils import StrEnum
+from webviz_config.webviz_plugin_subclasses import SettingsGroupABC
+
+
+class Ensembles(SettingsGroupABC):
+    class Ids(StrEnum):
+        ENSEMBLES = "ensembles"
+
+    def __init__(self, ensembles: List[str]) -> None:
+        super().__init__("Ensembles")
+        self._ensembles = ensembles
+
+    def layout(self) -> List[Component]:
+        return [
+            wcc.Dropdown(
+                id=self.register_component_unique_id(self.Ids.ENSEMBLES),
+                options=[{"label": ens, "value": ens} for ens in self._ensembles],
+                value=[self._ensembles[0] if self._ensembles else None],
+                clearable=False,
+                multi=True,
+            ),
+        ]
diff --git a/..._sim_vs_obs_view/_settings/_selections.py → .../_sim_vs_obs_view/_settings/_plot_type.py b/..._sim_vs_obs_view/_settings/_selections.py → .../_sim_vs_obs_view/_settings/_plot_type.py
@@ -11,19 +11,16 @@ class PlotType(StrEnum):
     ERROR_BOXPLOT = "error-boxplot"
 
 
-class Selections(SettingsGroupABC):
+class PlotTypeSettings(SettingsGroupABC):
     class Ids(StrEnum):
         PLOT_TYPE = "plot-type"
-        ENSEMBLES = "ensembles"
 
-    def __init__(self, ensembles: List[str]) -> None:
-        super().__init__("Selections")
-        self._ensembles = ensembles
+    def __init__(self) -> None:
+        super().__init__("Plot Type")
 
     def layout(self) -> List[Component]:
         return [
             wcc.RadioItems(
-                label="Plot Type",
                 id=self.register_component_unique_id(self.Ids.PLOT_TYPE),
                 options=[
                     {
@@ -37,12 +34,4 @@ def layout(self) -> List[Component]:
                 ],
                 value=PlotType.CROSSPLOT,
             ),
-            wcc.Dropdown(
-                label="Ensembles",
-                id=self.register_component_unique_id(self.Ids.ENSEMBLES),
-                options=[{"label": ens, "value": ens} for ens in self._ensembles],
-                value=[self._ensembles[0] if len(self._ensembles) > 0 else None],
-                clearable=False,
-                multi=True,
-            ),
         ]
diff --git a/webviz_subsurface/plugins/_rft_plotter/_views/_sim_vs_obs_view/_view.py b/webviz_subsurface/plugins/_rft_plotter/_views/_sim_vs_obs_view/_view.py
@@ -9,13 +9,14 @@
 from ..._reusable_view_element import GeneralViewElement
 from ..._types import ColorAndSizeByType
 from ..._utils import RftPlotterDataModel, filter_frame
-from ._settings import PlotType, Selections, SizeColorSettings
+from ._settings import Ensembles, PlotType, PlotTypeSettings, SizeColorSettings
 from ._utils import update_crossplot, update_errorplot
 
 
 class SimVsObsView(ViewABC):
     class Ids(StrEnum):
-        SELECTIONS = "selections"
+        PLOT_TYPE = "plot-type"
+        ENSEMBLES = "ensembles"
         FILTERS = "filters"
         SIZE_COLOR_SETTINGS = "size-color-settings"
         VIEW_ELEMENT = "view-element"
@@ -26,7 +27,8 @@ def __init__(self, datamodel: RftPlotterDataModel) -> None:
 
         self.add_settings_groups(
             {
-                self.Ids.SELECTIONS: Selections(self._datamodel.ensembles),
+                self.Ids.PLOT_TYPE: PlotTypeSettings(),
+                self.Ids.ENSEMBLES: Ensembles(self._datamodel.ensembles),
                 self.Ids.FILTERS: FilterLayout(
                     wells=self._datamodel.well_names,
                     zones=self._datamodel.zone_names,
@@ -47,14 +49,14 @@ def set_callbacks(self) -> None:
                 "children",
             ),
             Input(
-                self.settings_group(self.Ids.SELECTIONS)
-                .component_unique_id(Selections.Ids.PLOT_TYPE)
+                self.settings_group(self.Ids.PLOT_TYPE)
+                .component_unique_id(PlotTypeSettings.Ids.PLOT_TYPE)
                 .to_string(),
                 "value",
             ),
             Input(
-                self.settings_group(self.Ids.SELECTIONS)
-                .component_unique_id(Selections.Ids.ENSEMBLES)
+                self.settings_group(self.Ids.ENSEMBLES)
+                .component_unique_id(Ensembles.Ids.ENSEMBLES)
                 .to_string(),
                 "value",
             ),