From 82462b25c695b20a09ccbc5f1720d445ee07a447 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Thu, 3 Oct 2019 17:20:00 +0100
Subject: [PATCH] RE #26846 Fixed instrument issue with MantidPlot
---
.../gui/engineering_diffraction/engineering_diffraction.py | 2 +-
.../engineering_diffraction/tabs/calibration/presenter.py | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
index 6b38972c87c..5d22268cef1 100644
--- a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
+++ b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
@@ -50,7 +50,7 @@ class EngineeringDiffractionGui(QtWidgets.QMainWindow, Ui_main_window):
self.lineEdit_RBNumber.textChanged.connect(slot)
def set_on_instrument_changed(self, slot):
- self.comboBox_instrument.currentTextChanged.connect(slot)
+ self.comboBox_instrument.currentIndexChanged.connect(slot)
def open_help_window(self):
InterfaceManager().showCustomInterfaceHelp(self.doc)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
index 5515a5f5c5d..113ba2e580a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
@@ -46,6 +46,12 @@ class CalibrationPresenter(object):
self.disable_calibrate_buttons()
def set_instrument_override(self, instrument):
+ if instrument == 0:
+ instrument = "ENGINX"
+ elif instrument == 1:
+ instrument = "IMAT"
+ else:
+ raise ValueError("Invalid instrument index")
self.view.set_instrument_override(instrument)
self.instrument = instrument
--
GitLab