Skip to content
Snippets Groups Projects
Commit 5255a342 authored by Conor Finn's avatar Conor Finn
Browse files

RE #26846 PEP8 fixes

parent 82462b25
No related branches found
No related tags found
No related merge requests found
...@@ -123,7 +123,8 @@ class CalibrationModel(object): ...@@ -123,7 +123,8 @@ class CalibrationModel(object):
difc_zero_plot.gca().legend(("Peaks Fitted", "DifC/TZero Fitted Straight Line")) difc_zero_plot.gca().legend(("Peaks Fitted", "DifC/TZero Fitted Straight Line"))
difc_zero_plot.gca().set_xlabel("Expected Peaks Centre(dSpacing, A)") 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: try:
return Load(Filename=ceria_run_no, OutputWorkspace="engggui_calibration_sample_ws") return Load(Filename=ceria_run_no, OutputWorkspace="engggui_calibration_sample_ws")
except Exception as e: except Exception as e:
......
...@@ -7,11 +7,10 @@ ...@@ -7,11 +7,10 @@
# pylint: disable=invalid-name # pylint: disable=invalid-name
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
from time import sleep
from mantidqt.utils.asynchronous import AsyncTask from mantidqt.utils.asynchronous import AsyncTask
from mantid.simpleapi import logger from mantid.simpleapi import logger
class CalibrationPresenter(object): class CalibrationPresenter(object):
def __init__(self, model, view): def __init__(self, model, view):
self.model = model self.model = model
......
...@@ -14,6 +14,14 @@ Name = "Engineering_Diffraction" ...@@ -14,6 +14,14 @@ Name = "Engineering_Diffraction"
if 'engineering_diffraction' in globals(): if 'engineering_diffraction' in globals():
eng_diff = globals()['engineering_diffraction'] 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: else:
eng_diff = EngineeringDiffractionGui() eng_diff = EngineeringDiffractionGui()
eng_diff.show() eng_diff.show()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment