Skip to content

Commit

Permalink
SpectrumROI: remove unneed pos argument
Browse files Browse the repository at this point in the history 
Co-authored-by: JackEAllen <jack.allen@stfc.ac.uk>
Co-authored-by: Mike Sullivan <michael.sullivan@stfc.ac.uk>
  • Loading branch information
@samtygier-stfc @JackEAllen @MikeSullivan7
3 people committed Jun 6, 2024
1 parent d69e4a5 commit c4ce799
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 49 deletions.
2 changes: 1 addition & 1 deletion mantidimaging/gui/windows/spectrum_viewer/spectrum_widget.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def add_roi(self, roi: SensibleROI, name: str) -> None:
@param roi: The ROI to add.
@param name: The name of the ROI.
"""
roi_object = SpectrumROI(name, roi, pos=(0, 0), rotatable=False, scaleSnap=True, translateSnap=True)
roi_object = SpectrumROI(name, roi, rotatable=False, scaleSnap=True, translateSnap=True)
roi_object.colour = self.colour_generator()
roi_object.sig_colour_change.connect(lambda name, color: self.roiColorChangeRequested.emit(name, color))

Expand Down
56 changes: 8 additions & 48 deletions mantidimaging/gui/windows/spectrum_viewer/test/spectrum_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,7 @@ def test_WHEN_colour_generator_called_THEN_different_colours_returned(self):
self.assertEqual(len(colour_list), len({tuple(c) for c in colour_list}))

def test_WHEN_change_roi_colour_called_THEN_roi_colour_changed(self):
spectrum_roi = SpectrumROI("roi",
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI("roi", self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict["roi"] = spectrum_roi
self.spectrum_widget.spectrum_data_dict["roi"] = np.array([0, 0, 0, 0])
roi_colour = self.spectrum_widget.roi_dict["roi"].pen.color().getRgb()
Expand All @@ -73,25 +68,15 @@ def test_WHEN_change_roi_colour_called_THEN_roi_colour_changed(self):

@parameterized.expand([("Visible", "visible_roi", 1), ("Invisible", "invisible_roi", 0)])
def test_WHEN_set_roi_visibility_flags_called_THEN_roi_Visibility_flags_toggled(self, _, name, alpha):
spectrum_roi = SpectrumROI(name,
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI(name, self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict[name] = spectrum_roi
self.spectrum_widget.spectrum_data_dict[name] = np.array([0, 0, 0, 0])
self.spectrum_widget.set_roi_visibility_flags(name, alpha)
self.assertEqual(bool(alpha), self.spectrum_widget.roi_dict[name].isVisible())

@parameterized.expand([("Visible", "visible_roi", 1), ("Invisible", "invisible_roi", 0)])
def test_WHEN_set_roi_alpha_called_THEN_roi_alpha_updated(self, _, name, alpha):
spectrum_roi = SpectrumROI(name,
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI(name, self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict[name] = spectrum_roi
self.spectrum_widget.spectrum_data_dict[name] = np.array([0, 0, 0, 0])
self.spectrum_widget.set_roi_alpha(name, alpha)
Expand All @@ -100,12 +85,7 @@ def test_WHEN_set_roi_alpha_called_THEN_roi_alpha_updated(self, _, name, alpha):

@parameterized.expand([("Visible", "visible_roi", 1), ("Invisible", "invisible_roi", 0)])
def test_WHEN_set_roi_alpha_called_THEN_set_roi_visibility_flags_called(self, _, name, alpha):
spectrum_roi = SpectrumROI(name,
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI(name, self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict[name] = spectrum_roi
self.spectrum_widget.spectrum_data_dict[name] = np.array([0, 0, 0, 0])
with mock.patch.object(SpectrumWidget, "set_roi_visibility_flags") as mock_set_roi_visibility_flags:
Expand All @@ -120,12 +100,7 @@ def test_WHEN_add_range_called_THEN_region_and_label_set_correctly(self, _, rang
f"ToF range: {range_min:.3f} - {range_max:.3f}")

def test_WHEN_get_roi_called_THEN_SensibleROI_returned(self):
spectrum_roi = SpectrumROI("roi",
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI("roi", self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict["roi"] = spectrum_roi
roi = self.spectrum_widget.get_roi("roi")
self.assertIsInstance(type(roi), type(SensibleROI))
Expand All @@ -136,12 +111,7 @@ def test_WHEN_get_roi_called_with_invalid_roi_name_THEN_raise_key_error(self):
self.spectrum_widget.get_roi("invalid_roi")

def test_WHEN_remove_roi_called_THEN_roi_removed_from_roi_dict(self):
spectrum_roi = SpectrumROI("roi_1",
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI("roi_1", self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict["roi_1"] = spectrum_roi
self.assertIn("roi_1", self.spectrum_widget.roi_dict)
self.spectrum_widget.remove_roi("roi_1")
Expand All @@ -153,12 +123,7 @@ def test_WHEN_set_tof_range_called_THEN_range_control_set_correctly(self):
self.assertEqual(self.spectrum_plot_widget._tof_range_label.text, "ToF range: 0.000 - 100.000")

def test_WHEN_rename_roi_called_THEN_roi_renamed(self):
spectrum_roi = SpectrumROI("roi_1",
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI("roi_1", self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict["roi_1"] = spectrum_roi
self.spectrum_widget.spectrum_data_dict["roi_1"] = np.array([0, 0, 0, 0])
self.assertIn("roi_1", self.spectrum_widget.roi_dict.keys())
Expand All @@ -167,12 +132,7 @@ def test_WHEN_rename_roi_called_THEN_roi_renamed(self):
self.assertIn("roi_2", self.spectrum_widget.roi_dict)

def test_WHEN_rename_roi_called_with_default_roi_THEN_roi_name_not_changed(self):
spectrum_roi = SpectrumROI("roi_1",
self.sensible_roi,
pos=(0, 0),
rotatable=False,
scaleSnap=True,
translateSnap=True)
spectrum_roi = SpectrumROI("roi_1", self.sensible_roi, rotatable=False, scaleSnap=True, translateSnap=True)
self.spectrum_widget.roi_dict["roi"] = spectrum_roi
self.spectrum_widget.roi_dict["roi_1"] = spectrum_roi
self.spectrum_widget.spectrum_data_dict["roi_1"] = np.array([0, 0, 0, 0])
Expand Down

0 comments on commit c4ce799

Please sign in to comment.