jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 17:44:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding Set Code To Filtering Method

Browse source 
Updating Tab To Include Set Param
This commit is contained in:
Phoenix Osiris 2013-07-17 17:21:00 -04:00
parent 4f61da62e8
commit 2e1f5332db
4 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cockatrice/src/carddatabasemodel.cpp
View file

@ -144,6 +144,19 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
if (!cardTypes.contains(info->getMainCardType())) if (!cardTypes.contains(info->getMainCardType()))
return false; return false;
if (!cardSet.isEmpty()) {
bool blnGood = false;
for(int intLoop = 0; intLoop < info->getSets().count(); intLoop++) {
if (info->getSets().at(intLoop)->getShortName() == cardSet) {
blnGood = true;
break;
}
}
if (!blnGood) {
return false;
}
}
return true; return true;
} }

3
cockatrice/src/carddatabasemodel.h
View file

@ -34,7 +34,7 @@ public:
enum FilterBool { ShowTrue, ShowFalse, ShowAll }; enum FilterBool { ShowTrue, ShowFalse, ShowAll };
private: private:
FilterBool isToken; FilterBool isToken;
QString cardNameBeginning, cardName, cardText; QString cardNameBeginning, cardName, cardText, cardSet;
QSet<QString> cardNameSet, cardTypes, cardColors; QSet<QString> cardNameSet, cardTypes, cardColors;
public: public:
CardDatabaseDisplayModel(QObject *parent = 0); CardDatabaseDisplayModel(QObject *parent = 0);
@ -43,6 +43,7 @@ public:
void setCardName(const QString &_cardName) { cardName = _cardName; invalidate(); } void setCardName(const QString &_cardName) { cardName = _cardName; invalidate(); }
void setCardNameSet(const QSet<QString> &_cardNameSet) { cardNameSet = _cardNameSet; invalidate(); } void setCardNameSet(const QSet<QString> &_cardNameSet) { cardNameSet = _cardNameSet; invalidate(); }
void setCardText(const QString &_cardText) { cardText = _cardText; invalidate(); } void setCardText(const QString &_cardText) { cardText = _cardText; invalidate(); }
void setCardSet(const QString &_cardSet) { cardSet = _cardSet; invalidate(); }
void setCardTypes(const QSet<QString> &_cardTypes) { cardTypes = _cardTypes; invalidate(); } void setCardTypes(const QSet<QString> &_cardTypes) { cardTypes = _cardTypes; invalidate(); }
void setCardColors(const QSet<QString> &_cardColors) { cardColors = _cardColors; invalidate(); } void setCardColors(const QSet<QString> &_cardColors) { cardColors = _cardColors; invalidate(); }
void clearSearch(); void clearSearch();

4
cockatrice/src/dlg_cardsearch.cpp
View file

@ -89,6 +89,10 @@ QString DlgCardSearch::getCardText() const
return cardTextEdit->text(); return cardTextEdit->text();
} }
QString DlgCardSearch::getCardSet() const {
return cboSetList->itemData(cboSetList->currentIndex()).toString();
}
QSet<QString> DlgCardSearch::getCardTypes() const QSet<QString> DlgCardSearch::getCardTypes() const
{ {
QStringList result; QStringList result;

3
cockatrice/src/tab_deck_editor.cpp
View file

@ -504,7 +504,8 @@ void TabDeckEditor::actSearch()
databaseDisplayModel->setCardName(dlgCardSearch->getCardName()); databaseDisplayModel->setCardName(dlgCardSearch->getCardName());
databaseDisplayModel->setCardText(dlgCardSearch->getCardText()); databaseDisplayModel->setCardText(dlgCardSearch->getCardText());
databaseDisplayModel->setCardTypes(dlgCardSearch->getCardTypes()); databaseDisplayModel->setCardTypes(dlgCardSearch->getCardTypes());
databaseDisplayModel->setCardColors(dlgCardSearch->getCardColors()); databaseDisplayModel->setCardColors(dlgCardSearch->getCardColors());
databaseDisplayModel->setCardSet(dlgCardSearch->getCardSet());
} }
} }