##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Fix the cosinus bug....
perrinel -
r298:3a08c66e4df2
parent child
Show More
Show file before | Show file after | Hide comments
@@ -42,7 +42,7 public slots:
42 42 void onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
43 43
44 44 signals:
45 void dataCacheUpdated();
45 void updated();
46 46
47 47
48 48 private:
Show file before | Show file after | Hide comments
@@ -30,14 +30,13 public:
30 30 void setTimeController(TimeController *timeController) noexcept;
31 31
32 32
33 /// Request the data loading of the variable whithin dateTime
34 void requestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
35
36 33 signals:
37 34 /// Signal emitted when a variable has been created
38 35 void variableCreated(std::shared_ptr<Variable> variable);
39 36
40 37 public slots:
38 /// Request the data loading of the variable whithin dateTime
39 void onRequestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
41 40 /**
42 41 * Creates a new variable and adds it to the model
43 42 * @param name the name of the new variable
Show file before | Show file after | Hide comments
@@ -67,7 +67,7 void Variable::onAddDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
67 67 if (impl->m_DataSeries) {
68 68 impl->m_DataSeries->merge(dataSeries.get());
69 69
70 emit dataCacheUpdated();
70 emit updated();
71 71 }
72 72 }
73 73
Show file before | Show file after | Hide comments
@@ -9,7 +9,6
9 9 #include <Time/TimeController.h>
10 10
11 11 #include <QDateTime>
12 #include <QElapsedTimer>
13 12 #include <QMutex>
14 13 #include <QThread>
15 14
@@ -112,33 +111,27 void VariableController::createVariable(const QString &name,
112 111 }
113 112
114 113
115 void VariableController::requestDataLoading(std::shared_ptr<Variable> variable,
116 const SqpDateTime &dateTime)
114 void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,
115 const SqpDateTime &dateTime)
117 116 {
118 117 // we want to load data of the variable for the dateTime.
119 118 // First we check if the cache contains some of them.
120 119 // For the other, we ask the provider to give them.
121 120 if (variable) {
122 121
123 QElapsedTimer timer;
124 timer.start();
125 qCInfo(LOG_VariableController()) << "TORM: The slow s0 operation took" << timer.elapsed()
126 << "milliseconds";
127 122 auto dateTimeListNotInCache
128 123 = impl->m_VariableCacheController->provideNotInCacheDateTimeList(variable, dateTime);
129 qCInfo(LOG_VariableController()) << "TORM: The slow s1 operation took" << timer.elapsed()
130 << "milliseconds";
131 124
132 // Ask the provider for each data on the dateTimeListNotInCache
133 impl->m_VariableToProviderMap.at(variable)->requestDataLoading(dateTimeListNotInCache);
134
135 qCInfo(LOG_VariableController()) << "TORM: The slow s2 operation took" << timer.elapsed()
136 << "milliseconds";
137
138 // store in cache
139 impl->m_VariableCacheController->addDateTime(variable, dateTime);
140 qCInfo(LOG_VariableController()) << "TORM: The slow s3 operation took" << timer.elapsed()
141 << "milliseconds";
125 if (!dateTimeListNotInCache.empty()) {
126 // Ask the provider for each data on the dateTimeListNotInCache
127 impl->m_VariableToProviderMap.at(variable)->requestDataLoading(
128 std::move(dateTimeListNotInCache));
129 // store in cache
130 impl->m_VariableCacheController->addDateTime(variable, dateTime);
131 }
132 else {
133 emit variable->updated();
134 }
142 135 }
143 136 else {
144 137 qCCritical(LOG_VariableController()) << tr("Impossible to load data of a variable null");
Show file before | Show file after | Hide comments
@@ -13,6 +13,7
13 13 Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationGraphWidget)
14 14
15 15 class QCPRange;
16 class SqpDateTime;
16 17 class Variable;
17 18
18 19 namespace Ui {
@@ -37,6 +38,9 public:
37 38
38 39 void updateDisplay(std::shared_ptr<Variable> variable);
39 40
41 signals:
42 void requestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
43
40 44
41 45 private:
42 46 Ui::VisualizationGraphWidget *ui;
Show file before | Show file after | Hide comments
@@ -37,30 +37,32 void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSerie
37 37 timer.start();
38 38 if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
39 39 // Clean the graph
40 qCDebug(LOG_VisualizationGraphHelper()) << "The slow s1 operation took" << timer.elapsed()
41 << "milliseconds";
42 40 // NAIVE approch
43 41 const auto &xData = scalarSeries.xAxisData()->data();
44 42 const auto &valuesData = scalarSeries.valuesData()->data();
43 const auto count = xData.count();
44 qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache" << xData.count();
45 45
46 auto xValue = QVector<double>();
47 auto vValue = QVector<double>();
46 auto xValue = QVector<double>(count);
47 auto vValue = QVector<double>(count);
48 48
49 const auto count = xData.count();
50 auto ite = 0;
49 int n = 0;
51 50 for (auto i = 0; i < count; ++i) {
52 const auto x = xData.at(i);
51 const auto x = xData[i];
53 52 if (x >= dateTime.m_TStart && x <= dateTime.m_TEnd) {
54 xValue.push_back(x);
55 vValue.push_back(valuesData.at(i));
56 ++ite;
53 xValue[n] = x;
54 vValue[n] = valuesData[i];
55 ++n;
57 56 }
58 57 }
59 58
60 qcpGraph->setData(xValue, vValue);
59 xValue.resize(n);
60 vValue.resize(n);
61 61
62 qCDebug(LOG_VisualizationGraphHelper()) << "The slow s2 operation took" << timer.elapsed()
63 << "milliseconds";
62 qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
63 << xValue.count();
64
65 qcpGraph->setData(xValue, vValue);
64 66 }
65 67 else {
66 68 /// @todo DEBUG
Show file before | Show file after | Hide comments
@@ -57,6 +57,9 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget
57 57 ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
58 58 connect(ui->widget, &QCustomPlot::customContextMenuRequested, this,
59 59 &VisualizationGraphWidget::onGraphMenuRequested);
60
61 connect(this, &VisualizationGraphWidget::requestDataLoading, &sqpApp->variableController(),
62 &VariableController::onRequestDataLoading);
60 63 }
61 64
62 65
@@ -74,7 +77,7 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
74 77 impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
75 78 }
76 79
77 connect(variable.get(), SIGNAL(dataCacheUpdated()), this, SLOT(onDataCacheVariableUpdated()));
80 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
78 81 }
79 82
80 83 void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable) noexcept
@@ -142,9 +145,6 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange
142 145 it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
143 146
144 147 auto variable = it->first;
145 qCInfo(LOG_VisualizationGraphWidget())
146 << tr("TORM: VisualizationGraphWidget::onRangeChanged")
147 << variable->dataSeries()->xAxisData()->size();
148 148 auto dateTime = SqpDateTime{t2.lower, t2.upper};
149 149
150 150 if (!variable->contains(dateTime)) {
@@ -179,8 +179,7 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange
179 179 variable->setDateTime(dateTime);
180 180
181 181 // CHangement detected, we need to ask controller to request data loading
182 sqpApp->variableController().requestDataLoading(variable,
183 variableDateTimeWithTolerance);
182 emit requestDataLoading(variable, variableDateTimeWithTolerance);
184 183 }
185 184 }
186 185 }
Show file before | Show file after | Hide comments
@@ -5,6 +5,8
5 5
6 6 #include <cmath>
7 7
8 #include <QDateTime>
9
8 10 Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider")
9 11
10 12 std::unique_ptr<IDataSeries>
@@ -16,6 +18,7 CosinusProvider::retrieveData(const DataProviderParameters &parameters) const
16 18 auto start = dateTime.m_TStart;
17 19 auto end = dateTime.m_TEnd;
18 20
21
19 22 // We assure that timerange is valid
20 23 if (end < start) {
21 24 std::swap(start, end);
@@ -47,10 +50,12 void CosinusProvider::requestDataLoading(const QVector<SqpDateTime> &dateTimeLis
47 50
48 51 std::shared_ptr<IDataSeries> CosinusProvider::retrieveDataSeries(const SqpDateTime &dateTime)
49 52 {
53 auto dataIndex = 0;
50 54
51 55 // Gets the timerange from the parameters
52 auto start = dateTime.m_TStart;
53 auto end = dateTime.m_TEnd;
56 double freq = 100.0;
57 double start = dateTime.m_TStart * freq; // 100 htz
58 double end = dateTime.m_TEnd * freq; // 100 htz
54 59
55 60 // We assure that timerange is valid
56 61 if (end < start) {
@@ -61,11 +66,9 std::shared_ptr<IDataSeries> CosinusProvider::retrieveDataSeries(const SqpDateTi
61 66 auto scalarSeries
62 67 = std::make_shared<ScalarSeries>(end - start, Unit{QStringLiteral("t"), true}, Unit{});
63 68
64 auto dataIndex = 0;
65 69 for (auto time = start; time < end; ++time, ++dataIndex) {
66 scalarSeries->setData(dataIndex, time, std::cos(time));
70 const auto timeOnFreq = time / freq;
71 scalarSeries->setData(dataIndex, timeOnFreq, std::cos(timeOnFreq));
67 72 }
68
69
70 73 return scalarSeries;
71 74 }
General Comments 0
You need to be logged in to leave comments. Login now