GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Files · core/src/Variable/VariableController.cpp

Use std::shared_ptr in CosinusProvider

Alexandre Leroux - - Load All Authors

File last commit:

r287:9a5cb57f1573


                r287:9a5cb57f1573

Download file

             VariableController.cpp
        
                    175 lines
            
             | 5.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / core / src / Variable / VariableController.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
      #include <Variable/Variable.h>

        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
      #include <Variable/VariableCacheController.h>

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      #include <Variable/VariableController.h>

        Alexandre Leroux
    
Adds Variable model in the Variable controller

              r108
            
      #include <Variable/VariableModel.h>

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
      #include <Data/DataProviderParameters.h>

      #include <Data/IDataProvider.h>

      #include <Data/IDataSeries.h>

        perrinel
    
Time widget is now used with the variable createion request

              r179
            
      #include <Time/TimeController.h>

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
      #include <QDateTime>

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      #include <QMutex>

      #include <QThread>

        perrinel
    
Temporal parameters of the selected variables can be updated using the...

              r281
            
      #include <QtCore/QItemSelectionModel>

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
      #include <unordered_map>

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
      namespace {

      /// @todo Generates default dataseries, according to the provider passed in parameter. This method

      /// will be deleted when the timerange is recovered from SciQlop

        Alexandre Leroux
    
Use std::shared_ptr in CosinusProvider

              r287
            
      std::shared_ptr<IDataSeries> generateDefaultDataSeries(const IDataProvider &provider,

        perrinel
    
Time widget is now used with the variable createion request

              r179
            
                                                             const SqpDateTime &dateTime) noexcept

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
      {

        perrinel
    
Time widget is now used with the variable createion request

              r179
            
          auto parameters = DataProviderParameters{dateTime};

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
          return provider.retrieveData(parameters);

      }

      } // namespace

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      struct VariableController::VariableControllerPrivate {

        Alexandre Leroux
    
Use raw pointer for VariableModel (QObject class)

              r148
            
          explicit VariableControllerPrivate(VariableController *parent)

        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
                  : m_WorkingMutex{},

                    m_VariableModel{new VariableModel{parent}},

        perrinel
    
Temporal parameters of the selected variables can be updated using the...

              r281
            
                    m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},

        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
                    m_VariableCacheController{std::make_unique<VariableCacheController>()}

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
          {

          }

          QMutex m_WorkingMutex;

        Alexandre Leroux
    
Use raw pointer for VariableModel (QObject class)

              r148
            
          /// Variable model. The VariableController has the ownership

          VariableModel *m_VariableModel;

        perrinel
    
Temporal parameters of the selected variables can be updated using the...

              r281
            
          QItemSelectionModel *m_VariableSelectionModel;

        perrinel
    
Time widget is now used with the variable createion request

              r179
            
        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
        perrinel
    
Correction MR

              r181
            
          TimeController *m_TimeController{nullptr};

        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
          std::unique_ptr<VariableCacheController> m_VariableCacheController;

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
          std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >

              m_VariableToProviderMap;

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      };

      VariableController::VariableController(QObject *parent)

        Alexandre Leroux
    
Use raw pointer for VariableModel (QObject class)

              r148
            
              : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      {

        perrinel
    
Add the TimeWidget

              r126
            
          qCDebug(LOG_VariableController()) << tr("VariableController construction")

                                            << QThread::currentThread();

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      }

      VariableController::~VariableController()

      {

        perrinel
    
Add the TimeWidget

              r126
            
          qCDebug(LOG_VariableController()) << tr("VariableController destruction")

                                            << QThread::currentThread();

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
          this->waitForFinish();

      }

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
      VariableModel *VariableController::variableModel() noexcept

        Alexandre Leroux
    
Adds Variable model in the Variable controller

              r108
            
      {

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
          return impl->m_VariableModel;

        Alexandre Leroux
    
Adds Variable model in the Variable controller

              r108
            
      }

        perrinel
    
Temporal parameters of the selected variables can be updated using the...

              r281
            
      QItemSelectionModel *VariableController::variableSelectionModel() noexcept

      {

          return impl->m_VariableSelectionModel;

      }

        perrinel
    
