HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r339:39fcfe63cb2d

Intialization of network controller

perrinel -

r339:39fcfe63cb2d

parent child

Context file:

r339:39fcfe63cb2d

core/include/Network/NetworkController.h created 644 +30 0

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

core/src/Network/NetworkController.cpp created 644 +33 0

@@ -0,0 +1,33
	1	#include "Network/NetworkController.h"
	2
	3	#include <QMutex>
	4	#include <QThread>
	5
	6	Q_LOGGING_CATEGORY(LOG_NetworkController, "NetworkController")
	7
	8	struct NetworkController::NetworkControllerPrivate {
	9	explicit NetworkControllerPrivate(NetworkController *parent) : m_WorkingMutex{} {}
	10	QMutex m_WorkingMutex;
	11	};
	12
	13	NetworkController::NetworkController(QObject *parent)
	14	: QObject(parent), impl{spimpl::make_unique_impl<NetworkControllerPrivate>(this)}
	15	{
	16	}
	17
	18	void NetworkController::initialize()
	19	{
	20	qCDebug(LOG_NetworkController()) << tr("NetworkController init") << QThread::currentThread();
	21	impl->m_WorkingMutex.lock();
	22	qCDebug(LOG_NetworkController()) << tr("NetworkController init END");
	23	}
	24
	25	void NetworkController::finalize()
	26	{
	27	impl->m_WorkingMutex.unlock();
	28	}
	29
	30	void NetworkController::waitForFinish()
	31	{
	32	QMutexLocker locker{&impl->m_WorkingMutex};
	33	}

core/include/Data/IDataProvider.h 0 -4

             public:
                 virtual ~IDataProvider() noexcept = default;
-                virtual std::shared_ptr<IDataSeries>
-                retrieveData(const DataProviderParameters &parameters) const = 0;
                 virtual void requestDataLoading(const QVector<SqpDateTime> &dateTimeList) = 0;
             signals:

core/src/Variable/VariableController.cpp 0 -14

@@ -17,20 +17,6
17		17
18	Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")	18	Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
19		19
20	namespace {
21
22	/// @todo Generates default dataseries, according to the provider passed in parameter. This method
23	/// will be deleted when the timerange is recovered from SciQlop
24	std::shared_ptr<IDataSeries> generateDefaultDataSeries(const IDataProvider &provider,
25	const SqpDateTime &dateTime) noexcept
26	{
27	auto parameters = DataProviderParameters{dateTime};
28
29	return provider.retrieveData(parameters);
30	}
31
32	} // namespace
33
34	struct VariableController::VariableControllerPrivate {	20	struct VariableController::VariableControllerPrivate {
35	explicit VariableControllerPrivate(VariableController *parent)	21	explicit VariableControllerPrivate(VariableController *parent)
36	: m_WorkingMutex{},	22	: m_WorkingMutex{},

gui/include/SqpApplication.h +2 0

             #define sqpApp (static_cast<SqpApplication *>(QCoreApplication::instance()))
             class DataSourceController;
+            class NetworkController;
             class TimeController;
             class VariableController;
             class VisualizationController;
                 /// Accessors for the differents sciqlop controllers
                 DataSourceController &dataSourceController() noexcept;
+                NetworkController &networkController() noexcept;
                 TimeController &timeController() noexcept;
                 VariableController &variableController() noexcept;
                 VisualizationController &visualizationController() noexcept;

gui/src/SqpApplication.cpp +19 0

             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
+            #include <Network/NetworkController.h>
             #include <QThread>
             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             public:
                 SqpApplicationPrivate()
                         : m_DataSourceController{std::make_unique<DataSourceController>()},
+                          m_NetworkController{std::make_unique<NetworkController>()},
                           m_TimeController{std::make_unique<TimeController>()},
                           m_VariableController{std::make_unique<VariableController>()},
                           m_VisualizationController{std::make_unique<VisualizationController>()}
                             SIGNAL(variableCreated(std::shared_ptr<Variable>)));
                     m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
+                    m_NetworkController->moveToThread(&m_NetworkControllerThread);
                     m_VariableController->moveToThread(&m_VariableControllerThread);
                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
                     m_DataSourceControllerThread.quit();
                     m_DataSourceControllerThread.wait();
+                    m_NetworkControllerThread.quit();
+                    m_NetworkControllerThread.wait();
                     m_VariableControllerThread.quit();
                     m_VariableControllerThread.wait();
                 std::unique_ptr<DataSourceController> m_DataSourceController;
                 std::unique_ptr<VariableController> m_VariableController;
                 std::unique_ptr<TimeController> m_TimeController;
+                std::unique_ptr<NetworkController> m_NetworkController;
                 std::unique_ptr<VisualizationController> m_VisualizationController;
                 QThread m_DataSourceControllerThread;
+                QThread m_NetworkControllerThread;
                 QThread m_VariableControllerThread;
                 QThread m_VisualizationControllerThread;
             };
                 connect(&impl->m_DataSourceControllerThread, &QThread::finished,
                         impl->m_DataSourceController.get(), &DataSourceController::finalize);
+                connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(),
+                        &NetworkController::initialize);
+                connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(),
+                        &NetworkController::finalize);
                 connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(),
                         &VariableController::initialize);
                 connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(),
                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
                 impl->m_DataSourceControllerThread.start();
+                impl->m_NetworkControllerThread.start();
                 impl->m_VariableControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
             }
                 return *impl->m_DataSourceController;
             }
+            NetworkController &SqpApplication::networkController() noexcept
+            {
+                return *impl->m_NetworkController;
+            }
             TimeController &SqpApplication::timeController() noexcept
             {
                 return *impl->m_TimeController;

gui/src/Visualization/VisualizationGraphHelper.cpp +2 -4

             void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
                                   const SqpDateTime &dateTime)
             {
-                QElapsedTimer timer;
-                timer.start();
                 if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
                     // Clean the graph
                     // NAIVE approch
-                    const auto &xData = scalarSeries.xAxisData()->data();
+                    const auto xData = scalarSeries.xAxisData()->data();
-                    const auto &valuesData = scalarSeries.valuesData()->data();
+                    const auto valuesData = scalarSeries.valuesData()->data();
                     const auto count = xData.count();
                     qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache" << xData.count();
                     auto xValue = QVector<double>(count);

plugins/mockplugin/include/CosinusProvider.h +2 -4

              */
             class CosinusProvider : public IDataProvider {
             public:
-                /// @sa IDataProvider::retrieveData()
-                std::shared_ptr<IDataSeries>
-                retrieveData(const DataProviderParameters &parameters) const override;
                 void requestDataLoading(const QVector<SqpDateTime> &dateTimeList) override;
             private:
+                /// @sa IDataProvider::retrieveData()
+                std::shared_ptr<IDataSeries> retrieveData(const DataProviderParameters &parameters) const;
                 std::shared_ptr<IDataSeries> retrieveDataSeries(const SqpDateTime &dateTime);
             };

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