From 8a8436dfc1ed38e22a562556f1d27aa749bac36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Thu, 9 Jul 2020 13:02:04 +0200 Subject: [PATCH] added gui_error method to SweepWorker --- .gitignore | 1 + NanoVNASaver/SweepWorker.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f65c89a..00ea0ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /venv/ +/env/ .idea .vscode /build/ diff --git a/NanoVNASaver/SweepWorker.py b/NanoVNASaver/SweepWorker.py index a45db89..42143dd 100644 --- a/NanoVNASaver/SweepWorker.py +++ b/NanoVNASaver/SweepWorker.py @@ -134,12 +134,9 @@ class SweepWorker(QtCore.QRunnable): int(self.app.sweepCountInput.text()) ) except ValueError: - self.error_message = ( + self.gui_error( "Unable to parse frequency inputs" " - check start and stop fields.") - self.stopped = True - self.running = False - self.signals.sweepError.emit() return if self.averaging: @@ -380,3 +377,10 @@ class SweepWorker(QtCore.QRunnable): def setVNA(self, vna): self.vna = vna + + + def gui_error(self, message: str): + self.error_message = message + self.stopped = True + self.running = False + self.signals.sweepError.emit()