From 8f88ab24bfa69ea323cf7dd59dd1bdf0dee06f00 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Wed, 29 Jan 2020 11:04:54 +0000
Subject: [PATCH] RE #27188 Remove unused and simplify cropping view functions
---
.../tabs/calibration/presenter.py | 9 +++------
.../tabs/calibration/test/test_calib_presenter.py | 4 ++--
.../tabs/calibration/view.py | 11 ++++-------
.../engineering_diffraction/tabs/focus/presenter.py | 7 ++-----
.../gui/engineering_diffraction/tabs/focus/view.py | 13 ++-----------
5 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
index 6517bf5b020..ed279520107 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
@@ -36,7 +36,7 @@ class CalibrationPresenter(object):
# Cropping Options
self.cropping_widget = CroppingWidget(self.view, view=self.view.get_cropping_widget())
- self.view.set_cropping_widget_hidden()
+ self.show_cropping(False)
def connect_view_signals(self):
self.view.set_on_calibrate_clicked(self.on_calibrate_clicked)
@@ -169,7 +169,7 @@ class CalibrationPresenter(object):
self.set_calibrate_button_text("Load")
self.view.set_check_plot_output_enabled(False)
self.view.set_check_cropping_enabled(False)
- self.view.set_check_cropping_state(0)
+ self.view.set_check_cropping_checked(False)
def set_calibrate_button_text(self, text):
self.view.set_calibrate_button_text(text)
@@ -179,10 +179,7 @@ class CalibrationPresenter(object):
self.view.find_vanadium_files()
def show_cropping(self, show):
- if show:
- self.view.set_cropping_widget_visible()
- else:
- self.view.set_cropping_widget_hidden()
+ self.view.set_cropping_widget_visibility(show)
# -----------------------
# Observers / Observables
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
index 0590fbb07bc..a3f96bc4f8b 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
@@ -281,9 +281,9 @@ class CalibrationPresenterTest(unittest.TestCase):
def test_cropping_disabled_when_loading_calib(self):
self.presenter.set_load_existing_enabled(True)
- self.assertEqual(self.view.set_cropping_widget_hidden.call_count, 1)
+ self.view.set_cropping_widget_visibility.assert_called_with(False)
self.view.set_check_cropping_enabled.assert_called_with(False)
- self.view.set_check_cropping_state.assert_called_with(0)
+ self.view.set_check_cropping_checked.assert_called_with(False)
def check_calibration_equal(self, a, b):
self.assertEqual(a.get_vanadium(), b.get_vanadium())
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
index 2d564dddfd5..1613fc38953 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/view.py
@@ -93,17 +93,14 @@ class CalibrationView(QtWidgets.QWidget, Ui_calib):
def set_calibrate_button_text(self, text):
self.button_calibrate.setText(text)
- def set_cropping_widget_visible(self):
- self.widget_cropping.show()
-
- def set_cropping_widget_hidden(self):
- self.widget_cropping.hide()
+ def set_cropping_widget_visibility(self, visible):
+ self.widget_cropping.setVisible(visible)
def set_check_cropping_enabled(self, enabled):
self.check_cropCalib.setEnabled(enabled)
- def set_check_cropping_state(self, state):
- self.check_cropCalib.setCheckState(state)
+ def set_check_cropping_checked(self, checked):
+ self.check_cropCalib.setChecked(checked)
# =================
# Component Getters
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
index c28e614d8a8..8a9bad5d4bf 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
@@ -34,7 +34,7 @@ class FocusPresenter(object):
# Cropping Options
self.cropping_widget = CroppingWidget(self.view, view=self.view.get_cropping_widget())
- self.view.set_cropping_widget_hidden()
+ self.show_cropping(False)
def on_focus_clicked(self):
if not self._validate():
@@ -121,10 +121,7 @@ class FocusPresenter(object):
self.current_calibration = calibration
def show_cropping(self, visible):
- if visible:
- self.view.set_cropping_widget_visible()
- else:
- self.view.set_cropping_widget_hidden()
+ self.view.set_cropping_widget_visibility(visible)
# -----------------------
# Observers / Observables
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
index bf136d642a3..e9ee1472555 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/view.py
@@ -49,17 +49,8 @@ class FocusView(QtWidgets.QWidget, Ui_focus):
def set_plot_output_enabled(self, enabled):
self.check_plotOutput.setEnabled(enabled)
- def set_cropping_widget_hidden(self):
- self.widget_cropping.hide()
-
- def set_cropping_widget_visible(self):
- self.widget_cropping.show()
-
- def set_check_cropping_enabled(self, enabled):
- self.check_cropFocus.setEnabled(enabled)
-
- def set_check_cropping_state(self, state):
- self.check_cropFocus.setCheckState(state)
+ def set_cropping_widget_visibility(self, visible):
+ self.widget_cropping.setVisible(visible)
# =================
# Component Getters
--
GitLab