HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Files · src/Variable/Variable.cpp

Removed forgotten files form previous impl of VC, fixed wrong submodules...

Removed forgotten files form previous impl of VC, fixed wrong submodules init (was always erasing changes :( ) Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

jeandet - - Load All Authors

File last commit:

r29:ab4890d233e8


                r31:dec007be0b03

Download file

             Variable.cpp
        
                    214 lines
            
             | 6.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / Variable / Variable.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        jeandet
    
Some refactoring on Variable class...

              r15
            
      #include <optional>

      #include <QMutex>

      #include <QReadWriteLock>

      #include <QThread>

        jeandet
    
First init from SciQLop Core module...

              r0
            
      #include "Variable/Variable.h"

      #include <Data/IDataSeries.h>

      #include <Data/DateTimeRange.h>

        jeandet
    
Basic serial variable creation and update...

              r2
            
      #include <Common/debug.h>

        jeandet
    
First init from SciQLop Core module...

              r0
            
      Q_LOGGING_CATEGORY(LOG_Variable, "Variable")

      /**

       * Searches in metadata for a value that can be converted to DataSeriesType

       * @param metadata the metadata where to search

       * @return the value converted to a DataSeriesType if it was found, UNKNOWN type otherwise

       * @sa DataSeriesType

       */

        jeandet
    
Made Variable data update atomic ease thread safety and avoid mixing...

              r16
            
      static DataSeriesType findDataSeriesType(const QVariantHash &metadata)

        jeandet
    
First init from SciQLop Core module...

              r0
            
      {

          auto dataSeriesType = DataSeriesType::UNKNOWN;

          // Go through the metadata and stop at the first value that could be converted to DataSeriesType

          for (auto it = metadata.cbegin(), end = metadata.cend();

               it != end && dataSeriesType == DataSeriesType::UNKNOWN; ++it) {

              dataSeriesType = DataSeriesTypeUtils::fromString(it.value().toString());

          }

          return dataSeriesType;

      }

        jeandet
    
Some refactoring on Variable class...

              r15
            
      #define VP_PROPERTY(property,getter,setter,type) \

          type getter() noexcept\

          {\

              QReadLocker lock{&m_Lock};\

              return property;\

          }\

          void setter(const type& getter) noexcept\

          {\

              QWriteLocker lock{&m_Lock};\

              property = getter;\

          }\

          type property;\

      #define V_FW_GETTER_SETTER(getter,setter, type)\

          type Variable::getter() const noexcept \

          {\

              return impl->getter();\

          }\

          void Variable::setter(const type& getter) noexcept \

          {\

              impl->setter(getter);\

        jeandet
    
Removed useless function in Variable class...

              r29
            
              emit updated();\

        jeandet
    
Some refactoring on Variable class...

              r15
            
          }\

        jeandet
    
First init from SciQLop Core module...

              r0
            
      struct Variable::VariablePrivate {

          explicit VariablePrivate(const QString &name, const QVariantHash &metadata)

                  : m_Name{name},

                    m_Range{INVALID_RANGE},

                    m_CacheRange{INVALID_RANGE},

                    m_Metadata{metadata},

                    m_DataSeries{nullptr},

                    m_RealRange{INVALID_RANGE},

                    m_NbPoints{0},

                    m_Type{findDataSeriesType(m_Metadata)}

          {

          }

          VariablePrivate(const VariablePrivate &other)

                  : m_Name{other.m_Name},

                    m_Range{other.m_Range},

                    m_CacheRange{other.m_CacheRange},

                    m_Metadata{other.m_Metadata},

                    m_DataSeries{other.m_DataSeries != nullptr ? other.m_DataSeries->clone() : nullptr},

                    m_RealRange{other.m_RealRange},

                    m_NbPoints{other.m_NbPoints},

                    m_Type{findDataSeriesType(m_Metadata)}

          {

          }

          void lockRead() { m_Lock.lockForRead(); }

          void lockWrite() { m_Lock.lockForWrite(); }

          void unlock() { m_Lock.unlock(); }

          void purgeDataSeries()

          {

              if (m_DataSeries) {

                  m_DataSeries->purge(m_CacheRange.m_TStart, m_CacheRange.m_TEnd);

              }

              updateRealRange();

              updateNbPoints();

          }

        jeandet
    
Made Variable data update atomic ease thread safety and avoid mixing...

              r16
            
          void mergeDataSeries(const std::vector<IDataSeries*>& dataseries)

          {

              QWriteLocker lock{&m_Lock};

              for(auto ds:dataseries)

              {

                  if(m_DataSeries)

                      m_DataSeries->merge(ds);

                  else

                      m_DataSeries = ds->clone();

              }

          }

        jeandet
    
First init from SciQLop Core module...

              r0
            
          void updateNbPoints() { m_NbPoints = m_DataSeries ? m_DataSeries->nbPoints() : 0; }

          /// Updates real range according to current variable range and data series

          void updateRealRange()

          {

              if (m_DataSeries) {

        jeandet
    
Made Variable data update atomic ease thread safety and avoid mixing...

              r16
            
                  auto lock = m_DataSeries->getReadLock();

        jeandet
    
First init from SciQLop Core module...

              r0
            
                  auto end = m_DataSeries->cend();

                  auto minXAxisIt = m_DataSeries->minXAxisData(m_Range.m_TStart);

                  auto maxXAxisIt = m_DataSeries->maxXAxisData(m_Range.m_TEnd);

        jeandet
    
Made Variable data update atomic ease thread safety and avoid mixing...

              r16
            
                  if(minXAxisIt != end && maxXAxisIt != end && minXAxisIt->x() <= maxXAxisIt->x())

                      m_RealRange = DateTimeRange{minXAxisIt->x(), maxXAxisIt->x()};

                  else

                      m_RealRange = std::nullopt;

        jeandet
    
First init from SciQLop Core module...

              r0
            
              }

              else {

        jeandet
    
Some refactoring on Variable class...

              r15
            
                  m_RealRange = std::nullopt;

        jeandet
    
First init from SciQLop Core module...

              r0
            
              }

          }

        jeandet
    
Some refactoring on Variable class...

              r15
            
          VP_PROPERTY(m_Name, name, setName, QString)

          VP_PROPERTY(m_Range, range, setRange, DateTimeRange)

          VP_PROPERTY(m_CacheRange, cacheRange, setCacheRange, DateTimeRange)

          VP_PROPERTY(m_Metadata, metadata, setMetadata, QVariantHash)

          VP_PROPERTY(m_DataSeries, dataSeries, setDataSeries, std::shared_ptr<IDataSeries>)

          VP_PROPERTY(m_RealRange, realRange, setRealRange, std::optional<DateTimeRange>)

        jeandet
    
VariableController2 tests refactoring...

              r3
            
          unsigned int m_NbPoints;

        jeandet
    
Some refactoring on Variable class...

              r15
            
          VP_PROPERTY(m_Type, type, setType, DataSeriesType)

        jeandet
    
First init from SciQLop Core module...

              r0
            
          QReadWriteLock m_Lock;

      };

      Variable::Variable(const QString &name, const QVariantHash &metadata)

        jeandet
    
Basic serial variable creation and update...

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

                _uuid{QUuid::createUuid()}

        jeandet
    
First init from SciQLop Core module...

              r0
            
      {

      }

      Variable::Variable(const Variable &other)

        jeandet
    
Basic serial variable creation and update...

              r2
            
              : impl{spimpl::make_unique_impl<VariablePrivate>(*other.impl)},

                _uuid{QUuid::createUuid()} //is a clone but must have a != uuid

        jeandet
    
First init from SciQLop Core module...

              r0
            
      {

      }

      std::shared_ptr<Variable> Variable::clone() const

      {

          return std::make_shared<Variable>(*this);

      }

        jeandet
    
Some refactoring on Variable class...

              r15
            
      V_FW_GETTER_SETTER(name,setName,QString)

        jeandet
    
First init from SciQLop Core module...

              r0
            
      DateTimeRange Variable::range() const noexcept

      {

        jeandet
    
Some refactoring on Variable class...

              r15
            
          return impl->range();

        jeandet
    
First init from SciQLop Core module...

              r0
            
      }

        jeandet
    
Many fixes plus implemented var synchronization...

              r9
            
      void Variable::setRange(const DateTimeRange &range, bool notify) noexcept

        jeandet
    
First init from SciQLop Core module...

              r0
            
      {

        jeandet
    
Some refactoring on Variable class...

              r15
            
          impl->setRange(range);

        jeandet
    
First init from SciQLop Core module...

              r0
            
          impl->updateRealRange();

        jeandet
    
Many fixes plus implemented var synchronization...

              r9
            
          if(notify)

              emit this->updated();

        jeandet
    
First init from SciQLop Core module...

              r0
            
      }

        jeandet
    
Some refactoring on Variable class...

              r15
            
      V_FW_GETTER_SETTER(cacheRange, setCacheRange, DateTimeRange)

        jeandet
    
First init from SciQLop Core module...

              r0
            
        jeandet
    
VariableController2 tests refactoring...

              r3
            
      unsigned int Variable::nbPoints() const noexcept

        jeandet
    
First init from SciQLop Core module...

              r0
            
      {

          return impl->m_NbPoints;

      }

        jeandet
    
Some refactoring on Variable class...

              r15
            
      std::optional<DateTimeRange> Variable::realRange() const noexcept

        jeandet
    
First init from SciQLop Core module...

              r0
            
      {

        jeandet
    
Some refactoring on Variable class...

              r15
            
          return impl->realRange();

        jeandet
    
First init from SciQLop Core module...

              r0
            
      }

        jeandet
    
Made Variable data update atomic ease thread safety and avoid mixing...

              r16
            
      void Variable::updateData(const std::vector<IDataSeries *> &dataSeries, const DateTimeRange &newRange, const DateTimeRange &newCacheRange, bool notify)

        jeandet
    
Basic serial variable creation and update...

              r2
            
      {

        jeandet
    
Made Variable data update atomic ease thread safety and avoid mixing...

              r16
            
          {

              QWriteLocker lock{&m_lock};

              impl->mergeDataSeries(dataSeries);

              impl->setRange(newRange);

              impl->setCacheRange(newCacheRange);

              impl->purgeDataSeries();

        jeandet
    
Basic serial variable creation and update...

              r2
            
          }

        jeandet
    
Many fixes plus implemented var synchronization...

              r9
            
          if(notify)

        jeandet
    
Made Variable data update atomic ease thread safety and avoid mixing...

              r16
            
              emit updated();

        jeandet
    
Basic serial variable creation and update...

              r2
            
      }

        jeandet
    
First init from SciQLop Core module...

              r0
            
      std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept

      {

        jeandet
    
Some refactoring on Variable class...

              r15
            
          return impl->dataSeries();

        jeandet
    
First init from SciQLop Core module...

              r0
            
      }

      DataSeriesType Variable::type() const noexcept

      {

        jeandet
    
Some refactoring on Variable class...

              r15
            
          return impl->type();

        jeandet
    
First init from SciQLop Core module...

              r0
            
      }

      QVariantHash Variable::metadata() const noexcept

      {

          impl->lockRead();

          auto metadata = impl->m_Metadata;

          impl->unlock();

          return metadata;

      }

	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

jeandet Some refactoring on Variable class...	r15	#include <optional>
		#include <QMutex>
		#include <QReadWriteLock>
		#include <QThread>

jeandet First init from SciQLop Core module...	r0	#include "Variable/Variable.h"

		#include <Data/IDataSeries.h>
		#include <Data/DateTimeRange.h>

jeandet Basic serial variable creation and update...	r2	#include <Common/debug.h>
jeandet First init from SciQLop Core module...	r0
		Q_LOGGING_CATEGORY(LOG_Variable, "Variable")


		/**
		* Searches in metadata for a value that can be converted to DataSeriesType
		* @param metadata the metadata where to search
		* @return the value converted to a DataSeriesType if it was found, UNKNOWN type otherwise
		* @sa DataSeriesType
		*/
jeandet Made Variable data update atomic ease thread safety and avoid mixing...	r16	static DataSeriesType findDataSeriesType(const QVariantHash &metadata)
jeandet First init from SciQLop Core module...	r0	{
		auto dataSeriesType = DataSeriesType::UNKNOWN;

		// Go through the metadata and stop at the first value that could be converted to DataSeriesType
		for (auto it = metadata.cbegin(), end = metadata.cend();
		it != end && dataSeriesType == DataSeriesType::UNKNOWN; ++it) {
		dataSeriesType = DataSeriesTypeUtils::fromString(it.value().toString());
		}

		return dataSeriesType;
		}


jeandet Some refactoring on Variable class...	r15	#define VP_PROPERTY(property,getter,setter,type) \
		type getter() noexcept\
		{\
		QReadLocker lock{&m_Lock};\
		return property;\
		}\
		void setter(const type& getter) noexcept\
		{\
		QWriteLocker lock{&m_Lock};\
		property = getter;\
		}\
		type property;\

		#define V_FW_GETTER_SETTER(getter,setter, type)\
		type Variable::getter() const noexcept \
		{\
		return impl->getter();\
		}\
		void Variable::setter(const type& getter) noexcept \
		{\
		impl->setter(getter);\
jeandet Removed useless function in Variable class...	r29	emit updated();\
jeandet Some refactoring on Variable class...	r15	}\

jeandet First init from SciQLop Core module...	r0	struct Variable::VariablePrivate {
		explicit VariablePrivate(const QString &name, const QVariantHash &metadata)
		: m_Name{name},
		m_Range{INVALID_RANGE},
		m_CacheRange{INVALID_RANGE},
		m_Metadata{metadata},
		m_DataSeries{nullptr},
		m_RealRange{INVALID_RANGE},
		m_NbPoints{0},
		m_Type{findDataSeriesType(m_Metadata)}
		{
		}

		VariablePrivate(const VariablePrivate &other)
		: m_Name{other.m_Name},
		m_Range{other.m_Range},
		m_CacheRange{other.m_CacheRange},
		m_Metadata{other.m_Metadata},
		m_DataSeries{other.m_DataSeries != nullptr ? other.m_DataSeries->clone() : nullptr},
		m_RealRange{other.m_RealRange},
		m_NbPoints{other.m_NbPoints},
		m_Type{findDataSeriesType(m_Metadata)}
		{
		}

		void lockRead() { m_Lock.lockForRead(); }
		void lockWrite() { m_Lock.lockForWrite(); }
		void unlock() { m_Lock.unlock(); }

		void purgeDataSeries()
		{
		if (m_DataSeries) {
		m_DataSeries->purge(m_CacheRange.m_TStart, m_CacheRange.m_TEnd);
		}
		updateRealRange();
		updateNbPoints();
		}
jeandet Made Variable data update atomic ease thread safety and avoid mixing...	r16	void mergeDataSeries(const std::vector<IDataSeries*>& dataseries)
		{
		QWriteLocker lock{&m_Lock};
		for(auto ds:dataseries)
		{
		if(m_DataSeries)
		m_DataSeries->merge(ds);
		else
		m_DataSeries = ds->clone();
		}
		}
jeandet First init from SciQLop Core module...	r0	void updateNbPoints() { m_NbPoints = m_DataSeries ? m_DataSeries->nbPoints() : 0; }

		/// Updates real range according to current variable range and data series
		void updateRealRange()
		{
		if (m_DataSeries) {
jeandet Made Variable data update atomic ease thread safety and avoid mixing...	r16	auto lock = m_DataSeries->getReadLock();
jeandet First init from SciQLop Core module...	r0	auto end = m_DataSeries->cend();
		auto minXAxisIt = m_DataSeries->minXAxisData(m_Range.m_TStart);
		auto maxXAxisIt = m_DataSeries->maxXAxisData(m_Range.m_TEnd);
jeandet Made Variable data update atomic ease thread safety and avoid mixing...	r16	if(minXAxisIt != end && maxXAxisIt != end && minXAxisIt->x() <= maxXAxisIt->x())
		m_RealRange = DateTimeRange{minXAxisIt->x(), maxXAxisIt->x()};
		else
		m_RealRange = std::nullopt;
jeandet First init from SciQLop Core module...	r0	}
		else {
jeandet Some refactoring on Variable class...	r15	m_RealRange = std::nullopt;
jeandet First init from SciQLop Core module...	r0	}
		}

jeandet Some refactoring on Variable class...	r15	VP_PROPERTY(m_Name, name, setName, QString)
		VP_PROPERTY(m_Range, range, setRange, DateTimeRange)
		VP_PROPERTY(m_CacheRange, cacheRange, setCacheRange, DateTimeRange)
		VP_PROPERTY(m_Metadata, metadata, setMetadata, QVariantHash)
		VP_PROPERTY(m_DataSeries, dataSeries, setDataSeries, std::shared_ptr<IDataSeries>)
		VP_PROPERTY(m_RealRange, realRange, setRealRange, std::optional<DateTimeRange>)
jeandet VariableController2 tests refactoring...	r3	unsigned int m_NbPoints;
jeandet Some refactoring on Variable class...	r15	VP_PROPERTY(m_Type, type, setType, DataSeriesType)
jeandet First init from SciQLop Core module...	r0	QReadWriteLock m_Lock;
		};

		Variable::Variable(const QString &name, const QVariantHash &metadata)
jeandet Basic serial variable creation and update...	r2	: impl{spimpl::make_unique_impl<VariablePrivate>(name, metadata)},
		_uuid{QUuid::createUuid()}
jeandet First init from SciQLop Core module...	r0	{
		}

		Variable::Variable(const Variable &other)
jeandet Basic serial variable creation and update...	r2	: impl{spimpl::make_unique_impl<VariablePrivate>(*other.impl)},
		_uuid{QUuid::createUuid()} //is a clone but must have a != uuid
jeandet First init from SciQLop Core module...	r0	{
		}

		std::shared_ptr<Variable> Variable::clone() const
		{
		return std::make_shared<Variable>(*this);
		}

jeandet Some refactoring on Variable class...	r15	V_FW_GETTER_SETTER(name,setName,QString)
jeandet First init from SciQLop Core module...	r0
		DateTimeRange Variable::range() const noexcept
		{
jeandet Some refactoring on Variable class...	r15	return impl->range();
jeandet First init from SciQLop Core module...	r0	}

jeandet Many fixes plus implemented var synchronization...	r9	void Variable::setRange(const DateTimeRange &range, bool notify) noexcept
jeandet First init from SciQLop Core module...	r0	{
jeandet Some refactoring on Variable class...	r15	impl->setRange(range);
jeandet First init from SciQLop Core module...	r0	impl->updateRealRange();
jeandet Many fixes plus implemented var synchronization...	r9	if(notify)
		emit this->updated();
jeandet First init from SciQLop Core module...	r0	}

jeandet Some refactoring on Variable class...	r15	V_FW_GETTER_SETTER(cacheRange, setCacheRange, DateTimeRange)
jeandet First init from SciQLop Core module...	r0
jeandet VariableController2 tests refactoring...	r3	unsigned int Variable::nbPoints() const noexcept
jeandet First init from SciQLop Core module...	r0	{
		return impl->m_NbPoints;
		}

jeandet Some refactoring on Variable class...	r15	std::optional<DateTimeRange> Variable::realRange() const noexcept
jeandet First init from SciQLop Core module...	r0	{
jeandet Some refactoring on Variable class...	r15	return impl->realRange();
jeandet First init from SciQLop Core module...	r0	}

jeandet Made Variable data update atomic ease thread safety and avoid mixing...	r16	void Variable::updateData(const std::vector<IDataSeries *> &dataSeries, const DateTimeRange &newRange, const DateTimeRange &newCacheRange, bool notify)
jeandet Basic serial variable creation and update...	r2	{
jeandet Made Variable data update atomic ease thread safety and avoid mixing...	r16	{
		QWriteLocker lock{&m_lock};
		impl->mergeDataSeries(dataSeries);
		impl->setRange(newRange);
		impl->setCacheRange(newCacheRange);
		impl->purgeDataSeries();
jeandet Basic serial variable creation and update...	r2	}
jeandet Many fixes plus implemented var synchronization...	r9	if(notify)
jeandet Made Variable data update atomic ease thread safety and avoid mixing...	r16	emit updated();
jeandet Basic serial variable creation and update...	r2	}

jeandet First init from SciQLop Core module...	r0
		std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept
		{
jeandet Some refactoring on Variable class...	r15	return impl->dataSeries();
jeandet First init from SciQLop Core module...	r0	}

		DataSeriesType Variable::type() const noexcept
		{
jeandet Some refactoring on Variable class...	r15	return impl->type();
jeandet First init from SciQLop Core module...	r0	}

		QVariantHash Variable::metadata() const noexcept
		{
		impl->lockRead();
		auto metadata = impl->m_Metadata;
		impl->unlock();
		return metadata;
		}