Merge pull request #155 from Geode-solutions/feat/ColorMapViewer

Feat/color map viewer

Author: BotellaA

opengeodeweb_viewer_schemas.json

@@ -9,10 +9,14 @@
           "id": {
             "type": "string",
             "minLength": 1
+          },
+          "name": {
+            "type": "string"
           }
         },
         "required": [
-          "id"
+          "id",
+          "name"
         ],
         "additionalProperties": false
       },
@@ -1014,10 +1018,14 @@
           "id": {
             "type": "string",
             "minLength": 1
+          },
+          "name": {
+            "type": "string"
           }
         },
         "required": [
-          "id"
+          "id",
+          "name"
         ],
         "additionalProperties": false
       },
@@ -1863,10 +1871,14 @@
           "id": {
             "type": "string",
             "minLength": 1
+          },
+          "name": {
+            "type": "string"
           }
         },
         "required": [
-          "id"
+          "id",
+          "name"
         ],
         "additionalProperties": false
       },
@@ -2470,6 +2482,24 @@
         ],
         "additionalProperties": false
       },
+      "pick_colormap": {
+        "$id": "opengeodeweb_viewer.viewer.pick_colormap",
+        "route": "pick_colormap",
+        "rpc": "pick_colormap",
+        "type": "object",
+        "properties": {
+          "x": {
+            "type": "number"
+          },
+          "y": {
+            "type": "number"
+          }
+        },
+        "required": [
+          "x",
+          "y"
+        ]
+      },
       "highlight": {
         "$id": "opengeodeweb_viewer.viewer.highlight",
         "rpc": "highlight",

requirements.txt

@@ -22,7 +22,7 @@ frozenlist>=1
     # via
     #   aiohttp
     #   aiosignal
-idna==3.16
+idna==3.17
     # via yarl
 kiwisolver>=1
     # via matplotlib
@@ -61,4 +61,3 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.1.3

src/opengeodeweb_viewer/object/object_methods.py

@@ -37,6 +37,7 @@ def registerObject(
         data.mapper.SetResolveCoincidentTopologyLineOffsetParameters(1, -0.1)
         data.mapper.SetResolveCoincidentTopologyPolygonOffsetParameters(2, 0)
         data.mapper.SetResolveCoincidentTopologyPointOffsetParameter(-2)
+        data.scalarBar.SetVisibility(False)
 
         renderWindow = self.getView("-1")
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
@@ -48,6 +49,7 @@ def registerObject(
                 resetCamara = False
         renderer.AddActor(data.actor)
         renderer.AddActor(data.highlight.actor)
+        renderer.AddActor2D(data.scalarBar)
         if resetCamara:
             renderer.ResetCamera()
 
@@ -57,11 +59,22 @@ def deregisterObject(self, data_id: str) -> None:
         renderer = renderWindow.GetRenderers().GetFirstRenderer()
         renderer.RemoveActor(pipeline.actor)
         renderer.RemoveActor(pipeline.highlight.actor)
+        renderer.RemoveActor2D(pipeline.scalarBar)
         self.deregister_object(data_id)
+        self.update_scalar_bars_layout()
 
     def SetVisibility(self, data_id: str, visibility: bool) -> None:
-        actor = self.get_vtk_pipeline(data_id).actor
-        actor.SetVisibility(visibility)
+        pipeline = self.get_vtk_pipeline(data_id)
+        pipeline.actor.SetVisibility(visibility)
+        if not visibility:
+            pipeline.scalarBar.SetVisibility(False)
+        else:
+            if (
+                pipeline.mapper.GetScalarVisibility()
+                and pipeline.mapper.GetLookupTable() is not None
+            ):
+                pipeline.scalarBar.SetVisibility(True)
+        self.update_scalar_bars_layout()
 
     def SetOpacity(self, data_id: str, opacity: float) -> None:
         actor = self.get_vtk_pipeline(data_id).actor
@@ -153,14 +166,16 @@ def SetBlocksColor(
             attributes.SetBlockOpacity(blocks[block_id], alpha)
 
     def clearColors(self, data_id: str) -> None:
-        db = self.get_vtk_pipeline(data_id)
-        mapper = db.mapper
-        reader = db.reader
+        pipeline = self.get_vtk_pipeline(data_id)
+        mapper = pipeline.mapper
+        reader = pipeline.reader
         output = reader.GetOutputDataObject(0)
         if isinstance(output, vtkDataSet):
             output.GetPointData().SetActiveScalars("")
             output.GetCellData().SetActiveScalars("")
         mapper.ScalarVisibilityOff()
+        pipeline.scalarBar.SetVisibility(False)
+        self.update_scalar_bars_layout()
 
     def _apply_highlight_style(self, actor: vtkActor, mapper: vtkDataSetMapper) -> None:
         mapper.ScalarVisibilityOff()

src/opengeodeweb_viewer/rpc/generic/generic_protocols.py

@@ -37,7 +37,7 @@ def register(self, rpc_params: RpcParams) -> None:
         )
         params = schemas.Register.from_dict(rpc_params)
         data_id = params.id
-        specific_params = {"id": data_id}
+        specific_params = {"id": data_id, "name": params.name}
         viewer_object = self.get_viewer_data(data_id).viewer_object
         if viewer_object == "mesh":
             self.mesh_protocols.registerMesh(specific_params)

src/opengeodeweb_viewer/rpc/generic/schemas/register.json

@@ -5,10 +5,14 @@
     "id": {
       "type": "string",
       "minLength": 1
+    },
+    "name": {
+      "type": "string"
     }
   },
   "required": [
-    "id"
+    "id",
+    "name"
   ],
   "additionalProperties": false
 }

src/opengeodeweb_viewer/rpc/generic/schemas/register.py

@@ -8,3 +8,4 @@ def __post_init__(self) -> None:
         print(self, flush=True)
 
     id: str
+    name: str

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -44,10 +44,15 @@ def registerMesh(self, rpc_params: RpcParams) -> None:
         params = schemas.Register.from_dict(rpc_params)
         data_id = params.id
         try:
-            file_name = str(self.get_viewer_data(data_id).viewable_file)
+            viewer_data = self.get_viewer_data(data_id)
+            file_name = str(viewer_data.viewable_file)
+
             reader = vtkXMLGenericDataObjectReader()
             reader.SetFileName(os.path.join(self.DATA_FOLDER_PATH, data_id, file_name))
             reader.Update()
+            dataset = reader.GetOutputDataObject(0)
+            if dataset:
+                dataset.SetObjectName(params.name)
             mapper = vtkDataSetMapper()
             mapper.SetInputConnection(reader.GetOutputPort())
             data = VtkPipeline(reader, mapper)
@@ -167,6 +172,10 @@ def setupColorMap(
         data.mapper.SetUseLookupTableScalarRange(False)
         data.mapper.InterpolateScalarsBeforeMappingOn()
 
+        data.scalarBar.SetLookupTable(lut)
+        data.scalarBar.SetVisibility(True)
+        self.update_scalar_bars_layout()
+
     @exportRpc(mesh_prefix + mesh_schemas_dict["highlight"]["rpc"])
     def setMeshhighlight(self, rpc_params: RpcParams) -> None:
         validate_schema(

src/opengeodeweb_viewer/rpc/mesh/schemas/register.json

@@ -5,10 +5,14 @@
     "id": {
       "type": "string",
       "minLength": 1
+    },
+    "name": {
+      "type": "string"
     }
   },
   "required": [
-    "id"
+    "id",
+    "name"
   ],
   "additionalProperties": false
 }

src/opengeodeweb_viewer/rpc/mesh/schemas/register.py

@@ -8,3 +8,4 @@ def __post_init__(self) -> None:
         print(self, flush=True)
 
     id: str
+    name: str

src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -218,14 +218,18 @@ def registerModel(self, rpc_params: RpcParams) -> None:
         params = schemas.Register.from_dict(rpc_params)
         data_id = params.id
         try:
-            file_name = str(self.get_viewer_data(data_id).viewable_file)
+            viewer_data = self.get_viewer_data(data_id)
+            file_name = str(viewer_data.viewable_file)
+
             reader = vtkXMLMultiBlockDataReader()
             reader.SetFileName(os.path.join(self.DATA_FOLDER_PATH, data_id, file_name))
             reader.Update()
             filter = vtkGeometryFilter()
             filter.SetInputConnection(reader.GetOutputPort())
             filter.Update()
             geometry_output = filter.GetOutputDataObject(0)
+            if geometry_output:
+                geometry_output.SetObjectName(params.name)
             mapper = vtkCompositePolyDataMapper()
             mapper.SetInputDataObject(geometry_output)
             attributes = vtkCompositeDataDisplayAttributes()