jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-15 06:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

New DeckList method to return cards as CardInfoPtrs

Browse source 
Saner update to prevent crashes.
This commit is contained in:
Lukas Brübach 2025-03-01 12:47:58 +01:00
parent f994ffa02d
commit 443f8717a3
6 changed files with 75 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -81,7 +81,7 @@ void TabDeckEditorVisual::createCentralFrame()
void TabDeckEditorVisual::onDeckChanged()
{
AbstractTabDeckEditor::onDeckChanged();
tabContainer->visualDeckView->updateDisplay();
tabContainer->visualDeckView->decklistDataChanged(QModelIndex(), QModelIndex());
tabContainer->deckAnalytics->refreshDisplays(deckDockWidget->deckModel);
tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel);
}

3
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -309,6 +309,8 @@ void DeckEditorDeckDockWidget::setDeck(DeckLoader *_deck)
deckView->expandAll();
deckTagsDisplayWidget->connectDeckList(deckModel->getDeckList());
emit deckChanged();
}
DeckLoader *DeckEditorDeckDockWidget::getDeckList()
@ -325,6 +327,7 @@ void DeckEditorDeckDockWidget::cleanDeck()
nameEdit->setText(QString());
commentsEdit->setText(QString());
hashLabel->setText(QString());
emit deckChanged();
updateBannerCardComboBox();
deckTagsDisplayWidget->connectDeckList(deckModel->getDeckList());
}

31
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -205,35 +205,8 @@ void VisualDeckEditorWidget::populateCards()
if (!deck_list_model)
return;
DeckList *decklist = deck_list_model->getDeckList();
if (!decklist)
return;
InnerDecklistNode *listRoot = decklist->getRoot();
if (!listRoot)
return;
for (int i = 0; i < listRoot->size(); i++) {
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
if (!currentZone)
continue;
for (int j = 0; j < currentZone->size(); j++) {
DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
if (!currentCard)
continue;
for (int k = 0; k < currentCard->getNumber(); ++k) {
CardInfoPtr info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
currentCard->getName(), currentCard->getCardProviderId());
if (info) {
if (currentZone->getName() == DECK_ZONE_MAIN) {
mainDeckCards->append(info);
} else if (currentZone->getName() == DECK_ZONE_SIDE) {
sideboardCards->append(info);
}
} else {
qDebug() << "Card not found in database!";
}
}
}
}
mainDeckCards = decklist->getCardsAsCardInfoPtrsForZone(DECK_ZONE_MAIN);
sideboardCards = decklist->getCardsAsCardInfoPtrsForZone(DECK_ZONE_SIDE);
}
void VisualDeckEditorWidget::sortCardList(const QStringList properties, Qt::SortOrder order = Qt::AscendingOrder)

4
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h
View file

@ -26,6 +26,9 @@ public:
void sortCardList(QStringList properties, Qt::SortOrder order);
void setDeckList(const DeckList &new_deck_list_model);
public slots:
void decklistDataChanged(QModelIndex topLeft, QModelIndex bottomRight);
signals:
void activeCardChanged(CardInfoPtr activeCard);
void mainboardCardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
@ -35,7 +38,6 @@ protected slots:
void onHover(CardInfoPtr hoveredCard);
void onMainboardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
void onSideboardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
void decklistDataChanged(QModelIndex topLeft, QModelIndex bottomRight);
void activeSortCriteriaChanged();
private:

62
common/decklist.cpp
View file

@ -1,5 +1,7 @@
#include "decklist.h"
#include "../cockatrice/src/game/cards/card_database_manager.h"
#include <QCryptographicHash>
#include <QDebug>
#include <QFile>
@ -864,6 +866,66 @@ QMap<QString, QString> DeckList::getCardListWithProviderId() const
return result;
}
QList<CardInfoPtr> *DeckList::getCardsAsCardInfoPtrs() const
{
QList<CardInfoPtr> *cards = new QList<CardInfoPtr>();
InnerDecklistNode *listRoot = getRoot();
if (!listRoot)
return cards;
for (int i = 0; i < listRoot->size(); i++) {
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
if (!currentZone)
continue;
for (int j = 0; j < currentZone->size(); j++) {
DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
if (!currentCard)
continue;
for (int k = 0; k < currentCard->getNumber(); ++k) {
CardInfoPtr info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
currentCard->getName(), currentCard->getCardProviderId());
if (info) {
cards->append(info);
} else {
qDebug() << "Card not found in database!";
}
}
}
}
return cards;
}
QList<CardInfoPtr> *DeckList::getCardsAsCardInfoPtrsForZone(QString zoneName) const
{
QList<CardInfoPtr> *cards = new QList<CardInfoPtr>();
InnerDecklistNode *listRoot = getRoot();
if (!listRoot)
return cards;
for (int i = 0; i < listRoot->size(); i++) {
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
if (!currentZone)
continue;
if (currentZone->getName() == zoneName) {
for (int j = 0; j < currentZone->size(); j++) {
DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
if (!currentCard)
continue;
for (int k = 0; k < currentCard->getNumber(); ++k) {
CardInfoPtr info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
currentCard->getName(), currentCard->getCardProviderId());
if (info) {
cards->append(info);
} else {
qDebug() << "Card not found in database!";
}
}
}
}
}
return cards;
}
int DeckList::getSideboardSize() const
{
int size = 0;

4
common/decklist.h
View file

@ -5,6 +5,8 @@
#include <QVector>
// Required on Mac. Forward declaration doesn't work. Don't ask why.
#include "../cockatrice/src/game/cards/card_database.h"
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
#include <common/pb/move_card_to_zone.pb.h>
@ -364,6 +366,8 @@ public:
}
QStringList getCardList() const;
QMap<QString, QString> getCardListWithProviderId() const;
QList<CardInfoPtr> *getCardsAsCardInfoPtrs() const;
QList<CardInfoPtr> *getCardsAsCardInfoPtrsForZone(QString zoneName) const;
int getSideboardSize() const;