GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r372:4fa51b091d97

Removes unit and mission from variable...

Alexandre Leroux -

r372:4fa51b091d97

parent child

Context file:

r372:4fa51b091d97

Collapse all files

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

                 Q_OBJECT
             public:
-                explicit Variable(const QString &name, const QString &unit, const QString &mission,
+                explicit Variable(const QString &name, const SqpDateTime &dateTime);
-                                  const SqpDateTime &dateTime);
                 QString name() const noexcept;
-                QString mission() const noexcept;
-                QString unit() const noexcept;
                 SqpDateTime dateTime() const noexcept;
                 void setDateTime(const SqpDateTime &dateTime) noexcept;

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

             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 SqpDateTime &dateTime)
-                                         const SqpDateTime &dateTime)
+                        : m_Name{name}, m_DateTime{dateTime}, m_DataSeries{nullptr}
-                        : m_Name{name},
-                          m_Unit{unit},
-                          m_Mission{mission},
-                          m_DateTime{dateTime},
-                          m_DataSeries{nullptr}
                 {
                 }
                 QString m_Name;
-                QString m_Unit;
-                QString m_Mission;
                 SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
                 std::unique_ptr<IDataSeries> m_DataSeries;
             };
-            Variable::Variable(const QString &name, const QString &unit, const QString &mission,
+            Variable::Variable(const QString &name, const SqpDateTime &dateTime)
-                               const SqpDateTime &dateTime)
+                    : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime)}
-                    : impl{spimpl::make_unique_impl<VariablePrivate>(name, unit, mission, dateTime)}
             {
             }
                 return impl->m_Name;
             }
-            QString Variable::mission() const noexcept
-                return impl->m_Mission;
-            QString Variable::unit() const noexcept
-                return impl->m_Unit;
             SqpDateTime Variable::dateTime() const noexcept
             {
                 return impl->m_DateTime;

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

                 auto insertIndex = rowCount();
                 beginInsertRows({}, insertIndex, insertIndex);
-                /// @todo For the moment, the other data of the variable is initialized with default values
+                auto variable = std::make_shared<Variable>(name, dateTime);
-                auto variable = std::make_shared<Variable>(name, QStringLiteral("unit"),
-                                                           QStringLiteral("mission"), dateTime);
                 impl->m_Variables.push_back(variable);
                 connect(variable.get(), &Variable::updated, this, &VariableModel::onVariableUpdated);

core/tests/Variable/TestVariableCacheController.cpp +2 -2

                 auto sqp2 = SqpDateTime{static_cast<double>(ts2.toMSecsSinceEpoch()),
                                         static_cast<double>(te2.toMSecsSinceEpoch())};
-                auto var0 = std::make_shared<Variable>("", "", "", sqp0);
+                auto var0 = std::make_shared<Variable>("", sqp0);
                 variableCacheController.addDateTime(var0, sqp0);
                 variableCacheController.addDateTime(var0, sqp1);
                                          static_cast<double>(te03.toMSecsSinceEpoch())};
-                auto var0 = std::make_shared<Variable>("", "", "", sqp0);
+                auto var0 = std::make_shared<Variable>("", sqp0);
                 // First case: add the first interval to the variable :sqp0

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