jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-21 18:02:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor setCode to cardUUID and introduce new cardSetShortName field.

Browse source
This commit is contained in:
Lukas Brübach 2024-11-18 23:47:36 +01:00
parent 89daa0ec4a
commit ff3e6796cf
5 changed files with 85 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cockatrice/src/deck/deck_list_model.cpp
View file

@ -79,7 +79,7 @@ int DeckListModel::rowCount(const QModelIndex &parent) const
int DeckListModel::columnCount(const QModelIndex & /*parent*/) const
{
return 4;
return 5;
}
QVariant DeckListModel::data(const QModelIndex &index, int role) const
@ -114,11 +114,14 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
return node->getName();
}
case 2: {
return node->getCardUuid();
return node->getCardSetShortName();
}
case 3: {
return node->getCardCollectorNumber();
}
case 4: {
return node->getCardUuid();
}
default:
return {};
}
@ -143,9 +146,11 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
case 1:
return card->getName();
case 2:
return card->getCardUuid();
return card->getCardSetShortName();
case 3:
return card->getCardCollectorNumber();
case 4:
return card->getCardUuid();
default:
return {};
}
@ -182,6 +187,8 @@ QVariant DeckListModel::headerData(const int section, const Qt::Orientation orie
return tr("Set");
case 3:
return tr("Number");
case 4:
return tr("UUID");
default:
return {};
}
@ -244,11 +251,14 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
node->setName(value.toString());
break;
case 2:
node->setCardSetCode(value.toString());
node->setCardSetShortName(value.toString());
break;
case 3:
node->setCardCollectorNumber(value.toString());
break;
case 4:
node->setCardUUID(value.toString());
break;
default:
return false;
}
@ -375,15 +385,17 @@ QModelIndex DeckListModel::addCard(const QString &cardName,
auto *cardNode = dynamic_cast<DecklistModelCardNode *>(
cardTypeNode->findCardChildByNameAndUUID(cardName, cardInfoSet.getProperty("uuid")));
if (!cardNode) {
auto *decklistCard = deckList->addCard(cardInfo->getName(), zoneName, cardInfoSet.getProperty("uuid"),
cardInfoSet.getProperty("num"));
auto *decklistCard =
deckList->addCard(cardInfo->getName(), zoneName, cardInfoSet.getPtr()->getCorrectedShortName(),
cardInfoSet.getProperty("num"), cardInfoSet.getProperty("uuid"));
beginInsertRows(parentIndex, static_cast<int>(cardTypeNode->size()), static_cast<int>(cardTypeNode->size()));
cardNode = new DecklistModelCardNode(decklistCard, cardTypeNode);
endInsertRows();
} else {
cardNode->setNumber(cardNode->getNumber() + 1);
cardNode->setCardSetCode(cardInfoSet.getProperty("uuid"));
cardNode->setCardSetShortName(cardInfoSet.getPtr()->getCorrectedShortName());
cardNode->setCardCollectorNumber(cardInfoSet.getProperty("num"));
cardNode->setCardUUID(cardInfoSet.getProperty("uuid"));
deckList->updateDeckHash();
}
sort(lastKnownColumn, lastKnownOrder);