diff --git a/scripts/ErrorReporter/error_dialog_app.py b/scripts/ErrorReporter/error_dialog_app.py index 1f051c0a604336f8348f28915dfcee71e03b953f..71b880e4b626aa878e59851727d8465e40382a09 100644 --- a/scripts/ErrorReporter/error_dialog_app.py +++ b/scripts/ErrorReporter/error_dialog_app.py @@ -30,7 +30,7 @@ def main(): return int(command_line_args.exit_code) app = QtGui.QApplication(sys.argv) form = CrashReportPage(show_continue_terminate=False) - ErrorReporterPresenter(form, command_line_args.exit_code) + presenter = ErrorReporterPresenter(form, command_line_args.exit_code) app.exec_() return int(command_line_args.exit_code) diff --git a/scripts/ErrorReporter/error_report_presenter.py b/scripts/ErrorReporter/error_report_presenter.py index a984fb3d6da444b25ddfec62378d5fdbf8270f0b..bc85f2deb8c388bd02343aff19ddc51f372ffad2 100644 --- a/scripts/ErrorReporter/error_report_presenter.py +++ b/scripts/ErrorReporter/error_report_presenter.py @@ -2,24 +2,24 @@ from mantid.kernel import ErrorReporter, UsageService from mantid.kernel import Logger -class ErrorReporterPresenter(): +class ErrorReporterPresenter(object): def __init__(self, view, exit_code): + self.error_log = Logger("error") self._view = view self._exit_code = exit_code - self._view.connect_signal(self.error_handler) + self._view.action.connect(self.error_handler) + print('Connected') self._view.show() - self.error_log = Logger("error") def error_handler(self, continue_working, share, name, email): + print("Recieving signal") if share == 0: errorReporter = ErrorReporter( - "mantidplot",UsageService.getUpTime(), UsageService.isEnabled(), self._exit_code, - True, str(name), str(email)) + "mantidplot", UsageService.getUpTime(), self._exit_code, True, str(name), str(email)) errorReporter.sendErrorReport() elif share == 1: errorReporter = ErrorReporter( - "mantidplot",UsageService.getUpTime(), UsageService.isEnabled(), self._exit_code, - False, str(name), str(email)) + "mantidplot", UsageService.getUpTime(), self._exit_code, False, str(name), str(email)) errorReporter.sendErrorReport() if not continue_working: diff --git a/scripts/ErrorReporter/errorreport.py b/scripts/ErrorReporter/errorreport.py index ea38f3f0ab284571914cda3434b62caec8b7fa0c..60a876896420cd9cb3565519841ae9f0e987d02f 100644 --- a/scripts/ErrorReporter/errorreport.py +++ b/scripts/ErrorReporter/errorreport.py @@ -39,9 +39,6 @@ class CrashReportPage(QtGui.QWidget, ui_errorreport.Ui_Errorreport): def quit (self): self.quit_signal.emit() - def connect_signal(self, slot): - self.action.connect(slot) - def fullShare(self): self.action.emit(self.continue_working, 0, self.input_name, self.input_email) self.close()