From b32ef07cfdcc28fd8a44363576dd9facbc7535ed Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sat, 4 Jul 2020 20:33:12 +0200 Subject: [PATCH] catch KeyboardInterrupt in the direct call case --- slic/core/acquisition/acquisition.py | 5 ++++- slic/core/acquisition/diaacquisition.py | 5 ++++- slic/core/acquisition/sfacquisition.py | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/slic/core/acquisition/acquisition.py b/slic/core/acquisition/acquisition.py index fcf2d0296..3b2a0c931 100644 --- a/slic/core/acquisition/acquisition.py +++ b/slic/core/acquisition/acquisition.py @@ -49,7 +49,10 @@ class Acquisition(BaseAcquisition): self.current_task = task if wait: - task.wait() + try: + task.wait() + except KeyboardInterrupt: + print("Stopped current DAQ task:") return task diff --git a/slic/core/acquisition/diaacquisition.py b/slic/core/acquisition/diaacquisition.py index 3a7385905..4eb63c1de 100644 --- a/slic/core/acquisition/diaacquisition.py +++ b/slic/core/acquisition/diaacquisition.py @@ -72,7 +72,10 @@ class DIAAcquisition(BaseAcquisition): self.current_task = task if wait: - task.wait() + try: + task.wait() + except KeyboardInterrupt: + print("Stopped current DAQ task:") return task diff --git a/slic/core/acquisition/sfacquisition.py b/slic/core/acquisition/sfacquisition.py index 0ba1cc391..b3f1cadf7 100644 --- a/slic/core/acquisition/sfacquisition.py +++ b/slic/core/acquisition/sfacquisition.py @@ -52,7 +52,10 @@ class SFAcquisition(BaseAcquisition): self.current_task = task if wait: - task.wait() + try: + task.wait() + except KeyboardInterrupt: + print("Stopped current DAQ task:") return task