Merge pull request #157 from Geode-solutions/fix/highlight-visibility

Fix/highlight visibility

Author: BotellaA

requirements.txt

@@ -63,4 +63,3 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.1.3

src/opengeodeweb_viewer/object/object_methods.py

@@ -14,6 +14,7 @@
 )
 from vtkmodules.vtkCommonDataModel import (
     vtkDataSet,
+    vtkMultiBlockDataSet,
 )
 from vtkmodules.vtkFiltersExtraction import vtkExtractSelection
 
@@ -132,6 +133,27 @@ def SetPointsColor(
             actor = self.get_vtk_pipeline(data_id).actor
             actor.GetProperty().SetVertexColor([red / 255, green / 255, blue / 255])
 
+    def _prune_hidden_blocks(
+        self,
+        dataset: vtkMultiBlockDataSet,
+        visibility_attributes: vtkCompositeDataDisplayAttributes,
+    ) -> vtkMultiBlockDataSet:
+        pruned = vtkMultiBlockDataSet()
+        pruned.SetNumberOfBlocks(dataset.GetNumberOfBlocks())
+        for index in range(dataset.GetNumberOfBlocks()):
+            block = dataset.GetBlock(index)
+            if block is None:
+                continue
+            if not visibility_attributes.GetBlockVisibility(block):
+                continue
+            if isinstance(block, vtkMultiBlockDataSet):
+                pruned.SetBlock(
+                    index, self._prune_hidden_blocks(block, visibility_attributes)
+                )
+            else:
+                pruned.SetBlock(index, block)
+        return pruned
+
     def SetBlocksVisibility(
         self, data_id: str, block_ids: list[int], visibility: bool
     ) -> None:
@@ -140,9 +162,21 @@ def SetBlocksVisibility(
         if not isinstance(mapper, vtkCompositePolyDataMapper):
             raise Exception("Mapper is not a vtkCompositePolyDataMapper")
         blocks = pipeline.blockDataSets
-        attributes = mapper.GetCompositeDataDisplayAttributes()
+        visibility_attributes = mapper.GetCompositeDataDisplayAttributes()
         for block_id in block_ids:
-            attributes.SetBlockVisibility(blocks[block_id], visibility)
+            visibility_attributes.SetBlockVisibility(blocks[block_id], visibility)
+        dataset = (
+            pipeline.filter.GetOutputDataObject(0)
+            if pipeline.filter
+            else pipeline.reader.GetOutputDataObject(0)
+        )
+        if not isinstance(dataset, vtkMultiBlockDataSet):
+            return
+        if pipeline.pick_mapper is None:
+            pipeline.pick_mapper = vtkCompositePolyDataMapper()
+        pipeline.pick_mapper.SetInputDataObject(
+            self._prune_hidden_blocks(dataset, visibility_attributes)
+        )
 
     def SetBlocksColor(
         self,

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -264,6 +264,16 @@ def pickedIds(self, rpc_params: RpcParams) -> dict[str, list[str] | int | None]:
         params = schemas.PickedIDS.from_dict(rpc_params)
         renderer = self.getView("-1").GetRenderers().GetFirstRenderer()
 
+        pipelines_to_restore = [
+            pipeline
+            for pipeline_id in params.ids
+            if (pipeline := self.get_vtk_pipeline(pipeline_id)).pick_mapper is not None
+        ]
+        for pipeline in pipelines_to_restore:
+            pick_mapper = pipeline.pick_mapper
+            if pick_mapper is not None:
+                pipeline.actor.SetMapper(pick_mapper)
+
         actors = []
         picker = vtkCellPicker(tolerance=0.005)
         picker.Pick(params.x, params.y, 0, renderer)
@@ -278,6 +288,8 @@ def pickedIds(self, rpc_params: RpcParams) -> dict[str, list[str] | int | None]:
 
         for actor in actors:
             actor.SetPickable(True)
+        for pipeline in pipelines_to_restore:
+            pipeline.actor.SetMapper(pipeline.mapper)
 
         array_ids = [
             id for id in params.ids if self.get_vtk_pipeline(id).actor in actors
@@ -351,7 +363,22 @@ def setHighlight(
         )
         params = schemas.Highlight.from_dict(rpc_params)
         picker = vtkCellPicker(tolerance=0.005)
-        picker.Pick(params.x, params.y, 0, self.get_renderer())
+
+        pipelines_to_restore = [
+            pipeline
+            for pipeline_id in params.ids
+            if (pipeline := self.get_vtk_pipeline(pipeline_id)).pick_mapper is not None
+        ]
+        for pipeline in pipelines_to_restore:
+            pick_mapper = pipeline.pick_mapper
+            if pick_mapper is not None:
+                pipeline.actor.SetMapper(pick_mapper)
+        try:
+            picker.Pick(params.x, params.y, 0, self.get_renderer())
+        finally:
+            for pipeline in pipelines_to_restore:
+                pipeline.actor.SetMapper(pipeline.mapper)
+
         self.clear_highlights(params.ids)
         actor = picker.GetActor()
         pipeline_id = next(
@@ -377,6 +404,11 @@ def setHighlight(
                 if 0 <= flat_index < len(pipeline.blockDataSets)
                 else None
             )
+            if dataset:
+                attr = pipeline.mapper.GetCompositeDataDisplayAttributes()
+                if attr and not attr.GetBlockVisibility(dataset):
+                    self.render(-1)
+                    return {}
             geode_id = (
                 pipeline.blockGeodeIds[flat_index]
                 if 0 <= flat_index < len(pipeline.blockGeodeIds)

src/opengeodeweb_viewer/vtk_protocol.py

@@ -77,6 +77,7 @@ class VtkPipeline:
     blockGeodeIds: list[str] = field(default_factory=list)
     scalarBar: vtkScalarBarActor = field(default_factory=vtkScalarBarActor)
     block_styles: dict[int, BlockStyle] = field(default_factory=dict)
+    pick_mapper: vtkMapper | None = None
 
 
 class VtkTypingMixin: