##// END OF EJS Templates
Merge branch 'feature/DeltaTOnPan' into develop
perrinel -
r261:f23c8cc9e461 merge
parent child
Show More
@@ -1,80 +1,82
1 /*------------------------------------------------------------------------------
1 /*------------------------------------------------------------------------------
2 -- This file is a part of the QLop Software
2 -- This file is a part of the QLop Software
3 -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
3 -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
4 --
4 --
5 -- This program is free software; you can redistribute it and/or modify
5 -- This program is free software; you can redistribute it and/or modify
6 -- it under the terms of the GNU General Public License as published by
6 -- it under the terms of the GNU General Public License as published by
7 -- the Free Software Foundation; either version 2 of the License, or
7 -- the Free Software Foundation; either version 2 of the License, or
8 -- (at your option) any later version.
8 -- (at your option) any later version.
9 --
9 --
10 -- This program is distributed in the hope that it will be useful,
10 -- This program is distributed in the hope that it will be useful,
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 -- GNU General Public License for more details.
13 -- GNU General Public License for more details.
14 --
14 --
15 -- You should have received a copy of the GNU General Public License
15 -- You should have received a copy of the GNU General Public License
16 -- along with this program; if not, write to the Free Software
16 -- along with this program; if not, write to the Free Software
17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 -------------------------------------------------------------------------------*/
18 -------------------------------------------------------------------------------*/
19 /*-- Author : Alexis Jeandet
19 /*-- Author : Alexis Jeandet
20 -- Mail : alexis.jeandet@member.fsf.org
20 -- Mail : alexis.jeandet@member.fsf.org
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #include "MainWindow.h"
22 #include "MainWindow.h"
23 #include <QProcessEnvironment>
23 #include <QProcessEnvironment>
24 #include <QThread>
24 #include <QThread>
25 #include <SqpApplication.h>
25 #include <SqpApplication.h>
26 #include <qglobal.h>
26 #include <qglobal.h>
27
27
28 #include <Plugin/PluginManager.h>
28 #include <Plugin/PluginManager.h>
29 #include <QDir>
29 #include <QDir>
30
30
31 namespace {
31 namespace {
32
32
33 /// Name of the directory containing the plugins
33 /// Name of the directory containing the plugins
34
34
35 #if _WIN32 || _WIN64
35 #if _WIN32 || _WIN64
36 const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins");
36 const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins");
37 #endif
37 #endif
38
38
39
39
40 #if __GNUC__
40 #if __GNUC__
41 #if __x86_64__ || __ppc64__
41 #if __x86_64__ || __ppc64__
42 #define ENVIRONMENT64
42 #define ENVIRONMENT64
43 #else
43 #else
44 #define ENVIRONMENT32
44 #define ENVIRONMENT32
45 #endif
45 #endif
46 #endif
46 #endif
47 } // namespace
47 } // namespace
48
48
49 int main(int argc, char *argv[])
49 int main(int argc, char *argv[])
50 {
50 {
51 SqpApplication a{argc, argv};
51 SqpApplication a{argc, argv};
52 SqpApplication::setOrganizationName("LPP");
52 SqpApplication::setOrganizationName("LPP");
53 SqpApplication::setOrganizationDomain("lpp.fr");
53 SqpApplication::setOrganizationDomain("lpp.fr");
54 SqpApplication::setApplicationName("SciQLop");
54 SqpApplication::setApplicationName("SciQLop");
55 MainWindow w;
55 MainWindow w;
56 w.show();
56 w.show();
57
57
58 // Loads plugins
58 // Loads plugins
59 auto pluginDir = QDir{sqpApp->applicationDirPath()};
59 auto pluginDir = QDir{sqpApp->applicationDirPath()};
60 #if _WIN32 || _WIN64
60 #if _WIN32 || _WIN64
61 pluginDir.mkdir(PLUGIN_DIRECTORY_NAME);
61 pluginDir.mkdir(PLUGIN_DIRECTORY_NAME);
62 pluginDir.cd(PLUGIN_DIRECTORY_NAME);
62 pluginDir.cd(PLUGIN_DIRECTORY_NAME);
63 #endif
63 #endif
64
64
65
65
66 #if __GNUC__
66 #if __GNUC__
67 #if __x86_64__ || __ppc64__
67 #if __x86_64__ || __ppc64__
68 pluginDir.cd("../lib64/SciQlop");
68 if (!pluginDir.cd("../lib64/SciQlop")) {
69 pluginDir.cd("../lib64/sciqlop");
70 }
69 #else
71 #else
70 pluginDir.cd("../lib/SciQlop");
72 __x86_64__ || __ppc64__ if (!pluginDir.cd("../lib/SciQlop")) { pluginDir.cd("../lib/sciqlop"); }
71 #endif
73 #endif
72 #endif
74 #endif
73 qCDebug(LOG_PluginManager())
75 qCDebug(LOG_PluginManager())
74 << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());
76 << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());
75
77
76 PluginManager pluginManager{};
78 PluginManager pluginManager{};
77 pluginManager.loadPlugins(pluginDir);
79 pluginManager.loadPlugins(pluginDir);
78
80
79 return a.exec();
81 return a.exec();
80 }
82 }
@@ -1,23 +1,28
1 #ifndef SCIQLOP_SQPDATETIME_H
1 #ifndef SCIQLOP_SQPDATETIME_H
2 #define SCIQLOP_SQPDATETIME_H
2 #define SCIQLOP_SQPDATETIME_H
3
3
4 #include <QObject>
4 #include <QObject>
5 /**
5 /**
6 * @brief The SqpDateTime struct holds the information of time parameters
6 * @brief The SqpDateTime struct holds the information of time parameters
7 */
7 */
8 struct SqpDateTime {
8 struct SqpDateTime {
9 /// Start time
9 /// Start time
10 double m_TStart;
10 double m_TStart;
11 /// End time
11 /// End time
12 double m_TEnd;
12 double m_TEnd;
13
13
14 bool contains(const SqpDateTime &dateTime)
14 bool contains(const SqpDateTime &dateTime)
15 {
15 {
16 return (m_TStart <= dateTime.m_TStart && m_TEnd >= dateTime.m_TEnd);
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 // Required for using shared_ptr in signals/slots
25 // Required for using shared_ptr in signals/slots
21 Q_DECLARE_METATYPE(SqpDateTime)
26 Q_DECLARE_METATYPE(SqpDateTime)
22
27
23 #endif // SCIQLOP_SQPDATETIME_H
28 #endif // SCIQLOP_SQPDATETIME_H
@@ -1,54 +1,56
1 #ifndef SCIQLOP_VARIABLE_H
1 #ifndef SCIQLOP_VARIABLE_H
2 #define SCIQLOP_VARIABLE_H
2 #define SCIQLOP_VARIABLE_H
3
3
4 #include <Data/SqpDateTime.h>
4 #include <Data/SqpDateTime.h>
5
5
6
6
7 #include <QLoggingCategory>
7 #include <QLoggingCategory>
8 #include <QObject>
8 #include <QObject>
9
9
10 #include <Common/spimpl.h>
10 #include <Common/spimpl.h>
11
11
12 Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
12 Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
13
13
14 class IDataSeries;
14 class IDataSeries;
15 class QString;
15 class QString;
16
16
17 /**
17 /**
18 * @brief The Variable class represents a variable in SciQlop.
18 * @brief The Variable class represents a variable in SciQlop.
19 */
19 */
20 class Variable : public QObject {
20 class Variable : public QObject {
21
21
22 Q_OBJECT
22 Q_OBJECT
23
23
24 public:
24 public:
25 explicit Variable(const QString &name, const QString &unit, const QString &mission,
25 explicit Variable(const QString &name, const QString &unit, const QString &mission,
26 const SqpDateTime &dateTime);
26 const SqpDateTime &dateTime);
27
27
28 QString name() const noexcept;
28 QString name() const noexcept;
29 QString mission() const noexcept;
29 QString mission() const noexcept;
30 QString unit() const noexcept;
30 QString unit() const noexcept;
31 SqpDateTime dateTime() const noexcept;
31 SqpDateTime dateTime() const noexcept;
32 void setDateTime(const SqpDateTime &dateTime) noexcept;
32
33
33 /// @return the data of the variable, nullptr if there is no data
34 /// @return the data of the variable, nullptr if there is no data
34 IDataSeries *dataSeries() const noexcept;
35 IDataSeries *dataSeries() const noexcept;
35
36
36 bool contains(const SqpDateTime &dateTime);
37 bool contains(const SqpDateTime &dateTime);
38 bool intersect(const SqpDateTime &dateTime);
37 void setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept;
39 void setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept;
38
40
39 public slots:
41 public slots:
40 void onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
42 void onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
41
43
42 signals:
44 signals:
43 void dataCacheUpdated();
45 void dataCacheUpdated();
44
46
45
47
46 private:
48 private:
47 class VariablePrivate;
49 class VariablePrivate;
48 spimpl::unique_impl_ptr<VariablePrivate> impl;
50 spimpl::unique_impl_ptr<VariablePrivate> impl;
49 };
51 };
50
52
51 // Required for using shared_ptr in signals/slots
53 // Required for using shared_ptr in signals/slots
52 Q_DECLARE_METATYPE(std::shared_ptr<Variable>)
54 Q_DECLARE_METATYPE(std::shared_ptr<Variable>)
53
55
54 #endif // SCIQLOP_VARIABLE_H
56 #endif // SCIQLOP_VARIABLE_H
@@ -1,89 +1,87
1 #include "Variable/Variable.h"
1 #include "Variable/Variable.h"
2
2
3 #include <Data/IDataSeries.h>
3 #include <Data/IDataSeries.h>
4 #include <Data/SqpDateTime.h>
4 #include <Data/SqpDateTime.h>
5
5
6 Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
6 Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
7
7
8 struct Variable::VariablePrivate {
8 struct Variable::VariablePrivate {
9 explicit VariablePrivate(const QString &name, const QString &unit, const QString &mission,
9 explicit VariablePrivate(const QString &name, const QString &unit, const QString &mission,
10 const SqpDateTime &dateTime)
10 const SqpDateTime &dateTime)
11 : m_Name{name},
11 : m_Name{name},
12 m_Unit{unit},
12 m_Unit{unit},
13 m_Mission{mission},
13 m_Mission{mission},
14 m_DateTime{dateTime},
14 m_DateTime{dateTime},
15 m_DataSeries{nullptr}
15 m_DataSeries{nullptr}
16 {
16 {
17 }
17 }
18
18
19 QString m_Name;
19 QString m_Name;
20 QString m_Unit;
20 QString m_Unit;
21 QString m_Mission;
21 QString m_Mission;
22
22
23 SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
23 SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
24 std::unique_ptr<IDataSeries> m_DataSeries;
24 std::unique_ptr<IDataSeries> m_DataSeries;
25 };
25 };
26
26
27 Variable::Variable(const QString &name, const QString &unit, const QString &mission,
27 Variable::Variable(const QString &name, const QString &unit, const QString &mission,
28 const SqpDateTime &dateTime)
28 const SqpDateTime &dateTime)
29 : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission, dateTime)}
29 : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission, dateTime)}
30 {
30 {
31 }
31 }
32
32
33 QString Variable::name() const noexcept
33 QString Variable::name() const noexcept
34 {
34 {
35 return impl->m_Name;
35 return impl->m_Name;
36 }
36 }
37
37
38 QString Variable::mission() const noexcept
38 QString Variable::mission() const noexcept
39 {
39 {
40 return impl->m_Mission;
40 return impl->m_Mission;
41 }
41 }
42
42
43 QString Variable::unit() const noexcept
43 QString Variable::unit() const noexcept
44 {
44 {
45 return impl->m_Unit;
45 return impl->m_Unit;
46 }
46 }
47
47
48 SqpDateTime Variable::dateTime() const noexcept
48 SqpDateTime Variable::dateTime() const noexcept
49 {
49 {
50 return impl->m_DateTime;
50 return impl->m_DateTime;
51 }
51 }
52
52
53 void Variable::setDateTime(const SqpDateTime &dateTime) noexcept
54 {
55 impl->m_DateTime = dateTime;
56 }
57
53 void Variable::setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept
58 void Variable::setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept
54 {
59 {
55 if (!impl->m_DataSeries) {
60 if (!impl->m_DataSeries) {
56 impl->m_DataSeries = std::move(dataSeries);
61 impl->m_DataSeries = std::move(dataSeries);
57 }
62 }
58 }
63 }
59
64
60 void Variable::onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
65 void Variable::onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
61 {
66 {
62 if (impl->m_DataSeries) {
67 if (impl->m_DataSeries) {
63 impl->m_DataSeries->merge(dataSeries.get());
68 impl->m_DataSeries->merge(dataSeries.get());
64
69
65 emit dataCacheUpdated();
70 emit dataCacheUpdated();
66 }
71 }
67 }
72 }
68
73
69 IDataSeries *Variable::dataSeries() const noexcept
74 IDataSeries *Variable::dataSeries() const noexcept
70 {
75 {
71 return impl->m_DataSeries.get();
76 return impl->m_DataSeries.get();
72 }
77 }
73
78
74 bool Variable::contains(const SqpDateTime &dateTime)
79 bool Variable::contains(const SqpDateTime &dateTime)
75 {
80 {
76 if (!impl->m_DateTime.contains(dateTime)) {
81 return impl->m_DateTime.contains(dateTime);
77 // The current variable dateTime isn't enough to display the dateTime requested.
82 }
78 // We have to update it to the new dateTime requested.
79 // the correspondant new data to display will be given by the cache if possible and the
80 // provider if necessary.
81 qCInfo(LOG_Variable()) << "NEW DATE NEEDED";
82
83 impl->m_DateTime = dateTime;
84
85 return false;
86 }
87
83
88 return true;
84 bool Variable::intersect(const SqpDateTime &dateTime)
85 {
86 return impl->m_DateTime.intersect(dateTime);
89 }
87 }
@@ -1,173 +1,205
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::unordered_multimap<std::shared_ptr<Variable>, QCPAbstractPlottable *>
29 std::unordered_multimap<std::shared_ptr<Variable>, QCPAbstractPlottable *>
30 m_VariableToPlotMultiMap;
30 m_VariableToPlotMultiMap;
31 };
31 };
32
32
33 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
33 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
34 : QWidget{parent},
34 : QWidget{parent},
35 ui{new Ui::VisualizationGraphWidget},
35 ui{new Ui::VisualizationGraphWidget},
36 impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
36 impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
37 {
37 {
38 ui->setupUi(this);
38 ui->setupUi(this);
39
39
40 // qcpplot title
40 // qcpplot title
41 ui->widget->plotLayout()->insertRow(0);
41 ui->widget->plotLayout()->insertRow(0);
42 ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name});
42 ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name});
43
43
44 // Set qcpplot properties :
44 // Set qcpplot properties :
45 // - Drag (on x-axis) and zoom are enabled
45 // - Drag (on x-axis) and zoom are enabled
46 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
46 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
47 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
47 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
48 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
48 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
49 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
49 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
50 connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
50 connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
51 &QCPAxis::rangeChanged),
51 &QCPAxis::rangeChanged),
52 this, &VisualizationGraphWidget::onRangeChanged);
52 this, &VisualizationGraphWidget::onRangeChanged);
53 }
53 }
54
54
55
55
56 VisualizationGraphWidget::~VisualizationGraphWidget()
56 VisualizationGraphWidget::~VisualizationGraphWidget()
57 {
57 {
58 delete ui;
58 delete ui;
59 }
59 }
60
60
61 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
61 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
62 {
62 {
63 // Uses delegate to create the qcpplot components according to the variable
63 // Uses delegate to create the qcpplot components according to the variable
64 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
64 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
65
65
66 for (auto createdPlottable : qAsConst(createdPlottables)) {
66 for (auto createdPlottable : qAsConst(createdPlottables)) {
67 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
67 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
68 }
68 }
69
69
70 connect(variable.get(), SIGNAL(dataCacheUpdated()), this, SLOT(onDataCacheVariableUpdated()));
70 connect(variable.get(), SIGNAL(dataCacheUpdated()), this, SLOT(onDataCacheVariableUpdated()));
71 }
71 }
72
72
73 void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
73 void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
74 {
74 {
75 if (visitor) {
75 if (visitor) {
76 visitor->visit(this);
76 visitor->visit(this);
77 }
77 }
78 else {
78 else {
79 qCCritical(LOG_VisualizationGraphWidget())
79 qCCritical(LOG_VisualizationGraphWidget())
80 << tr("Can't visit widget : the visitor is null");
80 << tr("Can't visit widget : the visitor is null");
81 }
81 }
82 }
82 }
83
83
84 bool VisualizationGraphWidget::canDrop(const Variable &variable) const
84 bool VisualizationGraphWidget::canDrop(const Variable &variable) const
85 {
85 {
86 /// @todo : for the moment, a graph can always accomodate a variable
86 /// @todo : for the moment, a graph can always accomodate a variable
87 Q_UNUSED(variable);
87 Q_UNUSED(variable);
88 return true;
88 return true;
89 }
89 }
90
90
91 void VisualizationGraphWidget::close()
91 void VisualizationGraphWidget::close()
92 {
92 {
93 // The main view cannot be directly closed.
93 // The main view cannot be directly closed.
94 return;
94 return;
95 }
95 }
96
96
97 QString VisualizationGraphWidget::name() const
97 QString VisualizationGraphWidget::name() const
98 {
98 {
99 if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) {
99 if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) {
100 return title->text();
100 return title->text();
101 }
101 }
102 else {
102 else {
103 return QString{};
103 return QString{};
104 }
104 }
105 }
105 }
106
106
107 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
107 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
108 {
108 {
109
109
110 qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged");
110 qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged");
111
111
112 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
112 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
113 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
113 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
114
114 auto variable = it->first;
115 auto variable = it->first;
115 auto tolerance = 0.1 * (t2.upper - t2.lower);
116 qCInfo(LOG_VisualizationGraphWidget())
116 auto dateTime = SqpDateTime{t2.lower - tolerance, t2.upper + tolerance};
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 if (!variable->contains(dateTime)) {
121 if (!variable->contains(dateTime)) {
121 sqpApp->variableController().requestDataLoading(variable, dateTime);
122
123 auto variableDateTimeWithTolerance = dateTime;
124 if (variable->intersect(dateTime)) {
125 auto variableDateTime = variable->dateTime();
126 if (variableDateTime.m_TStart < dateTime.m_TStart) {
127 dateTime.m_TStart = variableDateTime.m_TStart;
128 // START is set to the old one. tolerance have to be added to the right
129 // add 10% tolerance for right (end) side
130 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
131 variableDateTimeWithTolerance.m_TEnd += tolerance;
132 }
133 if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
134 dateTime.m_TEnd = variableDateTime.m_TEnd;
135 // END is set to the old one. tolerance have to be added to the left
136 // add 10% tolerance for left (start) side
137 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
138 variableDateTimeWithTolerance.m_TStart -= tolerance;
139 }
140 }
141 else {
142 // add 10% tolerance for each side
143 auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
144 variableDateTimeWithTolerance.m_TStart -= tolerance;
145 variableDateTimeWithTolerance.m_TEnd += tolerance;
146 }
147 variable->setDateTime(dateTime);
148
149 // CHangement detected, we need to ask controller to request data loading
150 sqpApp->variableController().requestDataLoading(variable,
151 variableDateTimeWithTolerance);
122 }
152 }
123 }
153 }
124 }
154 }
125
155
126 void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
156 void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
127 {
157 {
128 auto zoomOrientations = QFlags<Qt::Orientation>{};
158 auto zoomOrientations = QFlags<Qt::Orientation>{};
129
159
130 // Lambda that enables a zoom orientation if the key modifier related to this orientation has
160 // Lambda that enables a zoom orientation if the key modifier related to this orientation
161 // has
131 // been pressed
162 // been pressed
132 auto enableOrientation
163 auto enableOrientation
133 = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
164 = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
134 auto orientationEnabled = event->modifiers().testFlag(modifier);
165 auto orientationEnabled = event->modifiers().testFlag(modifier);
135 zoomOrientations.setFlag(orientation, orientationEnabled);
166 zoomOrientations.setFlag(orientation, orientationEnabled);
136 };
167 };
137 enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER);
168 enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER);
138 enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER);
169 enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER);
139
170
140 ui->widget->axisRect()->setRangeZoom(zoomOrientations);
171 ui->widget->axisRect()->setRangeZoom(zoomOrientations);
141 }
172 }
142
173
143 void VisualizationGraphWidget::onDataCacheVariableUpdated()
174 void VisualizationGraphWidget::onDataCacheVariableUpdated()
144 {
175 {
145 // NOTE:
176 // NOTE:
146 // We don't want to call the method for each component of a variable unitarily, but for all
177 // We don't want to call the method for each component of a variable unitarily, but for
178 // all
147 // its components at once (eg its three components in the case of a vector).
179 // its components at once (eg its three components in the case of a vector).
148
180
149 // The unordered_multimap does not do this easily, so the question is whether to:
181 // The unordered_multimap does not do this easily, so the question is whether to:
150 // - use an ordered_multimap and the algos of std to group the values by key
182 // - use an ordered_multimap and the algos of std to group the values by key
151 // - use a map (unique keys) and store as values directly the list of components
183 // - use a map (unique keys) and store as values directly the list of components
152
184
153 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
185 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
154 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
186 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
155 auto variable = it->first;
187 auto variable = it->first;
156 VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
188 VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
157 variable->dataSeries(), variable->dateTime());
189 variable->dataSeries(), variable->dateTime());
158 }
190 }
159 }
191 }
160
192
161 void VisualizationGraphWidget::updateDisplay(std::shared_ptr<Variable> variable)
193 void VisualizationGraphWidget::updateDisplay(std::shared_ptr<Variable> variable)
162 {
194 {
163 auto abstractPlotableItPair = impl->m_VariableToPlotMultiMap.equal_range(variable);
195 auto abstractPlotableItPair = impl->m_VariableToPlotMultiMap.equal_range(variable);
164
196
165 auto abstractPlotableVect = QVector<QCPAbstractPlottable *>{};
197 auto abstractPlotableVect = QVector<QCPAbstractPlottable *>{};
166
198
167 for (auto it = abstractPlotableItPair.first; it != abstractPlotableItPair.second; ++it) {
199 for (auto it = abstractPlotableItPair.first; it != abstractPlotableItPair.second; ++it) {
168 abstractPlotableVect.push_back(it->second);
200 abstractPlotableVect.push_back(it->second);
169 }
201 }
170
202
171 VisualizationGraphHelper::updateData(abstractPlotableVect, variable->dataSeries(),
203 VisualizationGraphHelper::updateData(abstractPlotableVect, variable->dataSeries(),
172 variable->dateTime());
204 variable->dateTime());
173 }
205 }
General Comments 0
You need to be logged in to leave comments. Login now