Auto status change to "Under Review"
@@ -0,0 +1,42 | |||||
|
1 | #ifndef SCIQLOP_RESCALEAXEOPERATION_H | |||
|
2 | #define SCIQLOP_RESCALEAXEOPERATION_H | |||
|
3 | ||||
|
4 | #include "Visualization/IVisualizationWidgetVisitor.h" | |||
|
5 | #include <Data/SqpDateTime.h> | |||
|
6 | ||||
|
7 | #include <Common/spimpl.h> | |||
|
8 | ||||
|
9 | #include <QLoggingCategory> | |||
|
10 | ||||
|
11 | #include <memory> | |||
|
12 | ||||
|
13 | class Variable; | |||
|
14 | ||||
|
15 | Q_DECLARE_LOGGING_CATEGORY(LOG_RescaleAxeOperation) | |||
|
16 | ||||
|
17 | /** | |||
|
18 | * @brief The RescaleAxeOperation class defines an operation that traverses all of visualization | |||
|
19 | * widgets to remove a variable if they contain it | |||
|
20 | */ | |||
|
21 | class RescaleAxeOperation : public IVisualizationWidgetVisitor { | |||
|
22 | public: | |||
|
23 | /** | |||
|
24 | * Ctor | |||
|
25 | * @param variable the variable to remove from widgets | |||
|
26 | */ | |||
|
27 | explicit RescaleAxeOperation(std::shared_ptr<Variable> variable, const SqpDateTime &range); | |||
|
28 | ||||
|
29 | void visitEnter(VisualizationWidget *widget) override final; | |||
|
30 | void visitLeave(VisualizationWidget *widget) override final; | |||
|
31 | void visitEnter(VisualizationTabWidget *tabWidget) override final; | |||
|
32 | void visitLeave(VisualizationTabWidget *tabWidget) override final; | |||
|
33 | void visitEnter(VisualizationZoneWidget *zoneWidget) override final; | |||
|
34 | void visitLeave(VisualizationZoneWidget *zoneWidget) override final; | |||
|
35 | void visit(VisualizationGraphWidget *graphWidget) override final; | |||
|
36 | ||||
|
37 | private: | |||
|
38 | class RescaleAxeOperationPrivate; | |||
|
39 | spimpl::unique_impl_ptr<RescaleAxeOperationPrivate> impl; | |||
|
40 | }; | |||
|
41 | ||||
|
42 | #endif // SCIQLOP_RESCALEAXEOPERATION_H |
@@ -0,0 +1,71 | |||||
|
1 | #include "Visualization/operations/RescaleAxeOperation.h" | |||
|
2 | #include "Visualization/VisualizationGraphWidget.h" | |||
|
3 | ||||
|
4 | Q_LOGGING_CATEGORY(LOG_RescaleAxeOperation, "RescaleAxeOperation") | |||
|
5 | ||||
|
6 | struct RescaleAxeOperation::RescaleAxeOperationPrivate { | |||
|
7 | explicit RescaleAxeOperationPrivate(std::shared_ptr<Variable> variable, | |||
|
8 | const SqpDateTime &range) | |||
|
9 | : m_Variable(variable), m_Range(range) | |||
|
10 | { | |||
|
11 | } | |||
|
12 | ||||
|
13 | std::shared_ptr<Variable> m_Variable; | |||
|
14 | SqpDateTime m_Range; | |||
|
15 | }; | |||
|
16 | ||||
|
17 | RescaleAxeOperation::RescaleAxeOperation(std::shared_ptr<Variable> variable, | |||
|
18 | const SqpDateTime &range) | |||
|
19 | : impl{spimpl::make_unique_impl<RescaleAxeOperationPrivate>(variable, range)} | |||
|
20 | { | |||
|
21 | } | |||
|
22 | ||||
|
23 | void RescaleAxeOperation::visitEnter(VisualizationWidget *widget) | |||
|
24 | { | |||
|
25 | // VisualizationWidget is not intended to contain a variable | |||
|
26 | Q_UNUSED(widget) | |||
|
27 | } | |||
|
28 | ||||
|
29 | void RescaleAxeOperation::visitLeave(VisualizationWidget *widget) | |||
|
30 | { | |||
|
31 | // VisualizationWidget is not intended to contain a variable | |||
|
32 | Q_UNUSED(widget) | |||
|
33 | } | |||
|
34 | ||||
|
35 | void RescaleAxeOperation::visitEnter(VisualizationTabWidget *tabWidget) | |||
|
36 | { | |||
|
37 | // VisualizationTabWidget is not intended to contain a variable | |||
|
38 | Q_UNUSED(tabWidget) | |||
|
39 | } | |||
|
40 | ||||
|
41 | void RescaleAxeOperation::visitLeave(VisualizationTabWidget *tabWidget) | |||
|
42 | { | |||
|
43 | // VisualizationTabWidget is not intended to contain a variable | |||
|
44 | Q_UNUSED(tabWidget) | |||
|
45 | } | |||
|
46 | ||||
|
47 | void RescaleAxeOperation::visitEnter(VisualizationZoneWidget *zoneWidget) | |||
|
48 | { | |||
|
49 | // VisualizationZoneWidget is not intended to contain a variable | |||
|
50 | Q_UNUSED(zoneWidget) | |||
|
51 | } | |||
|
52 | ||||
|
53 | void RescaleAxeOperation::visitLeave(VisualizationZoneWidget *zoneWidget) | |||
|
54 | { | |||
|
55 | // VisualizationZoneWidget is not intended to contain a variable | |||
|
56 | Q_UNUSED(zoneWidget) | |||
|
57 | } | |||
|
58 | ||||
|
59 | void RescaleAxeOperation::visit(VisualizationGraphWidget *graphWidget) | |||
|
60 | { | |||
|
61 | if (graphWidget) { | |||
|
62 | // If the widget contains the variable, removes it | |||
|
63 | if (impl->m_Variable && graphWidget->contains(*impl->m_Variable)) { | |||
|
64 | graphWidget->setRange(impl->m_Variable, impl->m_Range); | |||
|
65 | } | |||
|
66 | } | |||
|
67 | else { | |||
|
68 | qCCritical(LOG_RescaleAxeOperation(), | |||
|
69 | "Can't visit VisualizationGraphWidget : the widget is null"); | |||
|
70 | } | |||
|
71 | } |
@@ -192,6 +192,10 MainWindow::MainWindow(QWidget *parent) | |||||
192 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), m_Ui->view, |
|
192 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), m_Ui->view, | |
193 | SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable>))); |
|
193 | SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable>))); | |
194 |
|
194 | |||
|
195 | connect(&sqpApp->visualizationController(), | |||
|
196 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)), m_Ui->view, | |||
|
197 | SLOT(onRangeChanged(std::shared_ptr<Variable>, const SqpDateTime &))); | |||
|
198 | ||||
195 | // Widgets / widgets connections |
|
199 | // Widgets / widgets connections | |
196 |
|
200 | |||
197 | // For the following connections, we use DirectConnection to allow each widget that can |
|
201 | // For the following connections, we use DirectConnection to allow each widget that can |
@@ -10,6 +10,8 | |||||
10 |
|
10 | |||
11 | #include <Data/SqpDateTime.h> |
|
11 | #include <Data/SqpDateTime.h> | |
12 |
|
12 | |||
|
13 | #include <functional> | |||
|
14 | ||||
13 | class DataProviderParameters; |
|
15 | class DataProviderParameters; | |
14 | class IDataSeries; |
|
16 | class IDataSeries; | |
15 | class QNetworkReply; |
|
17 | class QNetworkReply; |
@@ -6,6 +6,8 | |||||
6 | #include <QLoggingCategory> |
|
6 | #include <QLoggingCategory> | |
7 | #include <QObject> |
|
7 | #include <QObject> | |
8 |
|
8 | |||
|
9 | #include <functional> | |||
|
10 | ||||
9 | Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceItemAction) |
|
11 | Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceItemAction) | |
10 |
|
12 | |||
11 | class DataSourceItem; |
|
13 | class DataSourceItem; |
@@ -59,6 +59,9 signals: | |||||
59 | /// Signal emitted when a variable is about to be deleted from the controller |
|
59 | /// Signal emitted when a variable is about to be deleted from the controller | |
60 | void variableAboutToBeDeleted(std::shared_ptr<Variable> variable); |
|
60 | void variableAboutToBeDeleted(std::shared_ptr<Variable> variable); | |
61 |
|
61 | |||
|
62 | /// Signal emitted when a data acquisition is requested on a range for a variable | |||
|
63 | void rangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range); | |||
|
64 | ||||
62 | public slots: |
|
65 | public slots: | |
63 | /// Request the data loading of the variable whithin dateTime |
|
66 | /// Request the data loading of the variable whithin dateTime | |
64 | void onRequestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime); |
|
67 | void onRequestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime); |
@@ -1,6 +1,8 | |||||
1 | #ifndef SCIQLOP_VISUALIZATIONCONTROLLER_H |
|
1 | #ifndef SCIQLOP_VISUALIZATIONCONTROLLER_H | |
2 | #define SCIQLOP_VISUALIZATIONCONTROLLER_H |
|
2 | #define SCIQLOP_VISUALIZATIONCONTROLLER_H | |
3 |
|
3 | |||
|
4 | #include <Data/SqpDateTime.h> | |||
|
5 | ||||
4 | #include <QLoggingCategory> |
|
6 | #include <QLoggingCategory> | |
5 | #include <QObject> |
|
7 | #include <QObject> | |
6 | #include <QUuid> |
|
8 | #include <QUuid> | |
@@ -29,6 +31,9 signals: | |||||
29 | /// Signal emitted when a variable is about to be deleted from SciQlop |
|
31 | /// Signal emitted when a variable is about to be deleted from SciQlop | |
30 | void variableAboutToBeDeleted(std::shared_ptr<Variable> variable); |
|
32 | void variableAboutToBeDeleted(std::shared_ptr<Variable> variable); | |
31 |
|
33 | |||
|
34 | /// Signal emitted when a data acquisition is requested on a range for a variable | |||
|
35 | void rangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range); | |||
|
36 | ||||
32 | public slots: |
|
37 | public slots: | |
33 | /// Manage init/end of the controller |
|
38 | /// Manage init/end of the controller | |
34 | void initialize(); |
|
39 | void initialize(); |
@@ -60,7 +60,7 void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept | |||||
60 | impl->m_DataSeries->merge(dataSeries.get()); |
|
60 | impl->m_DataSeries->merge(dataSeries.get()); | |
61 | impl->m_DataSeries->unlock(); |
|
61 | impl->m_DataSeries->unlock(); | |
62 | dataSeries->unlock(); |
|
62 | dataSeries->unlock(); | |
63 | emit updated(); |
|
63 | // emit updated(); | |
64 | } |
|
64 | } | |
65 | } |
|
65 | } | |
66 |
|
66 |
@@ -139,6 +139,7 void VariableController::createVariable(const QString &name, const QVariantHash | |||||
139 | if (varIdentifier == identifier) { |
|
139 | if (varIdentifier == identifier) { | |
140 | impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache); |
|
140 | impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache); | |
141 | variable->setDataSeries(dataSeriesAcquired); |
|
141 | variable->setDataSeries(dataSeriesAcquired); | |
|
142 | emit variable->updated(); | |||
142 | } |
|
143 | } | |
143 | } |
|
144 | } | |
144 | }; |
|
145 | }; | |
@@ -160,6 +161,7 void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime) | |||||
160 | if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { |
|
161 | if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { | |
161 | selectedVariable->setDateTime(dateTime); |
|
162 | selectedVariable->setDateTime(dateTime); | |
162 | this->onRequestDataLoading(selectedVariable, dateTime); |
|
163 | this->onRequestDataLoading(selectedVariable, dateTime); | |
|
164 | emit rangeChanged(selectedVariable, dateTime); | |||
163 | } |
|
165 | } | |
164 | } |
|
166 | } | |
165 | } |
|
167 | } |
@@ -32,14 +32,15 public: | |||||
32 | /// Removes a variable from the graph |
|
32 | /// Removes a variable from the graph | |
33 | void removeVariable(std::shared_ptr<Variable> variable) noexcept; |
|
33 | void removeVariable(std::shared_ptr<Variable> variable) noexcept; | |
34 |
|
34 | |||
|
35 | /// Rescale the X axe to range parameter | |||
|
36 | void setRange(std::shared_ptr<Variable> variable, const SqpDateTime &range); | |||
|
37 | ||||
35 | // IVisualizationWidget interface |
|
38 | // IVisualizationWidget interface | |
36 | void accept(IVisualizationWidgetVisitor *visitor) override; |
|
39 | void accept(IVisualizationWidgetVisitor *visitor) override; | |
37 | bool canDrop(const Variable &variable) const override; |
|
40 | bool canDrop(const Variable &variable) const override; | |
38 | bool contains(const Variable &variable) const override; |
|
41 | bool contains(const Variable &variable) const override; | |
39 | QString name() const override; |
|
42 | QString name() const override; | |
40 |
|
43 | |||
41 | void updateDisplay(std::shared_ptr<Variable> variable); |
|
|||
42 |
|
||||
43 | signals: |
|
44 | signals: | |
44 | void requestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime); |
|
45 | void requestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime); | |
45 |
|
46 |
@@ -2,6 +2,7 | |||||
2 | #define SCIQLOP_VISUALIZATIONWIDGET_H |
|
2 | #define SCIQLOP_VISUALIZATIONWIDGET_H | |
3 |
|
3 | |||
4 | #include "Visualization/IVisualizationWidget.h" |
|
4 | #include "Visualization/IVisualizationWidget.h" | |
|
5 | #include <Data/SqpDateTime.h> | |||
5 |
|
6 | |||
6 | #include <QLoggingCategory> |
|
7 | #include <QLoggingCategory> | |
7 | #include <QWidget> |
|
8 | #include <QWidget> | |
@@ -41,6 +42,8 public slots: | |||||
41 | /// Slot called when a variable is about to be deleted from SciQlop |
|
42 | /// Slot called when a variable is about to be deleted from SciQlop | |
42 | void onVariableAboutToBeDeleted(std::shared_ptr<Variable> variable) noexcept; |
|
43 | void onVariableAboutToBeDeleted(std::shared_ptr<Variable> variable) noexcept; | |
43 |
|
44 | |||
|
45 | void onRangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range) noexcept; | |||
|
46 | ||||
44 | private: |
|
47 | private: | |
45 | Ui::VisualizationWidget *ui; |
|
48 | Ui::VisualizationWidget *ui; | |
46 | }; |
|
49 | }; |
@@ -38,6 +38,11 public: | |||||
38 | m_VisualizationController.get(), |
|
38 | m_VisualizationController.get(), | |
39 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection); |
|
39 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection); | |
40 |
|
40 | |||
|
41 | connect(m_VariableController.get(), | |||
|
42 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)), | |||
|
43 | m_VisualizationController.get(), | |||
|
44 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &))); | |||
|
45 | ||||
41 |
|
46 | |||
42 | m_DataSourceController->moveToThread(&m_DataSourceControllerThread); |
|
47 | m_DataSourceController->moveToThread(&m_DataSourceControllerThread); | |
43 | m_DataSourceControllerThread.setObjectName("DataSourceControllerThread"); |
|
48 | m_DataSourceControllerThread.setObjectName("DataSourceControllerThread"); |
@@ -69,7 +69,6 void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSerie | |||||
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 { |
@@ -122,6 +122,15 void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable | |||||
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 | // } | |||
|
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) { | |
@@ -177,37 +186,48 void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept | |||||
177 |
|
186 | |||
178 | void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) |
|
187 | void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |
179 | { |
|
188 | { | |
180 |
qC |
|
189 | qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged") | |
181 |
|
|
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}; | |
|
197 | auto dateTimeRange = dateTime; | |||
|
198 | ||||
|
199 | auto toleranceFactor = 0.2; | |||
|
200 | auto tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart); | |||
|
201 | auto variableDateTimeWithTolerance = dateTime; | |||
|
202 | variableDateTimeWithTolerance.m_TStart -= tolerance; | |||
|
203 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |||
188 |
|
204 | |||
189 | if (!variable->contains(dateTime)) { |
|
205 | qCInfo(LOG_VisualizationGraphWidget()) << "v" << dateTime; | |
|
206 | qCInfo(LOG_VisualizationGraphWidget()) << "vtol" << variableDateTimeWithTolerance; | |||
|
207 | // If new range with tol is upper than variable datetime parameters. we need to request new | |||
|
208 | // data | |||
|
209 | if (!variable->contains(variableDateTimeWithTolerance)) { | |||
190 |
|
210 | |||
191 | auto variableDateTimeWithTolerance = dateTime; |
|
211 | auto variableDateTimeWithTolerance = dateTime; | |
192 | if (!variable->isInside(dateTime)) { |
|
212 | if (!variable->isInside(dateTime)) { | |
193 | auto variableDateTime = variable->dateTime(); |
|
213 | auto variableDateTime = variable->dateTime(); | |
194 | if (variableDateTime.m_TStart < dateTime.m_TStart) { |
|
214 | if (variableDateTime.m_TStart < dateTime.m_TStart) { | |
195 |
qC |
|
215 | qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to right:"); | |
196 |
|
216 | |||
197 | auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd; |
|
217 | auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd; | |
198 | dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta; |
|
218 | dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta; | |
199 | // Tolerance have to be added to the right |
|
219 | // Tolerance have to be added to the right | |
200 |
// add |
|
220 | // add tolerance for right (end) side | |
201 |
|
|
221 | tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart); | |
202 | variableDateTimeWithTolerance.m_TEnd += tolerance; |
|
222 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |
203 | } |
|
223 | } | |
204 | else if (variableDateTime.m_TEnd > dateTime.m_TEnd) { |
|
224 | else if (variableDateTime.m_TEnd > dateTime.m_TEnd) { | |
205 |
qC |
|
225 | qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to left: "); | |
206 | auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart; |
|
226 | auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart; | |
207 | dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta; |
|
227 | dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta; | |
208 | // Tolerance have to be added to the left |
|
228 | // Tolerance have to be added to the left | |
209 |
// add |
|
229 | // add tolerance for left (start) side | |
210 |
|
|
230 | tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart); | |
211 | variableDateTimeWithTolerance.m_TStart -= tolerance; |
|
231 | variableDateTimeWithTolerance.m_TStart -= tolerance; | |
212 | } |
|
232 | } | |
213 | else { |
|
233 | else { | |
@@ -216,19 +236,24 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |||||
216 | } |
|
236 | } | |
217 | } |
|
237 | } | |
218 | else { |
|
238 | else { | |
219 |
qC |
|
239 | qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: "); | |
220 | // add 10% tolerance for each side |
|
240 | // add 10% tolerance for each side | |
221 |
|
|
241 | tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart); | |
222 | variableDateTimeWithTolerance.m_TStart -= tolerance; |
|
242 | variableDateTimeWithTolerance.m_TStart -= tolerance; | |
223 | variableDateTimeWithTolerance.m_TEnd += tolerance; |
|
243 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |
224 | } |
|
244 | } | |
225 |
variable-> |
|
245 | if (!variable->contains(dateTimeRange)) { | |
|
246 | qCInfo(LOG_VisualizationGraphWidget()) | |||
|
247 | << "TORM: Modif on variable datetime detected" << dateTime; | |||
|
248 | variable->setDateTime(dateTime); | |||
|
249 | } | |||
226 |
|
250 | |||
|
251 | qCInfo(LOG_VisualizationGraphWidget()) << tr("Request data detection: "); | |||
227 | // CHangement detected, we need to ask controller to request data loading |
|
252 | // CHangement detected, we need to ask controller to request data loading | |
228 | emit requestDataLoading(variable, variableDateTimeWithTolerance); |
|
253 | emit requestDataLoading(variable, variableDateTimeWithTolerance); | |
229 | } |
|
254 | } | |
230 | else { |
|
255 | else { | |
231 |
qC |
|
256 | qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: "); | |
232 | } |
|
257 | } | |
233 | } |
|
258 | } | |
234 | } |
|
259 | } | |
@@ -262,24 +287,21 void VisualizationGraphWidget::onDataCacheVariableUpdated() | |||||
262 | // - 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 | |
263 | // - 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 | |
264 |
|
289 | |||
|
290 | auto grapheRange = ui->widget->xAxis->range(); | |||
|
291 | auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper}; | |||
|
292 | ||||
265 | for (auto it = impl->m_VariableToPlotMultiMap.cbegin(); |
|
293 | for (auto it = impl->m_VariableToPlotMultiMap.cbegin(); | |
266 | it != impl->m_VariableToPlotMultiMap.cend(); ++it) { |
|
294 | it != impl->m_VariableToPlotMultiMap.cend(); ++it) { | |
267 | auto variable = it->first; |
|
295 | auto variable = it->first; | |
268 | VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second, |
|
296 | qCInfo(LOG_VisualizationGraphWidget()) | |
269 | variable->dataSeries(), variable->dateTime()); |
|
297 | << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated S" | |
270 | } |
|
298 | << variable->dateTime(); | |
271 | } |
|
299 | qCInfo(LOG_VisualizationGraphWidget()) | |
272 |
|
300 | << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated E" << dateTime; | ||
273 | void VisualizationGraphWidget::updateDisplay(std::shared_ptr<Variable> variable) |
|
301 | if (dateTime.contains(variable->dateTime()) || dateTime.intersect(variable->dateTime())) { | |
274 | { |
|
302 | ||
275 | auto abstractPlotableItPair = impl->m_VariableToPlotMultiMap.equal_range(variable); |
|
303 | VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second, | |
276 |
|
304 | variable->dataSeries(), variable->dateTime()); | ||
277 | auto abstractPlotableVect = QVector<QCPAbstractPlottable *>{}; |
|
305 | } | |
278 |
|
||||
279 | for (auto it = abstractPlotableItPair.first; it != abstractPlotableItPair.second; ++it) { |
|
|||
280 | abstractPlotableVect.push_back(it->second); |
|
|||
281 | } |
|
306 | } | |
282 |
|
||||
283 | VisualizationGraphHelper::updateData(abstractPlotableVect, variable->dataSeries(), |
|
|||
284 | variable->dateTime()); |
|
|||
285 | } |
|
307 | } |
@@ -5,6 +5,7 | |||||
5 | #include "Visualization/VisualizationZoneWidget.h" |
|
5 | #include "Visualization/VisualizationZoneWidget.h" | |
6 | #include "Visualization/operations/GenerateVariableMenuOperation.h" |
|
6 | #include "Visualization/operations/GenerateVariableMenuOperation.h" | |
7 | #include "Visualization/operations/RemoveVariableOperation.h" |
|
7 | #include "Visualization/operations/RemoveVariableOperation.h" | |
|
8 | #include "Visualization/operations/RescaleAxeOperation.h" | |||
8 | #include "Visualization/qcustomplot.h" |
|
9 | #include "Visualization/qcustomplot.h" | |
9 |
|
10 | |||
10 | #include "ui_VisualizationWidget.h" |
|
11 | #include "ui_VisualizationWidget.h" | |
@@ -141,3 +142,11 void VisualizationWidget::onVariableAboutToBeDeleted(std::shared_ptr<Variable> v | |||||
141 | auto removeVariableOperation = RemoveVariableOperation{variable}; |
|
142 | auto removeVariableOperation = RemoveVariableOperation{variable}; | |
142 | accept(&removeVariableOperation); |
|
143 | accept(&removeVariableOperation); | |
143 | } |
|
144 | } | |
|
145 | ||||
|
146 | void VisualizationWidget::onRangeChanged(std::shared_ptr<Variable> variable, | |||
|
147 | const SqpDateTime &range) noexcept | |||
|
148 | { | |||
|
149 | // Calls the operation of removing all references to the variable in the visualization | |||
|
150 | auto rescaleVariableOperation = RescaleAxeOperation{variable, range}; | |||
|
151 | accept(&rescaleVariableOperation); | |||
|
152 | } |
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
Status change > Approved
You need to be logged in to leave comments.
Login now