Merge branch 'main' into occ-nurbs

Author: tomvanmele

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
+* Add abstract methods to `compas_rhino.artists.volmeshartist`.
 
 * Added `compas.geometry.Curve` and `compas.geometry.NurbsCurve`.
 * Added `compas.geometry.Surface` and `compas.geometry.NurbsSurface`.
@@ -16,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+* Fixed bug in directions of `compas.datastructures.Mesh.from_meshgrid`.
+
 ### Removed
 
 
@@ -26,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Changed default path for Rhino 7 legacy install cleanup to Rhino7.app in `compas_rhino.__init__.py`.
-* Changed z-coordinate of `compas.datastructures.Mesh.from_meshgrid` to `0.0` instead of `0`. 
+* Changed z-coordinate of `compas.datastructures.Mesh.from_meshgrid` to `0.0` instead of `0`.
 
 ### Removed
 

src/compas/datastructures/mesh/mesh.py

@@ -639,14 +639,14 @@ def from_meshgrid(cls, dx, nx, dy=None, ny=None):
         dy = dy or dx
         ny = ny or nx
 
-        V, U = meshgrid(linspace(0, dx, nx + 1), linspace(0, dy, ny + 1), indexing='ij')
+        U, V = meshgrid(linspace(0, dx, nx + 1), linspace(0, dy, ny + 1), indexing='ij')
 
         quads = [[
             [U[i + 0][j + 0], V[i + 0][j + 0], 0.0],
             [U[i + 0][j + 1], V[i + 0][j + 1], 0.0],
             [U[i + 1][j + 1], V[i + 1][j + 1], 0.0],
             [U[i + 1][j + 0], V[i + 1][j + 0], 0.0]
-        ] for i, j in product(range(ny), range(nx))]
+        ] for i, j in product(range(nx), range(ny))]
 
         return cls.from_polygons(quads)
 

src/compas_rhino/artists/volmeshartist.py

@@ -28,11 +28,42 @@ class VolMeshArtist(RhinoArtist, VolMeshArtist):
     def __init__(self, volmesh, layer=None, **kwargs):
         super(VolMeshArtist, self).__init__(volmesh=volmesh, layer=layer, **kwargs)
 
-    def clear_by_name(self):
-        """Clear all objects in the "namespace" of the associated volmesh."""
+    # ==========================================================================
+    # clear
+    # ==========================================================================
+
+    def clear(self):
         guids = compas_rhino.get_objects(name="{}.*".format(self.volmesh.name))
         compas_rhino.delete_objects(guids, purge=True)
 
+    def clear_vertices(self):
+        guids = compas_rhino.get_objects(name="{}.vertex.*".format(self.volmesh.name))
+        compas_rhino.delete_objects(guids, purge=True)
+
+    def clear_edges(self):
+        guids = compas_rhino.get_objects(name="{}.edge.*".format(self.volmesh.name))
+        compas_rhino.delete_objects(guids, purge=True)
+
+    def clear_faces(self):
+        guids = compas_rhino.get_objects(name="{}.face.*".format(self.volmesh.name))
+        compas_rhino.delete_objects(guids, purge=True)
+
+    def clear_cells(self):
+        guids = compas_rhino.get_objects(name="{}.cell.*".format(self.volmesh.name))
+        compas_rhino.delete_objects(guids, purge=True)
+
+    def clear_vertexlabels(self):
+        guids = compas_rhino.get_objects(name="{}.vertexlabel.*".format(self.volmesh.name))
+        compas_rhino.delete_objects(guids, purge=True)
+
+    def clear_edgelabels(self):
+        guids = compas_rhino.get_objects(name="{}.edgelabel.*".format(self.volmesh.name))
+        compas_rhino.delete_objects(guids, purge=True)
+
+    def clear_facelabels(self):
+        guids = compas_rhino.get_objects(name="{}.facelabel.*".format(self.volmesh.name))
+        compas_rhino.delete_objects(guids, purge=True)
+
     # ==========================================================================
     # draw
     # ==========================================================================