HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Files · gui/src/Visualization/VisualizationGraphHelper.cpp

Updates IDataProvider::requestDataLoading() method's signature...

Updates IDataProvider::requestDataLoading() method's signature The parameters needed for data retrieval are passed to a DataProviderParameters object. For now, it concerns only the list of datetimes to process, but the object will be completed with extra data which may be necessary for certain providers

perrinel - - Load All Authors

File last commit:

r367:df969ff9808a


                r408:49f712bf7e59

Download file

             VisualizationGraphHelper.cpp
        
                    160 lines
            
             | 5.5 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / gui / src / Visualization / VisualizationGraphHelper.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        perrinel
    
Correction for pull request

              r243
            
      #include "Visualization/VisualizationGraphHelper.h"

        Alexandre Leroux
    
Creates factory that is responsible of creation of QCustomPlot components relative to a variable

              r181
            
      #include "Visualization/qcustomplot.h"

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
      #include <Data/ScalarSeries.h>

        Alexandre Leroux
    
Creates factory that is responsible of creation of QCustomPlot components relative to a variable

              r181
            
      #include <Variable/Variable.h>

        perrinel
    
Correction for pull request

              r243
            
      Q_LOGGING_CATEGORY(LOG_VisualizationGraphHelper, "VisualizationGraphHelper")

        Alexandre Leroux
    
Creates factory that is responsible of creation of QCustomPlot components relative to a variable

              r181
            
        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
      namespace {

        perrinel
    
Add current progression for thread fix

              r364
            
      class SqpDataContainer : public QCPGraphDataContainer {

      public:

        perrinel
    
Change info to debug on thread display log

              r367
            
          void appendGraphDataUnsorted(const QCPGraphData &data) { mData.append(data); }

        perrinel
    
Add current progression for thread fix

              r364
            
      };

        Alexandre Leroux
    
Handles axes properties

              r183
            
      /// Format for datetimes on a axis

      const auto DATETIME_TICKER_FORMAT = QStringLiteral("yyyy/MM/dd \nhh:mm:ss");

      /// Generates the appropriate ticker for an axis, depending on whether the axis displays time or

      /// non-time data

      QSharedPointer<QCPAxisTicker> axisTicker(bool isTimeAxis)

      {

          if (isTimeAxis) {

              auto dateTicker = QSharedPointer<QCPAxisTickerDateTime>::create();

              dateTicker->setDateTimeFormat(DATETIME_TICKER_FORMAT);

              return dateTicker;

          }

          else {

              // default ticker

              return QSharedPointer<QCPAxisTicker>::create();

          }

      }

        Alexandre Leroux
    
Handles creations for scalar series

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

              r235
            
      void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,

                            const SqpDateTime &dateTime)

      {

        perrinel
    
Change info to debug on thread display log

              r367
            
          qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"

                                                  << QThread::currentThread()->objectName();

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
          if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {

              // Clean the graph

              // NAIVE approch

        perrinel
    
Add current progression for thread fix

              r364
            
              scalarSeries.lockRead();

              {

                  const auto xData = scalarSeries.xAxisData()->data();

                  const auto valuesData = scalarSeries.valuesData()->data();

                  const auto count = xData.count();

        perrinel
    
Correction clang format

              r365
            
                  qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache"

                                                         << xData.count();

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
        perrinel
    
Add current progression for thread fix

              r364
            
                  auto dataContainer = qcpGraph->data();

                  dataContainer->clear();

                  auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();

                  qcpGraph->setData(sqpDataContainer);

                  for (auto i = 0; i < count; ++i) {

                      const auto x = xData[i];

                      if (x >= dateTime.m_TStart && x <= dateTime.m_TEnd) {

        perrinel
    
Change info to debug on thread display log

              r367
            
                          sqpDataContainer->appendGraphDataUnsorted(QCPGraphData(x, valuesData[i]));

        perrinel
    
Add current progression for thread fix

              r364
            
                      }

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
                  }

        perrinel
    
Add current progression for thread fix

              r364
            
                  sqpDataContainer->sort();

        perrinel
    
Correction clang format

              r365
            
                  qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"

                                                         << sqpDataContainer->size();

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
              }

        perrinel
    
Add current progression for thread fix

              r364
            
              scalarSeries.unlock();

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
        perrinel
    
onRangeChanged is now based on the good range (the new one)...

              r315
            
              // Display all data

              component->rescaleAxes();

              component->parentPlot()->replot();

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
          }

          else {

              /// @todo DEBUG

          }

      }

      QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot,

                                                        const SqpDateTime &dateTime)

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
      {

          auto component = plot.addGraph();

          if (component) {

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
              //        // Graph data

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
              component->setData(scalarSeries.xAxisData()->data(), scalarSeries.valuesData()->data(),

                                 true);

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
              updateScalarData(component, scalarSeries, dateTime);

        Alexandre Leroux
    
Handles axes properties

              r183
            
              // Axes properties

              /// @todo : for the moment, no control is performed on the axes: the units and the tickers

              /// are fixed for the default x-axis and y-axis of the plot, and according to the new graph

              auto setAxisProperties = [](auto axis, const auto &unit) {

                  // label (unit name)

                  axis->setLabel(unit.m_Name);

                  // ticker (depending on the type of unit)

                  axis->setTicker(axisTicker(unit.m_TimeUnit));

              };

              setAxisProperties(plot.xAxis, scalarSeries.xAxisUnit());

              setAxisProperties(plot.yAxis, scalarSeries.valuesUnit());

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
              // Display all data

              component->rescaleAxes();

              plot.replot();

          }

          else {

        perrinel
    
Correction for pull request

              r243
            
              qCDebug(LOG_VisualizationGraphHelper())

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
                  << QObject::tr("Can't create graph for the scalar series");

          }

          return component;

      }

      } // namespace

        perrinel
    