Time widget is now used with the variable createion request

              r179
            
      void VariableController::setTimeController(TimeController *timeController) noexcept

      {

          impl->m_TimeController = timeController;

      }

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
      void VariableController::createVariable(const QString &name,

                                              std::shared_ptr<IDataProvider> provider) noexcept

        Alexandre Leroux
    
Affects model to the Variable Widget

              r143
            
      {

        perrinel
    
Time widget is now used with the variable createion request

              r179
            
          if (!impl->m_TimeController) {

              qCCritical(LOG_VariableController())

                  << tr("Impossible to create variable: The time controller is null");

              return;

          }

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
          /// @todo : for the moment :

          /// - the provider is only used to retrieve data from the variable for its initialization, but

          /// it will be retained later

          /// - default data are generated for the variable, without taking into account the timerange set

          /// in sciqlop

        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
          auto dateTime = impl->m_TimeController->dateTime();

        perrinel
    
Time widget is now used with the variable createion request

              r179
            
          if (auto newVariable = impl->m_VariableModel->createVariable(

        perrinel
    
A variable is now created with its dateTime too....

              r212
            
                  name, dateTime, generateDefaultDataSeries(*provider, dateTime))) {

        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
        perrinel
    
The mock plugin can now create data with view operation

              r219
            
              // store the provider

              impl->m_VariableToProviderMap[newVariable] = provider;

              connect(provider.get(), &IDataProvider::dataProvided, newVariable.get(),

        Alexandre Leroux
    
Use std::shared_ptr in CosinusProvider

              r287
            
                      &Variable::setDataSeries);

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
        perrinel
    
Create a variable notify the variable cache parameter

              r209
            
              // store in cache

              impl->m_VariableCacheController->addDateTime(newVariable, dateTime);

              // notify the creation

        Alexandre Leroux
    
Updates VariableController::createVariable() method...

              r154
            
              emit variableCreated(newVariable);

          }

        Alexandre Leroux
    
Affects model to the Variable Widget

              r143
            
      }

        perrinel
    
Temporal parameters of the selected variables can be updated using the...

              r281
            
      void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime)

      {

          auto selectedRows = impl->m_VariableSelectionModel->selectedRows();

          for (const auto &selectedRow : qAsConst(selectedRows)) {

              if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {

                  selectedVariable->setDateTime(dateTime);

        perrinel
    
The data of the variable is now requested with the new provided...

              r282
            
                  this->onRequestDataLoading(selectedVariable, dateTime);

        perrinel
    
Temporal parameters of the selected variables can be updated using the...

              r281
            
              }

          }

      }

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
        perrinel
    
Fix the cosinus bug....

              r276
            
      void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,

                                                    const SqpDateTime &dateTime)

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
      {

          // we want to load data of the variable for the dateTime.

          // First we check if the cache contains some of them.

          // For the other, we ask the provider to give them.

          if (variable) {

              auto dateTimeListNotInCache

                  = impl->m_VariableCacheController->provideNotInCacheDateTimeList(variable, dateTime);

        perrinel
    
Fix the cosinus bug....

              r276
            
              if (!dateTimeListNotInCache.empty()) {

                  // Ask the provider for each data on the dateTimeListNotInCache

                  impl->m_VariableToProviderMap.at(variable)->requestDataLoading(

                      std::move(dateTimeListNotInCache));

                  // store in cache

                  impl->m_VariableCacheController->addDateTime(variable, dateTime);

              }

              else {

                  emit variable->updated();

              }

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
          }

          else {

              qCCritical(LOG_VariableController()) << tr("Impossible to load data of a variable null");

          }

      }

        Alexandre Leroux
    
Inits variable controller and adds it to the SciQlop app

              r106
            
      void VariableController::initialize()

      {

          qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();

          impl->m_WorkingMutex.lock();

          qCDebug(LOG_VariableController()) << tr("VariableController init END");

      }

      void VariableController::finalize()

      {

          impl->m_WorkingMutex.unlock();

      }

      void VariableController::waitForFinish()

      {

          QMutexLocker locker{&impl->m_WorkingMutex};

      }

	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

