GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Files · gui/src/Visualization/VisualizationGraphHelper.cpp

Updates UI to not call the sort method when update graphs, as data series are already sorted

Alexandre Leroux - - Load All Authors

File last commit:

r419:a8d8791b7e7a


                r419:a8d8791b7e7a

Download file

             VisualizationGraphHelper.cpp
        
                    161 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

              r227
            
      #include "Visualization/VisualizationGraphHelper.h"

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

              r168
            
      #include "Visualization/qcustomplot.h"

        Alexandre Leroux
    
Handles creations for scalar series

              r169
            
      #include <Data/ScalarSeries.h>

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

              r168
            
      #include <Variable/Variable.h>

        perrinel
    
Correction for pull request

              r227
            
      Q_LOGGING_CATEGORY(LOG_VisualizationGraphHelper, "VisualizationGraphHelper")

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

              r168
            
        Alexandre Leroux
    
Handles creations for scalar series

              r169
            
      namespace {

        perrinel
    
Add current progression for thread fix

              r336
            
      class SqpDataContainer : public QCPGraphDataContainer {

      public:

        Alexandre Leroux
    
Updates UI to not call the sort method when update graphs, as data series are already sorted

              r419
            
          void appendGraphData(const QCPGraphData &data) { mData.append(data); }

        perrinel
    
Add current progression for thread fix

              r336
            
      };

        Alexandre Leroux
    
Handles axes properties

              r170
            
      /// 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

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

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

                            const SqpDateTime &dateTime)

      {

        perrinel
    
Change info to debug on thread display log

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

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

        perrinel
    
The mock plugin can now create data with view operation

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

        perrinel
    
Add current progression for thread fix

              r336
            
              scalarSeries.lockRead();

              {

        Alexandre Leroux
    
Updates UI to not call the sort method when update graphs, as data series are already sorted

              r419
            
                  const auto &xData = scalarSeries.xAxisData()->cdata();

                  const auto &valuesData = scalarSeries.valuesData()->cdata();

                  auto xDataBegin = xData.cbegin();

                  auto xDataEnd = xData.cend();

                  qCInfo(LOG_VisualizationGraphHelper())

                      << "TORM: Current points in cache" << xData.count();

        perrinel
    
Add current progression for thread fix

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

                  qcpGraph->setData(sqpDataContainer);

        Alexandre Leroux
    
Updates UI to not call the sort method when update graphs, as data series are already sorted

              r419
            
                  auto lowerIt = std::lower_bound(xDataBegin, xDataEnd, dateTime.m_TStart);

                  auto upperIt = std::upper_bound(xDataBegin, xDataEnd, dateTime.m_TEnd);

                  auto distance = std::distance(xDataBegin, lowerIt);

                  auto valuesDataIt = valuesData.cbegin() + distance;

                  for (auto xAxisDataIt = lowerIt; xAxisDataIt != upperIt;

                       ++xAxisDataIt, ++valuesDataIt) {

                      sqpDataContainer->appendGraphData(QCPGraphData(*xAxisDataIt, *valuesDataIt));

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
                  }

        Alexandre Leroux
    
Updates UI to not call the sort method when update graphs, as data series are already sorted

              r419
            
                  qCInfo(LOG_VisualizationGraphHelper())

                      << "TORM: Current points displayed" << sqpDataContainer->size();

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
              }

        perrinel
    
Add current progression for thread fix

              r336
            
              scalarSeries.unlock();

        perrinel
    
The mock plugin can now create data with view operation

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

              r290
            
              // Display all data

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

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
          }

          else {

              /// @todo DEBUG

          }

      }

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

                                                        const SqpDateTime &dateTime)

        Alexandre Leroux
    
Handles creations for scalar series

              r169
            
      {

          auto component = plot.addGraph();

          if (component) {

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
              //        // Graph data

        Alexandre Leroux
    
Handles creations for scalar series

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

                                 true);

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
              updateScalarData(component, scalarSeries, dateTime);

        Alexandre Leroux
    
Handles axes properties

              r170
            
              // 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

              r169
            
              // Display all data

              component->rescaleAxes();

              plot.replot();

          }

          else {

        perrinel
    
Correction for pull request

              r227
            
              qCDebug(LOG_VisualizationGraphHelper())

        Alexandre Leroux
    
Handles creations for scalar series

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

          }

          return component;

      }

      } // namespace

        perrinel
    
Correction for pull request

              r227
            
      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

              r168
            
      {

          auto result = QVector<QCPAbstractPlottable *>{};

          if (variable) {

        Alexandre Leroux
    
Handles creations for scalar series

              r169
            
              // 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

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

        Alexandre Leroux
    
Handles creations for scalar series

              r169
            
              }

              else {

        perrinel
    
Correction for pull request

              r227
            
                  qCDebug(LOG_VisualizationGraphHelper())

        Alexandre Leroux
    
Handles creations for scalar series

              r169
            
                      << 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

              r168
            
          }

          else {

        perrinel
    
Correction for pull request

              r227
            
              qCDebug(LOG_VisualizationGraphHelper())

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

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

          }

          return result;

      }

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
        perrinel
    
