From d917656e1ff8ef99efe8a8c695fce958b56e891e Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Mon, 20 Jan 2020 09:56:04 +0000
Subject: [PATCH] RE #26849 Improve formatting
---
.../tabs/calibration/model.py | 3 ++-
.../tabs/calibration/presenter.py | 15 ++++++++-------
.../tabs/common/cropping/cropping_presenter.py | 8 ++++----
.../cropping/test/test_cropping_presenter.py | 1 +
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
index e71bb1811dd..fd3ee96f23b 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
@@ -295,7 +295,8 @@ class CalibrationModel(object):
kwargs["bank_names"] = ["North"]
def generate_output_file(difc_list, tzero_list, bank_name, kwargs_to_pass):
- file_path = calibration_dir + self._generate_output_file_name(vanadium_path, sample_path, instrument, bank=bank_name)
+ file_path = calibration_dir + self._generate_output_file_name(vanadium_path, sample_path, instrument,
+ bank=bank_name)
write_ENGINX_GSAS_iparam_file(file_path, difc_list, tzero_list, **kwargs_to_pass)
if not path.exists(calibration_dir):
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
index 259773cb485..7e81c200e4b 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
@@ -75,13 +75,14 @@ class CalibrationPresenter(object):
:param bank: Optional parameter to crop by bank.
:param spectrum_numbers: Optional parameter to crop by spectrum number.
"""
- self.worker = AsyncTask(self.model.create_new_calibration, (vanadium_path, sample_path), {
- "plot_output": plot_output,
- "instrument": self.instrument,
- "rb_num": rb_num,
- "bank": bank,
- "spectrum_numbers": spectrum_numbers
- },
+ self.worker = AsyncTask(self.model.create_new_calibration, (vanadium_path, sample_path),
+ {
+ "plot_output": plot_output,
+ "instrument": self.instrument,
+ "rb_num": rb_num,
+ "bank": bank,
+ "spectrum_numbers": spectrum_numbers
+ },
error_cb=self._on_error,
success_cb=self._on_success)
self.pending_calibration.set_calibration(vanadium_path, sample_path, self.instrument)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
index a34a7813060..7481cd49326 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/cropping_presenter.py
@@ -26,12 +26,12 @@ class CroppingPresenter(object):
# Signal Activated Functions
- def on_combo_changed(self, index_or_string_i_dunno): # TODO: Does this signal send and index or text?
- if index_or_string_i_dunno == 0:
+ def on_combo_changed(self, index):
+ if index == 0:
self.bank = 1
self.custom_spectra_enabled = False
self.set_custom_visibility(False)
- elif index_or_string_i_dunno == 1:
+ elif index == 1:
self.bank = 2
self.custom_spectra_enabled = False
self.set_custom_visibility(False)
@@ -64,7 +64,7 @@ class CroppingPresenter(object):
def set_custom_visibility(self, visible):
if visible:
- self.custom_valid = False
+ self.on_spectra_changed(self.view.get_custom_spectra_text())
self.view.set_custom_spectra_entry_visible()
else:
self.custom_valid = True # Make custom valid if not used, makes validation easier.
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
index f62e8b17375..84cb6f592b2 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/cropping/test/test_cropping_presenter.py
@@ -36,6 +36,7 @@ class CroppingPresenterTest(unittest.TestCase):
self.view.set_custom_spectra_entry_hidden.assert_called_with()
def test_combo_changed_index_custom(self):
+ self.model.validate_and_clean_spectrum_numbers.return_value = ("", "1400")
self.presenter.on_combo_changed(2)
self.assertEqual(self.presenter.bank, 0)
--
GitLab