Keep models of a category in the order of registration

Author: Quincunx271

include/nodes/internal/DataModelRegistry.hpp

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <unordered_map>
-#include <set>
 #include <memory>
+#include <set>
+#include <unordered_map>
+#include <vector>
 
 #include <QtCore/QString>
 
@@ -32,6 +33,7 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
   using RegistryItemPtr     = std::unique_ptr<NodeDataModel>;
   using RegisteredModelsMap = std::unordered_map<QString, RegistryItemPtr>;
   using RegisteredModelsCategoryMap = std::unordered_map<QString, QString>;
+  using RegisteredModelsOrder = std::vector<QString>;
   using CategoriesSet = std::set<QString>;
 
   using RegisteredTypeConvertersMap = std::map<TypeConverterId, TypeConverter>;
@@ -61,6 +63,7 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
     {
       _registeredModels[name] = std::move(uniqueModel);
       _categories.insert(category);
+      _registeredModelsOrder.push_back(name);
       _registeredModelsCategory[name] = category;
     }
   }
@@ -82,6 +85,8 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
 
   RegisteredModelsMap const &registeredModels() const;
 
+  RegisteredModelsOrder const& registeredModelsOrder() const;
+
   RegisteredModelsCategoryMap const &registeredModelsCategoryAssociation() const;
 
   CategoriesSet const &categories() const;
@@ -97,6 +102,8 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
 
   RegisteredModelsMap _registeredModels;
 
+  RegisteredModelsOrder _registeredModelsOrder;
+
   RegisteredTypeConvertersMap _registeredTypeConverters;
 };
 }

src/DataModelRegistry.cpp

@@ -30,6 +30,12 @@ registeredModels() const
   return _registeredModels;
 }
 
+DataModelRegistry::RegisteredModelsOrder const &
+DataModelRegistry::
+registeredModelsOrder() const
+{
+  return _registeredModelsOrder;
+}
 
 DataModelRegistry::RegisteredModelsCategoryMap const &
 DataModelRegistry::

src/FlowView.cpp

@@ -141,12 +141,13 @@ contextMenuEvent(QContextMenuEvent *event)
     topLevelItems[cat] = item;
   }
 
-  for (auto const &assoc : _scene->registry().registeredModelsCategoryAssociation())
+  auto const &assocCategory = _scene->registry().registeredModelsCategoryAssociation();
+  for (auto const &name : _scene->registry().registeredModelsOrder())
   {
-    auto parent = topLevelItems[assoc.second];
+    auto parent = topLevelItems[assocCategory.at(name)];
     auto item   = new QTreeWidgetItem(parent);
-    item->setText(0, assoc.first);
-    item->setData(0, Qt::UserRole, assoc.first);
+    item->setText(0, name);
+    item->setData(0, Qt::UserRole, name);
   }
 
   treeView->expandAll();