remove contours implementation and update reqs

Author: tomvanmele

requirements.txt

@@ -1,9 +1,5 @@
 # flake8: noqa
 jsonschema >= 4.17, < 4.18
-matplotlib >= 2.2, < 3.0; python_version >= '2.7' and python_version < '3.0'
-matplotlib >= 2.2, < 3.1; python_version >= '3.5' and python_version <= '3.7' and sys_platform == 'win32'
-matplotlib >= 3.1; python_version >= '3.8' and sys_platform == 'win32'
-matplotlib >= 2.2; python_version >= '3.5' and sys_platform != 'win32'
 networkx >= 3.0
 numpy >= 1.15.4
 scipy >= 1.1

src/compas/datastructures/mesh/contours_numpy.py

@@ -2,14 +2,6 @@
 from __future__ import absolute_import
 from __future__ import division
 
-from numpy import asarray
-from numpy import meshgrid
-from numpy import linspace
-from numpy import amax
-from numpy import amin
-
-from scipy.interpolate import griddata
-import matplotlib.pyplot as plt
 from compas.numerical import scalarfield_contours
 
 
@@ -35,12 +27,12 @@ def mesh_isolines_numpy(mesh, attr_name, N=50):
         Each isoline is a list of paths, and each path is a list polygons.
 
     """
-    xy = [mesh.vertex_coordinates(key, "xy") for key in mesh.vertices()]
-    s = [mesh.vertex[key][attr_name] for key in mesh.vertices()]
+    xy = mesh.vertices_attributes("xy")
+    s = mesh.vertices_attribute(attr_name)
     return scalarfield_contours(xy, s, N)
 
 
-def mesh_contours_numpy(mesh, levels=50, density=100):
+def mesh_contours_numpy(mesh, levels=50):
     """Compute the contours of the mesh.
 
     Parameters
@@ -49,8 +41,6 @@ def mesh_contours_numpy(mesh, levels=50, density=100):
         The mesh object.
     levels : int, optional
         The number of contours.
-    density : int, optional
-        The density of the interpolation grid.
 
     Returns
     -------
@@ -66,34 +56,6 @@ def mesh_contours_numpy(mesh, levels=50, density=100):
     The contours are defined as the isolines of the z-coordinates of the vertices of the mesh.
 
     """
-    xy = [mesh.vertex_attributes(key, "xy") for key in mesh.vertices()]
-    z = [mesh.vertex_attribute(key, "z") for key in mesh.vertices()]
-
-    xy = asarray(xy)
-    z = asarray(z)
-    x = xy[:, 0]
-    y = xy[:, 1]
-
-    X, Y = meshgrid(linspace(amin(x), amax(x), 2 * density), linspace(amin(y), amax(y), 2 * density))
-
-    Z = griddata((x, y), z, (X, Y), method="cubic")
-
-    fig = plt.figure()
-    ax = fig.add_subplot(111, aspect="equal")
-    c = ax.contour(X, Y, Z, levels)
-
-    contours = [0] * len(c.collections)
-    levels = c.levels
-
-    for i, coll in enumerate(iter(c.collections)):
-        paths = coll.get_paths()
-        contours[i] = [0] * len(paths)
-        for j, path in enumerate(iter(paths)):
-            polygons = path.to_polygons()
-            contours[i][j] = [0] * len(polygons)
-            for k, polygon in enumerate(iter(polygons)):
-                contours[i][j][k] = polygon
-
-    plt.close(fig)
-
-    return levels, contours
+    xy = mesh.vertices_attributes("xy")
+    z = mesh.vertices_attribute("z")
+    return scalarfield_contours(xy, z, levels)