ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: fix updates in MemoryAccessLogModel

This commit is contained in:
Adam Higerd 2025-05-20 19:12:28 -05:00 committed by Vicki Pfau
parent 30a94053c3
commit 1d5bff49c9
2 changed files with 6 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/qt/MemoryAccessLogController.cpp
View File

@ -45,8 +45,8 @@ bool MemoryAccessLogController::canExport() const {
return m_regionMapping.contains("cart0");
}
MemoryAccessLogController::Flags MemoryAccessLogController::flagsForAddress(uint32_t addresss, int segment) {
uint32_t offset = cacheRegion(addresss, segment);
MemoryAccessLogController::Flags MemoryAccessLogController::flagsForAddress(uint32_t address, int segment) {
uint32_t offset = cacheRegion(address, segment);
if (!m_cachedRegion) {
return { 0, 0 };
}

72
src/platform/qt/MemoryAccessLogModel.cpp
View File

@ -54,7 +54,7 @@ QVariant MemoryAccessLogModel::data(const QModelIndex& index, int role) const {
} else {
return QString("0x%1 – 0x%2")
.arg(QString("%0").arg(block.region.first, 8, 16, QChar('0')).toUpper())
.arg(QString("%0").arg(block.region.second, 8, 16, QChar('0')).toUpper());
.arg(QString("%0").arg(block.region.second, 8, 16, QChar('0')).toUpper());
}
}
for (int i = 0; i < 8; ++i) {
@ -211,73 +211,9 @@ void MemoryAccessLogModel::updateSelection(uint32_t start, uint32_t end) {
newBlocks.append({ lastFlags, qMakePair(lastStart, end) });
}
if (m_cachedBlocks.count() == 0 || newBlocks.count() == 0) {
beginResetModel();
m_cachedBlocks = newBlocks;
endResetModel();
return;
}
QPair<int, int> changed{ -1, -1 };
for (int i = 0; i < m_cachedBlocks.count() && i < newBlocks.count(); ++i) {
const Block& oldBlock = m_cachedBlocks.at(i);
const Block& newBlock = newBlocks.at(i);
if (oldBlock != newBlock) {
changed = qMakePair(i, m_cachedBlocks.count());
break;
}
}
if (m_cachedBlocks.count() > newBlocks.count()) {
beginRemoveRows({}, newBlocks.count(), m_cachedBlocks.count());
m_cachedBlocks.resize(newBlocks.count());
endRemoveRows();
changed.second = newBlocks.count();
}
if (m_cachedBlocks.count() < newBlocks.count()) {
beginInsertRows({}, m_cachedBlocks.count(), newBlocks.count());
if (changed.first < 0) {
// Only new rows
m_cachedBlocks = newBlocks;
endInsertRows();
return;
}
}
if (changed.first < 0) {
// No changed rows, though some might have been removed
return;
}
for (int i = 0; i < m_cachedBlocks.count() && i < newBlocks.count(); ++i) {
const Block& oldBlock = m_cachedBlocks.at(i);
const Block& newBlock = newBlocks.at(i);
if (oldBlock.flags != newBlock.flags) {
int oldFlags = oldBlock.flags.count();
int newFlags = newBlock.flags.count();
if (oldFlags > newFlags) {
beginRemoveRows(createIndex(i, 0, std::numeric_limits<quintptr>::max()), newFlags, oldFlags);
} else if (oldFlags < newFlags) {
beginInsertRows(createIndex(i, 0, std::numeric_limits<quintptr>::max()), oldFlags, newFlags);
}
m_cachedBlocks[i] = newBlock;
emit dataChanged(createIndex(0, 0, i), createIndex(std::min(oldFlags, newFlags), 0, i));
if (oldFlags > newFlags) {
endRemoveRows();
} else if (oldFlags < newFlags) {
endInsertRows();
}
}
}
emit dataChanged(createIndex(changed.first, 0, std::numeric_limits<quintptr>::max()),
createIndex(changed.second, 0, std::numeric_limits<quintptr>::max()));
if (m_cachedBlocks.count() < newBlocks.count()) {
m_cachedBlocks = newBlocks;
endInsertRows();
}
beginResetModel();
m_cachedBlocks = newBlocks;
endResetModel();
}
void MemoryAccessLogModel::setSegment(int segment) {