diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-14 11:45:34 +0200 |
| commit | d9261bdb05cd0863a2c3747c812871dbb851646e (patch) | |
| tree | d1a81110e3fe213747a58f236e021a085417f663 /src/SartAlgorithm.cpp | |
| parent | 9a58b7451179ed512f975bc4c90fb71f172250b9 (diff) | |
| download | astra-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/SartAlgorithm.cpp')
| -rw-r--r-- | src/SartAlgorithm.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/SartAlgorithm.cpp b/src/SartAlgorithm.cpp index 94460ba..7a3947d 100644 --- a/src/SartAlgorithm.cpp +++ b/src/SartAlgorithm.cpp @@ -288,8 +288,6 @@ void CSartAlgorithm::run(int _iNrIterations) // check initialized ASTRA_ASSERT(m_bIsInitialized); - m_bShouldAbort = false; - // data projectors CDataProjectorInterface* pFirstForwardProjector; CDataProjectorInterface* pForwardProjector; @@ -334,7 +332,7 @@ void CSartAlgorithm::run(int _iNrIterations) // iteration loop - for (int iIteration = 0; iIteration < _iNrIterations && !m_bShouldAbort; ++iIteration) { + for (int iIteration = 0; iIteration < _iNrIterations && !shouldAbort(); ++iIteration) { int iProjection = m_piProjectionOrder[m_iIterationCount % m_iProjectionCount]; |