GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r169:cc2257464c26

Handles creations for scalar series

Alexandre Leroux -

r169:cc2257464c26

parent child

Context file:

r169:cc2257464c26

Collapse all files

core/include/Variable/Variable.h +3 0

             #ifndef SCIQLOP_VARIABLE_H
             #define SCIQLOP_VARIABLE_H
             #include <Common/spimpl.h>
             #include <QObject>
             class IDataSeries;
             class QString;
             /**
              * @brief The Variable class represents a variable in SciQlop.
              */
             class Variable {
             public:
                 explicit Variable(const QString &name, const QString &unit, const QString &mission);
                 QString name() const noexcept;
                 QString mission() const noexcept;
                 QString unit() const noexcept;
                 void addDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept;
+                /// @return the data of the variable, nullptr if there is no data
+                IDataSeries *dataSeries() const noexcept;
             private:
                 class VariablePrivate;
                 spimpl::unique_impl_ptr<VariablePrivate> impl;
             };
             // Required for using shared_ptr in signals/slots
             Q_DECLARE_METATYPE(std::shared_ptr<Variable>)
             #endif // SCIQLOP_VARIABLE_H

core/src/Variable/Variable.cpp +5 0

             #include "Variable/Variable.h"
             #include <Data/IDataSeries.h>
             struct Variable::VariablePrivate {
                 explicit VariablePrivate(const QString &name, const QString &unit, const QString &mission)
                         : m_Name{name}, m_Unit{unit}, m_Mission{mission}, m_DataSeries{nullptr}
                 {
                 }
                 QString m_Name;
                 QString m_Unit;
                 QString m_Mission;
                 std::unique_ptr<IDataSeries> m_DataSeries;
             };
             Variable::Variable(const QString &name, const QString &unit, const QString &mission)
                     : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission)}
             {
             }
             QString Variable::name() const noexcept
             {
                 return impl->m_Name;
             }
             QString Variable::mission() const noexcept
             {
                 return impl->m_Mission;
             }
             QString Variable::unit() const noexcept
             {
                 return impl->m_Unit;
             }
             void Variable::addDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept
             {
                 if (!impl->m_DataSeries) {
                     impl->m_DataSeries = std::move(dataSeries);
                 }
                 /// @todo : else, merge the two data series (if possible)
             }
+            IDataSeries *Variable::dataSeries() const noexcept
+            {
+                return impl->m_DataSeries.get();
+            }

gui/src/Visualization/GraphPlottablesFactory.cpp +38 -1

@@ -1,22 +1,59
1	#include "Visualization/GraphPlottablesFactory.h"	1	#include "Visualization/GraphPlottablesFactory.h"
2	#include "Visualization/qcustomplot.h"	2	#include "Visualization/qcustomplot.h"
3		3
		4	#include <Data/ScalarSeries.h>
		5
4	#include <Variable/Variable.h>	6	#include <Variable/Variable.h>
5		7
6	Q_LOGGING_CATEGORY(LOG_GraphPlottablesFactory, "GraphPlottablesFactory")	8	Q_LOGGING_CATEGORY(LOG_GraphPlottablesFactory, "GraphPlottablesFactory")
7		9
		10	namespace {
		11
		12
		13	QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot)
		14	{
		15	auto component = plot.addGraph();
		16
		17	if (component) {
		18	// Graph data
		19	component->setData(scalarSeries.xAxisData()->data(), scalarSeries.valuesData()->data(),
		20	true);
		21
		22	// Display all data
		23	component->rescaleAxes();
		24
		25	plot.replot();
		26	}
		27	else {
		28	qCDebug(LOG_GraphPlottablesFactory())
		29	<< QObject::tr("Can't create graph for the scalar series");
		30	}
		31
		32	return component;
		33	}
		34
		35	} // namespace
		36
8	QVector<QCPAbstractPlottable > GraphPlottablesFactory::create(const Variable variable,	37	QVector<QCPAbstractPlottable > GraphPlottablesFactory::create(const Variable variable,
9	QCustomPlot &plot) noexcept	38	QCustomPlot &plot) noexcept
10	{	39	{
11	auto result = QVector<QCPAbstractPlottable *>{};	40	auto result = QVector<QCPAbstractPlottable *>{};
12		41
13	if (variable) {	42	if (variable) {
14	/// @todo ALX	43	// Gets the data series of the variable to call the creation of the right components
		44	// according to its type
		45	if (auto scalarSeries = dynamic_cast<ScalarSeries *>(variable->dataSeries())) {
		46	result.append(createScalarSeriesComponent(*scalarSeries, plot));
		47	}
		48	else {
		49	qCDebug(LOG_GraphPlottablesFactory())
		50	<< QObject::tr("Can't create graph plottables : unmanaged data series type");
		51	}
15	}	52	}
16	else {	53	else {
17	qCDebug(LOG_GraphPlottablesFactory())	54	qCDebug(LOG_GraphPlottablesFactory())
18	<< QObject::tr("Can't create graph plottables : the variable is null");	55	<< QObject::tr("Can't create graph plottables : the variable is null");
19	}	56	}
20		57
21	return result;	58	return result;
22	}	59	}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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