From 6cd26dd3dd76d2679925bda89ab81a6b7034ba0b Mon Sep 17 00:00:00 2001
From: dad <dad@mail.com>
Date: Tue, 8 Aug 2023 14:20:04 -0600
Subject: [PATCH] Add secondary sorting to Memory Map

Fixed unstable sorting in Memory Map when sorting by Type, Protection or
Initial (Protection). To resolve this, a secondary sort is now performed
on Address (only in ascending order) for rows with equal values. This
change affects MemoryMapView::sortRows and results in QString::compare
being called twice (also in StdTable::SortBy::AsText), introducing
additional computational complexity. Further optimization may be needed.
---
 src/gui/Src/Gui/MemoryMapView.cpp | 31 +++++++++++++++++++++++++++++++
 src/gui/Src/Gui/MemoryMapView.h   |  3 +++
 2 files changed, 34 insertions(+)

diff --git a/src/gui/Src/Gui/MemoryMapView.cpp b/src/gui/Src/Gui/MemoryMapView.cpp
index 2b6d7f4b..dab49bef 100644
--- a/src/gui/Src/Gui/MemoryMapView.cpp
+++ b/src/gui/Src/Gui/MemoryMapView.cpp
@@ -195,6 +195,37 @@ void MemoryMapView::setupContextMenu()
     connect(Config(), SIGNAL(shortcutsUpdated()), this, SLOT(refreshShortcutsSlot()));
 }
 
+void MemoryMapView::sortRows(int column, bool ascending)
+{
+    auto sortFn = mColumnSortFunctions.at(column);
+    auto addressSortFn = mColumnSortFunctions.at(0);
+    std::vector<size_t> index;
+    index.resize(mData.size());
+    size_t i;
+    for(i = 0; i < mData.size(); i++)
+    {
+        index[i] = i;
+    }
+    std::stable_sort(index.begin(), index.end(), [column, ascending, this, &sortFn, &addressSortFn](const size_t & a, const size_t & b)
+    {
+        if(column > 0 && QString::compare(mData.at(a).at(column).text, mData.at(b).at(column).text) == 0)
+        {
+            auto less = addressSortFn(mData.at(a).at(0).text, mData.at(b).at(0).text);
+            return less;
+        }
+
+        auto less = sortFn(mData.at(a).at(column).text, mData.at(b).at(column).text);
+        return ascending ? less : !less;
+    });
+    auto copy1 = mData;
+    auto copy2 = mIcon;
+    for(i = 0; i < mData.size(); i++)
+    {
+        mData[i] = std::move(copy1[index[i]]);
+        mIcon[i] = std::move(copy2[index[i]]);
+    }
+}
+
 void MemoryMapView::refreshShortcutsSlot()
 {
     mMemoryExecuteSingleshoot->setShortcut(ConfigShortcut("ActionToggleBreakpoint"));
diff --git a/src/gui/Src/Gui/MemoryMapView.h b/src/gui/Src/Gui/MemoryMapView.h
index 6890b9c2..bb493597 100644
--- a/src/gui/Src/Gui/MemoryMapView.h
+++ b/src/gui/Src/Gui/MemoryMapView.h
@@ -12,6 +12,9 @@ public:
     QString paintContent(QPainter* painter, dsint rowBase, int rowOffset, int col, int x, int y, int w, int h);
     void setupContextMenu();
 
+protected:
+    void sortRows(int column, bool ascending) override;
+
 signals:
     void showReferences();