diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py index bc3bc62a21fbcf7a38bcee66804186ebd4478a46..8dcb6918dbfc933034469c66f81b1e4114aa0a38 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py @@ -123,7 +123,8 @@ class CalibrationModel(object): difc_zero_plot.gca().legend(("Peaks Fitted", "DifC/TZero Fitted Straight Line")) difc_zero_plot.gca().set_xlabel("Expected Peaks Centre(dSpacing, A)") - def load_ceria(self, ceria_run_no): + @staticmethod + def load_ceria(ceria_run_no): try: return Load(Filename=ceria_run_no, OutputWorkspace="engggui_calibration_sample_ws") except Exception as e: diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py index 113ba2e580a42de72cab9117e10ffce5757e3fa1..035bbadc8dd14b67394ecec3a3db0ae41a894261 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py @@ -7,11 +7,10 @@ # pylint: disable=invalid-name from __future__ import (absolute_import, division, print_function) -from time import sleep - from mantidqt.utils.asynchronous import AsyncTask from mantid.simpleapi import logger + class CalibrationPresenter(object): def __init__(self, model, view): self.model = model diff --git a/scripts/Engineering_Diffraction_2.py b/scripts/Engineering_Diffraction_2.py index dc44007a3df4d7948748e817a554d3d16936264e..8c387a8759d4c49b9052cafb2c5691552cebb363 100644 --- a/scripts/Engineering_Diffraction_2.py +++ b/scripts/Engineering_Diffraction_2.py @@ -14,6 +14,14 @@ Name = "Engineering_Diffraction" if 'engineering_diffraction' in globals(): eng_diff = globals()['engineering_diffraction'] + if not eng_diff.isHidden(): + eng_diff.setWindowState( + eng_diff.windowState( + ) & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive) + eng_diff.activateWindow() + else: + eng_diff = EngineeringDiffractionGui() + eng_diff.show() else: eng_diff = EngineeringDiffractionGui() eng_diff.show()