fix viewer

Author: franaudo

src/compas_fea2/UI/viewer/scene.py

@@ -346,18 +346,18 @@ class FEA2ReactionFieldResultsObject(GroupObject):
 
     """
 
-    def __init__(self, field, step, component, show_vectors=1, show_contour=False, **kwargs):
+    def __init__(self, step, component, show_vectors=1, show_contour=False, **kwargs):
         # FIXME: component is not used
 
         field = kwargs.pop("item")
         cmap = kwargs.get("cmap", ColorMap.from_palette("hawaii"))
-        cmap = None
 
         group_elements = []
         if show_vectors:
             vectors, colors = draw_field_vectors([n.point for n in field.locations(step)], list(field.vectors(step)), show_vectors, translate=0, cmap=cmap)
+            # group_elements.append((Collection(vectors), {"name": f"DISP-{component}", "linecolors": colors, "linewidth": 3}))
             for v, c in zip(vectors, colors):
-                group_elements.append((v, {"name": f"REACT-{component}", "linecolor": c, "linewidth": 3}))
+                group_elements.append((v, {"name": f"DISP-{component}", "linecolor": c, "linewidth": 3}))
 
         if show_contour:
             from compas_fea2.model.elements import BeamElement

src/compas_fea2/UI/viewer/viewer.py

@@ -8,6 +8,7 @@
 
 from compas_fea2.UI.viewer.scene import FEA2ModelObject
 from compas_fea2.UI.viewer.scene import FEA2DisplacementFieldResultsObject
+from compas_fea2.UI.viewer.scene import FEA2ReactionFieldResultsObject
 from compas_fea2.UI.viewer.scene import FEA2StepObject
 
 
@@ -161,6 +162,13 @@ def add_displacement_field(self, field, step, component=None, fast=False, show_p
             field, step=step, component=component, fast=fast, show_parts=show_parts, opacity=opacity, show_bcs=show_bcs, show_loads=show_loads, **kwargs
         )
 
+    def add_reaction_field(self, field, step, component=None, fast=False, show_parts=True, opacity=0.5, show_bcs=True, show_loads=True, **kwargs):
+        register_scene_objects()
+        register(field.__class__.__base__, FEA2ReactionFieldResultsObject, context="Viewer")
+        self.reactions = self.scene.add(
+            field, step=step, component=component, fast=fast, show_parts=show_parts, opacity=opacity, show_bcs=show_bcs, show_loads=show_loads, **kwargs
+        )
+
     def add_mode_shape(self, mode_shape, step, component=None, fast=False, show_parts=True, opacity=0.5, show_bcs=True, show_loads=True, **kwargs):
         register_scene_objects()
         register(mode_shape.__class__.__base__, FEA2DisplacementFieldResultsObject, context="Viewer")

src/compas_fea2/model/model.py

@@ -1209,8 +1209,8 @@ def show(self, scale_model=1.0, show_bcs=1.0, **kwargs):
         register(self.__class__, FEA2ModelObject, context="Viewer")
 
         viewer = FEA2Viewer(center=self.center, scale_model=scale_model)
-        viewer.viewer.scene.add(self, model=self, opacity=0.5, show_bcs=show_bcs, kwargs=kwargs)
-        viewer.viewer.show()
+        viewer.scene.add(self, model=self, opacity=0.5, show_bcs=show_bcs, kwargs=kwargs)
+        viewer.show()
 
     @problem_method
     def show_displacements(self, problem, *args, **kwargs):

src/compas_fea2/problem/problem.py

@@ -615,7 +615,7 @@ def show_deformed(self, step=None, opacity=1, show_bcs=1, scale_results=1, scale
             vector = displacement.vector.scaled(scale_results)
             displacement.node.xyz = sum_vectors([Vector(*displacement.location.xyz), vector])
         viewer.add_model(self.model, fast=True, opacity=opacity, show_bcs=show_bcs, show_loads=show_loads, **kwargs)
-        viewer.viewer.show()
+        viewer.show()
 
     def show_displacements(self, step=None, fast=True, show_bcs=1, scale_model=1, show_loads=0.1, component=None, show_vectors=True, show_contours=True, **kwargs):
         """Display the displacement field results for a given step.
