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

Corrects regression on variable destruction

Alexandre Leroux - - Load All Authors

File last commit:

r373:643df4da22dc


                r386:4458a8f811e4

Download file

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

        Alexandre Leroux
    
Changes Variable from struct to class

              r151
            
      #include "Variable/Variable.h"

        Alexandre Leroux
    
Adds data series to a variable

              r152
            
      #include <Data/IDataSeries.h>

        perrinel
    
Variable slot is called when x range of its graph changed

              r210
            
      #include <Data/SqpDateTime.h>

        perrinel
    
Add current progression for thread fix

              r336
            
      #include <QReadWriteLock>

      #include <QThread>

        perrinel
    
Variable slot is called when x range of its graph changed

              r210
            
      Q_LOGGING_CATEGORY(LOG_Variable, "Variable")

        Alexandre Leroux
    
Adds data series to a variable

              r152
            
        Alexandre Leroux
    
Changes Variable from struct to class

              r151
            
      struct Variable::VariablePrivate {

        Alexandre Leroux
    
Adds QVariantHash to store metadata in a variable

              r373
            
          explicit VariablePrivate(const QString &name, const SqpDateTime &dateTime,

                                   const QVariantHash &metadata)

                  : m_Name{name}, m_DateTime{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr}

        Alexandre Leroux
    
Changes Variable from struct to class

              r151
            
          {

          }

          QString m_Name;

        perrinel
    
Variable slot is called when x range of its graph changed

              r210
            
          SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.

        Alexandre Leroux
    
Adds QVariantHash to store metadata in a variable

              r373
            
          QVariantHash m_Metadata;

        Alexandre Leroux
    
Adds data series to a variable

              r152
            
          std::unique_ptr<IDataSeries> m_DataSeries;

        Alexandre Leroux
    
Changes Variable from struct to class

              r151
            
      };

        Alexandre Leroux
    
Adds QVariantHash to store metadata in a variable

              r373
            
      Variable::Variable(const QString &name, const SqpDateTime &dateTime, const QVariantHash &metadata)

              : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}

        Alexandre Leroux
    
Changes Variable from struct to class

              r151
            
      {

      }

      QString Variable::name() const noexcept

      {

          return impl->m_Name;

      }

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
      SqpDateTime Variable::dateTime() const noexcept

      {

          return impl->m_DateTime;

      }

        perrinel
    
Implementation of the new Dela T computation strategy

              r241
            
      void Variable::setDateTime(const SqpDateTime &dateTime) noexcept

      {

          impl->m_DateTime = dateTime;

      }

        Alexandre Leroux
    
Use std::shared_ptr in CosinusProvider

              r287
            
      void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept

        Alexandre Leroux
    
Adds data series to a variable

              r152
            
      {

        perrinel
    
Change info to debug on thread display log

              r339
            
          qCDebug(LOG_Variable()) << "Variable::setDataSeries" << QThread::currentThread()->objectName();

        Alexandre Leroux
    
Use std::shared_ptr in CosinusProvider

              r287
            
          if (!dataSeries) {

              /// @todo ALX : log

              return;

        Alexandre Leroux
    
Adds data series to a variable

              r152
            
          }

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
        Alexandre Leroux
    
Use std::shared_ptr in CosinusProvider

              r287
            
          // Inits the data series of the variable

          if (!impl->m_DataSeries) {

              impl->m_DataSeries = dataSeries->clone();

          }

          else {

        perrinel
    
Add current progression for thread fix

              r336
            
              dataSeries->lockWrite();

              impl->m_DataSeries->lockWrite();

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
              impl->m_DataSeries->merge(dataSeries.get());

        perrinel
    
Add current progression for thread fix

              r336
            
              impl->m_DataSeries->unlock();

              dataSeries->unlock();

        perrinel
    
Fix the cosinus bug....

              r276
            
              emit updated();

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
          }

        Alexandre Leroux
    
Adds data series to a variable

              r152
            
      }

        Alexandre Leroux
    
Handles creations for scalar series

              r169
            
      IDataSeries *Variable::dataSeries() const noexcept

      {

          return impl->m_DataSeries.get();

      }

        perrinel
    
Variable slot is called when x range of its graph changed

              r210
            
        Alexandre Leroux
    
Adds QVariantHash to store metadata in a variable

              r373
            
      QVariantHash Variable::metadata() const noexcept

      {

          return impl->m_Metadata;

      }

        perrinel
    
The cache is now updated only if date requested has been successfully...

              r293
            
      bool Variable::contains(const SqpDateTime &dateTime) const noexcept

        perrinel
    
Variable slot is called when x range of its graph changed

              r210
            
      {

        perrinel
    
Implementation of the new Dela T computation strategy

              r241
            
          return impl->m_DateTime.contains(dateTime);

        perrinel
    
Variable slot is called when x range of its graph changed

              r210
            
      }

        perrinel
    
Add intersect méthode on variable and sqpDateTime...

              r240
            
        perrinel
    
The cache is now updated only if date requested has been successfully...

              r293
            
      bool Variable::intersect(const SqpDateTime &dateTime) const noexcept

        perrinel
    
