Merge branch 'main' into symlinks

Author: tomvanmele

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.17.0
+current_version = 1.17.1
 message = Bump version to {new_version}
 commit = True
 tag = True

CHANGELOG.md

@@ -16,6 +16,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 
+## [1.17.1] 2022-11-06
+
+### Added
+
+* Added `compas_rhino.geometry.RhinoCurve.offset`.
+* Added `compas.geometry.Surface.from_plane`.
+* Added `compas.geometry.surfaces.surface.new_surface_from_plane` pluggable.
+* Added `compas_rhino.geometry.surfaces.new_surface_from_plane` plugin.
+* Added `compas_rhino.geometry.RhinoSurface.intersections_with_curve`.
+
+### Changed
+
+* Fixed bug in `compas_rhino.geometry.RhinoCurve.frame_at`.
+* Changed implementation of `compas.datastructures.mesh_planarize_faces` to include edge midpoints.
+
+### Removed
+
+
 ## [1.17.0] 2022-10-07
 
 ### Added

docs/conf.py

@@ -42,7 +42,7 @@ def patched_m2r2_setup(app):
 copyright = "Block Research Group - ETH Zurich"
 author = "Tom Van Mele"
 
-release = "1.17.0"
+release = "1.17.1"
 version = ".".join(release.split(".")[0:2])
 
 master_doc = "index"

setup.py

@@ -24,7 +24,7 @@ def read(*names, **kwargs):
 
 setup(
     name="COMPAS",
-    version="1.17.0",
+    version="1.17.1",
     description="The COMPAS framework",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/compas/__init__.py

@@ -50,7 +50,7 @@
 __license__ = "MIT License"
 __email__ = "[email protected]"
 
-__version__ = "1.17.0"
+__version__ = "1.17.1"
 
 version = LooseVersion(compas.__version__)
 versionstring = version.vstring.split("-")[0]

src/compas/datastructures/halfedge/halfedge.py

@@ -712,7 +712,7 @@ def vertices_where_predicate(self, predicate, data=False):
         ----------
         predicate : callable
             The condition you want to evaluate.
-            The callable takes 2 parameters: the vertex identifier and the vertex attributs,
+            The callable takes 2 parameters: the vertex identifier and the vertex attributes,
             and should return True or False.
         data : bool, optional
             If True, yield the vertex attributes in addition to the vertex identifiers.

src/compas/datastructures/mesh/planarisation.py

@@ -4,11 +4,13 @@
 
 from compas.geometry import project_points_plane
 from compas.geometry import centroid_points
+from compas.geometry import midpoint_point_point
 from compas.geometry import distance_point_point
 from compas.geometry import distance_line_line
 from compas.geometry import bestfit_plane
 
 from compas.utilities import window
+from compas.utilities import pairwise
 
 
 __all__ = [
@@ -98,7 +100,10 @@ def mesh_planarize_faces(mesh, fixed=None, kmax=100, callback=None, callback_arg
         for fkey in mesh.faces():
             vertices = mesh.face_vertices(fkey)
             points = [mesh.vertex_coordinates(key) for key in vertices]
-            plane = bestfit_plane(points)
+            midpoints = []
+            for a, b in pairwise(points + points[:1]):
+                midpoints.append(midpoint_point_point(a, b))
+            plane = bestfit_plane(points + midpoints)
             projections = project_points_plane(points, plane)
 
             for index, key in enumerate(vertices):

src/compas/geometry/surfaces/surface.py

@@ -14,6 +14,11 @@ def new_surface(cls, *args, **kwargs):
     raise NotImplementedError
 
 
+@pluggable(category="factories")
+def new_surface_from_plane(cls, *args, **kwargs):
+    raise NotImplementedError
+
+
 class Surface(Geometry):
     """Class representing a general surface object.
 
@@ -107,6 +112,22 @@ def from_obj(cls, filepath):
         """
         raise NotImplementedError
 
+    @classmethod
+    def from_plane(cls, plane, *args, **kwargs):
+        """Construct a surface from a plane.
+
+        Parameters
+        ----------
+        plane : :class:`compas.geometry.Plane`
+            The plane.
+
+        Returns
+        -------
+        :class:`~compas.geometry.Surface`
+
+        """
+        return new_surface_from_plane(cls, plane, *args, **kwargs)
+
     # ==============================================================================
     # Conversions
     # ==============================================================================
@@ -393,3 +414,17 @@ def intersections_with_line(self, line):
 
         """
         raise NotImplementedError
+
+    def intersections_with_curve(self, curve):
+        """Compute the intersections with a curve.
+
+        Parameters
+        ----------
+        line : :class:`~compas.geometry.Curve`
+
+        Returns
+        -------
+        list[:class:`~compas.geometry.Point`]
+
+        """
+        raise NotImplementedError

src/compas_blender/__init__.py

@@ -51,7 +51,7 @@ def redraw():
     bpy.ops.wm.redraw_timer(type="DRAW_WIN_SWAP", iterations=1)
 
 
-__version__ = "1.17.0"
+__version__ = "1.17.1"
 
 
 def _check_blender_version(version):

src/compas_ghpython/__init__.py

@@ -20,7 +20,7 @@
 import compas
 import compas_rhino
 
-__version__ = "1.17.0"
+__version__ = "1.17.1"
 
 if compas.is_rhino():
     from .utilities import *  # noqa: F401 F403