mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-01-25 19:04:48 -08:00
Add as set instance on subsequent loads as well. (#6013)
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
@@ -284,11 +284,28 @@ void VisualDatabaseDisplayWidget::loadNextPage()
|
||||
}
|
||||
|
||||
// Load the next page of cards and add them to the flow widget
|
||||
|
||||
QList<const CardFilter *> setFilters = filterModel->getFiltersOfType(CardFilter::AttrSet);
|
||||
const CardFilter *setFilter = nullptr;
|
||||
if (setFilters.length() == 1) {
|
||||
setFilter = setFilters.at(0);
|
||||
}
|
||||
|
||||
for (int row = start; row < end; ++row) {
|
||||
QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn);
|
||||
QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole);
|
||||
if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) {
|
||||
addCard(info);
|
||||
if (setFilter) {
|
||||
CardInfoPerSetMap setMap = info->getSets();
|
||||
if (setMap.contains(setFilter->term())) {
|
||||
for (CardInfoPerSet cardSetInstance : setMap[setFilter->term()]) {
|
||||
addCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
|
||||
name.toString(), cardSetInstance.getProperty("uuid")));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
addCard(info);
|
||||
}
|
||||
} else {
|
||||
qCDebug(VisualDatabaseDisplayLog) << "Card " << name.toString() << " not found in database!";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user