HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r420:4458a8f811e4

Corrects regression on variable destruction

Alexandre Leroux -

r420:4458a8f811e4

parent child

Context file:

r420:4458a8f811e4

Collapse all files

core/src/Variable/VariableController.cpp +9 -6

                 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
                     m_VariableToProviderMap;
-                std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifier;
+                std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
             };
             VariableController::VariableController(QObject *parent)
                 // make some treatments before the deletion
                 emit variableAboutToBeDeleted(variable);
+                // Deletes identifier
+                impl->m_VariableToIdentifierMap.erase(variable);
                 // Deletes provider
                 auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
                 qCDebug(LOG_VariableController())
                     // store the provider
                     impl->m_VariableToProviderMap[newVariable] = provider;
-                    impl->m_VariableToIdentifier[newVariable] = identifier;
+                    impl->m_VariableToIdentifierMap[newVariable] = identifier;
                     auto addDateTimeAcquired = [ this, varW = std::weak_ptr<Variable>{newVariable} ](
                         QUuid identifier, auto dataSeriesAcquired, auto dateTimeToPutInCache)
                     {
                         if (auto variable = varW.lock()) {
-                            auto varIdentifier = impl->m_VariableToIdentifier.at(variable);
+                            auto varIdentifier = impl->m_VariableToIdentifierMap.at(variable);
                             if (varIdentifier == identifier) {
                                 impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache);
                                 variable->setDataSeries(dataSeriesAcquired);
             {
                 auto findReply = [identifier](const auto &entry) { return identifier == entry.second; };
-                auto end = impl->m_VariableToIdentifier.cend();
+                auto end = impl->m_VariableToIdentifierMap.cend();
-                auto it = std::find_if(impl->m_VariableToIdentifier.cbegin(), end, findReply);
+                auto it = std::find_if(impl->m_VariableToIdentifierMap.cbegin(), end, findReply);
                 if (it != end) {
                     impl->m_VariableModel->setDataProgress(it->first, progress);
                 }
                     if (!dateTimeListNotInCache.empty()) {
                         // Ask the provider for each data on the dateTimeListNotInCache
-                        auto identifier = impl->m_VariableToIdentifier.at(variable);
+                        auto identifier = impl->m_VariableToIdentifierMap.at(variable);
                         impl->m_VariableToProviderMap.at(variable)->requestDataLoading(
                             identifier,
                             DataProviderParameters{std::move(dateTimeListNotInCache), variable->metadata()});

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

             struct VariableModel::VariableModelPrivate {
                 /// Variables created in SciQlop
                 std::vector<std::shared_ptr<Variable> > m_Variables;
-                std::unordered_map<std::shared_ptr<Variable>, double> m_VariableToProgress;
+                std::unordered_map<Variable *, double> m_VariableToProgress;
                 /// Return the row index of the variable. -1 if it's not found
                 int indexOfVariable(Variable *variable) const noexcept;
             void VariableModel::setDataProgress(std::shared_ptr<Variable> variable, double progress)
             {
+                impl->m_VariableToProgress[variable.get()] = progress;
-                impl->m_VariableToProgress[variable] = progress;
                 auto modelIndex = createIndex(impl->indexOfVariable(variable.get()), NAME_COLUMN);
                 emit dataChanged(modelIndex, modelIndex);
                 else if (role == VariableRoles::ProgressRole) {
                     if (auto variable = impl->m_Variables.at(index.row())) {
-                        auto it = impl->m_VariableToProgress.find(variable);
+                        auto it = impl->m_VariableToProgress.find(variable.get());
                         if (it != impl->m_VariableToProgress.cend()) {
                             return it->second;
                         }

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