diff --git a/Demo/Demo.gif b/Demo/Demo.gif new file mode 100644 index 0000000000000000000000000000000000000000..30928dfa9e52e67f7040fcfcad9d1d747e5deaa5 Binary files /dev/null and b/Demo/Demo.gif differ diff --git a/Headers/worker.h b/Headers/worker.h index d1e752d9d5bf9035f1be823aff77d0ac99e3af27..bfad0f99439134139a792a384daaa1d432118fd9 100644 --- a/Headers/worker.h +++ b/Headers/worker.h @@ -1,6 +1,7 @@ #ifndef WORKER_H #define WORKER_H +#include <atomic> #include <QObject> #include <QThread> #include "reconstruction.h" @@ -12,15 +13,18 @@ class Worker : public QThread RecoImage* image; void run() override; ulong localCounts=0; - bool stopped=true; - bool exitted=false; + std::atomic<bool> stopped; + std::atomic<bool> exitted; public: // explicit Worker(QObject *parent = nullptr); Worker(QObject *parent, const Setup* config_, RecoImage* image_) : QThread(parent), config(config_), image(image_) - {} + { + stopped=true; + exitted=false; + } //signals: diff --git a/README.md b/README.md index 223a07613781689785217508cbd4d7c50bef0837..0ac0219130072fd26eb2377b10985472b1244511 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,20 @@ # Simple GUI application for back projection image reconstruction -## Use -- Install [ROOT](https://root.cern/install/) (v6.22 or above), `qmake` and `make`. -- Compile: +## Prerequisites +- Install [ROOT v6](https://root.cern/install/). +- Install qt5 development packages +```bash +sudo apt-get install qt5-default qtdeclarative5-dev +``` + +## Build ```bash mkdir -p build cd build - qmake CONFIG+=realease ../imagerQt.pro + qmake -config release ../imagerQt.pro make ``` -- Run: +## Run ```bash cd .. build/ImagerQt diff --git a/Sources/worker.cpp b/Sources/worker.cpp index 337b8871fe72d97ad47a2e3acc33dcb78ac2d8cf..d70b0280af23f7ceec0c3db9e58455eddc887747 100644 --- a/Sources/worker.cpp +++ b/Sources/worker.cpp @@ -58,6 +58,7 @@ void Worker::handleStop() void Worker::stopExecution() { exitted = true; + qDebug() << "Exiting thread signal received."; } void Worker::handleClear() diff --git a/imagerQt.pro b/imagerQt.pro index 1967a8ef6f91314558b39014845140b73cb6a7a0..cb35a04806f7b56814666fb2ebe11bba3201501a 100644 --- a/imagerQt.pro +++ b/imagerQt.pro @@ -71,6 +71,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin DISTFILES += \ .gitignore \ + Demo/Demo.gif \ README.md RESOURCES += \