mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-12 04:42:36 -03:00
qt: Handle peer addition/removal in a right way
This change fixes a bug when a multiple rows selection gets inconsistent after a peer addition/removal.
This commit is contained in:
parent
1b66f6e556
commit
ecbd911538
3 changed files with 30 additions and 4 deletions
|
@ -153,7 +153,30 @@ void PeerTableModel::refresh()
|
|||
new_peers_data.append(stats);
|
||||
}
|
||||
|
||||
Q_EMIT layoutAboutToBeChanged();
|
||||
m_peers_data.swap(new_peers_data);
|
||||
Q_EMIT layoutChanged();
|
||||
// Handle peer addition or removal as suggested in Qt Docs. See:
|
||||
// - https://doc.qt.io/qt-5/model-view-programming.html#inserting-and-removing-rows
|
||||
// - https://doc.qt.io/qt-5/model-view-programming.html#resizable-models
|
||||
// We take advantage of the fact that the std::vector returned
|
||||
// by interfaces::Node::getNodesStats is sorted by nodeid.
|
||||
for (int i = 0; i < m_peers_data.size();) {
|
||||
if (i < new_peers_data.size() && m_peers_data.at(i).nodeStats.nodeid == new_peers_data.at(i).nodeStats.nodeid) {
|
||||
++i;
|
||||
continue;
|
||||
}
|
||||
// A peer has been removed from the table.
|
||||
beginRemoveRows(QModelIndex(), i, i);
|
||||
m_peers_data.erase(m_peers_data.begin() + i);
|
||||
endRemoveRows();
|
||||
}
|
||||
|
||||
if (m_peers_data.size() < new_peers_data.size()) {
|
||||
// Some peers have been added to the end of the table.
|
||||
beginInsertRows(QModelIndex(), m_peers_data.size(), new_peers_data.size() - 1);
|
||||
m_peers_data.swap(new_peers_data);
|
||||
endInsertRows();
|
||||
} else {
|
||||
m_peers_data.swap(new_peers_data);
|
||||
}
|
||||
|
||||
Q_EMIT changed();
|
||||
}
|
||||
|
|
|
@ -73,6 +73,9 @@ public:
|
|||
public Q_SLOTS:
|
||||
void refresh();
|
||||
|
||||
Q_SIGNALS:
|
||||
void changed();
|
||||
|
||||
private:
|
||||
//! Internal peer data structure.
|
||||
QList<CNodeCombinedStats> m_peers_data{};
|
||||
|
|
|
@ -656,7 +656,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
|
|||
|
||||
// peer table signal handling - update peer details when selecting new node
|
||||
connect(ui->peerWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &RPCConsole::updateDetailWidget);
|
||||
connect(model->getPeerTableModel(), &PeerTableModel::layoutChanged, this, &RPCConsole::updateDetailWidget);
|
||||
connect(model->getPeerTableModel(), &PeerTableModel::changed, this, &RPCConsole::updateDetailWidget);
|
||||
|
||||
// set up ban table
|
||||
ui->banlistWidget->setModel(model->getBanTableModel());
|
||||
|
|
Loading…
Reference in a new issue