##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Add intersect méthode on variable and sqpDateTime...
perrinel -
r240:00cdbd31ff7e
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,23 +1,28
1 1 #ifndef SCIQLOP_SQPDATETIME_H
2 2 #define SCIQLOP_SQPDATETIME_H
3 3
4 4 #include <QObject>
5 5 /**
6 6 * @brief The SqpDateTime struct holds the information of time parameters
7 7 */
8 8 struct SqpDateTime {
9 9 /// Start time
10 10 double m_TStart;
11 11 /// End time
12 12 double m_TEnd;
13 13
14 14 bool contains(const SqpDateTime &dateTime)
15 15 {
16 16 return (m_TStart <= dateTime.m_TStart && m_TEnd >= dateTime.m_TEnd);
17 17 }
18
19 bool intersect(const SqpDateTime &dateTime)
20 {
21 return (m_TEnd >= dateTime.m_TStart && m_TStart <= dateTime.m_TEnd);
22 }
18 23 };
19 24
20 25 // Required for using shared_ptr in signals/slots
21 26 Q_DECLARE_METATYPE(SqpDateTime)
22 27
23 28 #endif // SCIQLOP_SQPDATETIME_H
Show file before | Show file after | Hide comments
@@ -1,54 +1,55
1 1 #ifndef SCIQLOP_VARIABLE_H
2 2 #define SCIQLOP_VARIABLE_H
3 3
4 4 #include <Data/SqpDateTime.h>
5 5
6 6
7 7 #include <QLoggingCategory>
8 8 #include <QObject>
9 9
10 10 #include <Common/spimpl.h>
11 11
12 12 Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
13 13
14 14 class IDataSeries;
15 15 class QString;
16 16
17 17 /**
18 18 * @brief The Variable class represents a variable in SciQlop.
19 19 */
20 20 class Variable : public QObject {
21 21
22 22 Q_OBJECT
23 23
24 24 public:
25 25 explicit Variable(const QString &name, const QString &unit, const QString &mission,
26 26 const SqpDateTime &dateTime);
27 27
28 28 QString name() const noexcept;
29 29 QString mission() const noexcept;
30 30 QString unit() const noexcept;
31 31 SqpDateTime dateTime() const noexcept;
32 32
33 33 /// @return the data of the variable, nullptr if there is no data
34 34 IDataSeries *dataSeries() const noexcept;
35 35
36 36 bool contains(const SqpDateTime &dateTime);
37 bool intersect(const SqpDateTime &dateTime);
37 38 void setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept;
38 39
39 40 public slots:
40 41 void onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
41 42
42 43 signals:
43 44 void dataCacheUpdated();
44 45
45 46
46 47 private:
47 48 class VariablePrivate;
48 49 spimpl::unique_impl_ptr<VariablePrivate> impl;
49 50 };
50 51
51 52 // Required for using shared_ptr in signals/slots
52 53 Q_DECLARE_METATYPE(std::shared_ptr<Variable>)
53 54
54 55 #endif // SCIQLOP_VARIABLE_H
Show file before | Show file after | Hide comments
@@ -1,89 +1,94
1 1 #include "Variable/Variable.h"
2 2
3 3 #include <Data/IDataSeries.h>
4 4 #include <Data/SqpDateTime.h>
5 5
6 6 Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
7 7
8 8 struct Variable::VariablePrivate {
9 9 explicit VariablePrivate(const QString &name, const QString &unit, const QString &mission,
10 10 const SqpDateTime &dateTime)
11 11 : m_Name{name},
12 12 m_Unit{unit},
13 13 m_Mission{mission},
14 14 m_DateTime{dateTime},
15 15 m_DataSeries{nullptr}
16 16 {
17 17 }
18 18
19 19 QString m_Name;
20 20 QString m_Unit;
21 21 QString m_Mission;
22 22
23 23 SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
24 24 std::unique_ptr<IDataSeries> m_DataSeries;
25 25 };
26 26
27 27 Variable::Variable(const QString &name, const QString &unit, const QString &mission,
28 28 const SqpDateTime &dateTime)
29 29 : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission, dateTime)}
30 30 {
31 31 }
32 32
33 33 QString Variable::name() const noexcept
34 34 {
35 35 return impl->m_Name;
36 36 }
37 37
38 38 QString Variable::mission() const noexcept
39 39 {
40 40 return impl->m_Mission;
41 41 }
42 42
43 43 QString Variable::unit() const noexcept
44 44 {
45 45 return impl->m_Unit;
46 46 }
47 47
48 48 SqpDateTime Variable::dateTime() const noexcept
49 49 {
50 50 return impl->m_DateTime;
51 51 }
52 52
53 53 void Variable::setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept
54 54 {
55 55 if (!impl->m_DataSeries) {
56 56 impl->m_DataSeries = std::move(dataSeries);
57 57 }
58 58 }
59 59
60 60 void Variable::onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
61 61 {
62 62 if (impl->m_DataSeries) {
63 63 impl->m_DataSeries->merge(dataSeries.get());
64 64
65 65 emit dataCacheUpdated();
66 66 }
67 67 }
68 68
69 69 IDataSeries *Variable::dataSeries() const noexcept
70 70 {
71 71 return impl->m_DataSeries.get();
72 72 }
73 73
74 74 bool Variable::contains(const SqpDateTime &dateTime)
75 75 {
76 76 if (!impl->m_DateTime.contains(dateTime)) {
77 77 // The current variable dateTime isn't enough to display the dateTime requested.
78 78 // We have to update it to the new dateTime requested.
79 79 // the correspondant new data to display will be given by the cache if possible and the
80 80 // provider if necessary.
81 81 qCInfo(LOG_Variable()) << "NEW DATE NEEDED";
82 82
83 impl->m_DateTime = dateTime;
83 // impl->m_DateTime = dateTime;
84 84
85 85 return false;
86 86 }
87 87
88 88 return true;
89 89 }
90
91 bool Variable::intersect(const SqpDateTime &dateTime)
92 {
93 return impl->m_DateTime.intersect(dateTime);
94 }
Show file before | Show file after | Hide comments
@@ -1,173 +1,198
1 1 #include "Visualization/VisualizationGraphWidget.h"
2 2 #include "Visualization/IVisualizationWidgetVisitor.h"
3 3 #include "Visualization/VisualizationGraphHelper.h"
4 4 #include "ui_VisualizationGraphWidget.h"
5 5
6 6 #include <Data/ArrayData.h>
7 7 #include <Data/IDataSeries.h>
8 8 #include <SqpApplication.h>
9 9 #include <Variable/Variable.h>
10 10 #include <Variable/VariableController.h>
11 11
12 12 #include <unordered_map>
13 13
14 14 Q_LOGGING_CATEGORY(LOG_VisualizationGraphWidget, "VisualizationGraphWidget")
15 15
16 16 namespace {
17 17
18 18 /// Key pressed to enable zoom on horizontal axis
19 19 const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier;
20 20
21 21 /// Key pressed to enable zoom on vertical axis
22 22 const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier;
23 23
24 24 } // namespace
25 25
26 26 struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
27 27
28 28 // 1 variable -> n qcpplot
29 29 std::unordered_multimap<std::shared_ptr<Variable>, QCPAbstractPlottable *>
30 30 m_VariableToPlotMultiMap;
31 31 };
32 32
33 33 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
34 34 : QWidget{parent},
35 35 ui{new Ui::VisualizationGraphWidget},
36 36 impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
37 37 {
38 38 ui->setupUi(this);
39 39
40 40 // qcpplot title
41 41 ui->widget->plotLayout()->insertRow(0);
42 42 ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name});
43 43
44 44 // Set qcpplot properties :
45 45 // - Drag (on x-axis) and zoom are enabled
46 46 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
47 47 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
48 48 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
49 49 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
50 50 connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
51 51 &QCPAxis::rangeChanged),
52 52 this, &VisualizationGraphWidget::onRangeChanged);
53 53 }
54 54
55 55
56 56 VisualizationGraphWidget::~VisualizationGraphWidget()
57 57 {
58 58 delete ui;
59 59 }
60 60
61 61 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
62 62 {
63 63 // Uses delegate to create the qcpplot components according to the variable
64 64 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
65 65
66 66 for (auto createdPlottable : qAsConst(createdPlottables)) {
67 67 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
68 68 }
69 69
70 70 connect(variable.get(), SIGNAL(dataCacheUpdated()), this, SLOT(onDataCacheVariableUpdated()));
71 71 }
72 72
73 73 void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
74 74 {
75 75 if (visitor) {
76 76 visitor->visit(this);
77 77 }
78 78 else {
79 79 qCCritical(LOG_VisualizationGraphWidget())
80 80 << tr("Can't visit widget : the visitor is null");
81 81 }
82 82 }
83 83
84 84 bool VisualizationGraphWidget::canDrop(const Variable &variable) const
85 85 {
86 86 /// @todo : for the moment, a graph can always accomodate a variable
87 87 Q_UNUSED(variable);
88 88 return true;
89 89 }
90 90
91 91 void VisualizationGraphWidget::close()
92 92 {
93 93 // The main view cannot be directly closed.
94 94 return;
95 95 }
96 96
97 97 QString VisualizationGraphWidget::name() const
98 98 {
99 99 if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) {
100 100 return title->text();
101 101 }
102 102 else {
103 103 return QString{};
104 104 }
105 105 }
106 106
107 107 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
108 108 {
109 109
110 110 qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged");
111 111
112 112 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
113 113 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
114
114 115 auto variable = it->first;
115 auto tolerance = 0.1 * (t2.upper - t2.lower);
116 auto dateTime = SqpDateTime{t2.lower - tolerance, t2.upper + tolerance};
116 qCInfo(LOG_VisualizationGraphWidget())
117 << tr("TORM: VisualizationGraphWidget::onRangeChanged")
118 << variable->dataSeries()->xAxisData()->size();
119 auto dateTime = SqpDateTime{t2.lower, t2.upper};
117 120
118 qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
119 << variable->dataSeries()->xAxisData()->size();
120 121 if (!variable->contains(dateTime)) {
122
123 if (variable->intersect(dateTime)) {
124 auto variableDateTime = variable->dateTime();
125 if (variableDateTime.m_TStart < dateTime.m_TStart) {
126 dateTime.m_TStart = variableDateTime.m_TStart;
127 // add 20% tolerance for left (start) side
128 auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
129 dateTime.m_TStart -= tolerance;
130 }
131
132 if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
133 dateTime.m_TEnd = variableDateTime.m_TEnd;
134 // add 20% tolerance for right (end) side
135 auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
136 dateTime.m_TEnd += tolerance;
137 }
138 }
139 else {
140 // add 10% tolerance for each side
141 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
142 dateTime.m_TStart -= tolerance;
143 dateTime.m_TEnd += tolerance;
144 }
145 // CHangement detected, we need to
121 146 sqpApp->variableController().requestDataLoading(variable, dateTime);
122 147 }
123 148 }
124 149 }
125 150
126 151 void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
127 152 {
128 153 auto zoomOrientations = QFlags<Qt::Orientation>{};
129 154
130 155 // Lambda that enables a zoom orientation if the key modifier related to this orientation has
131 156 // been pressed
132 157 auto enableOrientation
133 158 = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
134 159 auto orientationEnabled = event->modifiers().testFlag(modifier);
135 160 zoomOrientations.setFlag(orientation, orientationEnabled);
136 161 };
137 162 enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER);
138 163 enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER);
139 164
140 165 ui->widget->axisRect()->setRangeZoom(zoomOrientations);
141 166 }
142 167
143 168 void VisualizationGraphWidget::onDataCacheVariableUpdated()
144 169 {
145 170 // NOTE:
146 171 // We don't want to call the method for each component of a variable unitarily, but for all
147 172 // its components at once (eg its three components in the case of a vector).
148 173
149 174 // The unordered_multimap does not do this easily, so the question is whether to:
150 175 // - use an ordered_multimap and the algos of std to group the values by key
151 176 // - use a map (unique keys) and store as values directly the list of components
152 177
153 178 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
154 179 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
155 180 auto variable = it->first;
156 181 VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
157 182 variable->dataSeries(), variable->dateTime());
158 183 }
159 184 }
160 185
161 186 void VisualizationGraphWidget::updateDisplay(std::shared_ptr<Variable> variable)
162 187 {
163 188 auto abstractPlotableItPair = impl->m_VariableToPlotMultiMap.equal_range(variable);
164 189
165 190 auto abstractPlotableVect = QVector<QCPAbstractPlottable *>{};
166 191
167 192 for (auto it = abstractPlotableItPair.first; it != abstractPlotableItPair.second; ++it) {
168 193 abstractPlotableVect.push_back(it->second);
169 194 }
170 195
171 196 VisualizationGraphHelper::updateData(abstractPlotableVect, variable->dataSeries(),
172 197 variable->dateTime());
173 198 }
General Comments 3
Under Review
perrinel
author
Comment #1658
Edit
Delete
|

Auto status change to "Under Review"

Approved
perrinel
author
Comment #1659
Edit
Delete
|

Status change > Approved

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