[test] add plotmesh tests, add hide option to plotmesh, bump 0.3.2

Author: fangq

README.md

@@ -4,7 +4,7 @@
 
 * Copyright: (C) Qianqian Fang (2024-2025) <q.fang at neu.edu>, Edward Xu (2024) <xu.ed at northeastern.edu>
 * License: GNU Public License V3 or later
-* Version: 0.3.1
+* Version: 0.3.2
 * URL: [https://pypi.org/project/iso2mesh/](https://pypi.org/project/iso2mesh/)
 * Github: [https://github.com/NeuroJSON/pyiso2mesh](https://github.com/NeuroJSON/pyiso2mesh)
 

iso2mesh/__init__.py

@@ -137,7 +137,7 @@
     barycentricgrid,
 )
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 __all__ = [
     "advancefront",
     "barycentricgrid",

iso2mesh/plot.py

@@ -20,6 +20,7 @@
 import matplotlib.pyplot as plt
 from iso2mesh.trait import volface, meshcentroid
 
+COLOR_OFFSET = 3
 # _________________________________________________________________________________________________________
 
 
@@ -30,7 +31,7 @@ def plotsurf(node, face, *args, **kwargs):
     rngstate = np.random.get_state()
     h = []
 
-    randseed = int("623F9A9E", 16)
+    randseed = int("623F9A9E", 16) + COLOR_OFFSET
 
     if "ISO2MESH_RANDSEED" in globals():
         randseed = globals()["ISO2MESH_RANDSEED"]
@@ -119,6 +120,9 @@ def plotsurf(node, face, *args, **kwargs):
         norm = Normalize(vmin=face_values.min(), vmax=face_values.max())
         kwargs["facecolors"] = kwargs["cmap"](norm(face_values))
 
+    if not "linewidth" in kwargs:
+        kwargs["linewidth"] = 0.3
+
     patch = Poly3DCollection(polydata, edgecolors="k", **kwargs)
 
     ax.add_collection3d(patch)
@@ -170,7 +174,7 @@ def plottetra(node, elem, *args, **kwargs):
     rngstate = np.random.get_state()
 
     # Set deterministic seed for consistent coloring
-    randseed = int("623F9A9E", 16)
+    randseed = int("623F9A9E", 16) + COLOR_OFFSET
 
     if "ISO2MESH_RANDSEED" in globals():
         randseed = globals()["ISO2MESH_RANDSEED"]
@@ -215,6 +219,9 @@ def plottetra(node, elem, *args, **kwargs):
         norm = Normalize(vmin=face_values.min(), vmax=face_values.max())
         kwargs["facecolors"] = kwargs["cmap"](norm(face_values))
 
+    if not "linewidth" in kwargs:
+        kwargs["linewidth"] = 0.3
+
     patch = Poly3DCollection(polydata, edgecolors="k", **kwargs)
     ax.add_collection3d(patch)
 
@@ -263,7 +270,7 @@ def plotedges(node, edges, *args, **kwargs):
 
     if edges.ndim == 1 or edges.shape[1] == 1:
         # Loop: NaN-separated index list
-        randseed = int("623F9A9E", 16)
+        randseed = int("623F9A9E", 16) + COLOR_OFFSET
         if "iso2mesh_randseed" in kwargs:
             randseed = kwargs["iso2mesh_randseed"]
         np.random.seed(randseed)
@@ -368,6 +375,10 @@ def plotmesh(node, *args, **kwargs):
                 face = args[0]
                 elem = a
 
+    extraarg = {}
+    if len(opt) > 1 and len(opt) % 2 == 0:
+        extraarg = dict(zip(opt[::2], opt[1::2]))
+
     handles = []
 
     ax = kwargs.get("parent", None)
@@ -389,9 +400,10 @@ def plotmesh(node, *args, **kwargs):
         if getattr(idx, "size", None) == 0:
             print("Warning: nothing to plot")
             return None
-        ax.plot(x[idx], y[idx], z[idx], *opt)
+        ax.plot(x[idx], y[idx], z[idx], **kwargs)
         _autoscale_3d(ax, node)
-        plt.show(block=False)
+        if "hide" in extraarg and not extraarg["hide"]:
+            plt.show(block=False)
         return ax
 
     # Plot surface mesh
@@ -428,22 +440,10 @@ def plotmesh(node, *args, **kwargs):
         ax = plottetra(node, elem[idx, :], opt, *args, **kwargs)
         handles.append(ax)
 
-    plt.show(block=False)
-    return handles if len(handles) > 1 else handles[0]
-
+    if "hide" in extraarg and not extraarg["hide"]:
+        plt.show(block=False)
 
-def _get_face_triangles(node, face, selector):
-    """Convert 1-based faces to triangles and apply selector filter."""
-    face = np.asarray(face)
-    face3 = face[:, :3].astype(int) - 1
-    tris = node[face3, :3]
-    if selector:
-        cent = tris.mean(axis=1)
-        idx = np.where(
-            eval(selector, {"x": cent[:, 0], "y": cent[:, 1], "z": cent[:, 2]})
-        )[0]
-        tris = tris[idx]
-    return tris
+    return handles if len(handles) > 1 else handles[0]
 
 
 def _autoscale_3d(ax, points):
@@ -453,17 +453,3 @@ def _autoscale_3d(ax, points):
     ax.set_zlim([z.min(), z.max()])
     boxas = [x.max() - x.min(), y.max() - y.min(), z.max() - z.min()]
     ax.set_box_aspect(boxas)
-
-
-def _extract_poly_opts(opt):
-    """Extract facecolor/edgecolor options for Poly3DCollection."""
-    d = {}
-    if "facecolor" in opt:
-        d["facecolor"] = opt[opt.index("facecolor") + 1]
-    else:
-        d["facecolor"] = "white"
-    if "edgecolor" in opt:
-        d["edgecolor"] = opt[opt.index("edgecolor") + 1]
-    else:
-        d["edgecolor"] = "k"
-    return d

iso2mesh/trait.py

@@ -142,8 +142,7 @@ def surfedge(f, junction=None):
     openedge = edges[ix[qx], :]
 
     elemid = None
-    if junction is not None:
-        elemid, iy = np.unravel_index(ix[qx], f.shape)
+    elemid, _ = np.unravel_index(ix[qx], f.shape)
 
     return openedge, elemid
 

setup.py

@@ -6,7 +6,7 @@
 setup(
     name="iso2mesh",
     packages=["iso2mesh"],
-    version="0.3.1",
+    version="0.3.2",
     license='GPLv3+',
     description="Image-based 3D Surface and Volumetric Mesh Generator",
     long_description=readme,

test/run_test.py

@@ -1092,5 +1092,91 @@ def test_s2m_plc(self):
         )
 
 
+class Test_plot(unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        super(Test_plot, self).__init__(*args, **kwargs)
+        self.no, self.el = meshgrid6(
+            np.arange(1, 3), np.arange(-1, 1), np.arange(2, 3.5, 0.5)
+        )
+        self.fc = volface(self.el)[0]
+
+    def test_plotmesh_face(self):
+        patch = plotmesh(self.no, self.fc, "hide", True)
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = [9.0, 8.6803, 9.0, 20.0]
+
+        self.assertEqual(len(facecolors), 20)
+        self.assertEqual(np.round(np.sum(facecolors, axis=0), 4).tolist(), expected_fc)
+
+    def test_plotmesh_elem(self):
+        patch = plotmesh(self.no, self.el, "hide", True)
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = [9.0, 8.6803, 9.0, 20.0]
+
+        self.assertEqual(len(facecolors), 20)
+        self.assertEqual(np.round(np.sum(facecolors, axis=0), 4).tolist(), expected_fc)
+
+    def test_plotmesh_elemlabel(self):
+        patch = plotmesh(
+            self.no,
+            np.hstack((self.el, np.ones(self.el.shape[0], dtype=int).reshape(-1, 1))),
+            "hide",
+            True,
+        )
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = (1, 4)
+
+        self.assertEqual(len(facecolors), 20)
+        self.assertEqual(np.unique(facecolors, axis=0).shape, expected_fc)
+
+    def test_plotmesh_facelabel(self):
+        patch = plotmesh(
+            self.no,
+            np.hstack((self.fc, np.array([1, 2] * 10).reshape(-1, 1))),
+            None,
+            "hide",
+            True,
+        )
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = (2, 4)
+
+        self.assertEqual(len(facecolors), 20)
+        self.assertEqual(np.unique(facecolors, axis=0).shape, expected_fc)
+
+    def test_plotmesh_elemnodeval(self):
+        patch = plotmesh(self.no[:, [0, 1, 2, 0]], self.el, "hide", True)
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = [8.0, 10.4074, 8.0, 20.0]
+
+        self.assertEqual(len(facecolors), 20)
+        self.assertEqual(np.round(np.sum(facecolors, axis=0), 4).tolist(), expected_fc)
+
+    def test_plotmesh_facenodeval(self):
+        patch = plotmesh(self.no[:, [0, 1, 2, 0]], self.fc, "z < 3", "hide", True)
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = [7.0, 8.6728, 7.0, 18.0]
+
+        self.assertEqual(len(facecolors), 18)
+        self.assertEqual(np.round(np.sum(facecolors, axis=0), 4).tolist(), expected_fc)
+
+    def test_plotmesh_selector(self):
+        patch = plotmesh(
+            self.no[:, [0, 1, 2, 0]], self.fc, "(z < 3) & (x < 2)", "hide", True
+        )
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = [4.8877, 5.0, 4.451, 14.0]
+
+        self.assertEqual(len(facecolors), 14)
+        self.assertEqual(np.round(np.sum(facecolors, axis=0), 4).tolist(), expected_fc)
+
+    def test_plotmesh_elemselector(self):
+        patch = plotmesh(self.no, self.fc, "z < 2.5", "hide", True)
+        facecolors = np.array(patch[0].get_fc())
+        expected_fc = [3.9102, 4.0, 2.9608, 10.0]
+
+        self.assertEqual(len(facecolors), 10)
+        self.assertEqual(np.round(np.sum(facecolors, axis=0), 4).tolist(), expected_fc)
+
+
 if __name__ == "__main__":
     unittest.main()