aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #954 from ctrlaltca/deckeditor_cmc

Browse source 
Minor deck editor fixes
This commit is contained in:
ctrlaltca 2015-04-16 08:12:53 +02:00
commit 2f35e86be9
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
cockatrice/src/carddatabasemodel.cpp
View file

@ -1,6 +1,8 @@
#include "carddatabasemodel.h" #include "carddatabasemodel.h"
#include "filtertree.h" #include "filtertree.h"
#define CARDDBMODEL_COLUMNS 5
CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, QObject *parent) CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, QObject *parent)
: QAbstractListModel(parent), db(_db) : QAbstractListModel(parent), db(_db)
{ {
@ -21,31 +23,33 @@ int CardDatabaseModel::rowCount(const QModelIndex &/*parent*/) const
int CardDatabaseModel::columnCount(const QModelIndex &/*parent*/) const int CardDatabaseModel::columnCount(const QModelIndex &/*parent*/) const
{ {
return 5; return CARDDBMODEL_COLUMNS;
} }
QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
{ {
if (!index.isValid()) if (!index.isValid())
return QVariant(); return QVariant();
if ((index.row() >= cardList.size()) || (index.column() >= 5)) if ((index.row() >= cardList.size()) || (index.column() >= CARDDBMODEL_COLUMNS))
return QVariant(); return QVariant();
if (role != Qt::DisplayRole) if (role != Qt::DisplayRole && role != SortRole)
return QVariant(); return QVariant();
CardInfo *card = cardList.at(index.row()); CardInfo *card = cardList.at(index.row());
switch (index.column()){ switch (index.column()){
case 0: return card->getName(); case NameColumn: return card->getName();
case 1: { case SetListColumn: {
QStringList setList; QStringList setList;
const QList<CardSet *> &sets = card->getSets(); const QList<CardSet *> &sets = card->getSets();
for (int i = 0; i < sets.size(); i++) for (int i = 0; i < sets.size(); i++)
setList << sets[i]->getShortName(); setList << sets[i]->getShortName();
return setList.join(", "); return setList.join(", ");
} }
case 2: return card->getManaCost(); case ManaCostColumn: return role == SortRole ?
case 3: return card->getCardType(); QString("%1%2").arg(card->getCmc(), 4, QChar('0')).arg(card->getManaCost()) :
case 4: return card->getPowTough(); card->getManaCost();
case CardTypeColumn: return card->getCardType();
case PTColumn: return card->getPowTough();
default: return QVariant(); default: return QVariant();
} }
} }
@ -57,11 +61,11 @@ QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation,
if (orientation != Qt::Horizontal) if (orientation != Qt::Horizontal)
return QVariant(); return QVariant();
switch (section) { switch (section) {
case 0: return QString(tr("Name")); case NameColumn: return QString(tr("Name"));
case 1: return QString(tr("Sets")); case SetListColumn: return QString(tr("Sets"));
case 2: return QString(tr("Mana cost")); case ManaCostColumn: return QString(tr("Mana cost"));
case 3: return QString(tr("Card type")); case CardTypeColumn: return QString(tr("Card type"));
case 4: return QString(tr("P/T")); case PTColumn: return QString(tr("P/T"));
default: return QVariant(); default: return QVariant();
} }
} }
@ -86,7 +90,7 @@ void CardDatabaseModel::cardInfoChanged(CardInfo *card)
if (row == -1) if (row == -1)
return; return;
emit dataChanged(index(row, 0), index(row, 4)); emit dataChanged(index(row, 0), index(row, CARDDBMODEL_COLUMNS - 1));
} }
void CardDatabaseModel::cardAdded(CardInfo *card) void CardDatabaseModel::cardAdded(CardInfo *card)
@ -120,10 +124,10 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const {
QString leftString = sourceModel()->data(left).toString(); QString leftString = sourceModel()->data(left, CardDatabaseModel::SortRole).toString();
QString rightString = sourceModel()->data(right).toString(); QString rightString = sourceModel()->data(right, CardDatabaseModel::SortRole).toString();
if (!cardName.isEmpty()) if (!cardName.isEmpty() && left.column() == CardDatabaseModel::NameColumn)
{ {
bool isLeftType = leftString.startsWith(cardName, Qt::CaseInsensitive); bool isLeftType = leftString.startsWith(cardName, Qt::CaseInsensitive);
bool isRightType = rightString.startsWith(cardName, Qt::CaseInsensitive); bool isRightType = rightString.startsWith(cardName, Qt::CaseInsensitive);

2
cockatrice/src/carddatabasemodel.h
View file

@ -12,6 +12,8 @@ class FilterTree;
class CardDatabaseModel : public QAbstractListModel { class CardDatabaseModel : public QAbstractListModel {
Q_OBJECT Q_OBJECT
public: public:
enum Columns { NameColumn, SetListColumn, ManaCostColumn, CardTypeColumn, PTColumn, CMCColumn };
enum Role { SortRole=Qt::UserRole };
CardDatabaseModel(CardDatabase *_db, QObject *parent = 0); CardDatabaseModel(CardDatabase *_db, QObject *parent = 0);
~CardDatabaseModel(); ~CardDatabaseModel();
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const;