Keep categories in registration order, but have a way to sort them

paceholder · May 11, 2018 · a6e4ba4 · a6e4ba4
1 parent 6f623c3
commit a6e4ba4
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/include/nodes/internal/DataModelRegistry.hpp b/include/nodes/internal/DataModelRegistry.hpp
@@ -38,6 +38,7 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
   using RegisteredModelsCategoryMap = std::unordered_map<QString, QString>;
   using RegisteredModelsOrder = std::vector<QString>;
   using CategoriesSet = std::set<QString>;
+  using CategoriesOrder = std::vector<QString>;
 
   using RegisteredTypeConvertersMap = std::map<TypeConverterId, TypeConverter>;
 
@@ -89,6 +90,10 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
 
   CategoriesSet const &categories() const;
 
+  CategoriesOrder const &categoriesOrder() const;
+
+  void sortCategories();
+
   TypeConverter getTypeConverter(NodeDataType const & d1,
                                  NodeDataType const & d2) const;
 
@@ -100,6 +105,8 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
 
   RegisteredModelCreatorsMap _registeredItemCreators;
 
+  CategoriesOrder _categoriesOrder;
+
   RegisteredModelsOrder _registeredModelsOrder;
 
   RegisteredTypeConvertersMap _registeredTypeConverters;
@@ -130,12 +137,16 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
   registerModelImpl(RegistryItemCreator creator, QString const &category )
   {
     const QString name = ModelType::Name();
-    if (_registeredItemCreators.count(name) == 0)
+    if (!_registeredItemCreators.count(name))
     {
       _registeredItemCreators[name] = std::move(creator);
-      _categories.insert(category);
       _registeredModelsOrder.push_back(name);
       _registeredModelsCategory[name] = category;
+
+      if (!_categories.count(category)) {
+        _categories.insert(category);
+        _categoriesOrder.push_back(category);
+      }
     }
   }
 
@@ -144,12 +155,16 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
   registerModelImpl(RegistryItemCreator creator, QString const &category )
   {
     const QString name = creator()->name();
-    if (_registeredItemCreators.count(name) == 0)
+    if (!_registeredItemCreators.count(name))
     {
       _registeredItemCreators[name] = std::move(creator);
-      _categories.insert(category);
       _registeredModelsOrder.push_back(name);
       _registeredModelsCategory[name] = category;
+
+      if (!_categories.count(category)) {
+        _categories.insert(category);
+        _categoriesOrder.push_back(category);
+      }
     }
   }
 

diff --git a/src/DataModelRegistry.cpp b/src/DataModelRegistry.cpp
@@ -1,5 +1,7 @@
 #include "DataModelRegistry.hpp"
 
+#include <algorithm>
+
 #include <QtCore/QFile>
 #include <QtWidgets/QMessageBox>
 
@@ -53,6 +55,21 @@ categories() const
 }
 
 
+DataModelRegistry::CategoriesOrder const &
+DataModelRegistry::
+categoriesOrder() const
+{
+  return _categoriesOrder;
+}
+
+void
+DataModelRegistry::
+sortCategories()
+{
+  std::sort(_categoriesOrder.begin(), _categoriesOrder.end());
+}
+
+
 TypeConverter
 DataModelRegistry::
 getTypeConverter(NodeDataType const & d1,

diff --git a/src/FlowView.cpp b/src/FlowView.cpp
@@ -133,7 +133,7 @@ contextMenuEvent(QContextMenuEvent *event)
   modelMenu.addAction(treeViewAction);
 
   QMap<QString, QTreeWidgetItem*> topLevelItems;
-  for (auto const &cat : _scene->registry().categories())
+  for (auto const &cat : _scene->registry().categoriesOrder())
   {
     auto item = new QTreeWidgetItem(treeView);
     item->setText(0, cat);