@@ -639,14 +639,14 @@ def show_displacements(self, step=None, fast=True, show_bcs=1, scale_model=1, sh
             raise ValueError("No displacement field results available for this step")
 
         viewer = FEA2Viewer(center=self.model.center, scale_model=scale_model)
-        viewer.add_model(self.model, fast=fast, show_parts=False, opacity=0.5, show_bcs=show_bcs, show_loads=show_loads, **kwargs)
+        viewer.add_model(self.model, fast=fast, show_parts=True, opacity=0.5, show_bcs=show_bcs, show_loads=show_loads, **kwargs)
         viewer.add_displacement_field(step.problem.displacement_field, fast=fast, step=step, component=component, show_vectors=show_vectors, show_contour=show_contours, **kwargs)
         if show_loads:
-            self.add_step(step, show_loads=show_loads)
+            viewer.add_step(step, show_loads=show_loads)
         viewer.show()
         viewer.scene.clear()
 
-    def show_reactions(self, step=None, show_bcs=1, scale_model=1, show_loads=0.1, component=None, show_vectors=1, show_contours=False, **kwargs):
+    def show_reactions(self, step=None, fast=True, show_bcs=1, scale_model=1, show_loads=0.1, component=None, show_vectors=True, show_contours=True, **kwargs):
         """Display the reaction field results for a given step.
 
         Parameters
@@ -664,38 +664,20 @@ def show_reactions(self, step=None, show_bcs=1, scale_model=1, show_loads=0.1, c
         scale_results : _type_, optional
             _description_, by default 1
         """
-        from compas.scene import register
-        from compas.scene import register_scene_objects
-
-        from compas_fea2.UI.viewer import FEA2ModelObject
-        from compas_fea2.UI.viewer import FEA2ReactionFieldResultsObject
-        from compas_fea2.UI.viewer import FEA2StepObject
-        from compas_fea2.UI.viewer import FEA2Viewer
 
         if not step:
             step = self.steps_order[-1]
 
         if not step.problem.reaction_field:
-            raise ValueError("No reaction field results available for this step")
+            raise ValueError("No displacement field results available for this step")
 
         viewer = FEA2Viewer(center=self.model.center, scale_model=scale_model)
-        viewer.viewer.config.vectorsize = 0.2
-
-        register_scene_objects()  # This has to be called before registering the model object
-
-        register(self.model.__class__, FEA2ModelObject, context="Viewer")
-        viewer.viewer.scene.add(self.model, model=self.model, show_parts=True, opacity=0.5, show_bcs=show_bcs, show_loads=show_loads, **kwargs)
-
-        register(step.problem.reaction_field.__class__, FEA2ReactionFieldResultsObject, context="Viewer")
-        viewer.viewer.scene.add(
-            step.problem.reaction_field, field=step.problem.reaction_field, step=step, component=component, show_vectors=show_vectors, show_contour=show_contours, **kwargs
-        )
-
+        viewer.add_model(self.model, fast=fast, show_parts=True, opacity=0.5, show_bcs=show_bcs, show_loads=show_loads, **kwargs)
+        viewer.add_reaction_field(step.problem.reaction_field, fast=fast, step=step, component=component, show_vectors=show_vectors, show_contour=show_contours, **kwargs)
         if show_loads:
-            register(step.__class__, FEA2StepObject, context="Viewer")
-            viewer.viewer.scene.add(step, step=step, scale_factor=show_loads)
-
-        viewer.viewer.show()
+            viewer.add_step(step, show_loads=show_loads)
+        viewer.show()
+        viewer.scene.clear()
 
     def show_stress_contour(self, step=None, stresstype="vonmieses", high=None, low=None, cmap=None, side=None, scale_model=1.0, show_bcs=True, **kwargs):
         from compas.scene import register