##// END OF EJS Templates
Merge branch 'feature/DataSourceItemUpdate' into develop
Merge branch 'feature/DataSourceItemUpdate' into develop

File last commit:

r318:fc4b2122dbde
r362:7becb422304c merge
Show More
VisualizationGraphHelper.cpp
155 lines | 5.0 KiB | text/x-c | CppLexer
/ gui / src / Visualization / VisualizationGraphHelper.cpp
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>
The mock plugin can now create data with view operation
r235 #include <QElapsedTimer>
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 {
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
The mock plugin can now create data with view operation
r235 void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
const SqpDateTime &dateTime)
{
QElapsedTimer timer;
timer.start();
if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
// Clean the graph
// NAIVE approch
const auto &xData = scalarSeries.xAxisData()->data();
const auto &valuesData = scalarSeries.valuesData()->data();
Fix the cosinus bug....
r298 const auto count = xData.count();
qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache" << xData.count();
auto xValue = QVector<double>(count);
auto vValue = QVector<double>(count);
The mock plugin can now create data with view operation
r235
Fix the cosinus bug....
r298 int n = 0;
The mock plugin can now create data with view operation
r235 for (auto i = 0; i < count; ++i) {
Fix the cosinus bug....
r298 const auto x = xData[i];
The mock plugin can now create data with view operation
r235 if (x >= dateTime.m_TStart && x <= dateTime.m_TEnd) {
Fix the cosinus bug....
r298 xValue[n] = x;
vValue[n] = valuesData[i];
++n;
The mock plugin can now create data with view operation
r235 }
}
Fix the cosinus bug....
r298 xValue.resize(n);
vValue.resize(n);
The mock plugin can now create data with view operation
r235
Removed unused log
r316 qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
<< xValue.count();
Fix the cosinus bug....
r298
qcpGraph->setData(xValue, vValue);
onRangeChanged is now based on the good range (the new one)...
r315
// Display all data
component->rescaleAxes();
component->parentPlot()->replot();
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) {
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);
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 {
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
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())) {
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 {
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 {
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;
}
The mock plugin can now create data with view operation
r235
Correction for pull request
r243 void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect,
IDataSeries *dataSeries, const SqpDateTime &dateTime)
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 {
Correction for pull request
r243 qCCritical(LOG_VisualizationGraphHelper()) << QObject::tr(
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
}
}