fix: IndexError when removing a plot (close #36)

Author: paulmueller

CHANGELOG

@@ -1,3 +1,5 @@
+2.0.2
+ - fix: IndexError when removing a plot (#36)
 2.0.1
  - fix: correctly distinguish prereleases when checking for new versions
  - enh: allow loading data via drag&drop

shapeout2/gui/main.py

@@ -186,11 +186,11 @@ def adopt_pipeline(self, pipeline_state):
             try:
                 new_ncol, new_nrow = self.pipeline.get_plot_col_row_count(
                     plot_id, pipeline_state)
-            except KeyError:
+                lay = pipeline_state["plots"][plot_index]["layout"]
+            except (KeyError, IndexError):
                 # the plot was removed
                 continue
             else:
-                lay = pipeline_state["plots"][plot_index]["layout"]
                 lay["size x"] += 200*(new_ncol-old_ncol)
                 lay["size y"] += 200*(new_nrow-old_nrow)
         # set the new state of the pipeline

tests/test_gui_plotting.py

@@ -68,3 +68,34 @@ def test_handle_empty_plots_issue_27(qtbot):
     with pytest.warns(pipeline.core.EmptyDatasetWarning):
         # this now only throws a warning
         qtbot.mouseClick(pe, QtCore.Qt.LeftButton)  # activate (raises #27)
+
+
+def test_remove_plots_issue_36(qtbot):
+    """Correctly handle empty plots
+
+    https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2/issues/36
+
+    Traceback (most recent call last):
+      File "/home/paul/repos/ShapeOut2/shapeout2/gui/main.py",
+        line 193, in adopt_pipeline
+        lay = pipeline_state["plots"][plot_index]["layout"]
+    IndexError: list index out of range
+    """
+    mw = ShapeOut2()
+    qtbot.addWidget(mw)
+
+    # add a dataslots
+    path = pathlib.Path(__file__).parent / "data" / "calibration_beads_47.rtdc"
+    mw.add_dataslot(paths=[path, path, path])
+
+    assert len(mw.pipeline.slot_ids) == 3, "we added those"
+    assert len(mw.pipeline.filter_ids) == 1, "automatically added"
+
+    # now create a plot window
+    plot_id = mw.add_plot()
+    # and another one
+    mw.add_plot()
+
+    # remove a plot
+    pw = mw.block_matrix.get_widget(filt_plot_id=plot_id)
+    pw.action_remove()