From 72005400e557a3c3b3be71f9d0321e7cfa5bb03e Mon Sep 17 00:00:00 2001 From: Grant Date: Sun, 10 Nov 2019 17:20:11 -0800 Subject: [PATCH] Split FaultFinder into Own Object --- CMakeLists.txt | 1 + FaultFinder.cpp | 30 ++++++++---------------------- FaultFinder.hpp | 27 +++++++++++++++++++++++++++ main.cpp | 21 +++++++++++++++++++++ 4 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 FaultFinder.hpp create mode 100644 main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 5917027..9c0f897 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ add_executable( FaultFinder ConfigManager.cpp FaultManager.cpp StreamReader.cpp + main.cpp ${prog_SRCS} ) diff --git a/FaultFinder.cpp b/FaultFinder.cpp index cae37ea..3b70eb8 100644 --- a/FaultFinder.cpp +++ b/FaultFinder.cpp @@ -1,28 +1,14 @@ -#include -#include +#include "FaultFinder.hpp" -#include "StreamManager.hpp" -#include "ImageManager.hpp" -#include "FaultManager.hpp" -#include "ConfigManager.hpp" - -using namespace std; - -void handleClose(int signal) +FaultFinder::FaultFinder(QObject *parent) : QObject(parent) { - qApp->exit(14); + fault_mgr = new FaultManager(parent); + image_mgr = new ImageManager(parent); + config_mgr = new ConfigManager(parent); + stream_mgr = new StreamManager(parent); } -int main(int argc, char **argv) +FaultFinder::~FaultFinder() { - QCoreApplication app(argc, argv); - - signal(SIGINT, &handleClose); - - FaultManager fault_mgr(&app); - ImageManager image_mgr(&app); - ConfigManager config_mgr(&app); - StreamManager stream_mgr(&app); - - return app.exec(); + } \ No newline at end of file diff --git a/FaultFinder.hpp b/FaultFinder.hpp new file mode 100644 index 0000000..25596cb --- /dev/null +++ b/FaultFinder.hpp @@ -0,0 +1,27 @@ +#ifndef FAULT_FINDER_H +#define FAULT_FINDER_H + +#include + +#include "StreamManager.hpp" +#include "ImageManager.hpp" +#include "FaultManager.hpp" +#include "ConfigManager.hpp" + +class FaultFinder : public QObject +{ + Q_OBJECT; + +public: + FaultFinder(QObject *parent); + virtual ~FaultFinder(); + + FaultManager *fault_mgr; + ImageManager *image_mgr; + ConfigManager *config_mgr; + StreamManager *stream_mgr; + + bool test_mode = false; +}; + +#endif \ No newline at end of file diff --git a/main.cpp b/main.cpp new file mode 100644 index 0000000..f3b751e --- /dev/null +++ b/main.cpp @@ -0,0 +1,21 @@ +#include +#include + +#include "FaultFinder.hpp" + +using namespace std; + +void handleClose(int signal) +{ + qApp->exit(14); +} + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + FaultFinder ff(&app); + + signal(SIGINT, &handleClose); + + return app.exec(); +} \ No newline at end of file