Merge branch 'compas-dev:main' into datastructures-bounding-boxes

Author: dominikreisach

CHANGELOG.md

@@ -17,6 +17,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 
+## [2.13.0] 2025-06-04
+
+### Added
+
+* Added `compas.scene.Scene.add_group()` for adding group.
+* Added `compas.scene.Group.add_from_list()` for adding a list of items to a group.
+* Added implementation for `compas.geometry.SphericalSurface.isocurve_u`.
+* Added implementation for `compas.geometry.SphericalSurface.isocurve_v`.
+* Added implementation for `compas.geometry.CylindricalSurface.isocurve_u`.
+* Added implementation for `compas.geometry.CylindricalSurface.isocurve_v`.
+
+### Changed
+
+* Fixed error in `circle_to_compas` from Rhino.
+* Fixed Rhino to Rhino brep serialization.
+* Upated `compas.scene.Group.add()` to pass on group kwargs as default for child items.
+* Fixed bug in context detection, which wrongly defaults to `Viewer` instead of `None`.
+* Fixed bug in calculation of `compas.geometry.Polyhedron.edges` if geometry is computed using numpy.
+* Fixed bug in `Grpah.from_pointcloud` which uses degree parameter wrongly.
+
+### Removed
+
+
 ## [2.12.0] 2025-05-28
 
 ### Added

pyproject.toml

