summaryrefslogtreecommitdiffstats
path: root/src/SirtAlgorithm.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-08-14 11:45:34 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-08-14 11:45:34 +0200
commitd9261bdb05cd0863a2c3747c812871dbb851646e (patch)
treed1a81110e3fe213747a58f236e021a085417f663 /src/SirtAlgorithm.cpp
parent9a58b7451179ed512f975bc4c90fb71f172250b9 (diff)
downloadastra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.gz
astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.bz2
astra-d9261bdb05cd0863a2c3747c812871dbb851646e.tar.xz
astra-d9261bdb05cd0863a2c3747c812871dbb851646e.zip
Replace signal-based abort handling by query-based handling
The abort handling is currently only used to process Ctrl-C from Matlab. Since Matlab R2019a, it appears that calling utIsInterruptPending() from a thread other than the main thread will crash. The previous approach of checking utIsInterruptPending() in a thread, and then signalling the running algorithm was therefore broken.
Diffstat (limited to 'src/SirtAlgorithm.cpp')
-rw-r--r--src/SirtAlgorithm.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/SirtAlgorithm.cpp b/src/SirtAlgorithm.cpp
index 3ea0a24..f08e8b2 100644
--- a/src/SirtAlgorithm.cpp
+++ b/src/SirtAlgorithm.cpp
@@ -199,8 +199,6 @@ void CSirtAlgorithm::run(int _iNrIterations)
// check initialized
ASTRA_ASSERT(m_bIsInitialized);
- m_bShouldAbort = false;
-
int iIteration = 0;
// data projectors
@@ -290,7 +288,7 @@ void CSirtAlgorithm::run(int _iNrIterations)
// iteration loop
- for (; iIteration < _iNrIterations && !m_bShouldAbort; ++iIteration) {
+ for (; iIteration < _iNrIterations && !shouldAbort(); ++iIteration) {
// forward projection and difference calculation
pForwardProjector->project();