ENH: implement ability to close just one figure

Author: tacaswell

mpl_gui/__init__.py

@@ -232,20 +232,27 @@ def close_all(self):
         passing it to `show`.
 
         """
-        for fig in self.figures:
-            if fig.canvas.manager is not None:
-                fig.canvas.manager.destroy()
+        for fig in list(self.figures):
+            self.close(fig)
+
+    def close(self, val):
+        if val == "all":
+            return self.close_all()
+        # or do we want to close _all_ of the figures with a given label / number?
+        if isinstance(val, str):
+            fig = self.by_label[val]
+        elif isinstance(val, int):
+            fig = self.by_number[val]
+        else:
+            fig = val
+        if fig.canvas.manager is not None:
+            fig.canvas.manager.destroy()
             # disconnect figure from canvas
             fig.canvas.figure = None
             # disconnect canvas from figure
             _FigureCanvasBase(figure=fig)
-        self.figures.clear()
-
-    def close(self, val):
-        if val != "all":
-            # TODO close figures 1 at a time
-            raise RuntimeError("can only close them all")
-        self.close_all()
+        if fig in self.figures:
+            self.figures.remove(fig)
 
 
 class FigureContext(FigureRegistry):

mpl_gui/tests/test_examples.py

@@ -140,3 +140,29 @@ def test_change_labels():
     for j, f in enumerate(fr.by_label.values()):
         f.set_label(f"aardvark {j}")
     assert list(fr.by_label) == [f"aardvark {j}" for j in range(5)]
+
+
+def test_close_one_at_a_time():
+    fr = mg.FigureRegistry(block=False)
+    fig1 = fr.figure(label='a')
+    fig2 = fr.figure(label='b')
+    fig3 = fr.figure(label='c')
+    fr.figure(label='d')
+    assert len(fr.figures) == 4
+
+    fr.close(fig1)
+    assert len(fr.figures) == 3
+    assert fig1 not in fr.figures
+
+    fr.close(fig2.get_label())
+    assert len(fr.figures) == 2
+    assert fig2 not in fr.figures
+
+    fr.show()
+
+    fr.close(fig3.canvas.manager.num)
+    assert len(fr.figures) == 1
+    assert fig3 not in fr.figures
+
+    fr.close('all')
+    assert len(fr.figures) == 0