@@ -84,7 +84,7 @@ doctest_optionflags = [
 # ============================================================================
 
 [tool.bumpversion]
-current_version = "2.12.0"
+current_version = "2.13.0"
 message = "Bump version to {new_version}"
 commit = true
 tag = true

src/compas/__init__.py

@@ -20,7 +20,7 @@
 __copyright__ = "Copyright 2014-2022 - ETH Zurich, Copyright 2023 - COMPAS Association"
 __license__ = "MIT License"
 __email__ = "[email protected]"
-__version__ = "2.12.0"
+__version__ = "2.13.0"
 
 
 HERE = compas._os.realpath(os.path.dirname(__file__))
@@ -275,9 +275,10 @@ def safe_extract(tar, path=".", members=None, numeric_owner=False):
     return bunny
 
 
-def devday(year, is_open):
+def devday(year, open=True):
     import zlib
     import base64
 
-    encoded = b"eJxNksFq20AQhu/7FINPLSSxk1BaBDmYOGkoDjW2ac4jaSQNWu2I3VVStxRy6TG00OTQU6AP0Rfom+QJ8ggduTL0siz/zv/tvz/LBXz+AicncDQ5epVA69nFF6PRyJy+v1xMVzCja7LSkocZbrZD5orSwJESqGJsQzIe5wWmB5ZdPc7pOseNMc+PP76qoR+67G1vYvXP+/z48B3W3OjB4XEymcA+HL5Ojie94w7mkmFkcQmcrS/g4s9vV5bkU/LlHizP5z335zeYZrWTG0t5SQ25GIxZV+hq2EgHUUAD+404gptKoMGcIFYcQHNBKyFwagmebu9VJcjERc9pF8WHPRBfouNP1O/R5YDWghRbbs9KtZsShl70IssFHRizailjtMrTEKE/kM5DaAlrJSXGPN3+gtOK9q+IYc4OYKvMpGHHNSyJA2bVoJ5ZcgxTSx95UN5yLjBjstSgC4P4jqy+4pz6RDhoC3QSdG2Vhh4tNql0O8OiYmu5bdVk9cKsUtguyRILJKvOED26HW6FTaeqlk3+v+EPGNhqnVMrXQxaV87B6H95+Rd/oc5T"  # noqa: E501
-    exec(zlib.decompress(base64.b64decode(encoded)).decode().format(year))
+    if open:
+        encoded = b"eJxNksFq20AQhu/7FINPLSSxk1BaBDmYOGkoDjW2ac4jaSQNWu2I3VVStxRy6TG00OTQU6AP0Rfom+QJ8ggduTL0siz/zv/tvz/LBXz+AicncDQ5epVA69nFF6PRyJy+v1xMVzCja7LSkocZbrZD5orSwJESqGJsQzIe5wWmB5ZdPc7pOseNMc+PP76qoR+67G1vYvXP+/z48B3W3OjB4XEymcA+HL5Ojie94w7mkmFkcQmcrS/g4s9vV5bkU/LlHizP5z335zeYZrWTG0t5SQ25GIxZV+hq2EgHUUAD+404gptKoMGcIFYcQHNBKyFwagmebu9VJcjERc9pF8WHPRBfouNP1O/R5YDWghRbbs9KtZsShl70IssFHRizailjtMrTEKE/kM5DaAlrJSXGPN3+gtOK9q+IYc4OYKvMpGHHNSyJA2bVoJ5ZcgxTSx95UN5yLjBjstSgC4P4jqy+4pz6RDhoC3QSdG2Vhh4tNql0O8OiYmu5bdVk9cKsUtguyRILJKvOED26HW6FTaeqlk3+v+EPGNhqnVMrXQxaV87B6H95+Rd/oc5T"  # noqa: E501
+        exec(zlib.decompress(base64.b64decode(encoded)).decode().format(year))

src/compas/datastructures/graph/graph.py

@@ -5,6 +5,7 @@
 from ast import literal_eval
 from itertools import combinations
 from random import sample
+from random import shuffle
 
 import compas
 
@@ -159,7 +160,13 @@ def __from_data__(cls, data):
         graph._max_node = data.get("max_node", graph._max_node)
         return graph
 
-    def __init__(self, default_node_attributes=None, default_edge_attributes=None, name=None, **kwargs):
+    def __init__(
+        self,
+        default_node_attributes=None,
+        default_edge_attributes=None,
+        name=None,
+        **kwargs
+    ):  # fmt: skip
         super(Graph, self).__init__(kwargs, name=name)
         self._max_node = -1
         self.node = {}
@@ -375,8 +382,16 @@ def from_pointcloud(cls, cloud, degree=3):
         graph = cls()
         for x, y, z in cloud:
             graph.add_node(x=x, y=y, z=z)
+        nodes = list(graph.nodes())
         for u in graph.nodes():
-            for v in graph.node_sample(size=degree):
+            shuffle(nodes)
+            for v in nodes:
+                if v == u:
+                    continue
+                if graph.degree(v) == degree:
+                    continue
+                if graph.degree(u) == degree:
+                    break
                 graph.add_edge(u, v)
         return graph
 

src/compas/datastructures/mesh/mesh.py

@@ -229,7 +229,14 @@ def __from_data__(cls, data):
 
         return mesh
 
-    def __init__(self, default_vertex_attributes=None, default_edge_attributes=None, default_face_attributes=None, name=None, **kwargs):  # fmt: skip
+    def __init__(
+            self,
+            default_vertex_attributes=None,
+            default_edge_attributes=None,
+            default_face_attributes=None,
+            name=None,
+            **kwargs
+        ):  # fmt: skip
         super(Mesh, self).__init__(kwargs, name=name)
         self._max_vertex = -1
         self._max_face = -1

src/compas/files/gltf/gltf_node.py

@@ -162,7 +162,7 @@ def rotation(self, value):
         if self._matrix:
             raise Exception("Cannot set rotation when matrix is set.")
         if not isinstance(value, list) or len(value) != 4 or fabs(sum([q**2 for q in value]) - 1) > 1e-03:
-            raise Exception("Invalid rotation.  Rotations are expected to be given as " "unit quaternions of the form [q1, q2, q3, q4]")
+            raise Exception("Invalid rotation.  Rotations are expected to be given as unit quaternions of the form [q1, q2, q3, q4]")
         self._rotation = value
 
     @property
@@ -199,7 +199,7 @@ def matrix(self, value):
             raise Exception("Invalid matrix. A 4x4 matrix is expected.")
         if value[3] != [0, 0, 0, 1]:
             raise Exception(
-                "Invalid matrix.  A matrix without shear or skew is expected.  It must be of " "the form TRS, where T is a translation, R is a rotation and S is a scaling."
+                "Invalid matrix.  A matrix without shear or skew is expected.  It must be of the form TRS, where T is a translation, R is a rotation and S is a scaling."
             )
         self._matrix = value
 

src/compas/geometry/polyhedron.py

@@ -8,7 +8,6 @@
 from compas.geometry import Point
 from compas.geometry import Polygon
 from compas.geometry import transform_points
-from compas.itertools import pairwise
 from compas.tolerance import TOL
 
 from .geometry import Geometry
@@ -301,7 +300,9 @@ def faces(self, faces):
     def edges(self):
         seen = set()
         for face in self.faces:
-            for u, v in pairwise(face + face[:1]):
+            for i in range(-1, len(face) - 1):
+                u = face[i]
+                v = face[i + 1]
                 if (u, v) not in seen:
                     seen.add((u, v))
                     seen.add((v, u))

src/compas/geometry/surfaces/cylindrical.py

@@ -8,6 +8,7 @@
 
 from compas.geometry import Circle
 from compas.geometry import Frame
+from compas.geometry import Line
 from compas.geometry import Point
 from compas.geometry import Vector
 
@@ -162,6 +163,39 @@ def from_three_points(cls, a, b, c):
     # Methods
     # =============================================================================
 
+    def isocurve_u(self, u):
+        """Compute the isoparametric curve at parameter u.
+
+        Parameters
+        ----------
+        u : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Line`
+
+        """
+        base = self.point_at(u=u, v=0.5)
+        return Line.from_point_direction_length(base, self.frame.zaxis, 1.0)
+
+    def isocurve_v(self, v):
+        """Compute the isoparametric curve at parameter v.
+
+        Parameters
+        ----------
+        v : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Circle`
+
+        """
+        point = self.center + self.frame.zaxis * v
+        xaxis = self.frame.xaxis
+        yaxis = self.frame.yaxis
+        frame = Frame(point, xaxis, yaxis)
+        return Circle(radius=self.radius, frame=frame)
+
     def point_at(self, u, v, world=True):
         """Compute a point on the surface at the given parameters.
 

src/compas/geometry/surfaces/spherical.py

@@ -191,6 +191,44 @@ def from_points(cls, points):
     # Methods
     # =============================================================================
 
+    def isocurve_u(self, u):
+        """Compute the isoparametric curve at parameter u.
+
+        Parameters
+        ----------
+        u : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Circle`
+
+        """
+        origin = self.center
+        xaxis = self.point_at(u=u, v=0) - origin
+        yaxis = self.point_at(u=u, v=0.25) - origin
+        frame = Frame(origin, xaxis, yaxis)
+        return Circle(radius=xaxis.length, frame=frame)
+
+    def isocurve_v(self, v):
+        """Compute the isoparametric curve at parameter v.
+
+        Parameters
+        ----------
+        v : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Circle`
+
+        """
+        x = self.point_at(u=0, v=v)
+        y = self.point_at(u=0.25, v=v)
+        origin = self.center + self.frame.zaxis * (x - self.center).dot(self.frame.zaxis)
+        xaxis = x - origin
+        yaxis = y - origin
+        frame = Frame(origin, xaxis, yaxis)
+        return Circle(radius=xaxis.length, frame=frame)
+
     def point_at(self, u, v, world=True):
         """Construct a point on the sphere.
 

src/compas/geometry/surfaces/surface.py

@@ -474,7 +474,7 @@ def isocurve_v(self, v):
 
         Returns
         -------
-        :class:`compas_occ.geometry.Curve`
+        :class:`compas.geometry.Curve`
 
         """
         raise NotImplementedError