perrinel The mock plugin can now create data with view operation	r219	#include <Variable/Variable.h>
perrinel Create a variable notify the variable cache parameter	r209	#include <Variable/VariableCacheController.h>
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	#include <Variable/VariableController.h>
Alexandre Leroux Adds Variable model in the Variable controller	r108	#include <Variable/VariableModel.h>
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106
Alexandre Leroux Updates VariableController::createVariable() method...	r154	#include <Data/DataProviderParameters.h>
		#include <Data/IDataProvider.h>
		#include <Data/IDataSeries.h>
perrinel Time widget is now used with the variable createion request	r179	#include <Time/TimeController.h>
Alexandre Leroux Updates VariableController::createVariable() method...	r154
		#include <QDateTime>
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	#include <QMutex>
		#include <QThread>
perrinel Temporal parameters of the selected variables can be updated using the...	r281	#include <QtCore/QItemSelectionModel>
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106
perrinel Create a variable notify the variable cache parameter	r209	#include <unordered_map>

Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")

Alexandre Leroux Updates VariableController::createVariable() method...	r154	namespace {

		/// @todo Generates default dataseries, according to the provider passed in parameter. This method
		/// will be deleted when the timerange is recovered from SciQlop
Alexandre Leroux Use std::shared_ptr in CosinusProvider	r287	std::shared_ptr<IDataSeries> generateDefaultDataSeries(const IDataProvider &provider,
perrinel Time widget is now used with the variable createion request	r179	const SqpDateTime &dateTime) noexcept
Alexandre Leroux Updates VariableController::createVariable() method...	r154	{
perrinel Time widget is now used with the variable createion request	r179	auto parameters = DataProviderParameters{dateTime};
Alexandre Leroux Updates VariableController::createVariable() method...	r154
		return provider.retrieveData(parameters);
		}

		} // namespace

Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	struct VariableController::VariableControllerPrivate {
Alexandre Leroux Use raw pointer for VariableModel (QObject class)	r148	explicit VariableControllerPrivate(VariableController *parent)
perrinel Create a variable notify the variable cache parameter	r209	: m_WorkingMutex{},
		m_VariableModel{new VariableModel{parent}},
perrinel Temporal parameters of the selected variables can be updated using the...	r281	m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
perrinel Create a variable notify the variable cache parameter	r209	m_VariableCacheController{std::make_unique<VariableCacheController>()}
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	{
		}

		QMutex m_WorkingMutex;
Alexandre Leroux Use raw pointer for VariableModel (QObject class)	r148	/// Variable model. The VariableController has the ownership
		VariableModel *m_VariableModel;
perrinel Temporal parameters of the selected variables can be updated using the...	r281	QItemSelectionModel *m_VariableSelectionModel;
perrinel Time widget is now used with the variable createion request	r179
perrinel Create a variable notify the variable cache parameter	r209
perrinel Correction MR	r181	TimeController *m_TimeController{nullptr};
perrinel Create a variable notify the variable cache parameter	r209	std::unique_ptr<VariableCacheController> m_VariableCacheController;
perrinel The mock plugin can now create data with view operation	r219
		std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
		m_VariableToProviderMap;
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	};

		VariableController::VariableController(QObject *parent)
Alexandre Leroux Use raw pointer for VariableModel (QObject class)	r148	: QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	{
perrinel Add the TimeWidget	r126	qCDebug(LOG_VariableController()) << tr("VariableController construction")
		<< QThread::currentThread();
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	}

		VariableController::~VariableController()
		{
perrinel Add the TimeWidget	r126	qCDebug(LOG_VariableController()) << tr("VariableController destruction")
		<< QThread::currentThread();
Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	this->waitForFinish();
		}

Alexandre Leroux Updates VariableController::createVariable() method...	r154	VariableModel *VariableController::variableModel() noexcept
Alexandre Leroux Adds Variable model in the Variable controller	r108	{
Alexandre Leroux Updates VariableController::createVariable() method...	r154	return impl->m_VariableModel;
Alexandre Leroux Adds Variable model in the Variable controller	r108	}

perrinel Temporal parameters of the selected variables can be updated using the...	r281	QItemSelectionModel *VariableController::variableSelectionModel() noexcept
		{
		return impl->m_VariableSelectionModel;
		}

