GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r710:1edff56171b6

Creates duplicate only if the variable is in the model

Alexandre Leroux -

r710:1edff56171b6

parent child

Context file:

r710:1edff56171b6

core/include/Variable/VariableModel.h +7 0

                 void addVariable(std::shared_ptr<Variable> variable) noexcept;
                 /**
+                 * Checks that a variable is contained in the model
+                 * @param variable the variable to check
+                 * @return true if the variable is in the model, false otherwise
+                 */
+                bool containsVariable(std::shared_ptr<Variable> variable) const noexcept;
+                /**
                  * Creates a new variable in the model
                  * @param name the name of the new variable
                  * @param dateTime the dateTime of the new variable

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

             std::shared_ptr<Variable>
             VariableController::cloneVariable(std::shared_ptr<Variable> variable) noexcept
             {
+                if (impl->m_VariableModel->containsVariable(variable)) {
                     // Clones variable
                     auto duplicate = variable->clone();
                     return duplicate;
                 }
+                else {
+                    qCCritical(LOG_VariableController())
+                        << tr("Can't create duplicate of variable %1: variable not registered in the model")
+                               .arg(variable->name());
+                    return nullptr;
+                }
+            }
             void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {

core/src/Variable/VariableModel.cpp +6 0

                 endInsertRows();
             }
+            bool VariableModel::containsVariable(std::shared_ptr<Variable> variable) const noexcept
+            {
+                auto end = impl->m_Variables.cend();
+                return std::find(impl->m_Variables.cbegin(), end, variable) != end;
+            }
             std::shared_ptr<Variable> VariableModel::createVariable(const QString &name,
                                                                     const SqpRange &dateTime,
                                                                     const QVariantHash &metadata) noexcept

General Comments 0

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

No TODOs yet

	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