[bug] fix plot hold on bug

Author: fangq

iso2mesh/plot.py

@@ -127,7 +127,7 @@ def plotsurf(node, face, *args, **kwargs):
 
     ax.add_collection3d(patch)
     _autoscale_3d(ax, node)
-    h.append(patch)
+    h.append(ax)
 
     np.random.set_state(rngstate)
     # plt.axis("equal")
@@ -226,7 +226,7 @@ def plottetra(node, elem, *args, **kwargs):
     ax.add_collection3d(patch)
 
     _autoscale_3d(ax, node)
-    h.append(patch)
+    h.append(ax)
 
     # Restore RNG state
     np.random.set_state(rngstate)
@@ -402,7 +402,7 @@ def plotmesh(node, *args, **kwargs):
             return None
         ax.plot(x[idx], y[idx], z[idx], **kwargs)
         _autoscale_3d(ax, node)
-        if "hide" in extraarg and not extraarg["hide"]:
+        if not "hold" in extraarg or not extraarg["hold"] or extraarg["hold"] == "off":
             plt.show(block=False)
         return ax
 
@@ -440,7 +440,7 @@ def plotmesh(node, *args, **kwargs):
         ax = plottetra(node, elem[idx, :], opt, *args, **kwargs)
         handles.append(ax)
 
-    if "hide" in extraarg and not extraarg["hide"]:
+    if not "hold" in extraarg or not extraarg["hold"] or extraarg["hold"] == "off":
         plt.show(block=False)
 
     return handles if len(handles) > 1 else handles[0]

test/run_test.py

@@ -1107,15 +1107,15 @@ def __init__(self, *args, **kwargs):
         self.fc = volface(self.el)[0]
 
     def test_plotmesh_face(self):
-        patch = plotmesh(self.no, self.fc, "hide", True)
+        patch = plotmesh(self.no, self.fc, "hold", True)
         facecolors = np.array(patch[0].get_facecolors())
         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)
+        patch = plotmesh(self.no, self.el, "hold", True)
         facecolors = np.array(patch[0].get_facecolors())
         expected_fc = [9.0, 8.6803, 9.0, 20.0]
 
@@ -1126,7 +1126,7 @@ 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",
+            "hold",
             True,
         )
         facecolors = np.array(patch[0].get_facecolors())
@@ -1140,7 +1140,7 @@ def test_plotmesh_facelabel(self):
             self.no,
             np.hstack((self.fc, np.array([1, 2] * 10).reshape(-1, 1))),
             None,
-            "hide",
+            "hold",
             True,
         )
         facecolors = np.array(patch[0].get_facecolors())
@@ -1150,15 +1150,15 @@ def test_plotmesh_facelabel(self):
         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)
+        patch = plotmesh(self.no[:, [0, 1, 2, 0]], self.el, "hold", True)
         facecolors = np.array(patch[0].get_facecolors())
         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)
+        patch = plotmesh(self.no[:, [0, 1, 2, 0]], self.fc, "z < 3", "hold", True)
         facecolors = np.array(patch[0].get_facecolors())
         expected_fc = [7.0, 8.6728, 7.0, 18.0]
 
@@ -1167,7 +1167,7 @@ def test_plotmesh_facenodeval(self):
 
     def test_plotmesh_selector(self):
         patch = plotmesh(
-            self.no[:, [0, 1, 2, 0]], self.fc, "(z < 3) & (x < 2)", "hide", True
+            self.no[:, [0, 1, 2, 0]], self.fc, "(z < 3) & (x < 2)", "hold", True
         )
         facecolors = np.array(patch[0].get_facecolors())
         expected_fc = [4.8877, 5.0, 4.451, 14.0]
@@ -1176,7 +1176,7 @@ def test_plotmesh_selector(self):
         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)
+        patch = plotmesh(self.no, self.fc, "z < 2.5", "hold", True)
         facecolors = np.array(patch[0].get_facecolors())
         expected_fc = [3.9102, 4.0, 2.9608, 10.0]