##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Creates vector series...
Creates vector series + updates ScalarSeries::subDataSeries() to use iterators
perrinel - - Load All Authors

File last commit:

r548:5673fc6ded12
r561:df3e79308ca8
Show More
VisualizationGraphHelper.cpp
210 lines | 7.4 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:
Alexandre Leroux
Updates UI to not call the sort method when update graphs, as data series are already sorted
 r453 void appendGraphData(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);
Alexandre Leroux
Uses the same time spec (UTC) as axis for tooltips on graph
 r490 dateTicker->setDateTimeSpec(Qt::UTC);
Alexandre Leroux
Handles axes properties
 r183
return dateTicker;
}
else {
// default ticker
return QSharedPointer<QCPAxisTicker>::create();
}
}
Alexandre Leroux
Handles creations for scalar series
 r182
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 void updateScalarData(QCPAbstractPlottable *component, std::shared_ptr<ScalarSeries> scalarSeries,
perrinel
Change SqpRange for SqpDateTime
 r512 const SqpRange &dateTime)
perrinel
The mock plugin can now create data with view operation
 r235 {
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)) {
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 scalarSeries->lockRead();
perrinel
Add current progression for thread fix
 r364 {
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 const auto &xData = scalarSeries->xAxisData()->cdata();
const auto &valuesData = scalarSeries->valuesData()->cdata();
Alexandre Leroux
Updates UI to not call the sort method when update graphs, as data series are already sorted
 r453
auto xDataBegin = xData.cbegin();
auto xDataEnd = xData.cend();
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points in cache"
perrinel
Add clang format for linux
 r471 << xData.count();
Alexandre Leroux
Updates UI to not call the sort method when update graphs, as data series are already sorted
 r453
perrinel
Add current progression for thread fix
 r364 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
 r453 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
 r235 }
Alexandre Leroux
Updates UI to not call the sort method when update graphs, as data series are already sorted
 r453
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points displayed"
perrinel
Add clang format for linux
 r471 << sqpDataContainer->size();
perrinel
The mock plugin can now create data with view operation
 r235 }
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 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->parentPlot()->replot();
perrinel
The mock plugin can now create data with view operation
 r235 }
else {
/// @todo DEBUG
}
}
perrinel
Initialisation of the graph range at creation in a new graphe, or inside...
 r548 QCPAbstractPlottable *createScalarSeriesComponentV2(std::shared_ptr<ScalarSeries> scalarSeries,
QCustomPlot &plot)
{
auto component = plot.addGraph();
if (component) {
// 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());
}
return component;
}
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 QCPAbstractPlottable *createScalarSeriesComponent(std::shared_ptr<ScalarSeries> scalarSeries,
QCustomPlot &plot, const SqpRange &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
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 component->setData(scalarSeries->xAxisData()->data(), scalarSeries->valuesData()->data(),
Alexandre Leroux
Handles creations for scalar series
 r182 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));
};
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 setAxisProperties(plot.xAxis, scalarSeries->xAxisUnit());
setAxisProperties(plot.yAxis, scalarSeries->valuesUnit());
Alexandre Leroux
Handles axes properties
 r183
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
Initialisation of the graph range at creation in a new graphe, or inside...
 r548 QVector<QCPAbstractPlottable *>
VisualizationGraphHelper::createV2(std::shared_ptr<Variable> variable, QCustomPlot &plot) noexcept
{
auto result = QVector<QCPAbstractPlottable *>{};
if (variable) {
// Gets the data series of the variable to call the creation of the right components
// according to its type
if (auto scalarSeries = std::dynamic_pointer_cast<ScalarSeries>(variable->dataSeries())) {
result.append(createScalarSeriesComponentV2(scalarSeries, plot));
}
else {
qCDebug(LOG_VisualizationGraphHelper())
<< QObject::tr("Can't create graph plottables : unmanaged data series type");
}
}
else {
qCDebug(LOG_VisualizationGraphHelper())
<< QObject::tr("Can't create graph plottables : the variable is null");
}
return result;
}
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
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 if (auto scalarSeries = std::dynamic_pointer_cast<ScalarSeries>(variable->dataSeries())) {
result.append(createScalarSeriesComponent(scalarSeries, plot, variable->range()));
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,
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 std::shared_ptr<IDataSeries> dataSeries,
const SqpRange &dateTime)
perrinel
The mock plugin can now create data with view operation
 r235 {
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 if (auto scalarSeries = std::dynamic_pointer_cast<ScalarSeries>(dataSeries)) {
perrinel
The mock plugin can now create data with view operation
 r235 if (plotableVect.size() == 1) {
perrinel
The dataSeries of a variable is now shared istead of uniq to avoid...
 r542 updateScalarData(plotableVect.at(0), scalarSeries, dateTime);
perrinel
The mock plugin can now create data with view operation
 r235 }
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
}
}