Correction for pull request

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

                                                IDataSeries *dataSeries, const SqpDateTime &dateTime)

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
      {

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

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

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

              }

              else {

        perrinel
    
Correction for pull request

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

        perrinel
    
The mock plugin can now create data with view operation

              r219
            
                      "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	r227	#include "Visualization/VisualizationGraphHelper.h"
Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r168	#include "Visualization/qcustomplot.h"

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

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

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

perrinel Add current progression for thread fix	r336	class SqpDataContainer : public QCPGraphDataContainer {
		public:
Alexandre Leroux Updates UI to not call the sort method when update graphs, as data series are already sorted	r419	void appendGraphData(const QCPGraphData &data) { mData.append(data); }
perrinel Add current progression for thread fix	r336	};


Alexandre Leroux Handles axes properties	r170	/// 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	r169
perrinel The mock plugin can now create data with view operation	r219	void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
		const SqpDateTime &dateTime)
		{
perrinel Change info to debug on thread display log	r339	qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
		<< QThread::currentThread()->objectName();
perrinel The mock plugin can now create data with view operation	r219	if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
perrinel Add current progression for thread fix	r336	scalarSeries.lockRead();
		{
Alexandre Leroux Updates UI to not call the sort method when update graphs, as data series are already sorted	r419	const auto &xData = scalarSeries.xAxisData()->cdata();
		const auto &valuesData = scalarSeries.valuesData()->cdata();

		auto xDataBegin = xData.cbegin();
		auto xDataEnd = xData.cend();

		qCInfo(LOG_VisualizationGraphHelper())
		<< "TORM: Current points in cache" << xData.count();

perrinel Add current progression for thread fix	r336	auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
		qcpGraph->setData(sqpDataContainer);

Alexandre Leroux Updates UI to not call the sort method when update graphs, as data series are already sorted	r419	auto lowerIt = std::lower_bound(xDataBegin, xDataEnd, dateTime.m_TStart);
		auto upperIt = std::upper_bound(xDataBegin, xDataEnd, dateTime.m_TEnd);
		auto distance = std::distance(xDataBegin, lowerIt);

		auto valuesDataIt = valuesData.cbegin() + distance;
		for (auto xAxisDataIt = lowerIt; xAxisDataIt != upperIt;
		++xAxisDataIt, ++valuesDataIt) {
		sqpDataContainer->appendGraphData(QCPGraphData(xAxisDataIt, valuesDataIt));
perrinel The mock plugin can now create data with view operation	r219	}
Alexandre Leroux Updates UI to not call the sort method when update graphs, as data series are already sorted	r419
		qCInfo(LOG_VisualizationGraphHelper())
		<< "TORM: Current points displayed" << sqpDataContainer->size();
perrinel The mock plugin can now create data with view operation	r219	}
perrinel Add current progression for thread fix	r336	scalarSeries.unlock();
perrinel The mock plugin can now create data with view operation	r219
perrinel onRangeChanged is now based on the good range (the new one)...	r290
		// Display all data
		component->parentPlot()->replot();
perrinel The mock plugin can now create data with view operation	r219	}
		else {
		/// @todo DEBUG
		}
		}

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

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

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

Alexandre Leroux Handles axes properties	r170	// 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	r169	// Display all data
		component->rescaleAxes();
		plot.replot();
		}
		else {
perrinel Correction for pull request	r227	qCDebug(LOG_VisualizationGraphHelper())
Alexandre Leroux Handles creations for scalar series	r169	<< QObject::tr("Can't create graph for the scalar series");
		}

		return component;
		}

		} // namespace

perrinel Correction for pull request	r227	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	r168	{
		auto result = QVector<QCPAbstractPlottable *>{};

		if (variable) {
Alexandre Leroux Handles creations for scalar series	r169	// 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	r219	result.append(createScalarSeriesComponent(*scalarSeries, plot, variable->dateTime()));
Alexandre Leroux Handles creations for scalar series	r169	}
		else {
perrinel Correction for pull request	r227	qCDebug(LOG_VisualizationGraphHelper())
Alexandre Leroux Handles creations for scalar series	r169	<< 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	r168	}
		else {
perrinel Correction for pull request	r227	qCDebug(LOG_VisualizationGraphHelper())
Alexandre Leroux Creates factory that is responsible of creation of QCustomPlot components relative to a variable	r168	<< QObject::tr("Can't create graph plottables : the variable is null");
		}

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