##// END OF EJS Templates
Add implementation for the range rescale. Variable is ignored here...
perrinel -
r404:4113f5669532
parent child
Show More
@@ -1,311 +1,307
1 #include "Visualization/VisualizationGraphWidget.h"
1 #include "Visualization/VisualizationGraphWidget.h"
2 #include "Visualization/IVisualizationWidgetVisitor.h"
2 #include "Visualization/IVisualizationWidgetVisitor.h"
3 #include "Visualization/VisualizationGraphHelper.h"
3 #include "Visualization/VisualizationGraphHelper.h"
4 #include "ui_VisualizationGraphWidget.h"
4 #include "ui_VisualizationGraphWidget.h"
5
5
6 #include <Data/ArrayData.h>
6 #include <Data/ArrayData.h>
7 #include <Data/IDataSeries.h>
7 #include <Data/IDataSeries.h>
8 #include <SqpApplication.h>
8 #include <SqpApplication.h>
9 #include <Variable/Variable.h>
9 #include <Variable/Variable.h>
10 #include <Variable/VariableController.h>
10 #include <Variable/VariableController.h>
11
11
12 #include <unordered_map>
12 #include <unordered_map>
13
13
14 Q_LOGGING_CATEGORY(LOG_VisualizationGraphWidget, "VisualizationGraphWidget")
14 Q_LOGGING_CATEGORY(LOG_VisualizationGraphWidget, "VisualizationGraphWidget")
15
15
16 namespace {
16 namespace {
17
17
18 /// Key pressed to enable zoom on horizontal axis
18 /// Key pressed to enable zoom on horizontal axis
19 const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier;
19 const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier;
20
20
21 /// Key pressed to enable zoom on vertical axis
21 /// Key pressed to enable zoom on vertical axis
22 const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier;
22 const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier;
23
23
24 } // namespace
24 } // namespace
25
25
26 struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
26 struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
27
27
28 // 1 variable -> n qcpplot
28 // 1 variable -> n qcpplot
29 std::multimap<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMultiMap;
29 std::multimap<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMultiMap;
30 };
30 };
31
31
32 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
32 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
33 : QWidget{parent},
33 : QWidget{parent},
34 ui{new Ui::VisualizationGraphWidget},
34 ui{new Ui::VisualizationGraphWidget},
35 impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
35 impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
36 {
36 {
37 ui->setupUi(this);
37 ui->setupUi(this);
38
38
39 ui->graphNameLabel->setText(name);
39 ui->graphNameLabel->setText(name);
40
40
41 // 'Close' options : widget is deleted when closed
41 // 'Close' options : widget is deleted when closed
42 setAttribute(Qt::WA_DeleteOnClose);
42 setAttribute(Qt::WA_DeleteOnClose);
43 connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationGraphWidget::close);
43 connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationGraphWidget::close);
44 ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
44 ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
45
45
46 // Set qcpplot properties :
46 // Set qcpplot properties :
47 // - Drag (on x-axis) and zoom are enabled
47 // - Drag (on x-axis) and zoom are enabled
48 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
48 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
49 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
49 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
50 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
50 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
51 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
51 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
52 connect(ui->widget->xAxis,
52 connect(ui->widget->xAxis,
53 static_cast<void (QCPAxis::*)(const QCPRange &)>(&QCPAxis::rangeChanged), this,
53 static_cast<void (QCPAxis::*)(const QCPRange &)>(&QCPAxis::rangeChanged), this,
54 &VisualizationGraphWidget::onRangeChanged);
54 &VisualizationGraphWidget::onRangeChanged);
55
55
56 // Activates menu when right clicking on the graph
56 // Activates menu when right clicking on the graph
57 ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
57 ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
58 connect(ui->widget, &QCustomPlot::customContextMenuRequested, this,
58 connect(ui->widget, &QCustomPlot::customContextMenuRequested, this,
59 &VisualizationGraphWidget::onGraphMenuRequested);
59 &VisualizationGraphWidget::onGraphMenuRequested);
60
60
61 connect(this, &VisualizationGraphWidget::requestDataLoading, &sqpApp->variableController(),
61 connect(this, &VisualizationGraphWidget::requestDataLoading, &sqpApp->variableController(),
62 &VariableController::onRequestDataLoading);
62 &VariableController::onRequestDataLoading);
63 }
63 }
64
64
65
65
66 VisualizationGraphWidget::~VisualizationGraphWidget()
66 VisualizationGraphWidget::~VisualizationGraphWidget()
67 {
67 {
68 delete ui;
68 delete ui;
69 }
69 }
70
70
71 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
71 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
72 {
72 {
73 // Uses delegate to create the qcpplot components according to the variable
73 // Uses delegate to create the qcpplot components according to the variable
74 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
74 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
75
75
76 for (auto createdPlottable : qAsConst(createdPlottables)) {
76 for (auto createdPlottable : qAsConst(createdPlottables)) {
77 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
77 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
78 }
78 }
79
79
80 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
80 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
81 }
81 }
82 void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> variable)
82 void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> variable)
83 {
83 {
84
84
85 // when adding a variable, we need to set its time range to the current graph range
85 // when adding a variable, we need to set its time range to the current graph range
86 auto grapheRange = ui->widget->xAxis->range();
86 auto grapheRange = ui->widget->xAxis->range();
87 auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
87 auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
88 variable->setDateTime(dateTime);
88 variable->setDateTime(dateTime);
89
89
90 auto variableDateTimeWithTolerance = dateTime;
90 auto variableDateTimeWithTolerance = dateTime;
91
91
92 // add 10% tolerance for each side
92 // add 10% tolerance for each side
93 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
93 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
94 variableDateTimeWithTolerance.m_TStart -= tolerance;
94 variableDateTimeWithTolerance.m_TStart -= tolerance;
95 variableDateTimeWithTolerance.m_TEnd += tolerance;
95 variableDateTimeWithTolerance.m_TEnd += tolerance;
96
96
97 // Uses delegate to create the qcpplot components according to the variable
97 // Uses delegate to create the qcpplot components according to the variable
98 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
98 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
99
99
100 for (auto createdPlottable : qAsConst(createdPlottables)) {
100 for (auto createdPlottable : qAsConst(createdPlottables)) {
101 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
101 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
102 }
102 }
103
103
104 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
104 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
105
105
106 // CHangement detected, we need to ask controller to request data loading
106 // CHangement detected, we need to ask controller to request data loading
107 emit requestDataLoading(variable, variableDateTimeWithTolerance);
107 emit requestDataLoading(variable, variableDateTimeWithTolerance);
108 }
108 }
109
109
110 void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable) noexcept
110 void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable) noexcept
111 {
111 {
112 // Each component associated to the variable :
112 // Each component associated to the variable :
113 // - is removed from qcpplot (which deletes it)
113 // - is removed from qcpplot (which deletes it)
114 // - is no longer referenced in the map
114 // - is no longer referenced in the map
115 auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
115 auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
116 for (auto it = componentsIt.first; it != componentsIt.second;) {
116 for (auto it = componentsIt.first; it != componentsIt.second;) {
117 ui->widget->removePlottable(it->second);
117 ui->widget->removePlottable(it->second);
118 it = impl->m_VariableToPlotMultiMap.erase(it);
118 it = impl->m_VariableToPlotMultiMap.erase(it);
119 }
119 }
120
120
121 // Updates graph
121 // Updates graph
122 ui->widget->replot();
122 ui->widget->replot();
123 }
123 }
124
124
125 void VisualizationGraphWidget::setRange(std::shared_ptr<Variable> variable,
126 const SqpDateTime &range)
127 {
128 // auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
129 // for (auto it = componentsIt.first; it != componentsIt.second;) {
130 // }
note

I have created a note

131 ui->widget->xAxis->setRange(range.m_TStart, range.m_TEnd);
132 }
133
125 void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
134 void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
126 {
135 {
127 if (visitor) {
136 if (visitor) {
128 visitor->visit(this);
137 visitor->visit(this);
129 }
138 }
130 else {
139 else {
131 qCCritical(LOG_VisualizationGraphWidget())
140 qCCritical(LOG_VisualizationGraphWidget())
132 << tr("Can't visit widget : the visitor is null");
141 << tr("Can't visit widget : the visitor is null");
133 }
142 }
134 }
143 }
135
144
136 bool VisualizationGraphWidget::canDrop(const Variable &variable) const
145 bool VisualizationGraphWidget::canDrop(const Variable &variable) const
137 {
146 {
138 /// @todo : for the moment, a graph can always accomodate a variable
147 /// @todo : for the moment, a graph can always accomodate a variable
139 Q_UNUSED(variable);
148 Q_UNUSED(variable);
140 return true;
149 return true;
141 }
150 }
142
151
143 bool VisualizationGraphWidget::contains(const Variable &variable) const
152 bool VisualizationGraphWidget::contains(const Variable &variable) const
144 {
153 {
145 // Finds the variable among the keys of the map
154 // Finds the variable among the keys of the map
146 auto variablePtr = &variable;
155 auto variablePtr = &variable;
147 auto findVariable
156 auto findVariable
148 = [variablePtr](const auto &entry) { return variablePtr == entry.first.get(); };
157 = [variablePtr](const auto &entry) { return variablePtr == entry.first.get(); };
149
158
150 auto end = impl->m_VariableToPlotMultiMap.cend();
159 auto end = impl->m_VariableToPlotMultiMap.cend();
151 auto it = std::find_if(impl->m_VariableToPlotMultiMap.cbegin(), end, findVariable);
160 auto it = std::find_if(impl->m_VariableToPlotMultiMap.cbegin(), end, findVariable);
152 return it != end;
161 return it != end;
153 }
162 }
154
163
155 QString VisualizationGraphWidget::name() const
164 QString VisualizationGraphWidget::name() const
156 {
165 {
157 return ui->graphNameLabel->text();
166 return ui->graphNameLabel->text();
158 }
167 }
159
168
160 void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept
169 void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept
161 {
170 {
162 QMenu graphMenu{};
171 QMenu graphMenu{};
163
172
164 // Iterates on variables (unique keys)
173 // Iterates on variables (unique keys)
165 for (auto it = impl->m_VariableToPlotMultiMap.cbegin(),
174 for (auto it = impl->m_VariableToPlotMultiMap.cbegin(),
166 end = impl->m_VariableToPlotMultiMap.cend();
175 end = impl->m_VariableToPlotMultiMap.cend();
167 it != end; it = impl->m_VariableToPlotMultiMap.upper_bound(it->first)) {
176 it != end; it = impl->m_VariableToPlotMultiMap.upper_bound(it->first)) {
168 // 'Remove variable' action
177 // 'Remove variable' action
169 graphMenu.addAction(tr("Remove variable %1").arg(it->first->name()),
178 graphMenu.addAction(tr("Remove variable %1").arg(it->first->name()),
170 [ this, var = it->first ]() { removeVariable(var); });
179 [ this, var = it->first ]() { removeVariable(var); });
171 }
180 }
172
181
173 if (!graphMenu.isEmpty()) {
182 if (!graphMenu.isEmpty()) {
174 graphMenu.exec(mapToGlobal(pos));
183 graphMenu.exec(mapToGlobal(pos));
175 }
184 }
176 }
185 }
177
186
178 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1)
187 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1)
179 {
188 {
180 qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
189 qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
181 << QThread::currentThread()->objectName();
190 << QThread::currentThread()->objectName();
182
191
183 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
192 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
184 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
193 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
185
194
186 auto variable = it->first;
195 auto variable = it->first;
187 auto dateTime = SqpDateTime{t1.lower, t1.upper};
196 auto dateTime = SqpDateTime{t1.lower, t1.upper};
188 auto dateTimeRange = dateTime;
197 auto dateTimeRange = dateTime;
189
198
190 auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
199 auto toleranceFactor = 0.2;
note

Will be modified whith setting.

200 auto tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart);
191 auto variableDateTimeWithTolerance = dateTime;
201 auto variableDateTimeWithTolerance = dateTime;
192 variableDateTimeWithTolerance.m_TStart -= tolerance;
202 variableDateTimeWithTolerance.m_TStart -= tolerance;
193 variableDateTimeWithTolerance.m_TEnd += tolerance;
203 variableDateTimeWithTolerance.m_TEnd += tolerance;
194
204
195 qCInfo(LOG_VisualizationGraphWidget()) << "v" << dateTime;
205 qCInfo(LOG_VisualizationGraphWidget()) << "v" << dateTime;
196 qCInfo(LOG_VisualizationGraphWidget()) << "vtol" << variableDateTimeWithTolerance;
206 qCInfo(LOG_VisualizationGraphWidget()) << "vtol" << variableDateTimeWithTolerance;
197 // If new range with tol is upper than variable datetime parameters. we need to request new
207 // If new range with tol is upper than variable datetime parameters. we need to request new
198 // data
208 // data
199 if (!variable->contains(variableDateTimeWithTolerance)) {
209 if (!variable->contains(variableDateTimeWithTolerance)) {
200
210
201 auto variableDateTimeWithTolerance = dateTime;
211 auto variableDateTimeWithTolerance = dateTime;
202 if (!variable->isInside(dateTime)) {
212 if (!variable->isInside(dateTime)) {
203 auto variableDateTime = variable->dateTime();
213 auto variableDateTime = variable->dateTime();
204 if (variableDateTime.m_TStart < dateTime.m_TStart) {
214 if (variableDateTime.m_TStart < dateTime.m_TStart) {
205 qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to right:");
215 qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to right:");
206
216
207 auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd;
217 auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd;
208 dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta;
218 dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta;
209 // Tolerance have to be added to the right
219 // Tolerance have to be added to the right
210 // add 10% tolerance for right (end) side
220 // add tolerance for right (end) side
211 // auto tolerance = 0.1 * (dateTime.m_TEnd -
221 tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart);
212 // dateTime.m_TStart);
213 variableDateTimeWithTolerance.m_TEnd += tolerance;
222 variableDateTimeWithTolerance.m_TEnd += tolerance;
214 }
223 }
215 else if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
224 else if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
216 qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to left: ");
225 qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to left: ");
217 auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart;
226 auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart;
218 dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta;
227 dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta;
219 // Tolerance have to be added to the left
228 // Tolerance have to be added to the left
220 // add 10% tolerance for left (start) side
229 // add tolerance for left (start) side
221 tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
230 tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart);
222 variableDateTimeWithTolerance.m_TStart -= tolerance;
231 variableDateTimeWithTolerance.m_TStart -= tolerance;
223 }
232 }
224 else {
233 else {
225 qCWarning(LOG_VisualizationGraphWidget())
234 qCWarning(LOG_VisualizationGraphWidget())
226 << tr("Detection anormal zoom detection: ");
235 << tr("Detection anormal zoom detection: ");
227 }
236 }
228 }
237 }
229 else {
238 else {
230 qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: ");
239 qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: ");
231 // add 10% tolerance for each side
240 // add 10% tolerance for each side
232 tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
241 tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
233 variableDateTimeWithTolerance.m_TStart -= tolerance;
242 variableDateTimeWithTolerance.m_TStart -= tolerance;
234 variableDateTimeWithTolerance.m_TEnd += tolerance;
243 variableDateTimeWithTolerance.m_TEnd += tolerance;
235 }
244 }
236 if (!variable->contains(dateTimeRange)) {
245 if (!variable->contains(dateTimeRange)) {
237 qCInfo(LOG_VisualizationGraphWidget()) << "newv" << dateTime;
246 qCInfo(LOG_VisualizationGraphWidget())
247 << "TORM: Modif on variable datetime detected" << dateTime;
238 variable->setDateTime(dateTime);
248 variable->setDateTime(dateTime);
239 }
249 }
240
250
241 qCInfo(LOG_VisualizationGraphWidget()) << tr("Request data detection: ");
251 qCInfo(LOG_VisualizationGraphWidget()) << tr("Request data detection: ");
242 // CHangement detected, we need to ask controller to request data loading
252 // CHangement detected, we need to ask controller to request data loading
243 emit requestDataLoading(variable, variableDateTimeWithTolerance);
253 emit requestDataLoading(variable, variableDateTimeWithTolerance);
244 }
254 }
245 else {
255 else {
246 qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: ");
256 qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: ");
247 }
257 }
248 }
258 }
249 }
259 }
250
260
251 void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
261 void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
252 {
262 {
253 auto zoomOrientations = QFlags<Qt::Orientation>{};
263 auto zoomOrientations = QFlags<Qt::Orientation>{};
254
264
255 // Lambda that enables a zoom orientation if the key modifier related to this orientation
265 // Lambda that enables a zoom orientation if the key modifier related to this orientation
256 // has
266 // has
257 // been pressed
267 // been pressed
258 auto enableOrientation
268 auto enableOrientation
259 = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
269 = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
260 auto orientationEnabled = event->modifiers().testFlag(modifier);
270 auto orientationEnabled = event->modifiers().testFlag(modifier);
261 zoomOrientations.setFlag(orientation, orientationEnabled);
271 zoomOrientations.setFlag(orientation, orientationEnabled);
262 };
272 };
263 enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER);
273 enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER);
264 enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER);
274 enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER);
265
275
266 ui->widget->axisRect()->setRangeZoom(zoomOrientations);
276 ui->widget->axisRect()->setRangeZoom(zoomOrientations);
267 }
277 }
268
278
269 void VisualizationGraphWidget::onDataCacheVariableUpdated()
279 void VisualizationGraphWidget::onDataCacheVariableUpdated()
270 {
280 {
271 // NOTE:
281 // NOTE:
272 // We don't want to call the method for each component of a variable unitarily, but for
282 // We don't want to call the method for each component of a variable unitarily, but for
273 // all
283 // all
274 // its components at once (eg its three components in the case of a vector).
284 // its components at once (eg its three components in the case of a vector).
275
285
276 // The unordered_multimap does not do this easily, so the question is whether to:
286 // The unordered_multimap does not do this easily, so the question is whether to:
277 // - use an ordered_multimap and the algos of std to group the values by key
287 // - use an ordered_multimap and the algos of std to group the values by key
278 // - use a map (unique keys) and store as values directly the list of components
288 // - use a map (unique keys) and store as values directly the list of components
279
289
280 auto grapheRange = ui->widget->xAxis->range();
290 auto grapheRange = ui->widget->xAxis->range();
281 auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
291 auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
282
292
283 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
293 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
284 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
294 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
285 auto variable = it->first;
295 auto variable = it->first;
286 qCInfo(LOG_VisualizationGraphWidget())
296 qCInfo(LOG_VisualizationGraphWidget())
287 << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated S"
297 << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated S"
288 << variable->dateTime();
298 << variable->dateTime();
289 qCInfo(LOG_VisualizationGraphWidget())
299 qCInfo(LOG_VisualizationGraphWidget())
290 << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated E" << dateTime;
300 << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated E" << dateTime;
291 if (dateTime.contains(variable->dateTime()) || dateTime.intersect(variable->dateTime())) {
301 if (dateTime.contains(variable->dateTime()) || dateTime.intersect(variable->dateTime())) {
292
302
293 VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
303 VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
294 variable->dataSeries(), variable->dateTime());
304 variable->dataSeries(), variable->dateTime());
295 }
305 }
296 }
306 }
297 }
307 }
298
299 void VisualizationGraphWidget::updateDisplay(std::shared_ptr<Variable> variable)
300 {
301 auto abstractPlotableItPair = impl->m_VariableToPlotMultiMap.equal_range(variable);
302
303 auto abstractPlotableVect = QVector<QCPAbstractPlottable *>{};
304
305 for (auto it = abstractPlotableItPair.first; it != abstractPlotableItPair.second; ++it) {
306 abstractPlotableVect.push_back(it->second);
307 }
308
309 VisualizationGraphHelper::updateData(abstractPlotableVect, variable->dataSeries(),
310 variable->dateTime());
311 }
General Comments 3
Under Review
author

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
Approved
author

Status change > Approved

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