Merge branch 'main' into hashtree

Author: Licini

.github/workflows/docs.yml

@@ -6,12 +6,12 @@ on:
       - main
     tags:
       - 'v*'
-  pull_request:
-    branches:
-      - main
+  pull_request_review:
+    types: [submitted]
 
 jobs:
   docs:
+    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
     runs-on: ubuntu-latest
     steps:
       - uses: compas-dev/compas-actions.docs@v3

CHANGELOG.md

@@ -8,20 +8,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
-
+* Added `viewerinstance` in `compas.scene.Scene` to support viewers context detection.
 * Added `compas_rhino8` as starting point for Rhino8 support.
+* Added `compas.scene.SceneObjectNode`.
+* Added `compas.scene.SceneTree`.
+* Added `compas.scene.SceneObject.node`.
+* Added `compas.scene.SceneObject.frame`.
+* Added `compas.scene.SceneObject.worldtransformation`.
+* Added `compas.scene.SceneObject.parent`.
+* Added `compas.scene.SceneObject.children`.
+* Added `compas.scene.SceneObject.add()`.
 * Added tutorial for `compas.datastructures.Tree`.
+* Added Serialisation capability to `compas.scene.Scene`.
+* Added `show` flag to `compas.scene.SceneObject`.
+* Added `show_points` flag to `compas.scene.GeometryObject`.
+* Added `show_lines` flag to `compas.scene.GeometryObject`.
+* Added `show_surfaces` flag to `compas.scene.GeometryObject`.
+* Added `show_vertices` flag to `compas.scene.MeshObject`.
+* Added `show_edges` flag to `compas.scene.MeshObject`.
+* Added `show_faces` flag to `compas.scene.MeshObject`.
+* Added `show_nodes` flag to `compas.scene.NetworkObject`.
+* Added `show_edges` flag to `compas.scene.NetworkObject`.
+* Added `show_vertices` flag to `compas.scene.VolMeshObject`.
+* Added `show_edges` flag to `compas.scene.VolMeshObject`.
+* Added `show_faces` flag to `compas.scene.VolMeshObject`.
+* Added `show_cells` flag to `compas.scene.VolMeshObject`.
 * Added `compas.datastructures.HashTree` and `compas.datastructures.HashNode`.
 
 ### Changed
 
 * Changed the `__str__` of `compas.geometry.Point` and `compas.geometry.Vector` to use a limited number of decimals (determined by `Tolerance.PRECISION`). Note: `__repr__` will instead maintain full precision.
+* In pull requests, `docs` Workflow are now only triggered on review approval.
+* The `draw` implementations of `compas.scene.SceneObject` will now always use the `worldtransformation` of the `SceneObject`.
+* Fixed typo in name `Rhino.Geometry.MeshingParameters` in `compas_rhino.geometry.RhinoBrep.to_meshes()`.
+* Fixed `TypeErrorException` when serializing a `Mesh` which has been converted from Rhino.
+* Fixed color conversions in `compas_rhion.conversions.mesh_to_compas`.
 
 ### Removed
 
 * Removed `compas_rhino.forms`. Forms will be moved to `compas_ui`.
 
-
 ## [2.0.0-beta.1] 2023-12-20
 
 ### Added

docs/userguide/scene.py

@@ -74,7 +74,7 @@
 
 x = 0
 y = 0
-for obj in scene.sceneobjects:
+for obj in scene.objects:
     obj.transformation = Translation.from_vector([x, y, 0])
     x += 5
     if x > 20:

src/compas/data/encoders.py

@@ -151,7 +151,7 @@ def default(self, o):
                 return None
 
         if dotnet_support:
-            if isinstance(o, System.Decimal):
+            if isinstance(o, (System.Decimal, System.Double, System.Single)):
                 return float(o)
 
         return super(DataEncoder, self).default(o)

src/compas/scene/__init__.py

@@ -23,6 +23,8 @@
 from .context import register
 
 from .scene import Scene