perrinel Time widget is now used with the variable createion request	r179	void VariableController::setTimeController(TimeController *timeController) noexcept
		{
		impl->m_TimeController = timeController;
		}

Alexandre Leroux Updates VariableController::createVariable() method...	r154	void VariableController::createVariable(const QString &name,
		std::shared_ptr<IDataProvider> provider) noexcept
Alexandre Leroux Affects model to the Variable Widget	r143	{
perrinel Time widget is now used with the variable createion request	r179
		if (!impl->m_TimeController) {
		qCCritical(LOG_VariableController())
		<< tr("Impossible to create variable: The time controller is null");
		return;
		}


Alexandre Leroux Updates VariableController::createVariable() method...	r154	/// @todo : for the moment :
		/// - the provider is only used to retrieve data from the variable for its initialization, but
		/// it will be retained later
		/// - default data are generated for the variable, without taking into account the timerange set
		/// in sciqlop
perrinel Create a variable notify the variable cache parameter	r209	auto dateTime = impl->m_TimeController->dateTime();
perrinel Time widget is now used with the variable createion request	r179	if (auto newVariable = impl->m_VariableModel->createVariable(
perrinel A variable is now created with its dateTime too....	r212	name, dateTime, generateDefaultDataSeries(*provider, dateTime))) {
perrinel Create a variable notify the variable cache parameter	r209
perrinel The mock plugin can now create data with view operation	r219	// store the provider
		impl->m_VariableToProviderMap[newVariable] = provider;
		connect(provider.get(), &IDataProvider::dataProvided, newVariable.get(),
Alexandre Leroux Use std::shared_ptr in CosinusProvider	r287	&Variable::setDataSeries);
perrinel The mock plugin can now create data with view operation	r219

perrinel Create a variable notify the variable cache parameter	r209	// store in cache
		impl->m_VariableCacheController->addDateTime(newVariable, dateTime);

		// notify the creation
Alexandre Leroux Updates VariableController::createVariable() method...	r154	emit variableCreated(newVariable);
		}
Alexandre Leroux Affects model to the Variable Widget	r143	}

perrinel Temporal parameters of the selected variables can be updated using the...	r281	void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime)
		{
		auto selectedRows = impl->m_VariableSelectionModel->selectedRows();

		for (const auto &selectedRow : qAsConst(selectedRows)) {
		if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
		selectedVariable->setDateTime(dateTime);
perrinel The data of the variable is now requested with the new provided...	r282	this->onRequestDataLoading(selectedVariable, dateTime);
perrinel Temporal parameters of the selected variables can be updated using the...	r281	}
		}
		}

perrinel The mock plugin can now create data with view operation	r219
perrinel Fix the cosinus bug....	r276	void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,
		const SqpDateTime &dateTime)
perrinel The mock plugin can now create data with view operation	r219	{
		// we want to load data of the variable for the dateTime.
		// First we check if the cache contains some of them.
		// For the other, we ask the provider to give them.
		if (variable) {

		auto dateTimeListNotInCache
		= impl->m_VariableCacheController->provideNotInCacheDateTimeList(variable, dateTime);

perrinel Fix the cosinus bug....	r276	if (!dateTimeListNotInCache.empty()) {
		// Ask the provider for each data on the dateTimeListNotInCache
		impl->m_VariableToProviderMap.at(variable)->requestDataLoading(
		std::move(dateTimeListNotInCache));
		// store in cache
		impl->m_VariableCacheController->addDateTime(variable, dateTime);
		}
		else {
		emit variable->updated();
		}
perrinel The mock plugin can now create data with view operation	r219	}
		else {
		qCCritical(LOG_VariableController()) << tr("Impossible to load data of a variable null");
		}
		}


Alexandre Leroux Inits variable controller and adds it to the SciQlop app	r106	void VariableController::initialize()
		{
		qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
		impl->m_WorkingMutex.lock();
		qCDebug(LOG_VariableController()) << tr("VariableController init END");
		}

		void VariableController::finalize()
		{
		impl->m_WorkingMutex.unlock();
		}

		void VariableController::waitForFinish()
		{
		QMutexLocker locker{&impl->m_WorkingMutex};
		}