Add intersect méthode on variable and sqpDateTime...

              r240
            
      {

          return impl->m_DateTime.intersect(dateTime);

      }

        perrinel
    
The cache is now updated only if date requested has been successfully...

              r293
            
      bool Variable::isInside(const SqpDateTime &dateTime) const noexcept

      {

          return dateTime.contains(SqpDateTime{impl->m_DateTime.m_TStart, impl->m_DateTime.m_TEnd});

      }

	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

Alexandre Leroux Changes Variable from struct to class	r151	#include "Variable/Variable.h"

Alexandre Leroux Adds data series to a variable	r152	#include <Data/IDataSeries.h>
perrinel Variable slot is called when x range of its graph changed	r210	#include <Data/SqpDateTime.h>

perrinel Add current progression for thread fix	r336	#include <QReadWriteLock>
		#include <QThread>

perrinel Variable slot is called when x range of its graph changed	r210	Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
Alexandre Leroux Adds data series to a variable	r152
Alexandre Leroux Changes Variable from struct to class	r151	struct Variable::VariablePrivate {
Alexandre Leroux Adds QVariantHash to store metadata in a variable	r373	explicit VariablePrivate(const QString &name, const SqpDateTime &dateTime,
		const QVariantHash &metadata)
		: m_Name{name}, m_DateTime{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr}
Alexandre Leroux Changes Variable from struct to class	r151	{
		}

		QString m_Name;
perrinel Variable slot is called when x range of its graph changed	r210
		SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
Alexandre Leroux Adds QVariantHash to store metadata in a variable	r373	QVariantHash m_Metadata;
Alexandre Leroux Adds data series to a variable	r152	std::unique_ptr<IDataSeries> m_DataSeries;
Alexandre Leroux Changes Variable from struct to class	r151	};

Alexandre Leroux Adds QVariantHash to store metadata in a variable	r373	Variable::Variable(const QString &name, const SqpDateTime &dateTime, const QVariantHash &metadata)
		: impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}
Alexandre Leroux Changes Variable from struct to class	r151	{
		}

		QString Variable::name() const noexcept
		{
		return impl->m_Name;
		}

perrinel The mock plugin can now create data with view operation	r219	SqpDateTime Variable::dateTime() const noexcept
		{
		return impl->m_DateTime;
		}

perrinel Implementation of the new Dela T computation strategy	r241	void Variable::setDateTime(const SqpDateTime &dateTime) noexcept
		{
		impl->m_DateTime = dateTime;
		}

Alexandre Leroux Use std::shared_ptr in CosinusProvider	r287	void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
Alexandre Leroux Adds data series to a variable	r152	{
perrinel Change info to debug on thread display log	r339	qCDebug(LOG_Variable()) << "Variable::setDataSeries" << QThread::currentThread()->objectName();
Alexandre Leroux Use std::shared_ptr in CosinusProvider	r287	if (!dataSeries) {
		/// @todo ALX : log
		return;
Alexandre Leroux Adds data series to a variable	r152	}
perrinel The mock plugin can now create data with view operation	r219
Alexandre Leroux Use std::shared_ptr in CosinusProvider	r287	// Inits the data series of the variable
		if (!impl->m_DataSeries) {
		impl->m_DataSeries = dataSeries->clone();
		}
		else {
perrinel Add current progression for thread fix	r336	dataSeries->lockWrite();
		impl->m_DataSeries->lockWrite();
perrinel The mock plugin can now create data with view operation	r219	impl->m_DataSeries->merge(dataSeries.get());
perrinel Add current progression for thread fix	r336	impl->m_DataSeries->unlock();
		dataSeries->unlock();
perrinel Fix the cosinus bug....	r276	emit updated();
perrinel The mock plugin can now create data with view operation	r219	}
Alexandre Leroux Adds data series to a variable	r152	}
Alexandre Leroux Handles creations for scalar series	r169
		IDataSeries *Variable::dataSeries() const noexcept
		{
		return impl->m_DataSeries.get();
		}
perrinel Variable slot is called when x range of its graph changed	r210
Alexandre Leroux Adds QVariantHash to store metadata in a variable	r373	QVariantHash Variable::metadata() const noexcept
		{
		return impl->m_Metadata;
		}

perrinel The cache is now updated only if date requested has been successfully...	r293	bool Variable::contains(const SqpDateTime &dateTime) const noexcept
perrinel Variable slot is called when x range of its graph changed	r210	{
perrinel Implementation of the new Dela T computation strategy	r241	return impl->m_DateTime.contains(dateTime);
perrinel Variable slot is called when x range of its graph changed	r210	}
perrinel Add intersect méthode on variable and sqpDateTime...	r240
perrinel The cache is now updated only if date requested has been successfully...	r293	bool Variable::intersect(const SqpDateTime &dateTime) const noexcept
perrinel Add intersect méthode on variable and sqpDateTime...	r240	{
		return impl->m_DateTime.intersect(dateTime);
		}
perrinel The cache is now updated only if date requested has been successfully...	r293
		bool Variable::isInside(const SqpDateTime &dateTime) const noexcept
		{
		return dateTime.contains(SqpDateTime{impl->m_DateTime.m_TStart, impl->m_DateTime.m_TEnd});
		}