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

remove currentZone from PrintingSelector

Browse source
This commit is contained in:
RickyRister 2025-12-26 02:10:16 -08:00
parent ca3f6bba02
commit 3b9db1febc
7 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
View file

@ -115,9 +115,8 @@ void PrintingSelector::updateDisplay()
* @brief Sets the current card for the selector and updates the display. * @brief Sets the current card for the selector and updates the display.
* *
* @param newCard The new card to set. * @param newCard The new card to set.
* @param _currentZone The current zone the card is in.
*/ */
void PrintingSelector::setCard(const CardInfoPtr &newCard, const QString &_currentZone) void PrintingSelector::setCard(const CardInfoPtr &newCard)
{ {
if (newCard.isNull()) { if (newCard.isNull()) {
return; return;
@ -129,7 +128,6 @@ void PrintingSelector::setCard(const CardInfoPtr &newCard, const QString &_curre
} }
selectedCard = newCard; selectedCard = newCard;
currentZone = _currentZone;
if (isVisible()) { if (isVisible()) {
updateDisplay(); updateDisplay();
} }
@ -166,8 +164,8 @@ void PrintingSelector::getAllSetsForCurrentCard()
connect(widgetLoadingBufferTimer, &QTimer::timeout, this, [=, this]() mutable { connect(widgetLoadingBufferTimer, &QTimer::timeout, this, [=, this]() mutable {
for (int i = 0; i < BATCH_SIZE && currentIndex < printingsToUse.size(); ++i, ++currentIndex) { for (int i = 0; i < BATCH_SIZE && currentIndex < printingsToUse.size(); ++i, ++currentIndex) {
auto card = ExactCard(selectedCard, printingsToUse[currentIndex]); auto card = ExactCard(selectedCard, printingsToUse[currentIndex]);
auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget( auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget(this, deckEditor, deckModel, deckView,
this, deckEditor, deckModel, deckView, cardSizeWidget->getSlider(), card, currentZone); cardSizeWidget->getSlider(), card);
flowWidget->addWidget(cardDisplayWidget); flowWidget->addWidget(cardDisplayWidget);
cardDisplayWidget->clampSetNameToPicture(); cardDisplayWidget->clampSetNameToPicture();
connect(cardDisplayWidget, &PrintingSelectorCardDisplayWidget::cardPreferenceChanged, this, connect(cardDisplayWidget, &PrintingSelectorCardDisplayWidget::cardPreferenceChanged, this,

3
cockatrice/src/interface/widgets/printing_selector/printing_selector.h
View file

@ -33,7 +33,7 @@ class PrintingSelector : public QWidget
public: public:
PrintingSelector(QWidget *parent, AbstractTabDeckEditor *deckEditor); PrintingSelector(QWidget *parent, AbstractTabDeckEditor *deckEditor);
void setCard(const CardInfoPtr &newCard, const QString &_currentZone); void setCard(const CardInfoPtr &newCard);
void getAllSetsForCurrentCard(); void getAllSetsForCurrentCard();
[[nodiscard]] DeckListModel *getDeckModel() const [[nodiscard]] DeckListModel *getDeckModel() const
{ {
@ -78,7 +78,6 @@ private:
DeckListModel *deckModel; DeckListModel *deckModel;
QTreeView *deckView; QTreeView *deckView;
CardInfoPtr selectedCard; CardInfoPtr selectedCard;
QString currentZone;
QTimer *widgetLoadingBufferTimer; QTimer *widgetLoadingBufferTimer;
int currentIndex = 0; int currentIndex = 0;
}; };

6
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
View file

@ -22,17 +22,15 @@
* @param _deckView The QTreeView instance displaying the deck. * @param _deckView The QTreeView instance displaying the deck.
* @param _cardSizeSlider The slider controlling the size of the displayed card. * @param _cardSizeSlider The slider controlling the size of the displayed card.
* @param _rootCard The root card object, representing the card to be displayed. * @param _rootCard The root card object, representing the card to be displayed.
* @param _currentZone The current zone in which the card is located.
*/ */
PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *parent, PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *parent,
AbstractTabDeckEditor *_deckEditor, AbstractTabDeckEditor *_deckEditor,
DeckListModel *_deckModel, DeckListModel *_deckModel,
QTreeView *_deckView, QTreeView *_deckView,
QSlider *_cardSizeSlider, QSlider *_cardSizeSlider,
const ExactCard &_rootCard, const ExactCard &_rootCard)
QString &_currentZone)
: QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView), : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
cardSizeSlider(_cardSizeSlider), rootCard(_rootCard), currentZone(_currentZone) cardSizeSlider(_cardSizeSlider), rootCard(_rootCard)
{ {
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);

4
cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h
View file

@ -24,8 +24,7 @@ public:
DeckListModel *_deckModel, DeckListModel *_deckModel,
QTreeView *_deckView, QTreeView *_deckView,
QSlider *_cardSizeSlider, QSlider *_cardSizeSlider,
const ExactCard &_rootCard, const ExactCard &_rootCard);
QString &_currentZone);
public slots: public slots:
void clampSetNameToPicture(); void clampSetNameToPicture();
@ -41,7 +40,6 @@ private:
QTreeView *deckView; QTreeView *deckView;
QSlider *cardSizeSlider; QSlider *cardSizeSlider;
ExactCard rootCard; ExactCard rootCard;
QString currentZone;
PrintingSelectorCardOverlayWidget *overlayWidget; PrintingSelectorCardOverlayWidget *overlayWidget;
}; };

2
cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
View file

@ -101,7 +101,7 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta
void AbstractTabDeckEditor::updateCard(const ExactCard &card) void AbstractTabDeckEditor::updateCard(const ExactCard &card)
{ {
cardInfoDockWidget->updateCard(card); cardInfoDockWidget->updateCard(card);
printingSelectorDockWidget->printingSelector->setCard(card.getCardPtr(), DECK_ZONE_MAIN); printingSelectorDockWidget->printingSelector->setCard(card.getCardPtr());
} }
/** @brief Placeholder: called when the deck changes. */ /** @brief Placeholder: called when the deck changes. */

3
cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
View file

@ -158,8 +158,7 @@ void TabDeckEditor::refreshShortcuts()
*/ */
void TabDeckEditor::showPrintingSelector() void TabDeckEditor::showPrintingSelector()
{ {
printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr(), printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr());
DECK_ZONE_MAIN);
printingSelectorDockWidget->printingSelector->updateDisplay(); printingSelectorDockWidget->printingSelector->updateDisplay();
aPrintingSelectorDockVisible->setChecked(true); aPrintingSelectorDockVisible->setChecked(true);
printingSelectorDockWidget->setVisible(true); printingSelectorDockWidget->setVisible(true);

3
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -266,8 +266,7 @@ bool TabDeckEditorVisual::actSaveDeckAs()
/** @brief Shows the printing selector dock and updates it with the current card. */ /** @brief Shows the printing selector dock and updates it with the current card. */
void TabDeckEditorVisual::showPrintingSelector() void TabDeckEditorVisual::showPrintingSelector()
{ {
printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr(), printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr());
DECK_ZONE_MAIN);
printingSelectorDockWidget->printingSelector->updateDisplay(); printingSelectorDockWidget->printingSelector->updateDisplay();
aPrintingSelectorDockVisible->setChecked(true); aPrintingSelectorDockVisible->setChecked(true);
printingSelectorDockWidget->setVisible(true); printingSelectorDockWidget->setVisible(true);