diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py index 0f1312da95ea8a0f048cd37bd0678b1150516f36..f4beef96820b3e2eb85fca6c458a35d978ba6915 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_model.py @@ -14,7 +14,7 @@ class FittingDataModel(object): def __init__(self): self._loaded_workspaces = {} # Map stores using {WorkspaceName: Workspace} - def load_files(self, filenames_string: str): + def load_files(self, filenames_string): filenames = [name.strip() for name in filenames_string.split(",")] for filename in filenames: ws_name = self._generate_workspace_name(filename) @@ -26,7 +26,7 @@ class FittingDataModel(object): format(filename, e)) def get_loaded_workspaces(self): - # TODO: Remove debug line in next PR, when output is visible in the GUI. + # TODO: Remove debug line in next PR, when output is visible in the GUI. logger.debug("EngDiff2 Tracked Workspaces: {}".format(self._loaded_workspaces.keys())) return self._loaded_workspaces diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py index af9cb6e7635048c2d9bf29dd3021083ff4d157a6..e80f6b0ebbb11568d8d553af74d4ef15cadaa725 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_presenter.py @@ -43,7 +43,7 @@ class FittingDataPresenter(object): def get_loaded_workspaces(self): return self.model.get_loaded_workspaces() - def _start_load_worker(self, filenames: str): + def _start_load_worker(self, filenames): """ Load one to many files into mantid that are tracked by the interface. :param filenames: Comma separated list of filenames to load @@ -58,7 +58,7 @@ class FittingDataPresenter(object): logger.error("Error occurred when loading files.") self._emit_enable_button_signal() - def _enable_load_button(self, enabled: bool): + def _enable_load_button(self, enabled): self.view.set_load_button_enabled(enabled) def _emit_enable_button_signal(self): @@ -73,11 +73,11 @@ class FittingDataPresenter(object): def _files_are_valid(self): return self.view.get_filenames_valid() - def _validate(self) -> bool: + def _validate(self): if self._is_searching(): create_error_message(self.view, "Mantid is searching for files. Please wait.") return False elif not self._files_are_valid(): create_error_message(self.view, "Entered files are not valid.") return False - return True \ No newline at end of file + return True diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py index b50758a4d3db1079fe518124a1478c8de64e29fc..89073ffea2095a1bd7ed6b3e98c9ae24acd991b0 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/data_widget.py @@ -38,4 +38,4 @@ class FittingDataWidget(object): self.presenter.clear_workspaces() def replace_workspace(self, name, workspace): - self.presenter.replace_workspace(name, workspace) \ No newline at end of file + self.presenter.replace_workspace(name, workspace) diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py index 0d2e1be40bff65d1faabfd0afc6d232733dd324f..946ce7125876b59797a882428f099a91147d905f 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/fitting/data_handling/test/test_data_presenter.py @@ -69,6 +69,5 @@ class FittingDataPresenterTest(unittest.TestCase): self.view.sig_enable_load_button.emit.called_with(True) - if __name__ == '__main__': unittest.main()