Fix gridviewer

equinor · Feb 13, 2023 · a09d129 · a09d129
1 parent 2139b30
commit a09d129
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/webviz_subsurface/plugins/_grid_viewer_fmu/views/view_3d/_view_3d.py b/webviz_subsurface/plugins/_grid_viewer_fmu/views/view_3d/_view_3d.py
@@ -6,7 +6,7 @@
 from dash import Input, Output, State, callback, html, no_update
 from webviz_config.utils import StrEnum
 from webviz_config.webviz_plugin_subclasses import ViewABC
-
+import webviz_subsurface_components as wsc
 from webviz_subsurface._providers.ensemble_grid_provider import (
     CellFilter,
     EnsembleGridProvider,
@@ -127,7 +127,6 @@ def _set_geometry_and_scalar(
             layers: List[Dict],
             bounds: Optional[List[float]],
         ) -> Tuple[List[Dict], Optional[List]]:
-
             if PROPERTYTYPE(proptype) == PROPERTYTYPE.STATIC:
                 property_spec = PropertySpec(prop_name=prop[0], prop_date=None)
             else:
@@ -192,9 +191,9 @@ def _set_geometry_and_scalar(
             else:
                 value_range = None
 
-            layers[1]["pointsUrl"] = f"/grid/points/{geometry_token}"
-            layers[1]["polysUrl"] = f"/grid/polys/{geometry_token}"
-            layers[1]["propertiesUrl"] = f"/grid/scalar/{geometry_and_property_token}"
+            layers[1]["pointsData"] = f"/grid/points/{geometry_token}"
+            layers[1]["polysData"] = f"/grid/polys/{geometry_token}"
+            layers[1]["propertiesData"] = f"/grid/scalar/{geometry_and_property_token}"
             layers[1]["colorMapRange"] = value_range
             layers[1]["colorMapName"] = colormap
             return layers, bounds
@@ -214,13 +213,16 @@ def _set_geometry_and_scalar(
             ),
         )
         def _toggle_manual_color(enabled: List[str]) -> Tuple[bool, bool]:
-
             if enabled:
                 return False, False
             return True, True
 
         @callback(
             Output(self._view_id(VTKView3D.Ids.INFOBOX), "children"),
+            Output(
+                self._view_id(VTKView3D.Ids.VIEW),
+                "children",
+            ),
             Input(
                 self._data_settings_id(DataSettings.Ids.PROPERTIES),
                 "value",
@@ -238,6 +240,10 @@ def _toggle_manual_color(enabled: List[str]) -> Tuple[bool, bool]:
                 "layers",
             ),
             Input(self.get_store_unique_id(ElementIds.IJK_CROP_STORE), "data"),
+            Input(
+                self._color_scale_id(ColorScale.Ids.COLORMAP),
+                "value",
+            ),
             State(
                 self._data_settings_id(DataSettings.Ids.STATIC_DYNAMIC),
                 "value",
@@ -249,6 +255,7 @@ def update_infobox(
             realizations: List[int],
             layers: List[dict],
             grid_range: List[List[int]],
+            colormap: str,
             proptype: str,
         ) -> list:
             """Updates the information box with information on the visualized data."""
@@ -286,7 +293,22 @@ def update_infobox(
             color_range = layers[1].get("colorMapRange")
             if color_range is None:
                 color_range = actual_value_range
-
+            children = [
+                wsc.ViewAnnotation(
+                    id=f"view_1",
+                    children=[
+                        wsc.WebVizColorLegend(
+                            min=color_range[0],
+                            max=color_range[1],
+                            colorName=colormap,
+                            cssLegendStyles={"top": "0", "right": "0"},
+                            openColorSelector=False,
+                            legendScaleSize=0.1,
+                            legendFontSize=30,
+                        ),
+                    ],
+                )
+            ]
             return [
                 html.Div([html.B("Property: "), html.Label(properties[0])]),
                 html.Div(
@@ -307,4 +329,4 @@ def update_infobox(
                         ),
                     ]
                 ),
-            ]
+            ], children
diff --git a/...z_subsurface/plugins/_grid_viewer_fmu/views/view_3d/view_elements/_vtk_view_3d_element.py b/...z_subsurface/plugins/_grid_viewer_fmu/views/view_3d/view_elements/_vtk_view_3d_element.py
@@ -2,7 +2,7 @@
 from dash.development.base_component import Component
 from webviz_config.utils import StrEnum
 from webviz_config.webviz_plugin_subclasses import ViewElementABC
-from webviz_subsurface_components import DeckGLMap
+from webviz_subsurface_components import DashSubsurfaceViewer
 
 
 class VTKView3D(ViewElementABC):
@@ -17,7 +17,6 @@ def __init__(self) -> None:
         super().__init__()
 
     def inner_layout(self) -> Component:
-
         return html.Div(
             style={"position": "relative", "height": "90vh"},
             children=[
@@ -46,7 +45,7 @@ def inner_layout(self) -> Component:
                 html.Div(
                     style={"position": "absolute", "width": "100%", "height": "90%"},
                     children=[
-                        DeckGLMap(
+                        DashSubsurfaceViewer(
                             id=self.register_component_unique_id(VTKView3D.Ids.VIEW),
                             layers=[
                                 {
@@ -65,11 +64,7 @@ def inner_layout(self) -> Component:
                                     "@@type": "Grid3DLayer",
                                     "id": "Grid3DLayer",
                                     "material": True,
-                                    "colorMapName": "Physics reverse",
                                     "scaleZ": 1,
-                                    "pointsUrl": "/grid/points/test",
-                                    "polysUrl": "/grid/polys/test",
-                                    "propertiesUrl": "/grid/scalar/test",
                                 },
                             ],
                             views={