Modified to QTreeView, Add sort button to change sorting strategy

Author: zmoth

include/QtNodes/internal/DataFlowGraphicsScene.hpp

@@ -34,7 +34,7 @@ class NODE_EDITOR_PUBLIC DataFlowGraphicsScene
   createSceneMenu(QPointF const scenePos) override;
 
   void
-  sortSceneMenu(bool sort);
+  sortSceneMenu(bool sortMenu = true);
 
 public Q_SLOTS:
   void
@@ -50,7 +50,7 @@ public Q_SLOTS:
 private:
   DataFlowGraphModel &_graphModel;
 
-  bool _sortFlag;
+  bool _sortMenu;
 };
 
 }

src/DataFlowGraphicsScene.cpp

@@ -11,6 +11,9 @@
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QWidgetAction>
+#include <QtWidgets/QTreeView>
+#include <QStandardItem>
+#include <QPushButton>
 
 #include <QtCore/QBuffer>
 #include <QtCore/QByteArray>
@@ -35,7 +38,7 @@ DataFlowGraphicsScene(DataFlowGraphModel& graphModel,
                       QObject*            parent)
   : BasicGraphicsScene(graphModel, parent)
   , _graphModel(graphModel)
-  , _sortFlag(true)
+  , _sortMenu(true)
 {
   connect(&_graphModel, &DataFlowGraphModel::inPortDataWasSet,
           [this](NodeId const nodeId, PortType const, PortIndex const)
@@ -89,53 +92,85 @@ createSceneMenu(QPointF const scenePos)
   modelMenu->addAction(txtBoxAction);
 
   // Add result treeview to the context menu
-  QTreeWidget* treeView = new QTreeWidget(modelMenu);
+  QTreeView* treeView = new QTreeView(modelMenu);
   treeView->header()->close();
 
+  QStandardItemModel* treeModel = new QStandardItemModel(treeView);
+
   auto* treeViewAction = new QWidgetAction(modelMenu);
   treeViewAction->setDefaultWidget(treeView);
 
   // 2.
   modelMenu->addAction(treeViewAction);
 
+  // Add sort Button
+  auto* sortButton = new QPushButton("Sort");
+  sortButton->setCheckable(true);
+
+  auto* sortButtonAction = new QWidgetAction(modelMenu);
+  sortButtonAction->setDefaultWidget(sortButton);
+
+  // 3.
+  modelMenu->addAction(sortButtonAction);
+
   auto registry = _graphModel.dataModelRegistry();
 
+  int sortCount = 0;
   for (auto const& assoc : registry->registeredModelsCategoryAssociation())
   {
     // A node must have a parent
-    QList<QTreeWidgetItem*> parentList;
+    QList<QStandardItem*> parentList;
     parentList.clear();
-    parentList = treeView->findItems(assoc.second, Qt::MatchExactly);
+    parentList = treeModel->findItems(assoc.second, Qt::MatchExactly);
 
     if (parentList.count() <= 0)
     {
       // Create a parent if it does not exist
-      auto parentItem = new QTreeWidgetItem(treeView);
-      parentItem->setText(0, assoc.second);
+      auto parentItem = new QStandardItem(assoc.second);
+      parentItem->setData(sortCount, Qt::UserRole);
       parentItem->setFlags(parentItem->flags() & ~Qt::ItemIsSelectable);
       parentList.push_back(parentItem);
+      treeModel->appendRow(parentItem);
     }
 
-    auto childItem = new QTreeWidgetItem(parentList.first());
-    childItem->setText(0, assoc.first);
+    auto childItem = new QStandardItem(assoc.first);
+    childItem->setData(sortCount, Qt::UserRole);
+    parentList.first()->appendRow(childItem);
+
+    sortCount++;
   }
-  
+
+  treeView->setModel(treeModel);
   treeView->expandAll();
 
-  if (_sortFlag)
+  connect(sortButton, &QPushButton::clicked, this, 
+          [treeModel, treeView](bool checked)
+          {
+            if (checked)
+              treeModel->setSortRole(Qt::DisplayRole);
+            else
+              treeModel->setSortRole(Qt::UserRole);
+            treeView->sortByColumn(0, Qt::AscendingOrder);
+          });
+
+  if (_sortMenu)
+  {
+    sortButton->setChecked(_sortMenu);
     treeView->sortByColumn(0, Qt::AscendingOrder);
+  }
 
-  connect(treeView, &QTreeWidget::itemClicked,
+  connect(treeView, &QTreeView::clicked,
           [this,
            modelMenu,
-           scenePos](QTreeWidgetItem* item, int)
+           treeModel,
+           scenePos](const QModelIndex &index)
           {
-            if(!(item->flags() & (Qt::ItemIsSelectable)))
-            {
+            auto item = treeModel->itemFromIndex(index);
+            
+            if(item->hasChildren())
               return;
-            }
 
-            NodeId nodeId = this->_graphModel.addNode(item->text(0));
+            NodeId nodeId = this->_graphModel.addNode(item->text());
 
             if (nodeId != InvalidNodeId)
             {
@@ -149,20 +184,21 @@ createSceneMenu(QPointF const scenePos)
 
   //Setup filtering
   connect(txtBox, &QLineEdit::textChanged,
-          [treeView](const QString& text)
+          [treeView, treeModel](const QString &text)
           {
-            QTreeWidgetItemIterator it(treeView, QTreeWidgetItemIterator::NoChildren);
-            while (*it)
+            // Is there a better way?
+            for (int i = 0; i < treeModel->rowCount(); ++i)
             {
-              auto modelName = (*it)->text(0);
-              const bool match = (modelName.contains(text, Qt::CaseInsensitive));
-              (*it)->setHidden(!match);
-              // if (match)
-              // {
-              //   treeView->scrollToItem(*it);
-              // }
-
-              ++it;
+              QStandardItem *parent = treeModel->item(i);
+              for (int j = 0; j < parent->rowCount(); ++j)
+              {
+                QStandardItem *child = parent->child(j);
+
+                const bool match = child->text().contains(text, Qt::CaseInsensitive);
+
+                auto parentIndex = parent->index();
+                treeView->setRowHidden(j, parentIndex, !match);
+              }
             }
           });
 
@@ -177,9 +213,9 @@ createSceneMenu(QPointF const scenePos)
 
 void
 DataFlowGraphicsScene::
-sortSceneMenu(bool sort)
+sortSceneMenu(bool sortMenu)
 {
-  _sortFlag = sort;
+  _sortMenu = sortMenu;
 }