GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r228:8e4faeed90b4

A variable is now created with its dateTime too....

perrinel -

r228:8e4faeed90b4

parent child

Context file:

r228:8e4faeed90b4

core/include/Data/SqpDateTime.h +5 0

                 double m_TStart;
                 /// End time
                 double m_TEnd;
+                bool contains(const SqpDateTime &dateTime)
+                {
+                    return (m_TStart <= dateTime.m_TStart && m_TEnd >= dateTime.m_TEnd);
+                }
             };
             #endif // SCIQLOP_SQPDATETIME_H

core/include/Variable/Variable.h +2 -1

              */
             class Variable {
             public:
-                explicit Variable(const QString &name, const QString &unit, const QString &mission);
+                explicit Variable(const QString &name, const QString &unit, const QString &mission,
+                                  const SqpDateTime &dateTime);
                 QString name() const noexcept;
                 QString mission() const noexcept;

core/include/Variable/VariableModel.h +7 -2

             #ifndef SCIQLOP_VARIABLEMODEL_H
             #define SCIQLOP_VARIABLEMODEL_H
-            #include <Common/spimpl.h>
+            #include <Data/SqpDateTime.h>
             #include <QAbstractTableModel>
             #include <QLoggingCategory>
+            #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel)
             class IDataSeries;
                 /**
                  * Creates a new variable in the model
                  * @param name the name of the new variable
+                 * @param dateTime the dateTime of the new variable
                  * @param defaultDataSeries the default data of the new variable
                  * @return the pointer to the new variable
                  */
                 std::shared_ptr<Variable>
-                createVariable(const QString &name, std::unique_ptr<IDataSeries> defaultDataSeries) noexcept;
+                createVariable(const QString &name, const SqpDateTime &dateTime,
+                               std::unique_ptr<IDataSeries> defaultDataSeries) noexcept;
                 // /////////////////////////// //
                 // QAbstractTableModel methods //

core/src/Variable/Variable.cpp +20 -4

             Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
             struct Variable::VariablePrivate {
-                explicit VariablePrivate(const QString &name, const QString &unit, const QString &mission)
+                explicit VariablePrivate(const QString &name, const QString &unit, const QString &mission,
-                        : m_Name{name}, m_Unit{unit}, m_Mission{mission}, m_DataSeries{nullptr}
+                                         const SqpDateTime &dateTime)
+                        : m_Name{name},
+                          m_Unit{unit},
+                          m_Mission{mission},
+                          m_DateTime{dateTime},
+                          m_DataSeries{nullptr}
                 {
                 }
                 std::unique_ptr<IDataSeries> m_DataSeries;
             };
-            Variable::Variable(const QString &name, const QString &unit, const QString &mission)
+            Variable::Variable(const QString &name, const QString &unit, const QString &mission,
-                    : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission)}
+                               const SqpDateTime &dateTime)
+                    : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission, dateTime)}
             {
             }
             void Variable::onXRangeChanged(SqpDateTime dateTime)
             {
                 qCInfo(LOG_Variable()) << "onXRangeChanged detected";
+                if (!impl->m_DateTime.contains(dateTime)) {
+                    // The current variable dateTime isn't enough to display the dateTime requested.
+                    // We have to update it to the new dateTime requested.
+                    // the correspondant new data to display will be given by the cache if possible and the
+                    // provider if necessary.
+                    qCInfo(LOG_Variable()) << "NEW DATE NEEDED";
+                    impl->m_DateTime = dateTime;
+                }
             }

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

                 /// in sciqlop
                 auto dateTime = impl->m_TimeController->dateTime();
                 if (auto newVariable = impl->m_VariableModel->createVariable(
-                        name, generateDefaultDataSeries(*provider, dateTime))) {
+                        name, dateTime, generateDefaultDataSeries(*provider, dateTime))) {
                     // store in cache
                     impl->m_VariableCacheController->addDateTime(newVariable, dateTime);

core/src/Variable/VariableModel.cpp +3 -3

             }
             std::shared_ptr<Variable>
-            VariableModel::createVariable(const QString &name,
+            VariableModel::createVariable(const QString &name, const SqpDateTime &dateTime,
                                           std::unique_ptr<IDataSeries> defaultDataSeries) noexcept
             {
                 auto insertIndex = rowCount();
                 beginInsertRows({}, insertIndex, insertIndex);
                 /// @todo For the moment, the other data of the variable is initialized with default values
-                auto variable
+                auto variable = std::make_shared<Variable>(name, QStringLiteral("unit"),
-                    = std::make_shared<Variable>(name, QStringLiteral("unit"), QStringLiteral("mission"));
+                                                           QStringLiteral("mission"), dateTime);
                 variable->addDataSeries(std::move(defaultDataSeries));
                 impl->m_Variables.push_back(variable);

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