Correction for pull request

              r243
            
      QVector<QCPAbstractPlottable *> VisualizationGraphHelper::create(std::shared_ptr<Variable> variable,

                                                                       QCustomPlot &plot) noexcept

        Alexandre Leroux
    
Creates factory that is responsible of creation of QCustomPlot components relative to a variable

              r181
            
      {

          auto result = QVector<QCPAbstractPlottable *>{};

          if (variable) {

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
              // Gets the data series of the variable to call the creation of the right components

              // according to its type

              if (auto scalarSeries = dynamic_cast<ScalarSeries *>(variable->dataSeries())) {

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
                  result.append(createScalarSeriesComponent(*scalarSeries, plot, variable->dateTime()));

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
              }

              else {

        perrinel
    
Correction for pull request

              r243
            
                  qCDebug(LOG_VisualizationGraphHelper())

        Alexandre Leroux
    
Handles creations for scalar series

              r182
            
                      << QObject::tr("Can't create graph plottables : unmanaged data series type");

              }

        Alexandre Leroux
    
Creates factory that is responsible of creation of QCustomPlot components relative to a variable

              r181
            
          }

          else {

        perrinel
    
Correction for pull request

              r243
            
              qCDebug(LOG_VisualizationGraphHelper())

        Alexandre Leroux
    
Creates factory that is responsible of creation of QCustomPlot components relative to a variable

              r181
            
                  << QObject::tr("Can't create graph plottables : the variable is null");

          }

          return result;

      }

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
        perrinel
    
Correction for pull request

              r243
            
      void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect,

                                                IDataSeries *dataSeries, const SqpDateTime &dateTime)

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
      {

          if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) {

              if (plotableVect.size() == 1) {

                  updateScalarData(plotableVect.at(0), *scalarSeries, dateTime);

              }

              else {

        perrinel
    
Correction for pull request

              r243
            
                  qCCritical(LOG_VisualizationGraphHelper()) << QObject::tr(

        perrinel
    
The mock plugin can now create data with view operation

              r235
            
                      "Can't update Data of a scalarSeries because there is not only one component "

                      "associated");

              }

          }

          else {

              /// @todo DEBUG

          }

      }

	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 Correction for pull request	r243	#include "Visualization/VisualizationGraphHelper.h"
Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r181	#include "Visualization/qcustomplot.h"

Alexandre Leroux Handles creations for scalar series	r182	#include <Data/ScalarSeries.h>

Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r181	#include <Variable/Variable.h>

perrinel Correction for pull request	r243	Q_LOGGING_CATEGORY(LOG_VisualizationGraphHelper, "VisualizationGraphHelper")
Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r181
Alexandre Leroux Handles creations for scalar series	r182	namespace {

perrinel Add current progression for thread fix	r364	class SqpDataContainer : public QCPGraphDataContainer {
		public:
perrinel Change info to debug on thread display log	r367	void appendGraphDataUnsorted(const QCPGraphData &data) { mData.append(data); }
perrinel Add current progression for thread fix	r364	};


Alexandre Leroux Handles axes properties	r183	/// Format for datetimes on a axis
		const auto DATETIME_TICKER_FORMAT = QStringLiteral("yyyy/MM/dd \nhh:mm:ss");

		/// Generates the appropriate ticker for an axis, depending on whether the axis displays time or
		/// non-time data
		QSharedPointer<QCPAxisTicker> axisTicker(bool isTimeAxis)
		{
		if (isTimeAxis) {
		auto dateTicker = QSharedPointer<QCPAxisTickerDateTime>::create();
		dateTicker->setDateTimeFormat(DATETIME_TICKER_FORMAT);

		return dateTicker;
		}
		else {
		// default ticker
		return QSharedPointer<QCPAxisTicker>::create();
		}
		}
Alexandre Leroux Handles creations for scalar series	r182
perrinel The mock plugin can now create data with view operation	r235	void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
		const SqpDateTime &dateTime)
		{
perrinel Change info to debug on thread display log	r367	qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
		<< QThread::currentThread()->objectName();
perrinel The mock plugin can now create data with view operation	r235	if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
		// Clean the graph
		// NAIVE approch
perrinel Add current progression for thread fix	r364	scalarSeries.lockRead();
		{
		const auto xData = scalarSeries.xAxisData()->data();
		const auto valuesData = scalarSeries.valuesData()->data();
		const auto count = xData.count();
perrinel Correction clang format	r365	qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache"
		<< xData.count();
perrinel The mock plugin can now create data with view operation	r235
perrinel Add current progression for thread fix	r364	auto dataContainer = qcpGraph->data();
		dataContainer->clear();
		auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
		qcpGraph->setData(sqpDataContainer);

		for (auto i = 0; i < count; ++i) {
		const auto x = xData[i];
		if (x >= dateTime.m_TStart && x <= dateTime.m_TEnd) {
perrinel Change info to debug on thread display log	r367	sqpDataContainer->appendGraphDataUnsorted(QCPGraphData(x, valuesData[i]));
perrinel Add current progression for thread fix	r364	}
perrinel The mock plugin can now create data with view operation	r235	}
perrinel Add current progression for thread fix	r364	sqpDataContainer->sort();
perrinel Correction clang format	r365	qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
		<< sqpDataContainer->size();
perrinel The mock plugin can now create data with view operation	r235	}
perrinel Add current progression for thread fix	r364	scalarSeries.unlock();
perrinel The mock plugin can now create data with view operation	r235
perrinel onRangeChanged is now based on the good range (the new one)...	r315
		// Display all data
		component->rescaleAxes();
		component->parentPlot()->replot();
perrinel The mock plugin can now create data with view operation	r235	}
		else {
		/// @todo DEBUG
		}
		}

		QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot,
		const SqpDateTime &dateTime)
