Remember expanded or collapsed wave data groups when upon waveform tree reordering

Author: joern274

plugins/simulator/waveform_viewer/include/waveform_viewer/wave_tree_view.h

@@ -49,6 +49,7 @@ namespace hal {
     {
         Q_OBJECT
         QList<QModelIndex> mItemOrder;
+        QSet<u32> mExpandedGroups;
         QModelIndexList mContextIndexList;
         WaveDataList* mWaveDataList;
         WaveItemHash* mWaveItemHash;
@@ -68,11 +69,12 @@ namespace hal {
     Q_SIGNALS:
         void viewportHeightChanged(int height);
         void sizeChanged(int viewportHeight, int scrollbarMax, int scrollbarPos);
-        void numberVisibleChanged(int nVisible, int scrollbarMax, int scrollbarPos);
+//        void numberVisibleChanged(int nVisible, int scrollbarMax, int scrollbarPos);  // unused
         void triggerUpdateWaveItems();
 
     private Q_SLOTS:
-        void handleExpandCollapse(const QModelIndex& index);
+        void handleExpand(const QModelIndex& index);
+        void handleCollapse(const QModelIndex& index);
         void handleContextMenuRequested(const QPoint& pos);
         void handleRemoveItem();
         void handleRenameItem();

plugins/simulator/waveform_viewer/src/wave_tree_model.cpp

@@ -504,7 +504,7 @@ namespace hal {
     int WaveTreeModel::waveIndex(const QModelIndex& index) const
     {
          WaveData* wd = item(index);
-         if (!wd) return -1;
+         if (!wd) return -99;
          if (dynamic_cast<WaveDataGroup*>(wd)) return -1;
          if (dynamic_cast<WaveDataBoolean*>(wd)) return -2;
          if (dynamic_cast<WaveDataTrigger*>(wd)) return -3;
@@ -743,7 +743,7 @@ namespace hal {
         // drop on group item
         if (dropParent.internalPointer() == mRoot)
         {
-            dropRow(dropParent,0);
+            dropRow(dropParent,row >= 0 ? row : 0);
             return true;
         }
         return false;

plugins/simulator/waveform_viewer/src/wave_tree_view.cpp

@@ -33,8 +33,8 @@ namespace hal {
         setAcceptDrops(true);
         setContextMenuPolicy(Qt::CustomContextMenu);
         setItemDelegateForColumn(2,new WaveValueDelegate);
-        connect(this,&QTreeView::expanded,this,&WaveTreeView::handleExpandCollapse);
-        connect(this,&QTreeView::collapsed,this,&WaveTreeView::handleExpandCollapse);
+        connect(this,&QTreeView::expanded,this,&WaveTreeView::handleExpand);
+        connect(this,&QTreeView::collapsed,this,&WaveTreeView::handleCollapse);
         connect(this,&QTreeView::customContextMenuRequested,this,&WaveTreeView::handleContextMenuRequested);
     }
 
@@ -387,9 +387,20 @@ namespace hal {
         QAbstractItemView::startDrag(supportedActions);
     }
 
-    void WaveTreeView::handleExpandCollapse(const QModelIndex& index)
+    void WaveTreeView::handleExpand(const QModelIndex& index)
     {
-        Q_UNUSED(index);
+        const WaveTreeModel* wtm = static_cast<WaveTreeModel*>(model());
+        int grpId = wtm->groupId(index);
+        if (grpId >= 0) mExpandedGroups.insert(grpId);
+
+        reorder();
+    }
+
+    void WaveTreeView::handleCollapse(const QModelIndex& index)
+    {
+        const WaveTreeModel* wtm = static_cast<WaveTreeModel*>(model());
+        int grpId = wtm->groupId(index);
+        if (grpId >= 0) mExpandedGroups.remove(grpId);
 
         reorder();
     }
@@ -416,10 +427,13 @@ namespace hal {
         if (nVisible != mWaveItemHash->visibleEntries())
         {
             mWaveItemHash->setVisibleEntries(nVisible);
+
+            /*   // signal not connected
             if (verticalScrollBar()->isVisible())
                 Q_EMIT numberVisibleChanged(nVisible, verticalScrollBar()->maximum(), verticalScrollBar()->value());
             else
                 Q_EMIT numberVisibleChanged(nVisible, -1, -1);
+            */
         }
         for (int i=0; i<nVisible; i++)
         {
@@ -477,6 +491,16 @@ namespace hal {
                 auto it = notPlaced.find(wii);
                 if (it != notPlaced.end()) notPlaced.erase(it);
             }
+
+            // restore expanded or collapsed group state
+            int grpId = wtm->groupId(currentIndex);
+            if (grpId >= 0)
+            {
+                if (mExpandedGroups.contains(grpId))
+                    expand(currentIndex);
+                else
+                    collapse(currentIndex);
+            }
         }
 
         for (WaveItem* wi : notPlaced.values())