+from .scene import SceneObjectNode
+from .scene import SceneTree
 
 __all__ = [
     "SceneObjectNotRegisteredError",
@@ -33,6 +35,8 @@
     "GeometryObject",
     "VolMeshObject",
     "Scene",
+    "SceneObjectNode",
+    "SceneTree",
     "clear",
     "redraw",
     "register_scene_objects",

src/compas/scene/context.py

@@ -1,10 +1,12 @@
-from compas.plugins import pluggable
+import inspect
+from collections import defaultdict
+
+import compas
 from compas.plugins import PluginValidator
+from compas.plugins import pluggable
+
 from .exceptions import NoSceneObjectContextError
 from .exceptions import SceneObjectNotRegisteredError
-import inspect
-import compas
-from collections import defaultdict
 
 ITEM_SCENEOBJECT = defaultdict(dict)
 
@@ -62,15 +64,9 @@ def is_viewer_open():
     bool
 
     """
-    # TODO: implement [without introducing compas_view2 as a dependency..?]
-    # make the viewer app a singleton
-    # check for the exitence of an instance of the singleton
-    # if the instance exists, return True
-    # in this case, the viewer is the current context
-    # to do this without introducing compas_view2 as a dependency,
-    # creating the singleton instance should modify a class attribute of the SceneObject
-    # (or potentially a module level attribute of compas itself)
-    return False
+    from compas.scene import Scene
+
+    return Scene.viewerinstance is not None
 
 
 def _detect_current_context():

src/compas/scene/geometryobject.py

@@ -28,6 +28,12 @@ class GeometryObject(SceneObject):
         The size of the points.
     linewidth : float
         The width of the lines or curves.
+    show_points : bool
+        Flag for showing or hiding the points. Default is ``False``.
+    show_lines : bool
+        Flag for showing or hiding the lines or curves. Default is ``True``.
+    show_surfaces : bool
+        Flag for showing or hiding the surfaces. Default is ``True``.
 
     """
 
@@ -43,3 +49,6 @@ def __init__(self, geometry, **kwargs):
         self.surfacecolor = kwargs.get("surfacecolor", self.color)
         self.pointsize = kwargs.get("pointsize", 1.0)
         self.linewidth = kwargs.get("linewidth", 1.0)
+        self.show_points = kwargs.get("show_points", False)
+        self.show_lines = kwargs.get("show_lines", True)
+        self.show_surfaces = kwargs.get("show_surfaces", True)

src/compas/scene/meshobject.py

@@ -32,6 +32,16 @@ class MeshObject(SceneObject):
         Edge colors.
     facecolor : :class:`compas.colors.ColorDict`
         Face colors.
+    vertexsize : float
+        The size of the vertices. Default is ``1.0``.
+    edgewidth : float
+        The width of the edges. Default is ``1.0``.
+    show_vertices : bool
+        Flag for showing or hiding the vertices. Default is ``False``.
+    show_edges : bool
+        Flag for showing or hiding the edges. Default is ``True``.
+    show_faces : bool
+        Flag for showing or hiding the faces. Default is ``True``.
 
     See Also
     --------
@@ -54,6 +64,9 @@ def __init__(self, mesh, **kwargs):
         self.facecolor = kwargs.get("facecolor", self.color)
         self.vertexsize = kwargs.get("vertexsize", 1.0)
         self.edgewidth = kwargs.get("edgewidth", 1.0)
+        self.show_vertices = kwargs.get("show_vertices", False)
+        self.show_edges = kwargs.get("show_edges", True)
+        self.show_faces = kwargs.get("show_faces", True)
 
     @property
     def mesh(self):
@@ -78,8 +91,7 @@ def transformation(self, transformation):
     def vertex_xyz(self):
         if self._vertex_xyz is None:
             points = self.mesh.vertices_attributes("xyz")  # type: ignore
-            if self.transformation:
-                points = transform_points(points, self.transformation)
+            points = transform_points(points, self.worldtransformation)
             self._vertex_xyz = dict(zip(self.mesh.vertices(), points))  # type: ignore
         return self._vertex_xyz
 

src/compas/scene/networkobject.py

@@ -29,9 +29,13 @@ class NetworkObject(SceneObject):
     edgecolor : :class:`compas.colors.ColorDict`
         Mapping between edges and colors.
     nodesize : float
-        The size of the nodes.
+        The size of the nodes. Default is ``1.0``.
     edgewidth : float
-        The width of the edges.
+        The width of the edges. Default is ``1.0``.
+    show_nodes : bool
+        Flag for showing or hiding the nodes. Default is ``True``.
+    show_edges : bool
+        Flag for showing or hiding the edges. Default is ``True``.
 
     See Also
     --------
@@ -52,6 +56,8 @@ def __init__(self, network, **kwargs):
         self.edgecolor = kwargs.get("edgecolor", self.color)
         self.nodesize = kwargs.get("nodesize", 1.0)
         self.edgewidth = kwargs.get("edgewidth", 1.0)
+        self.show_nodes = kwargs.get("show_nodes", True)
+        self.show_edges = kwargs.get("show_edges", True)
 
     @property
     def network(self):
@@ -76,8 +82,7 @@ def transformation(self, transformation):
     def node_xyz(self):
         if self._node_xyz is None:
             points = self.network.nodes_attributes("xyz")  # type: ignore
-            if self.transformation:
-                points = transform_points(points, self.transformation)
+            points = transform_points(points, self.worldtransformation)
             self._node_xyz = dict(zip(self.network.nodes(), points))  # type: ignore
         return self._node_xyz