Alexandre Leroux Handles creations for scalar series	r182	{
		auto component = plot.addGraph();

		if (component) {
perrinel The mock plugin can now create data with view operation	r235	// // Graph data
Alexandre Leroux Handles creations for scalar series	r182	component->setData(scalarSeries.xAxisData()->data(), scalarSeries.valuesData()->data(),
		true);

perrinel The mock plugin can now create data with view operation	r235	updateScalarData(component, scalarSeries, dateTime);

Alexandre Leroux Handles axes properties	r183	// Axes properties
		/// @todo : for the moment, no control is performed on the axes: the units and the tickers
		/// are fixed for the default x-axis and y-axis of the plot, and according to the new graph

		auto setAxisProperties = [](auto axis, const auto &unit) {
		// label (unit name)
		axis->setLabel(unit.m_Name);

		// ticker (depending on the type of unit)
		axis->setTicker(axisTicker(unit.m_TimeUnit));
		};
		setAxisProperties(plot.xAxis, scalarSeries.xAxisUnit());
		setAxisProperties(plot.yAxis, scalarSeries.valuesUnit());

Alexandre Leroux Handles creations for scalar series	r182	// Display all data
		component->rescaleAxes();
		plot.replot();
		}
		else {
perrinel Correction for pull request	r243	qCDebug(LOG_VisualizationGraphHelper())
Alexandre Leroux Handles creations for scalar series	r182	<< QObject::tr("Can't create graph for the scalar series");
		}

		return component;
		}

		} // namespace

perrinel Correction for pull request	r243	QVector<QCPAbstractPlottable *> VisualizationGraphHelper::create(std::shared_ptr<Variable> variable,
		QCustomPlot &plot) noexcept
Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r181	{
		auto result = QVector<QCPAbstractPlottable *>{};

		if (variable) {
Alexandre Leroux Handles creations for scalar series	r182	// Gets the data series of the variable to call the creation of the right components
		// according to its type
		if (auto scalarSeries = dynamic_cast<ScalarSeries *>(variable->dataSeries())) {
perrinel The mock plugin can now create data with view operation	r235	result.append(createScalarSeriesComponent(*scalarSeries, plot, variable->dateTime()));
Alexandre Leroux Handles creations for scalar series	r182	}
		else {
perrinel Correction for pull request	r243	qCDebug(LOG_VisualizationGraphHelper())
Alexandre Leroux Handles creations for scalar series	r182	<< QObject::tr("Can't create graph plottables : unmanaged data series type");
		}
Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r181	}
		else {
perrinel Correction for pull request	r243	qCDebug(LOG_VisualizationGraphHelper())
Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r181	<< QObject::tr("Can't create graph plottables : the variable is null");
		}

		return result;
		}
perrinel The mock plugin can now create data with view operation	r235
perrinel Correction for pull request	r243	void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect,
		IDataSeries *dataSeries, const SqpDateTime &dateTime)
perrinel The mock plugin can now create data with view operation	r235	{
		if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) {
		if (plotableVect.size() == 1) {
		updateScalarData(plotableVect.at(0), *scalarSeries, dateTime);
		}
		else {
perrinel Correction for pull request	r243	qCCritical(LOG_VisualizationGraphHelper()) << QObject::tr(
perrinel The mock plugin can now create data with view operation	r235	"Can't update Data of a scalarSeries because there is not only one component "
		"associated");
		}
		}
		else {
		/// @todo DEBUG
		}
		}