Skip to content

Commit aaba460

Browse files
committed
Rename ROI editor object for clarity and update unit tests to remove unnecessary parameters
1 parent 52eee88 commit aaba460

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

datalab/gui/roieditor.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def __init__(
289289
edit=True,
290290
size=size,
291291
)
292-
self.setObjectName(f"{obj.PREFIX}_roi_dialog")
292+
self.setObjectName(f"{obj.PREFIX}_roi_editor")
293293
self.accepted.connect(self.dialog_accepted)
294294

295295
# Create the ROI items
@@ -352,10 +352,13 @@ def setup_items(self) -> None:
352352
"""Setup items"""
353353
self.main_item.set_selectable(False)
354354
self.main_item.set_readonly(True)
355-
self.get_plot().add_item(self.main_item)
355+
plot = self.get_plot()
356+
plot.add_item(self.main_item)
357+
plot.set_active_item(self.main_item)
358+
self.main_item.unselect()
356359
for roi_item in self.roi_items:
357-
self.get_plot().add_item(roi_item)
358-
self.get_plot().set_active_item(roi_item)
360+
plot.add_item(roi_item)
361+
plot.set_active_item(roi_item)
359362

360363
@abc.abstractmethod
361364
def get_obj_roi_class(self) -> type[TypeROI]:

datalab/tests/features/common/roieditor_unit_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_signal_roi_editor(screenshots: bool = False) -> None:
3131
roi_editor = cls(parent=None, obj=obj, mode="extract", size=(800, 600))
3232
if screenshots:
3333
roi_editor.show()
34-
qth.grab_save_window(roi_editor, "s_roi_editor")
34+
qth.grab_save_window(roi_editor)
3535
exec_dialog(roi_editor)
3636

3737

@@ -63,7 +63,7 @@ def test_image_roi_editor(screenshots: bool = False) -> None:
6363
roi_editor.remove_all_rois()
6464
if screenshots and mode == "extract":
6565
roi_editor.show()
66-
qth.grab_save_window(roi_editor, "i_roi_editor")
66+
qth.grab_save_window(roi_editor)
6767
if exec_dialog(roi_editor):
6868
results = roi_editor.get_roieditor_results()
6969
if results is not None:

doc/images/shots/i_roi_editor.png

1.42 KB
Loading

doc/images/shots/s_roi_editor.png

103 Bytes
Loading

0 commit comments

Comments
 (0)