From 33ed9d891fe61d17f671ed65925f7d98d4656261 Mon Sep 17 00:00:00 2001 From: Rebecca Breu Date: Fri, 14 May 2021 21:36:46 +0200 Subject: [PATCH] Rename add_delayed_items -> add_queued_items --- beeref/scene.py | 4 ++-- beeref/view.py | 6 +++--- tests/test_scene.py | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/beeref/scene.py b/beeref/scene.py index 731101a..479bfe1 100644 --- a/beeref/scene.py +++ b/beeref/scene.py @@ -340,11 +340,11 @@ class BeeGraphicsScene(QtWidgets.QGraphicsScene): self.itemsBoundingRect(selection_only=True)) def add_item_later(self, item, selected=False): - """Keep an item for adding later via ``add_delayed_items``""" + """Keep an item for adding later via ``add_queued_items``""" self.items_to_add.put((item, selected)) - def add_delayed_items(self): + def add_queued_items(self): """Adds items added via ``add_items_later``""" while not self.items_to_add.empty(): diff --git a/beeref/view.py b/beeref/view.py index 6d2b1e7..5991082 100644 --- a/beeref/view.py +++ b/beeref/view.py @@ -255,7 +255,7 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin): def on_items_loaded(self, value): logger.debug('On items loded: add queued images') - self.scene.add_delayed_items() + self.scene.add_queued_items() def on_loading_finished(self, filename, errors): if filename: @@ -267,7 +267,7 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin): ('

Problem loading file %s

' '

Not accessible or not a proper bee file

') % filename) else: - self.scene.add_delayed_items() + self.scene.add_queued_items() self.on_action_fit_scene() def open_from_file(self, filename): @@ -362,7 +362,7 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin): self, 'Problem loading images', msg + errornames) - self.scene.add_delayed_items() + self.scene.add_queued_items() self.scene.arrange_optimal() self.undo_stack.endMacro() diff --git a/tests/test_scene.py b/tests/test_scene.py index cddbf59..4926d16 100644 --- a/tests/test_scene.py +++ b/tests/test_scene.py @@ -806,25 +806,25 @@ class BeeGraphicsSceneTestCase(BeeTestCase): self.scene.on_change(None) self.scene.multi_select_item.fit_selection_area.assert_not_called() - def test_add_delayed_items_unselected(self): + def test_add_queued_items_unselected(self): item = BeePixmapItem(QtGui.QImage()) item.setZValue(0.33) self.scene.add_item_later(item, selected=False) - self.scene.add_delayed_items() + self.scene.add_queued_items() assert self.scene.items() == [item] assert item.isSelected() is False assert self.scene.max_z == 0.33 - def test_add_delayed_items_selected(self): + def test_add_queued_items_selected(self): self.scene.max_z = 0.6 item = BeePixmapItem(QtGui.QImage()) item.setZValue(0.33) self.scene.add_item_later(item, selected=True) - self.scene.add_delayed_items() + self.scene.add_queued_items() assert self.scene.items() == [item] assert item.isSelected() is True assert item.zValue() > 0.6 - def test_add_delayed_items_when_no_items(self): - self.scene.add_delayed_items() + def test_add_queued_items_when_no_items(self): + self.scene.add_queued_items() assert self.scene.items() == []