Merge pull request #1005 from compas-dev/datastructure-artist-fixes

General fixes related to data structure artists

Author: tomvanmele

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas.datastructures.VolMesh.from_meshgrid`.
 * Added `vertices_where`, `vertices_where_predicate`, `edges_where`, `edges_where_predicate` to `compas.datastructures.HalfFace`.
 * Added `faces_where`, `faces_where_predicate`, `cells_where`, `cells_where_predicate` to `compas.datastructures.HalfFace`.
+* Added `VolMeshArtist` to registered Blender artists.
 * Added `3.1` to supported versions for Blender installer.
 
 ### Changed
@@ -38,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `planarity` to optional requirement on all platforms.
 * Changed `numba` to optional requirement on all platforms.
 * Changed raw github content path for `compas.get`.
+* Fixed `compas_blender.artists.VolMeshArtist.draw` and `compas_blender.artists.VolMeshArtist.draw_cells`.
+* Fixed `compas_ghpython.artists.VolMeshArtist.draw` and `compas_ghpython.artists.VolMeshArtist.draw_cells`.
+* Fixed `compas_rhino.artists.VolMeshArtist.draw` and `compas_rhino.artists.VolMeshArtist.draw_cells`.
 
 ### Removed
 

src/compas/artists/meshartist.py

@@ -16,6 +16,21 @@ class MeshArtist(Artist):
     ----------
     mesh : :class:`~compas.datastructures.Mesh`
         A COMPAS mesh.
+    vertices : list[int], optional
+        Selection of vertices to draw.
+    edges : list[tuple[int, int]], optional
+        Selection of edges to draw.
+    faces : list[int], optional
+        Selection of faces to draw.
+    vertexcolor : tuple[float, float, float] | dict[int, tuple[float, float, float]], optional
+        Color of the vertices.
+        Default color is :attr:`MeshArtists.default_vertexcolor`.
+    edgecolor : tuple[float, float, float] | dict[tuple[int, int], tuple[float, float, float]], optional
+        Color of the edges.
+        Default color is :attr:`MeshArtists.default_edgecolor`.
+    facecolor : tuple[float, float, float] | dict[int, tuple[float, float, float]], optional
+        Color of the faces.
+        Default color is :attr:`MeshArtists.default_facecolor`.
 
     Attributes
     ----------
@@ -90,7 +105,15 @@ class MeshArtist(Artist):
     default_vertexsize = 5
     default_edgewidth = 1.0
 
-    def __init__(self, mesh, **kwargs):
+    def __init__(self,
+                 mesh,
+                 vertices=None,
+                 edges=None,
+                 faces=None,
+                 vertexcolor=None,
+                 edgecolor=None,
+                 facecolor=None,
+                 **kwargs):
         super(MeshArtist, self).__init__()
 
         self._default_vertexcolor = None
@@ -123,6 +146,13 @@ def __init__(self, mesh, **kwargs):
 
         self.mesh = mesh
 
+        self.vertices = vertices
+        self.edges = edges
+        self.faces = faces
+        self.vertex_color = vertexcolor
+        self.edge_color = edgecolor
+        self.face_color = facecolor
+
     @property
     def mesh(self):
         return self._mesh

src/compas/artists/networkartist.py

@@ -16,6 +16,16 @@ class NetworkArtist(Artist):
     ----------
     network : :class:`~compas.datastructures.Network`
         A COMPAS network.
+    nodes : list[hashable], optional
+        A list of node identifiers.
+        Default is None, in which case all nodes are drawn.
+    edges : list[tuple[hashable, hashable]], optional
+        A list of edge keys (as uv pairs) identifying which edges to draw.
+        The default is None, in which case all edges are drawn.
+    nodecolor : :class:`~compas.colors.Color` | dict[hashable, :class:`~compas.colors.Color`], optional
+        The color specification for the nodes.
+    edgecolor : :class:`~compas.colors.Color` | dict[tuple[hashable, hashable]], :class:`~compas.colors.Color`], optional
+        The color specification for the edges.
 
     Attributes
     ----------
@@ -69,7 +79,13 @@ class NetworkArtist(Artist):
     default_nodesize = 5
     default_edgewidth = 1.0
 
-    def __init__(self, network, **kwargs):
+    def __init__(self,
+                 network,
+                 nodes=None,
+                 edges=None,
+                 nodecolor=None,
+                 edgecolor=None,
+                 **kwargs):
         super(NetworkArtist, self).__init__()
 
         self._default_nodecolor = None
@@ -83,6 +99,7 @@ def __init__(self, network, **kwargs):
         self._edge_color = None
         self._node_text = None
         self._edge_text = None
+        self._edge_width = None
 
         self._nodecollection = None
         self._edgecollection = None
@@ -91,6 +108,11 @@ def __init__(self, network, **kwargs):
 
         self.network = network
 
+        self.nodes = nodes
+        self.edges = edges
+        self.node_color = nodecolor
+        self.edge_color = edgecolor
+
     @property
     def network(self):
         return self._network

src/compas/artists/volmeshartist.py

@@ -82,7 +82,17 @@ class VolMeshArtist(Artist):
     face_color = ColorDict()
     cell_color = ColorDict()
 
-    def __init__(self, volmesh, **kwargs):
+    def __init__(self,
+                 volmesh,
+                 vertices=None,
+                 edges=None,
+                 faces=None,
+                 cells=None,
+                 vertexcolor=None,
+                 edgecolor=None,
+                 facecolor=None,
+                 cellcolor=None,
+                 **kwargs):
         super(VolMeshArtist, self).__init__()
 
         self._default_vertexcolor = None
@@ -105,8 +115,28 @@ def __init__(self, volmesh, **kwargs):
         self._face_text = None
         self._cell_text = None
 
+        self._vertexcollection = None
+        self._edgecollection = None
+        self._facecollection = None
+        self._cellcollection = None
+        self._vertexnormalcollection = None
+        self._facenormalcollection = None
+        self._vertexlabelcollection = None
+        self._edgelabelcollection = None
+        self._facelabelcollection = None
+        self._celllabelcollection = None
+
         self.volmesh = volmesh
 
+        self.vertices = vertices
+        self.edges = edges
+        self.faces = faces
+        self.cells = cells
+        self.vertex_color = vertexcolor
+        self.edge_color = edgecolor
+        self.face_color = facecolor
+        self.cell_color = cellcolor
+
     @property
     def volmesh(self):
         return self._volmesh

src/compas_blender/artists/__init__.py

@@ -108,6 +108,7 @@
 from compas.geometry import Vector
 from compas.datastructures import Mesh
 from compas.datastructures import Network
+from compas.datastructures import VolMesh
 from compas.robots import RobotModel
 
 from .artist import BlenderArtist
@@ -130,6 +131,7 @@
 from .surfaceartist import SurfaceArtist
 from .torusartist import TorusArtist
 from .vectorartist import VectorArtist
+from .volmeshartist import VolMeshArtist
 
 
 @plugin(category='drawing-utils', pluggable_name='clear', requires=['bpy'])
@@ -164,6 +166,7 @@ def register_artists():
     Artist.register(Surface, SurfaceArtist, context='Blender')
     Artist.register(Torus, TorusArtist, context='Blender')
     Artist.register(Vector, VectorArtist, context='Blender')
+    Artist.register(VolMesh, VolMeshArtist, context='Blender')
     print('Blender Artists registered.')
 
 
@@ -188,4 +191,5 @@ def register_artists():
     'SurfaceArtist',
     'TorusArtist',
     'VectorArtist',
+    'VolMeshArtist',
 ]

src/compas_blender/artists/meshartist.py

@@ -27,29 +27,6 @@ class MeshArtist(BlenderArtist, MeshArtist):
         A COMPAS mesh.
     collection : str | :blender:`bpy.types.Collection`
         The Blender scene collection the object(s) created by this artist belong to.
-    vertices : list[int], optional
-        A list of vertex identifiers.
-        Default is None, in which case all vertices are drawn.
-    edges : list[tuple[int, int]], optional
-        A list of edge keys (as uv pairs) identifying which edges to draw.
-        The default is None, in which case all edges are drawn.
-    faces : list[int], optional
-        A list of face identifiers.
-        The default is None, in which case all faces are drawn.
-    vertexcolor : :class:`~compas.colors.Color` | dict[int, :class:`~compas.colors.Color`], optional
-        The color specification for the vertices.
-    edgecolor : :class:`~compas.colors.Color` | dict[tuple[int, int], :class:`~compas.colors.Color`], optional
-        The color specification for the edges.
-    facecolor : :class:`~compas.colors.Color` | dict[int, :class:`~compas.colors.Color`], optional
-        The color specification for the faces.
-    show_mesh : bool, optional
-        If True, draw the mesh.
-    show_vertices : bool, optional
-        If True, draw the individual vertices.
-    show_edges : bool, optional
-        If True, draw the individual edges.
-    show_faces : bool, optional
-        If True, draw the individual faces.
 
     Attributes
     ----------
@@ -97,31 +74,10 @@ class MeshArtist(BlenderArtist, MeshArtist):
     def __init__(self,
                  mesh: Mesh,
                  collection: Optional[Union[str, bpy.types.Collection]] = None,
-                 vertices: Optional[List[int]] = None,
-                 edges: Optional[List[int]] = None,
-                 faces: Optional[List[int]] = None,
-                 vertexcolor: Optional[Color] = None,
-                 edgecolor: Optional[Color] = None,
-                 facecolor: Optional[Color] = None,
-                 show_mesh: bool = False,
-                 show_vertices: bool = True,
-                 show_edges: bool = True,
-                 show_faces: bool = True,
                  **kwargs: Any):
 
         super().__init__(mesh=mesh, collection=collection or mesh.name, **kwargs)
 
-        self.vertices = vertices
-        self.edges = edges
-        self.faces = faces
-        self.vertex_color = vertexcolor
-        self.edge_color = edgecolor
-        self.face_color = facecolor
-        self.show_mesh = show_mesh
-        self.show_vertices = show_vertices
-        self.show_edges = show_edges
-        self.show_faces = show_faces
-
     @property
     def vertexcollection(self) -> bpy.types.Collection:
         if not self._vertexcollection:

src/compas_blender/artists/networkartist.py

@@ -28,20 +28,6 @@ class NetworkArtist(BlenderArtist, NetworkArtist):
         A COMPAS network.
     collection : str | :blender:`bpy.types.Collection`
         The name of the collection the object belongs to.
-    nodes : list[hashable], optional
-        A list of node identifiers.
-        Default is None, in which case all nodes are drawn.
-    edges : list[tuple[hashable, hashable]], optional
-        A list of edge keys (as uv pairs) identifying which edges to draw.
-        The default is None, in which case all edges are drawn.
-    nodecolor : :class:`~compas.colors.Color` | dict[hashable, :class:`~compas.colors.Color`], optional
-        The color specification for the nodes.
-    edgecolor : :class:`~compas.colors.Color` | dict[tuple[hashable, hashable]], :class:`~compas.colors.Color`], optional
-        The color specification for the edges.
-    show_nodes : bool, optional
-        If True, draw the nodes of the network.
-    show_edges : bool, optional
-        If True, draw the edges of the network.
 
     Attributes
     ----------
@@ -87,23 +73,10 @@ class NetworkArtist(BlenderArtist, NetworkArtist):
     def __init__(self,
                  network: Network,
                  collection: Optional[Union[str, bpy.types.Collection]] = None,
-                 nodes: Optional[List[int]] = None,
-                 edges: Optional[List[int]] = None,
-                 nodecolor: Color = None,
-                 edgecolor: Color = None,
-                 show_nodes: bool = True,
-                 show_edges: bool = True,
                  **kwargs: Any):
 
         super().__init__(network=network, collection=collection or network.name, **kwargs)
 
-        self.nodes = nodes
-        self.edges = edges
-        self.node_color = nodecolor
-        self.edge_color = edgecolor
-        self.show_nodes = show_nodes
-        self.show_edges = show_edges
-
     @property
     def nodecollection(self) -> bpy.types.Collection:
         if not self._nodecollection: