Merge pull request #1472 from compas-dev/fix-polyhedron-discretisation

Small fixes

Author: tomvanmele

CHANGELOG.md

@@ -11,12 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * 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
 

src/compas/datastructures/graph/graph.py

@@ -5,6 +5,8 @@
 from ast import literal_eval
 from itertools import combinations
 from random import sample
+from random import choice
+from random import shuffle
 
 import compas
 
@@ -159,7 +161,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 +383,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/geometry/polyhedron.py

@@ -301,7 +301,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

src/compas/rpc/dispatcher.py

@@ -122,7 +122,7 @@ def _dispatch(self, name, args):
                 try:
                     idict = json.loads(args[0], cls=DataDecoder)
                 except (IndexError, TypeError):
-                    odict["error"] = "API methods require a single JSON encoded dictionary as input.\n" "For example: input = json.dumps({'param_1': 1, 'param_2': [2, 3]})"
+                    odict["error"] = "API methods require a single JSON encoded dictionary as input.\nFor example: input = json.dumps({'param_1': 1, 'param_2': [2, 3]})"
 
                 else:
                     self._call(function, idict, odict)

src/compas/scene/context.py

@@ -112,9 +112,9 @@ def detect_current_context():
         return "Rhino"
     if compas.is_blender():
         return "Blender"
-    other_contexts = [v for v in ITEM_SCENEOBJECT.keys()]
-    if other_contexts:
-        return other_contexts[0]
+    # other_contexts = [v for v in ITEM_SCENEOBJECT.keys()]
+    # if other_contexts:
+    #     return other_contexts[0]
 
     return None
 

tests/compas/datastructures/test_graph.py

@@ -83,7 +83,7 @@ def test_graph_from_pointcloud():
     graph = Graph.from_pointcloud(cloud=cloud, degree=3)
     assert graph.number_of_nodes() == len(cloud)
     for node in graph.nodes():
-        assert graph.degree(node) >= 3
+        assert graph.degree(node) <= 3
 
 
 # ==============================================================================