diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 5c55db456..1de49dbdf 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -153,7 +153,7 @@ void DeckPreviewWidget::updateTagsVisibility(bool visible) QString DeckPreviewWidget::getColorIdentity() { - QStringList cardList = deckLoader->getDeck().deckList.getCardList(); + QStringList cardList = deckLoader->getDeck().deckList.getCardList({DECK_ZONE_MAIN, DECK_ZONE_SIDE}); if (cardList.isEmpty()) { return {}; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp index 71a04cce3..173988796 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp @@ -438,9 +438,9 @@ void DeckList::cleanList(bool preserveMetadata) refreshDeckHash(); } -QStringList DeckList::getCardList() const +QStringList DeckList::getCardList(const QSet &restrictToZones) const { - auto nodes = tree.getCardNodes(); + auto nodes = tree.getCardNodes(restrictToZones); QStringList result; std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result), [](auto node) { return node->getName(); }); @@ -448,9 +448,9 @@ QStringList DeckList::getCardList() const return result; } -QList DeckList::getCardRefList() const +QList DeckList::getCardRefList(const QSet &restrictToZones) const { - auto nodes = tree.getCardNodes(); + auto nodes = tree.getCardNodes(restrictToZones); QList result; std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result), diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h index 808733b09..8f7efbe2f 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h @@ -221,8 +221,8 @@ public: { return tree.isEmpty() && metadata.isEmpty() && sideboardPlans.isEmpty(); } - QStringList getCardList() const; - QList getCardRefList() const; + QStringList getCardList(const QSet &restrictToZones = {}) const; + QList getCardRefList(const QSet &restrictToZones = {}) const; QList getCardNodes(const QSet &restrictToZones = {}) const; QList getZoneNodes() const; int getSideboardSize() const;