From d9261bdb05cd0863a2c3747c812871dbb851646e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 14 Aug 2019 11:45:34 +0200 Subject: 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. --- src/SirtAlgorithm.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/SirtAlgorithm.cpp') 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(); -- cgit v1.2.3