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

more refactoring in CardAmountWidget

Browse source
This commit is contained in:
RickyRister 2025-12-28 05:52:09 -08:00
parent ca6961c0b6
commit 602bcfb23e
1 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
View file

@ -137,6 +137,31 @@ void CardAmountWidget::updateCardCount()
layout->activate(); layout->activate();
} }
static QModelIndex addAndReplacePrintings(DeckListModel *model,
const QModelIndex &existing,
const ExactCard &rootCard,
const QString &zone,
int extraCopies,
bool replaceProviderless)
{
auto newCardIndex = model->addCard(rootCard, zone);
if (!newCardIndex.isValid()) {
return {};
}
// Check if a card without a providerId already exists in the deckModel and replace it, if so.
if (existing.isValid() && existing != newCardIndex && replaceProviderless) {
for (int i = 0; i < extraCopies; i++) {
model->addCard(rootCard, zone);
}
model->removeRow(existing.row(), existing.parent());
}
// Set Index and Focus as if the user had just clicked the new card and modify the deckEditor saveState
return model->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
rootCard.getPrinting().getProperty("num"));
}
/** /**
* @brief Adds a printing of the card to the specified zone (Mainboard or Sideboard). * @brief Adds a printing of the card to the specified zone (Mainboard or Sideboard).
* *
@ -144,16 +169,14 @@ void CardAmountWidget::updateCardCount()
*/ */
void CardAmountWidget::addPrinting(const QString &zone) void CardAmountWidget::addPrinting(const QString &zone)
{ {
int addedCount = 1;
// Check if we will need to add extra copies due to replacing copies without providerIds // Check if we will need to add extra copies due to replacing copies without providerIds
QModelIndex existing = deckModel->findCard(rootCard.getName(), zone); QModelIndex existing = deckModel->findCard(rootCard.getName(), zone);
QString foundProviderId;
int extraCopies = 0; int extraCopies = 0;
bool replacingProviderless = false; bool replacingProviderless = false;
if (existing.isValid()) { if (existing.isValid()) {
foundProviderId = QString foundProviderId =
existing.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString(); existing.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString();
if (foundProviderId.isEmpty()) { if (foundProviderId.isEmpty()) {
int amount = existing.data(Qt::DisplayRole).toInt(); int amount = existing.data(Qt::DisplayRole).toInt();
@ -162,10 +185,8 @@ void CardAmountWidget::addPrinting(const QString &zone)
} }
} }
addedCount += extraCopies;
QString reason = QString("Added %1 copies of '%2 (%3) %4' to %5 [ProviderID: %6]%7") QString reason = QString("Added %1 copies of '%2 (%3) %4' to %5 [ProviderID: %6]%7")
.arg(addedCount) .arg(1 + extraCopies)
.arg(rootCard.getName()) .arg(rootCard.getName())
.arg(rootCard.getPrinting().getSet()->getShortName()) .arg(rootCard.getPrinting().getSet()->getShortName())
.arg(rootCard.getPrinting().getProperty("num")) .arg(rootCard.getPrinting().getProperty("num"))
@ -176,24 +197,14 @@ void CardAmountWidget::addPrinting(const QString &zone)
emit deckModified(reason); emit deckModified(reason);
// Add the card and expand the list UI // Add the card and expand the list UI
auto newCardIndex = deckModel->addCard(rootCard, zone); auto newCardIndex = addAndReplacePrintings(deckModel, existing, rootCard, zone, extraCopies, replacingProviderless);
// Check if a card without a providerId already exists in the deckModel and replace it, if so.
if (existing.isValid() && existing != newCardIndex && foundProviderId == "") {
for (int i = 0; i < extraCopies; i++) {
deckModel->addCard(rootCard, zone);
}
deckModel->removeRow(existing.row(), existing.parent());
}
// Set Index and Focus as if the user had just clicked the new card and modify the deckEditor saveState
newCardIndex = deckModel->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
rootCard.getPrinting().getProperty("num"));
if (newCardIndex.isValid()) {
deckView->setCurrentIndex(newCardIndex); deckView->setCurrentIndex(newCardIndex);
deckView->setFocus(Qt::FocusReason::MouseFocusReason); deckView->setFocus(Qt::FocusReason::MouseFocusReason);
deckEditor->setModified(true); deckEditor->setModified(true);
} }
}
/** /**
* @brief Adds a printing to the mainboard zone. * @brief Adds a printing to the mainboard zone.