HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r111:6ecdf811fc1c

Inits variable controller and adds it to the SciQlop app

Alexandre Leroux -

r111:6ecdf811fc1c

parent child

Context file:

r111:6ecdf811fc1c

Collapse all files

core/include/Variable/VariableController.h created 644 +31 0

@@ -0,0 +1,31
	1	#ifndef SCIQLOP_VARIABLECONTROLLER_H
	2	#define SCIQLOP_VARIABLECONTROLLER_H
	3
	4	#include <QLoggingCategory>
	5	#include <QObject>
	6
	7	#include <Common/spimpl.h>
	8
	9	Q_DECLARE_LOGGING_CATEGORY(LOG_VariableController)
	10
	11	/**
	12	* @brief The VariableController class aims to handle the variables in SciQlop.
	13	*/
	14	class VariableController : public QObject {
	15	Q_OBJECT
	16	public:
	17	explicit VariableController(QObject *parent = 0);
	18	virtual ~VariableController();
	19
	20	public slots:
	21	void initialize();
	22	void finalize();
	23
	24	private:
	25	void waitForFinish();
	26
	27	class VariableControllerPrivate;
	28	spimpl::unique_impl_ptr<VariableControllerPrivate> impl;
	29	};
	30
	31	#endif // SCIQLOP_VARIABLECONTROLLER_H

core/src/Variable/VariableController.cpp created 644 +46 0

@@ -0,0 +1,46
	1	#include <Variable/VariableController.h>
	2
	3	#include <QMutex>
	4	#include <QThread>
	5
	6	Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
	7
	8	struct VariableController::VariableControllerPrivate {
	9	explicit VariableControllerPrivate()
	10	: m_WorkingMutex{}
	11	{
	12	}
	13
	14	QMutex m_WorkingMutex;
	15	};
	16
	17	VariableController::VariableController(QObject *parent)
	18	: QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>()}
	19	{
	20	qCDebug(LOG_VariableController())
	21	<< tr("VariableController construction") << QThread::currentThread();
	22	}
	23
	24	VariableController::~VariableController()
	25	{
	26	qCDebug(LOG_VariableController())
	27	<< tr("VariableController destruction") << QThread::currentThread();
	28	this->waitForFinish();
	29	}
	30
	31	void VariableController::initialize()
	32	{
	33	qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
	34	impl->m_WorkingMutex.lock();
	35	qCDebug(LOG_VariableController()) << tr("VariableController init END");
	36	}
	37
	38	void VariableController::finalize()
	39	{
	40	impl->m_WorkingMutex.unlock();
	41	}
	42
	43	void VariableController::waitForFinish()
	44	{
	45	QMutexLocker locker{&impl->m_WorkingMutex};
	46	}

gui/include/SqpApplication.h +2 0

             #ifndef SCIQLOP_SQPAPPLICATION_H
             #define SCIQLOP_SQPAPPLICATION_H
             #include "SqpApplication.h"
             #include <QApplication>
             #include <QLoggingCategory>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication)
             #if defined(sqpApp)
             #undef sqpApp
             #endif
             #define sqpApp (static_cast<SqpApplication *>(QCoreApplication::instance()))
             class DataSourceController;
+            class VariableController;
             class VisualizationController;
             /**
              * @brief The SqpApplication class aims to make the link between SciQlop
              * and its plugins. This is the intermediate class that SciQlop has to use
              * in the way to connect a data source. Please first use load method to initialize
              * a plugin specified by its metadata name (JSON plugin source) then others specifics
              * method will be able to access it.
              * You can load a data source driver plugin then create a data source.
              */
             class SqpApplication : public QApplication {
                 Q_OBJECT
             public:
                 explicit SqpApplication(int &argc, char **argv);
                 virtual ~SqpApplication();
                 void initialize();
                 /// Accessors for the differents sciqlop controllers
                 DataSourceController &dataSourceController() const noexcept;
+                VariableController &variableController() const noexcept;
                 VisualizationController &visualizationController() const noexcept;
             private:
                 class SqpApplicationPrivate;
                 spimpl::unique_impl_ptr<SqpApplicationPrivate> impl;
             };
             #endif // SCIQLOP_SQPAPPLICATION_H

gui/src/SqpApplication.cpp +19 0

             #include "SqpApplication.h"
             #include <DataSource/DataSourceController.h>
             #include <QThread>
+            #include <Variable/VariableController.h>
             #include <Visualization/VisualizationController.h>
             Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
             class SqpApplication::SqpApplicationPrivate {
             public:
                 SqpApplicationPrivate()
                         : m_DataSourceController{std::make_unique<DataSourceController>()},
+                          m_VariableController{std::make_unique<VariableController>()},
                           m_VisualizationController{std::make_unique<VisualizationController>()}
                 {
                     m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
+                    m_VariableController->moveToThread(&m_VariableControllerThread);
                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
                 }
                 virtual ~SqpApplicationPrivate()
                 {
                     qCInfo(LOG_SqpApplication()) << tr("SqpApplicationPrivate destruction");
                     m_DataSourceControllerThread.quit();
                     m_DataSourceControllerThread.wait();
+                    m_VariableControllerThread.quit();
+                    m_VariableControllerThread.wait();
                     m_VisualizationControllerThread.quit();
                     m_VisualizationControllerThread.wait();
                 }
                 std::unique_ptr<DataSourceController> m_DataSourceController;
+                std::unique_ptr<VariableController> m_VariableController;
                 std::unique_ptr<VisualizationController> m_VisualizationController;
                 QThread m_DataSourceControllerThread;
+                QThread m_VariableControllerThread;
                 QThread m_VisualizationControllerThread;
             };
             SqpApplication::SqpApplication(int &argc, char **argv)
                     : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
             {
                 qCInfo(LOG_SqpApplication()) << tr("SqpApplication construction");
                 connect(&impl->m_DataSourceControllerThread, &QThread::started,
                         impl->m_DataSourceController.get(), &DataSourceController::initialize);
                 connect(&impl->m_DataSourceControllerThread, &QThread::finished,
                         impl->m_DataSourceController.get(), &DataSourceController::finalize);
+                connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(),
+                        &VariableController::initialize);
+                connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(),
+                        &VariableController::finalize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::started,
                         impl->m_VisualizationController.get(), &VisualizationController::initialize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
                 impl->m_DataSourceControllerThread.start();
+                impl->m_VariableControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
             }
             SqpApplication::~SqpApplication()
             {
             }
             void SqpApplication::initialize()
             {
             }
             DataSourceController &SqpApplication::dataSourceController() const noexcept
             {
                 return *impl->m_DataSourceController;
             }
+            VariableController &SqpApplication::variableController() const noexcept
+            {
+                return *impl->m_VariableController;
+            }
             VisualizationController &SqpApplication::visualizationController() const noexcept
             {
                 return *impl->m_VisualizationController;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages