Auto status change to "Under Review"
| @@ -1,160 +1,159 | |||||
| 1 | #include "Visualization/VisualizationGraphHelper.h" |
|
1 | #include "Visualization/VisualizationGraphHelper.h" | |
| 2 | #include "Visualization/qcustomplot.h" |
|
2 | #include "Visualization/qcustomplot.h" | |
| 3 |
|
3 | |||
| 4 | #include <Data/ScalarSeries.h> |
|
4 | #include <Data/ScalarSeries.h> | |
| 5 |
|
5 | |||
| 6 | #include <Variable/Variable.h> |
|
6 | #include <Variable/Variable.h> | |
| 7 |
|
7 | |||
| 8 | Q_LOGGING_CATEGORY(LOG_VisualizationGraphHelper, "VisualizationGraphHelper") |
|
8 | Q_LOGGING_CATEGORY(LOG_VisualizationGraphHelper, "VisualizationGraphHelper") | |
| 9 |
|
9 | |||
| 10 | namespace { |
|
10 | namespace { | |
| 11 |
|
11 | |||
| 12 | class SqpDataContainer : public QCPGraphDataContainer { |
|
12 | class SqpDataContainer : public QCPGraphDataContainer { | |
| 13 | public: |
|
13 | public: | |
| 14 | void appendGraphDataUnsorted(const QCPGraphData &data) { mData.append(data); } |
|
14 | void appendGraphDataUnsorted(const QCPGraphData &data) { mData.append(data); } | |
| 15 | }; |
|
15 | }; | |
| 16 |
|
16 | |||
| 17 |
|
17 | |||
| 18 | /// Format for datetimes on a axis |
|
18 | /// Format for datetimes on a axis | |
| 19 | const auto DATETIME_TICKER_FORMAT = QStringLiteral("yyyy/MM/dd \nhh:mm:ss"); |
|
19 | const auto DATETIME_TICKER_FORMAT = QStringLiteral("yyyy/MM/dd \nhh:mm:ss"); | |
| 20 |
|
20 | |||
| 21 | /// Generates the appropriate ticker for an axis, depending on whether the axis displays time or |
|
21 | /// Generates the appropriate ticker for an axis, depending on whether the axis displays time or | |
| 22 | /// non-time data |
|
22 | /// non-time data | |
| 23 | QSharedPointer<QCPAxisTicker> axisTicker(bool isTimeAxis) |
|
23 | QSharedPointer<QCPAxisTicker> axisTicker(bool isTimeAxis) | |
| 24 | { |
|
24 | { | |
| 25 | if (isTimeAxis) { |
|
25 | if (isTimeAxis) { | |
| 26 | auto dateTicker = QSharedPointer<QCPAxisTickerDateTime>::create(); |
|
26 | auto dateTicker = QSharedPointer<QCPAxisTickerDateTime>::create(); | |
| 27 | dateTicker->setDateTimeFormat(DATETIME_TICKER_FORMAT); |
|
27 | dateTicker->setDateTimeFormat(DATETIME_TICKER_FORMAT); | |
| 28 |
|
28 | |||
| 29 | return dateTicker; |
|
29 | return dateTicker; | |
| 30 | } |
|
30 | } | |
| 31 | else { |
|
31 | else { | |
| 32 | // default ticker |
|
32 | // default ticker | |
| 33 | return QSharedPointer<QCPAxisTicker>::create(); |
|
33 | return QSharedPointer<QCPAxisTicker>::create(); | |
| 34 | } |
|
34 | } | |
| 35 | } |
|
35 | } | |
| 36 |
|
36 | |||
| 37 | void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries, |
|
37 | void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries, | |
| 38 | const SqpDateTime &dateTime) |
|
38 | const SqpDateTime &dateTime) | |
| 39 | { |
|
39 | { | |
| 40 | qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData" |
|
40 | qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData" | |
| 41 | << QThread::currentThread()->objectName(); |
|
41 | << QThread::currentThread()->objectName(); | |
| 42 | if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) { |
|
42 | if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) { | |
| 43 | // Clean the graph |
|
43 | // Clean the graph | |
| 44 | // NAIVE approch |
|
44 | // NAIVE approch | |
| 45 | scalarSeries.lockRead(); |
|
45 | scalarSeries.lockRead(); | |
| 46 | { |
|
46 | { | |
| 47 | const auto xData = scalarSeries.xAxisData()->data(); |
|
47 | const auto xData = scalarSeries.xAxisData()->data(); | |
| 48 | const auto valuesData = scalarSeries.valuesData()->data(); |
|
48 | const auto valuesData = scalarSeries.valuesData()->data(); | |
| 49 | const auto count = xData.count(); |
|
49 | const auto count = xData.count(); | |
| 50 | qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache" |
|
50 | qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache" | |
| 51 | << xData.count(); |
|
51 | << xData.count(); | |
| 52 |
|
52 | |||
| 53 | auto dataContainer = qcpGraph->data(); |
|
53 | auto dataContainer = qcpGraph->data(); | |
| 54 | dataContainer->clear(); |
|
54 | dataContainer->clear(); | |
| 55 | auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create(); |
|
55 | auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create(); | |
| 56 | qcpGraph->setData(sqpDataContainer); |
|
56 | qcpGraph->setData(sqpDataContainer); | |
| 57 |
|
57 | |||
| 58 | for (auto i = 0; i < count; ++i) { |
|
58 | for (auto i = 0; i < count; ++i) { | |
| 59 | const auto x = xData[i]; |
|
59 | const auto x = xData[i]; | |
| 60 | if (x >= dateTime.m_TStart && x <= dateTime.m_TEnd) { |
|
60 | if (x >= dateTime.m_TStart && x <= dateTime.m_TEnd) { | |
| 61 | sqpDataContainer->appendGraphDataUnsorted(QCPGraphData(x, valuesData[i])); |
|
61 | sqpDataContainer->appendGraphDataUnsorted(QCPGraphData(x, valuesData[i])); | |
| 62 | } |
|
62 | } | |
| 63 | } |
|
63 | } | |
| 64 | sqpDataContainer->sort(); |
|
64 | sqpDataContainer->sort(); | |
| 65 | qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed" |
|
65 | qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed" | |
| 66 | << sqpDataContainer->size(); |
|
66 | << sqpDataContainer->size(); | |
| 67 | } |
|
67 | } | |
| 68 | scalarSeries.unlock(); |
|
68 | scalarSeries.unlock(); | |
| 69 |
|
69 | |||
| 70 |
|
70 | |||
| 71 | // Display all data |
|
71 | // Display all data | |
| 72 | component->rescaleAxes(); |
|
|||
| 73 | component->parentPlot()->replot(); |
|
72 | component->parentPlot()->replot(); | |
| 74 | } |
|
73 | } | |
| 75 | else { |
|
74 | else { | |
| 76 | /// @todo DEBUG |
|
75 | /// @todo DEBUG | |
| 77 | } |
|
76 | } | |
| 78 | } |
|
77 | } | |
| 79 |
|
78 | |||
| 80 | QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot, |
|
79 | QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot, | |
| 81 | const SqpDateTime &dateTime) |
|
80 | const SqpDateTime &dateTime) | |
| 82 | { |
|
81 | { | |
| 83 | auto component = plot.addGraph(); |
|
82 | auto component = plot.addGraph(); | |
| 84 |
|
83 | |||
| 85 | if (component) { |
|
84 | if (component) { | |
| 86 | // // Graph data |
|
85 | // // Graph data | |
| 87 | component->setData(scalarSeries.xAxisData()->data(), scalarSeries.valuesData()->data(), |
|
86 | component->setData(scalarSeries.xAxisData()->data(), scalarSeries.valuesData()->data(), | |
| 88 | true); |
|
87 | true); | |
| 89 |
|
88 | |||
| 90 | updateScalarData(component, scalarSeries, dateTime); |
|
89 | updateScalarData(component, scalarSeries, dateTime); | |
| 91 |
|
90 | |||
| 92 | // Axes properties |
|
91 | // Axes properties | |
| 93 | /// @todo : for the moment, no control is performed on the axes: the units and the tickers |
|
92 | /// @todo : for the moment, no control is performed on the axes: the units and the tickers | |
| 94 | /// are fixed for the default x-axis and y-axis of the plot, and according to the new graph |
|
93 | /// are fixed for the default x-axis and y-axis of the plot, and according to the new graph | |
| 95 |
|
94 | |||
| 96 | auto setAxisProperties = [](auto axis, const auto &unit) { |
|
95 | auto setAxisProperties = [](auto axis, const auto &unit) { | |
| 97 | // label (unit name) |
|
96 | // label (unit name) | |
| 98 | axis->setLabel(unit.m_Name); |
|
97 | axis->setLabel(unit.m_Name); | |
| 99 |
|
98 | |||
| 100 | // ticker (depending on the type of unit) |
|
99 | // ticker (depending on the type of unit) | |
| 101 | axis->setTicker(axisTicker(unit.m_TimeUnit)); |
|
100 | axis->setTicker(axisTicker(unit.m_TimeUnit)); | |
| 102 | }; |
|
101 | }; | |
| 103 | setAxisProperties(plot.xAxis, scalarSeries.xAxisUnit()); |
|
102 | setAxisProperties(plot.xAxis, scalarSeries.xAxisUnit()); | |
| 104 | setAxisProperties(plot.yAxis, scalarSeries.valuesUnit()); |
|
103 | setAxisProperties(plot.yAxis, scalarSeries.valuesUnit()); | |
| 105 |
|
104 | |||
| 106 | // Display all data |
|
105 | // Display all data | |
| 107 | component->rescaleAxes(); |
|
106 | component->rescaleAxes(); | |
| 108 | plot.replot(); |
|
107 | plot.replot(); | |
| 109 | } |
|
108 | } | |
| 110 | else { |
|
109 | else { | |
| 111 | qCDebug(LOG_VisualizationGraphHelper()) |
|
110 | qCDebug(LOG_VisualizationGraphHelper()) | |
| 112 | << QObject::tr("Can't create graph for the scalar series"); |
|
111 | << QObject::tr("Can't create graph for the scalar series"); | |
| 113 | } |
|
112 | } | |
| 114 |
|
113 | |||
| 115 | return component; |
|
114 | return component; | |
| 116 | } |
|
115 | } | |
| 117 |
|
116 | |||
| 118 | } // namespace |
|
117 | } // namespace | |
| 119 |
|
118 | |||
| 120 | QVector<QCPAbstractPlottable *> VisualizationGraphHelper::create(std::shared_ptr<Variable> variable, |
|
119 | QVector<QCPAbstractPlottable *> VisualizationGraphHelper::create(std::shared_ptr<Variable> variable, | |
| 121 | QCustomPlot &plot) noexcept |
|
120 | QCustomPlot &plot) noexcept | |
| 122 | { |
|
121 | { | |
| 123 | auto result = QVector<QCPAbstractPlottable *>{}; |
|
122 | auto result = QVector<QCPAbstractPlottable *>{}; | |
| 124 |
|
123 | |||
| 125 | if (variable) { |
|
124 | if (variable) { | |
| 126 | // Gets the data series of the variable to call the creation of the right components |
|
125 | // Gets the data series of the variable to call the creation of the right components | |
| 127 | // according to its type |
|
126 | // according to its type | |
| 128 | if (auto scalarSeries = dynamic_cast<ScalarSeries *>(variable->dataSeries())) { |
|
127 | if (auto scalarSeries = dynamic_cast<ScalarSeries *>(variable->dataSeries())) { | |
| 129 | result.append(createScalarSeriesComponent(*scalarSeries, plot, variable->dateTime())); |
|
128 | result.append(createScalarSeriesComponent(*scalarSeries, plot, variable->dateTime())); | |
| 130 | } |
|
129 | } | |
| 131 | else { |
|
130 | else { | |
| 132 | qCDebug(LOG_VisualizationGraphHelper()) |
|
131 | qCDebug(LOG_VisualizationGraphHelper()) | |
| 133 | << QObject::tr("Can't create graph plottables : unmanaged data series type"); |
|
132 | << QObject::tr("Can't create graph plottables : unmanaged data series type"); | |
| 134 | } |
|
133 | } | |
| 135 | } |
|
134 | } | |
| 136 | else { |
|
135 | else { | |
| 137 | qCDebug(LOG_VisualizationGraphHelper()) |
|
136 | qCDebug(LOG_VisualizationGraphHelper()) | |
| 138 | << QObject::tr("Can't create graph plottables : the variable is null"); |
|
137 | << QObject::tr("Can't create graph plottables : the variable is null"); | |
| 139 | } |
|
138 | } | |
| 140 |
|
139 | |||
| 141 | return result; |
|
140 | return result; | |
| 142 | } |
|
141 | } | |
| 143 |
|
142 | |||
| 144 | void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect, |
|
143 | void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect, | |
| 145 | IDataSeries *dataSeries, const SqpDateTime &dateTime) |
|
144 | IDataSeries *dataSeries, const SqpDateTime &dateTime) | |
| 146 | { |
|
145 | { | |
| 147 | if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) { |
|
146 | if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) { | |
| 148 | if (plotableVect.size() == 1) { |
|
147 | if (plotableVect.size() == 1) { | |
| 149 | updateScalarData(plotableVect.at(0), *scalarSeries, dateTime); |
|
148 | updateScalarData(plotableVect.at(0), *scalarSeries, dateTime); | |
| 150 | } |
|
149 | } | |
| 151 | else { |
|
150 | else { | |
| 152 | qCCritical(LOG_VisualizationGraphHelper()) << QObject::tr( |
|
151 | qCCritical(LOG_VisualizationGraphHelper()) << QObject::tr( | |
| 153 | "Can't update Data of a scalarSeries because there is not only one component " |
|
152 | "Can't update Data of a scalarSeries because there is not only one component " | |
| 154 | "associated"); |
|
153 | "associated"); | |
| 155 | } |
|
154 | } | |
| 156 | } |
|
155 | } | |
| 157 | else { |
|
156 | else { | |
| 158 | /// @todo DEBUG |
|
157 | /// @todo DEBUG | |
| 159 | } |
|
158 | } | |
| 160 | } |
|
159 | } | |
General Comments 3
Pull request updated. Auto status change to "Under Review"
Changed commits: * 3 added * 0 removed Changed files: * A plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt * M gui/src/Visualization/operations/RescaleAxeOperation.cpp * M app/src/MainWindow.cpp * M core/include/Data/IDataProvider.h * M core/include/DataSource/DataSourceItemAction.h * M core/include/Variable/VariableController.h * M core/include/Variable/VariableModel.h * M core/include/Visualization/VisualizationController.h * M core/src/Network/NetworkController.cpp * M core/src/Variable/Variable.cpp * M core/src/Variable/VariableController.cpp * M core/src/Variable/VariableModel.cpp * M gui/include/Visualization/VisualizationGraphWidget.h * M gui/include/Visualization/VisualizationWidget.h * M gui/src/SqpApplication.cpp * M gui/src/Variable/VariableInspectorWidget.cpp * M gui/src/Visualization/VisualizationGraphHelper.cpp * M gui/src/Visualization/VisualizationGraphWidget.cpp * M gui/src/Visualization/VisualizationWidget.cpp * M gui/src/Visualization/VisualizationZoneWidget.cpp * M plugins/amda/include/AmdaProvider.h * M plugins/amda/src/AmdaProvider.cpp * M plugins/amda/src/AmdaResultParser.cpp * M plugins/amda/tests/TestAmdaResultParser.cpp * M plugins/mockplugin/include/CosinusProvider.h * M plugins/mockplugin/src/CosinusProvider.cpp * R COPYING * R app/ui/MainWindow.ui * R cmake/sciqlop_package_qt.cmake * R core/include/Common/MetaTypes.h * R core/include/Data/ArrayData.h * R core/include/Data/DataProviderParameters.h * R core/include/Data/DataSeries.h * R core/include/Data/IDataSeries.h * R core/include/Data/ScalarSeries.h * R core/include/Data/SqpDateTime.h * R core/include/Network/NetworkController.h * R core/include/Plugin/PluginManager.h * R core/include/Time/TimeController.h * R core/include/Variable/Variable.h * R core/include/Variable/VariableCacheController.h * R core/src/Data/ScalarSeries.cpp * R core/src/DataSource/DataSourceItemAction.cpp * R core/src/Plugin/PluginManager.cpp * R core/src/Time/TimeController.cpp * R core/src/Variable/VariableCacheController.cpp * R core/src/Visualization/VisualizationController.cpp * R core/tests/Variable/TestVariableCacheController.cpp * R gui/include/DataSource/DataSourceTreeWidgetItem.h * R gui/include/DataSource/DataSourceWidget.h * R gui/include/SidePane/SqpSidePane.h * R gui/include/TimeWidget/TimeWidget.h * R gui/include/Variable/VariableInspectorWidget.h * R gui/include/Variable/VariableMenuHeaderWidget.h * R gui/include/Visualization/IVariableContainer.h * R gui/include/Visualization/IVisualizationWidget.h * R gui/include/Visualization/IVisualizationWidgetVisitor.h * R gui/include/Visualization/VisualizationGraphHelper.h * R gui/include/Visualization/VisualizationTabWidget.h * R gui/include/Visualization/VisualizationZoneWidget.h * R gui/include/Visualization/operations/GenerateVariableMenuOperation.h * R gui/include/Visualization/operations/MenuBuilder.h * R gui/include/Visualization/operations/RemoveVariableOperation.h * R gui/include/Visualization/qcustomplot.h * R gui/resources/icones/dataSourceComponent.png * R gui/resources/icones/dataSourceNode.png * R gui/resources/icones/dataSourceProduct.png * R gui/resources/icones/dataSourceRoot.png * R gui/resources/icones/delete.png * R gui/resources/icones/next.png * R gui/resources/icones/openInspector.png * R gui/resources/icones/plot.png * R gui/resources/icones/previous.png * R gui/resources/icones/sciqlop2PNG_1024.png * R gui/resources/icones/unplot.png * R gui/resources/sqpguiresources.qrc * R gui/src/DataSource/DataSourceTreeWidgetItem.cpp * R gui/src/DataSource/DataSourceWidget.cpp * R gui/src/SidePane/SqpSidePane.cpp * R gui/src/TimeWidget/TimeWidget.cpp * R gui/src/Variable/VariableMenuHeaderWidget.cpp * R gui/src/Visualization/VisualizationTabWidget.cpp * R gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp * R gui/src/Visualization/operations/MenuBuilder.cpp * R gui/src/Visualization/operations/RemoveVariableOperation.cpp * R gui/src/Visualization/qcustomplot.cpp * R gui/ui/DataSource/DataSourceWidget.ui * R gui/ui/SidePane/SqpSidePane.ui * R gui/ui/TimeWidget/TimeWidget.ui * R gui/ui/Variable/VariableInspectorWidget.ui * R gui/ui/Variable/VariableMenuHeaderWidget.ui * R gui/ui/Visualization/VisualizationGraphWidget.ui * R gui/ui/Visualization/VisualizationTabWidget.ui * R gui/ui/Visualization/VisualizationWidget.ui * R gui/ui/Visualization/VisualizationZoneWidget.ui * R gui/vera-exclusions/exclusions.txt * R plugin/CMakeLists.txt * R plugin/cmake/Findsciqlop-plugin.cmake * R plugin/include/Plugin/IPlugin.h * R plugins/amda/CMakeLists.txt * R plugins/amda/cmake/Findsciqlop-amda.cmake * R plugins/amda/include/AmdaDefs.h * R plugins/amda/include/AmdaGlobal.h * R plugins/amda/include/AmdaParser.h * R plugins/amda/include/AmdaPlugin.h * R plugins/amda/include/AmdaResultParser.h * R plugins/amda/resources/amda.json * R plugins/amda/resources/amdaresources.qrc * R plugins/amda/resources/samples/AmdaSample.json * R plugins/amda/src/AmdaDefs.cpp * R plugins/amda/src/AmdaParser.cpp * R plugins/amda/src/AmdaPlugin.cpp * R plugins/amda/tests-resources/TestAmdaParser/TwoRootsFile.json * R plugins/amda/tests-resources/TestAmdaParser/ValidFile1.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootKey.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootType.json * R plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt * R plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt * R plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt * R plugins/amda/tests/TestAmdaParser.cpp * R plugins/mockplugin/CMakeLists.txt * R plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake * R plugins/mockplugin/include/MockPlugin.h * R plugins/mockplugin/include/MockPluginGlobal.h * R plugins/mockplugin/resources/mockplugin.json * R plugins/mockplugin/src/MockPlugin.cpp * R README.md * R app/CMakeLists.txt * R app/include/MainWindow.h * R app/src/Main.cpp * R app/vera-exclusions/exclusions.txt * R cmake/sciqlop.cmake * R cmake/sciqlop_applications.cmake * R cmake/sciqlop_package.cmake * R cmake/sciqlop_params.cmake * R core/CMakeLists.txt * R core/include/Common/spimpl.h * R core/include/DataSource/DataSourceController.h * R core/include/DataSource/DataSourceItem.h * R core/src/DataSource/DataSourceController.cpp * R core/src/DataSource/DataSourceItem.cpp * R core/tests/DataSource/TestDataSourceController.cpp * R core/vera-exclusions/exclusions.txt * R formatting/cmake/use_clangformat.cmake * R formatting/vera-exclusions/exclusions.txt * R gui/CMakeLists.txt * R gui/include/SqpApplication.h * R LICENSE * R app/src/mainwindow.cpp * R app/src/mainwindow.ui
You need to be logged in to leave comments.
Login now