jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-13 05:20:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add sortable Identity Attack Armour Health columns and rename P/T to ATK/HP

Browse source
This commit is contained in:
Christian Daniel Jensen 2026-11-03 13:12:58 -07:00
parent 359ac79979
commit c69c0854fb
1 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
View file

@ -11,7 +11,6 @@
class QObject; class QObject;
#define CARDDBMODEL_COLUMNS 6
CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent) CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent)
: QAbstractListModel(parent), db(_db), showOnlyCardsFromEnabledSets(_showOnlyCardsFromEnabledSets) : QAbstractListModel(parent), db(_db), showOnlyCardsFromEnabledSets(_showOnlyCardsFromEnabledSets)
@ -38,12 +37,12 @@ int CardDatabaseModel::columnCount(const QModelIndex &parent) const
{ {
// Card rows are leaves, so a valid parent holds no columns. Reporting the // Card rows are leaves, so a valid parent holds no columns. Reporting the
// row width for a card index would claim child cells that do not exist. // row width for a card index would claim child cells that do not exist.
return parent.isValid() ? 0 : CARDDBMODEL_COLUMNS; return parent.isValid() ? 0 : ColumnCount;
} }
QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
{ {
if (!index.isValid() || index.row() >= cardList.size() || index.column() >= CARDDBMODEL_COLUMNS || if (!index.isValid() || index.row() >= cardList.size() || index.column() >= ColumnCount ||
(role != Qt::DisplayRole && role != SortRole)) { (role != Qt::DisplayRole && role != SortRole)) {
return QVariant(); return QVariant();
} }
@ -59,10 +58,18 @@ QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
: card->getManaCost(); : card->getManaCost();
case CardTypeColumn: case CardTypeColumn:
return card->getCardType(); return card->getCardType();
case PTColumn: case AtkHpColumn:
return card->getPowTough(); return card->getAtkHp();
case ColorColumn: case ColorColumn:
return card->getColors(); return card->getColors();
case IdentityColumn:
return card->getIdentity();
case AttackColumn:
return card->getAttack();
case ArmourColumn:
return card->getArmour();
case HealthColumn:
return card->getHealth();
default: default:
return QVariant(); return QVariant();
} }
@ -85,10 +92,18 @@ QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation,
return QString(tr("Essence Cost")); return QString(tr("Essence Cost"));
case CardTypeColumn: case CardTypeColumn:
return QString(tr("Card type")); return QString(tr("Card type"));
case PTColumn: case AtkHpColumn:
return QString(tr("P/T")); return QString(tr("ATK/HP"));
case ColorColumn: case ColorColumn:
return QString(tr("Essence")); return QString(tr("Essence"));
case IdentityColumn:
return QString(tr("Identity"));
case AttackColumn:
return QString(tr("Attack"));
case ArmourColumn:
return QString(tr("Armour"));
case HealthColumn:
return QString(tr("Health"));
default: default:
return QVariant(); return QVariant();
} }
@ -101,7 +116,7 @@ void CardDatabaseModel::cardInfoChanged(const CardInfoPtr &card)
return; return;
} }
emit dataChanged(index(row, 0), index(row, CARDDBMODEL_COLUMNS - 1)); emit dataChanged(index(row, 0), index(row, ColumnCount - 1));
} }
bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(const CardInfoPtr &card) const bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(const CardInfoPtr &card) const