GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r433:a2e6652524d1

Implementation of the cache feature : download before display needs

perrinel -

r433:a2e6652524d1

parent child

Context file:

r433:a2e6652524d1

core/src/Variable/Variable.cpp +1 -1

                     impl->m_DataSeries->merge(dataSeries.get());
                     impl->m_DataSeries->unlock();
                     dataSeries->unlock();
-                    emit updated();
+                    //  emit updated();
                 }
             }

core/src/Variable/VariableController.cpp +1 0

                             if (varIdentifier == identifier) {
                                 impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache);
                                 variable->setDataSeries(dataSeriesAcquired);
+                                emit variable->updated();
                             }
                         }
                     };

gui/src/Visualization/VisualizationGraphWidget.cpp +39 -13

             void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1)
             {
-                qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
+                qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
-                                                        << QThread::currentThread()->objectName();
+                                                       << QThread::currentThread()->objectName();
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                      it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
                     auto variable = it->first;
                     auto dateTime = SqpDateTime{t1.lower, t1.upper};
+                    auto dateTimeRange = dateTime;
-                    if (!variable->contains(dateTime)) {
+                    auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
+                    auto variableDateTimeWithTolerance = dateTime;
+                    variableDateTimeWithTolerance.m_TStart -= tolerance;
+                    variableDateTimeWithTolerance.m_TEnd += tolerance;
+                    qCInfo(LOG_VisualizationGraphWidget()) << "v" << dateTime;
+                    qCInfo(LOG_VisualizationGraphWidget()) << "vtol" << variableDateTimeWithTolerance;
+                    // If new range with tol is upper than variable datetime parameters. we need to request new
+                    // data
+                    if (!variable->contains(variableDateTimeWithTolerance)) {
                         auto variableDateTimeWithTolerance = dateTime;
                         if (!variable->isInside(dateTime)) {
                             auto variableDateTime = variable->dateTime();
                             if (variableDateTime.m_TStart < dateTime.m_TStart) {
-                                qCDebug(LOG_VisualizationGraphWidget()) << tr("TDetection pan to right:");
+                                qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to right:");
                                 auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd;
                                 dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta;
                                 // Tolerance have to be added to the right
                                 // add 10% tolerance for right (end) side
-                                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                //                    auto tolerance = 0.1 * (dateTime.m_TEnd -
+                                //                    dateTime.m_TStart);
                                 variableDateTimeWithTolerance.m_TEnd += tolerance;
                             }
                             else if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
-                                qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection pan to left: ");
+                                qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to left: ");
                                 auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart;
                                 dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta;
                                 // Tolerance have to be added to the left
                                 // add 10% tolerance for left (start) side
-                                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
                                 variableDateTimeWithTolerance.m_TStart -= tolerance;
                             }
                             else {
                             }
                         }
                         else {
-                            qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: ");
+                            qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: ");
                             // add 10% tolerance for each side
-                            auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                            tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
                             variableDateTimeWithTolerance.m_TStart -= tolerance;
                             variableDateTimeWithTolerance.m_TEnd += tolerance;
                         }
-                        variable->setDateTime(dateTime);
+                        if (!variable->contains(dateTimeRange)) {
+                            qCInfo(LOG_VisualizationGraphWidget()) << "newv" << dateTime;
+                            variable->setDateTime(dateTime);
+                        }
+                        qCInfo(LOG_VisualizationGraphWidget()) << tr("Request data detection: ");
                         // CHangement detected, we need to ask controller to request data loading
                         emit requestDataLoading(variable, variableDateTimeWithTolerance);
                     }
                     else {
-                        qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: ");
+                        qCInfo(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: ");
                     }
                 }
             }
                 //    - use an ordered_multimap and the algos of std to group the values by key
                 //    - use a map (unique keys) and store as values directly the list of components
+                auto grapheRange = ui->widget->xAxis->range();
+                auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                      it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
                     auto variable = it->first;
-                    VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
+                    qCInfo(LOG_VisualizationGraphWidget())
-                                                         variable->dataSeries(), variable->dateTime());
+                        << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated S"
+                        << variable->dateTime();
+                    qCInfo(LOG_VisualizationGraphWidget())
+                        << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated E" << dateTime;
+                    if (dateTime.contains(variable->dateTime()) || dateTime.intersect(variable->dateTime())) {
+                        VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
+                                                             variable->dataSeries(), variable->dateTime());
+                    }
                 }
             }

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages