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

[DeckListModel] Refactor api for offset count (#6454)

Browse source
This commit is contained in:
RickyRister 2025-12-29 08:19:03 -08:00 • committed by GitHub
parent 96c82a0377
commit 296866a675
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -831,11 +831,8 @@ void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, bool i
emit requestDeckHistorySave(reason);
if (isIncrement) {
deckModel->incrementAmountAtIndex(sourceIndex);
} else {
deckModel->decrementAmountAtIndex(sourceIndex);
}
int offset = isIncrement ? 1 : -1;
deckModel->offsetCountAtIndex(sourceIndex, offset);
emit deckModified();
}

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

@ -257,7 +257,7 @@ void CardAmountWidget::decrementCardHelper(const QString &zone)
QModelIndex idx = deckModel->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
rootCard.getPrinting().getProperty("num"));
deckModel->decrementAmountAtIndex(idx);
deckModel->offsetCountAtIndex(idx, -1);
deckEditor->setModified(true);
}

12
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
View file

@ -443,17 +443,7 @@ QModelIndex DeckListModel::addCard(const ExactCard &card, const QString &zoneNam
return index;
}
bool DeckListModel::incrementAmountAtIndex(const QModelIndex &idx)
{
return offsetAmountAtIndex(idx, 1);
}
bool DeckListModel::decrementAmountAtIndex(const QModelIndex &idx)
{
return offsetAmountAtIndex(idx, -1);
}
bool DeckListModel::offsetAmountAtIndex(const QModelIndex &idx, int offset)
bool DeckListModel::offsetCountAtIndex(const QModelIndex &idx, int offset)
{
if (!idx.isValid()) {
return false;

18
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
View file

@ -307,19 +307,13 @@ public:
QModelIndex addCard(const ExactCard &card, const QString &zoneName);
/**
* @brief Increments the `amount` field of the card node at the index by 1.
* @param idx The index of a card node. No-ops if the index is invalid or not a card node
* @brief Changes the `amount` field in the card node at the index by the amount.
* Removes the node if it causes the amount to fall to 0 or below.
* @param idx The index of a card node. No-ops if the index is invalid or not a card node.
* @param offset The amount to change the amount field by.
* @return Whether the operation was successful
*/
bool incrementAmountAtIndex(const QModelIndex &idx);
/**
* @brief Decrements the `amount` field of the card node at the index by 1.
* Removes the node if it causes the amount to fall to 0.
* @param idx The index of a card node. No-ops if the index is invalid or not a card node
* @return Whether the operation was successful
*/
bool decrementAmountAtIndex(const QModelIndex &idx);
bool offsetCountAtIndex(const QModelIndex &idx, int offset);
/**
* @brief Determines the sorted insertion row for a card.
@ -395,8 +389,6 @@ private:
const QString &providerId = "",
const QString &cardNumber = "") const;
bool offsetAmountAtIndex(const QModelIndex &idx, int offset);
void emitRecursiveUpdates(const QModelIndex &index);
void sortHelper(InnerDecklistNode *node, Qt::SortOrder order);