GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1097:5b22e1d6dd6f

correction of merge

perrinel -

r1097:5b22e1d6dd6f

parent child

Context file:

r1097:5b22e1d6dd6f

core/include/Catalogue/CatalogueController.h created 644 +51 0

@@ -0,0 +1,51
	1	#ifndef SCIQLOP_CATALOGUECONTROLLER_H
	2	#define SCIQLOP_CATALOGUECONTROLLER_H
	3
	4	#include "CoreGlobal.h"
	5
	6	#include <Data/SqpRange.h>
	7
	8	#include <QLoggingCategory>
	9	#include <QObject>
	10	#include <QUuid>
	11
	12	#include <Common/spimpl.h>
	13
	14	Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueController)
	15
	16	class DataSourceItem;
	17	class Variable;
	18
	19	/**
	20	* @brief The CatalogueController class aims to make the link between SciQlop and its plugins.
	21	* This is the intermediate class that SciQlop has to use in the way to connect a data source.
	22	* Please first use register method to initialize a plugin specified by its metadata name (JSON note trabillard Thu, 07 Dec 2017 09:21:12 Comment #2731 Edit Delete `\|` I don't think the catalogue has any connection with the plugins.
	23	* plugin source) then others specifics method will be able to access it. You can load a data source
	24	* driver plugin then create a data source.
	25	*/
	26	class SCIQLOP_CORE_EXPORT CatalogueController : public QObject {
	27	Q_OBJECT
	28	public:
	29	explicit CatalogueController(QObject *parent = 0);
	30	virtual ~CatalogueController();
	31
	32	signals:
	33	/// Signal emitted when a variable is about to be deleted from SciQlop
	34	void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
	35
	36	/// Signal emitted when a data acquisition is requested on a range for a variable
	37	void rangeChanged(std::shared_ptr<Variable> variable, const SqpRange &range);
	38
	39	public slots:
	40	/// Manage init/end of the controller
	41	void initialize();
	42	void finalize();
	43
	44	private:
	45	void waitForFinish();
	46
	47	class CatalogueControllerPrivate;
	48	spimpl::unique_impl_ptr<CatalogueControllerPrivate> impl;
	49	};
	50
	51	#endif // SCIQLOP_CATALOGUECONTROLLER_H

core/src/Catalogue/CatalogueController.cpp created 644 +52 0

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

gui/src/SqpApplication.cpp +15 0

             #include "SqpApplication.h"
+            #include <Catalogue/CatalogueController.h>
             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
             #include <DragAndDrop/DragDropHelper.h>
                           m_NetworkController{std::make_unique<NetworkController>()},
                           m_VisualizationController{std::make_unique<VisualizationController>()},
                           m_DragDropHelper{std::make_unique<DragDropHelper>()},
+                          m_CatalogueController{std::make_unique<CatalogueController>()},
                           m_PlotInterractionMode(SqpApplication::PlotsInteractionMode::None),
                           m_PlotCursorMode(SqpApplication::PlotsCursorMode::NoCursor)
                 {
                     m_VariableControllerThread.setObjectName("VariableControllerThread");
                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
                     m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
+                    m_CatalogueController->moveToThread(&m_CatalogueControllerThread);
+                    m_CatalogueControllerThread.setObjectName("CatalogueControllerThread");
                     // Additionnal init
                     m_VisualizationControllerThread.quit();
                     m_VisualizationControllerThread.wait();
+                    m_CatalogueControllerThread.quit();
+                    m_CatalogueControllerThread.wait();
                 }
                 std::unique_ptr<DataSourceController> m_DataSourceController;
                 std::unique_ptr<TimeController> m_TimeController;
                 std::unique_ptr<NetworkController> m_NetworkController;
                 std::unique_ptr<VisualizationController> m_VisualizationController;
+                std::unique_ptr<CatalogueController> m_CatalogueController;
                 QThread m_DataSourceControllerThread;
                 QThread m_NetworkControllerThread;
                 QThread m_VariableControllerThread;
                 QThread m_VisualizationControllerThread;
+                QThread m_CatalogueControllerThread;
                 std::unique_ptr<DragDropHelper> m_DragDropHelper;
                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
+                connect(&impl->m_CatalogueControllerThread, &QThread::started,
+                        impl->m_CatalogueController.get(), &CatalogueController::initialize);
+                connect(&impl->m_CatalogueControllerThread, &QThread::finished,
+                        impl->m_CatalogueController.get(), &CatalogueController::finalize);
                 impl->m_DataSourceControllerThread.start();
                 impl->m_NetworkControllerThread.start();
                 impl->m_VariableControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
+                impl->m_CatalogueControllerThread.start();
             }
             SqpApplication::~SqpApplication()

General Comments 3

perrinel

|

Auto status change to "Under Review"

trabillard

|

Status change > Approved

Write
Preview

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

	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