Merge pull request #1409 from compas-dev/fix-friday

Fix friday

Author: tomvanmele

CHANGELOG.md

@@ -10,15 +10,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 * Added key conversion map to `compas.colors.ColorDict` to avoid serialisation problems with tuple keys when used in combination with edges.
+* Added `Scene.find_all_by_itemtype`.
 
 ### Changed
 
 * Fixed bug in `VolMesh.delete_cell`.
 * Fixed `NoneType` error when calling `compas.geometry.Sphere.edges`.
-
+* Fixed bug in `VolMesh.vertex_halffaces`.
+* Fixed bug in `VolMesh.vertex_cells`.
+* Fixed bug in `VolMesh.is_halfface_on_boundary`.
 
 ### Removed
 
+* Removed `VolMesh.halfface_adjacent_halfface` because of general nonsensicalness, and because it is (and probably always has been) completely broken.
+
 
 ## [2.5.0] 2024-10-25
 

src/compas/datastructures/volmesh/volmesh.py

@@ -383,7 +383,7 @@ def from_obj(cls, filepath, precision=None):
 
     @classmethod
     def from_vertices_and_cells(cls, vertices, cells):
-        # type: (list[list[float]], list[list[list[int]]]) -> VolMesh
+        # type: (list[list[float]] | dict[int, list[float]], list[list[list[int]]]) -> VolMesh
         """Construct a volmesh object from vertices and cells.
 
         Parameters
@@ -407,11 +407,11 @@ def from_vertices_and_cells(cls, vertices, cells):
         volmesh = cls()
 
         if isinstance(vertices, Mapping):
-            for key, xyz in vertices.items():
+            for key, xyz in vertices.items():  # type: ignore
                 volmesh.add_vertex(key=key, attr_dict=dict(zip(("x", "y", "z"), xyz)))
         else:
-            for x, y, z in iter(vertices):
-                volmesh.add_vertex(x=x, y=y, z=z)
+            for x, y, z in iter(vertices):  # type: ignore
+                volmesh.add_vertex(x=x, y=y, z=z)  # type: ignore
 
         for cell in cells:
             volmesh.add_cell(cell)
@@ -531,9 +531,9 @@ def to_obj(self, filepath, precision=None, **kwargs):
         the faces to the file.
 
         """
-        meshes = [self.cell_to_mesh(cell) for cell in self.cells()]
+        meshes = [self.cell_to_mesh(cell) for cell in self.cells()]  # type: ignore
         obj = OBJ(filepath, precision=precision)
-        obj.write(meshes, **kwargs)
+        obj.write(meshes, **kwargs)  # type: ignore
 
     def to_vertices_and_cells(self):
         # type: () -> tuple[list[list[float]], list[list[list[int]]]]
@@ -659,7 +659,7 @@ def vertex_sample(self, size=1):
         :meth:`edge_sample`, :meth:`face_sample`, :meth:`cell_sample`
 
         """
-        return sample(list(self.vertices()), size)
+        return sample(list(self.vertices()), size)  # type: ignore
 
     def edge_sample(self, size=1):
         # type: (int) -> list[tuple[int, int]]
@@ -680,7 +680,7 @@ def edge_sample(self, size=1):
         :meth:`vertex_sample`, :meth:`face_sample`, :meth:`cell_sample`
 
         """
-        return sample(list(self.edges()), size)
+        return sample(list(self.edges()), size)  # type: ignore
 
     def face_sample(self, size=1):
         # type: (int) -> list[int]
@@ -701,7 +701,7 @@ def face_sample(self, size=1):
         :meth:`vertex_sample`, :meth:`edge_sample`, :meth:`cell_sample`
 
         """
-        return sample(list(self.faces()), size)
+        return sample(list(self.faces()), size)  # type: ignore
 
     def cell_sample(self, size=1):
         # type: (int) -> list[int]
@@ -722,7 +722,7 @@ def cell_sample(self, size=1):
         :meth:`vertex_sample`, :meth:`edge_sample`, :meth:`face_sample`
 
         """
-        return sample(list(self.cells()), size)
+        return sample(list(self.cells()), size)  # type: ignore
 
     def vertex_index(self):
         # type: () -> dict[int, int]
@@ -739,7 +739,7 @@ def vertex_index(self):
         :meth:`index_vertex`
 
         """
-        return {key: index for index, key in enumerate(self.vertices())}
+        return {key: index for index, key in enumerate(self.vertices())}  # type: ignore
 
     def index_vertex(self):
         # type: () -> dict[int, int]
@@ -756,7 +756,7 @@ def index_vertex(self):
         :meth:`vertex_index`
 
         """
-        return dict(enumerate(self.vertices()))
+        return dict(enumerate(self.vertices()))  # type: ignore
 
     def vertex_gkey(self, precision=None):
         # type: (int | None) -> dict[int, str]
@@ -781,7 +781,7 @@ def vertex_gkey(self, precision=None):
         """
         gkey = TOL.geometric_key
         xyz = self.vertex_coordinates
-        return {vertex: gkey(xyz(vertex), precision) for vertex in self.vertices()}
+        return {vertex: gkey(xyz(vertex), precision) for vertex in self.vertices()}  # type: ignore
 
     def gkey_vertex(self, precision=None):
         # type: (int | None) -> dict[str, int]
@@ -806,7 +806,7 @@ def gkey_vertex(self, precision=None):
         """
         gkey = TOL.geometric_key
         xyz = self.vertex_coordinates
-        return {gkey(xyz(vertex), precision): vertex for vertex in self.vertices()}
+        return {gkey(xyz(vertex), precision): vertex for vertex in self.vertices()}  # type: ignore
 
     # --------------------------------------------------------------------------
     # Builders & Modifiers
@@ -1760,8 +1760,10 @@ def vertex_halffaces(self, vertex):
         u = vertex
         faces = []
         for v in self._plane[u]:
-            for face in self._plane[u][v]:
-                if face is not None:
+            for w in self._plane[u][v]:
+                cell = self._plane[u][v][w]
+                if cell is not None:
+                    face = self.cell_halfedge_face(cell, (u, v))
                     faces.append(face)
         return faces
 
@@ -1789,7 +1791,8 @@ def vertex_cells(self, vertex):
             for w in self._plane[u][v]:
                 cell = self._plane[u][v][w]
                 if cell is not None:
-                    cells.append(cell)
+                    if cell not in cells:
+                        cells.append(cell)
         return cells
 
     def is_vertex_on_boundary(self, vertex):
@@ -3108,37 +3111,6 @@ def halfface_opposite_halfface(self, halfface):
         nbr = self._plane[w][v][u]
         return None if nbr is None else self._cell[nbr][w][v]
 
-    def halfface_adjacent_halfface(self, halfface, halfedge):
-        """Return the halfface adjacent to the halfface across the halfedge.
-
-        Parameters
-        ----------
-        halfface : int
-            The identifier of the halfface.
-        halfedge : tuple[int, int]
-            The identifier of the halfedge.
-
-        Returns
-        -------
-        int | None
-            The identifier of the adjacent half-face, or None if `halfedge` is on the boundary.
-
-        See Also
-        --------
-        :meth:`halfface_opposite_halfface`
-
-        Notes
-        -----
-        The adjacent face belongs a to one of the cell neighbors over faces of the initial cell.
-        A face and its adjacent face share two common vertices.
-
-        """
-        u, v = halfedge
-        cell = self.halfface_cell(halfface)
-        nbr_halfface = self._cell[cell][v][u]
-        nbr_cell = self._plane[u][v][nbr_halfface]
-        return None if nbr_cell is None else self._cell[nbr_cell][v][u]
-
     def halfface_vertex_ancestor(self, halfface, vertex):
         """Return the vertex before the specified vertex in a specific face.
 
@@ -3282,8 +3254,8 @@ def is_halfface_on_boundary(self, halfface):
         :meth:`is_vertex_on_boundary`, :meth:`is_edge_on_boundary`, :meth:`is_cell_on_boundary`
 
         """
-        u, v = self._halfface[halfface][:2]
-        return self._plane[v][u][halfface] is None
+        u, v, w = self._halfface[halfface][:3]
+        return self._plane[w][v][u] is None
 
     # --------------------------------------------------------------------------
     # Face Geometry

src/compas/scene/meshobject.py

@@ -106,16 +106,6 @@ def mesh(self, mesh):
         self._item = mesh
         self._transformation = None
 
-    @property
-    def transformation(self):
-        # type: () -> compas.geometry.Transformation | None
-        return self._transformation
-
-    @transformation.setter
-    def transformation(self, transformation):
-        # type: (compas.geometry.Transformation) -> None
-        self._transformation = transformation
-
     def draw_vertices(self):
         """Draw the vertices of the mesh.
 

src/compas/scene/scene.py

@@ -213,6 +213,7 @@ def redraw(self):
         self.draw()
 
     def find_by_name(self, name):
+        # type: (str) -> SceneObject
         """Find the first scene object with the given name.
 
         Parameters
@@ -225,10 +226,10 @@ def find_by_name(self, name):
         :class:`SceneObject`
 
         """
-        # type: (str) -> SceneObject
         return self.get_node_by_name(name=name)
 
     def find_by_itemtype(self, itemtype):
+        # type: (...) -> SceneObject | None
         """Find the first scene object with a data item of the given type.
 
         Parameters
@@ -238,10 +239,29 @@ def find_by_itemtype(self, itemtype):
 
         Returns
         -------
-        :class:`SceneObject`
+        :class:`SceneObject` or None
 
         """
-        # type: (Type[compas.data.Data]) -> SceneObject
         for obj in self.objects:
             if isinstance(obj.item, itemtype):
                 return obj
+
+    def find_all_by_itemtype(self, itemtype):
+        # type: (...) -> list[SceneObject]
+        """Find all scene objects with a data item of the given type.
+
+        Parameters
+        ----------
+        itemtype : :class:`compas.data.Data`
+            The type of the data item associated with the scene object.
+
+        Returns
+        -------
+        list[:class:`SceneObject`]
+
+        """
+        sceneobjects = []
+        for obj in self.objects:
+            if isinstance(obj.item, itemtype):
+                sceneobjects.append(obj)
+        return sceneobjects

src/compas_rhino/scene/meshobject.py

@@ -74,6 +74,7 @@ def clear(self):
 
         """
         compas_rhino.objects.delete_objects(self.guids, purge=True)
+        self.guids = []
 
     def clear_vertices(self):
         """Delete all vertices drawn by this scene object.
@@ -84,6 +85,7 @@ def clear_vertices(self):
 
         """
         compas_rhino.objects.delete_objects(self._guid_vertex, purge=True)
+        self._guid_vertex = {}
 
     def clear_edges(self):
         """Delete all edges drawn by this scene object.
@@ -94,6 +96,7 @@ def clear_edges(self):
 
         """
         compas_rhino.objects.delete_objects(self._guid_edge, purge=True)
+        self._guid_edge = {}
 
     def clear_faces(self):
         """Delete all faces drawn by this scene object.
@@ -104,6 +107,7 @@ def clear_faces(self):
 
         """
         compas_rhino.objects.delete_objects(self._guid_face, purge=True)
+        self._guid_face = {}
 
     # ==========================================================================
     # draw