[VDE] Accurately represent card amounts (#6547)

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp

@@ -37,6 +37,7 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                 &CardGroupDisplayWidget::onSelectionChanged);
     }
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
+    connect(deckListModel, &QAbstractItemModel::dataChanged, this, &CardGroupDisplayWidget::onDataChanged);
 }
 
 // Just here so it can get overwritten in subclasses.
@@ -81,8 +82,11 @@ void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected,
 
             auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
             if (it != indexToWidgetMap.end()) {
-                if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(it.value())) {
+                // Highlight all copies of this card
-                    displayWidget->setHighlighted(true);
+                for (auto widget : it.value()) {
+                    if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
+                        displayWidget->setHighlighted(true);
+                    }
                 }
             }
         }
@@ -96,23 +100,51 @@ void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected,
 
             auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
             if (it != indexToWidgetMap.end()) {
-                if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(it.value())) {
+                // Un-highlight all copies of this card
-                    displayWidget->setHighlighted(false);
+                for (auto widget : it.value()) {
+                    if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
+                        displayWidget->setHighlighted(false);
+                    }
                 }
             }
         }
     }
 }
 
+void CardGroupDisplayWidget::refreshSelectionForIndex(const QPersistentModelIndex &persistent)
+{
+    if (!selectionModel || !indexToWidgetMap.contains(persistent)) {
+        return;
+    }
+
+    // Convert persistent index to regular index for selection check
+    QModelIndex idx = QModelIndex(persistent);
+
+    // Check if this index is selected
+    // We need to check against the selection model's model (which might be a proxy)
+    bool isSelected = false;
+    if (auto proxyModel = qobject_cast<QAbstractProxyModel *>(selectionModel->model())) {
+        // Map source index to proxy
+        QModelIndex proxyIdx = proxyModel->mapFromSource(idx);
+        isSelected = selectionModel->isSelected(proxyIdx);
+    } else {
+        isSelected = selectionModel->isSelected(idx);
+    }
+
+    // Apply selection state to all widgets for this index
+    for (auto widget : indexToWidgetMap[persistent]) {
+        if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
+            displayWidget->setHighlighted(isSelected);
+        }
+    }
+}
+
 // =====================================================================================================================
 //                                             Display Widget Management
 // =====================================================================================================================
 
 QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex index)
 {
-    if (indexToWidgetMap.contains(index)) {
-        return indexToWidgetMap[index];
-    }
     auto cardName = index.sibling(index.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
     auto cardProviderId =
         index.sibling(index.row(), DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::EditRole).toString();
@@ -125,7 +157,8 @@ QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex i
     connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::onHover);
     connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, widget, &CardInfoPictureWidget::setScaleFactor);
 
-    indexToWidgetMap.insert(index, widget);
+    indexToWidgetMap[index].append(widget);
+
     return widget;
 }
 
@@ -152,17 +185,26 @@ void CardGroupDisplayWidget::updateCardDisplays()
         // 4. persist the source index
         QPersistentModelIndex persistent(sourceIndex);
 
-        addToLayout(constructWidgetForIndex(persistent));
+        // Get the card amount
+        int cardAmount =
+            sourceIndex.sibling(sourceIndex.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
+
+        // Create multiple widgets for the card count
+        for (int copy = 0; copy < cardAmount; ++copy) {
+            addToLayout(constructWidgetForIndex(persistent));
+        }
     }
 }
 
 void CardGroupDisplayWidget::clearAllDisplayWidgets()
 {
-    for (auto idx : indexToWidgetMap.keys()) {
+    auto it = indexToWidgetMap.begin();
-        auto displayWidget = indexToWidgetMap.value(idx);
+    while (it != indexToWidgetMap.end()) {
-        removeFromLayout(displayWidget);
+        for (auto displayWidget : it.value()) {
-        indexToWidgetMap.remove(idx);
+            removeFromLayout(displayWidget);
-        delete displayWidget;
+            delete displayWidget;
+        }
+        it = indexToWidgetMap.erase(it);
     }
 }
 
@@ -184,7 +226,13 @@ void CardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int first
             // Persist the index
             QPersistentModelIndex persistent(child);
 
-            insertIntoLayout(constructWidgetForIndex(persistent), row);
+            // Get the card amount for the newly added card
+            int cardAmount = child.sibling(child.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
+
+            // Insert multiple copies
+            for (int copy = 0; copy < cardAmount; ++copy) {
+                insertIntoLayout(constructWidgetForIndex(persistent), row);
+            }
         }
     }
 }
@@ -193,18 +241,100 @@ void CardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first,
 {
     Q_UNUSED(first);
     Q_UNUSED(last);
-    if (parent == trackedIndex) {
+
-        for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
+    if (parent != trackedIndex) {
-            if (!idx.isValid()) {
+        return;
-                removeFromLayout(indexToWidgetMap.value(idx));
+    }
-                indexToWidgetMap.value(idx)->deleteLater();
+
-                indexToWidgetMap.remove(idx);
+    // Use iterator so we can remove while iterating
+    auto it = indexToWidgetMap.begin();
+    while (it != indexToWidgetMap.end()) {
+        const QPersistentModelIndex &idx = it.key();
+        bool shouldRemove = !idx.isValid() || it.value().isEmpty();
+
+        if (shouldRemove) {
+            // Clean up widgets
+            for (auto widget : it.value()) {
+                removeFromLayout(widget);
+                widget->deleteLater();
+            }
+
+            // Erase and advance iterator
+            it = indexToWidgetMap.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    if (!trackedIndex.isValid()) {
+        emit cleanupRequested(this);
+    }
+}
+
+void CardGroupDisplayWidget::onDataChanged(const QModelIndex &topLeft,
+                                           const QModelIndex &bottomRight,
+                                           const QVector<int> &roles)
+{
+    if (topLeft.parent() != trackedIndex && bottomRight.parent() != trackedIndex) {
+        return;
+    }
+
+    // Check if CARD_AMOUNT column changed
+    bool amountChanged = (topLeft.column() <= DeckListModelColumns::CARD_AMOUNT &&
+                          bottomRight.column() >= DeckListModelColumns::CARD_AMOUNT) ||
+                         roles.isEmpty() || roles.contains(Qt::EditRole);
+
+    if (!amountChanged) {
+        return;
+    }
+
+    // For each affected row, adjust widget count
+    for (int row = topLeft.row(); row <= bottomRight.row(); ++row) {
+        QModelIndex idx = deckListModel->index(row, 0, trackedIndex);
+
+        if (!idx.isValid()) {
+            continue;
+        }
+
+        QPersistentModelIndex persistent(idx);
+        int newAmount = idx.sibling(idx.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
+
+        // Get current widget count
+        int currentWidgetCount = indexToWidgetMap.contains(persistent) ? indexToWidgetMap.value(persistent).count() : 0;
+
+        if (newAmount == currentWidgetCount) {
+            // Still refresh selection even if count didn't change
+            refreshSelectionForIndex(persistent);
+            continue;
+        }
+
+        if (newAmount < currentWidgetCount) {
+            // Remove excess widgets
+            int toRemove = currentWidgetCount - newAmount;
+
+            for (int i = 0; i < toRemove; ++i) {
+                if (!indexToWidgetMap[persistent].isEmpty()) {
+                    QWidget *widget = indexToWidgetMap[persistent].takeLast();
+                    removeFromLayout(widget);
+                    widget->deleteLater();
+                }
+            }
+
+            // If all widgets removed, clean up the map entry
+            if (indexToWidgetMap[persistent].isEmpty()) {
+                indexToWidgetMap.remove(persistent);
+            }
+        } else {
+            // Add new widgets
+            int toAdd = newAmount - currentWidgetCount;
+
+            for (int i = 0; i < toAdd; ++i) {
+                addToLayout(constructWidgetForIndex(persistent));
             }
         }
 
-        if (!trackedIndex.isValid()) {
+        // Always refresh selection state after modifying widgets
-            emit cleanupRequested(this);
+        refreshSelectionForIndex(persistent);
-        }
     }
 }
 

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h

@@ -33,12 +33,13 @@ public:
                            int bannerOpacity,
                            CardSizeWidget *cardSizeWidget);
     void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+    void refreshSelectionForIndex(const QPersistentModelIndex &persistent);
     void clearAllDisplayWidgets();
 
     DeckListModel *deckListModel;
     QItemSelectionModel *selectionModel;
     QPersistentModelIndex trackedIndex;
-    QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
+    QMap<QPersistentModelIndex, QList<QWidget *>> indexToWidgetMap;
     QString zoneName;
     QString cardGroupCategory;
     QString activeGroupCriteria;
@@ -53,6 +54,7 @@ public slots:
     virtual void updateCardDisplays();
     virtual void onCardAddition(const QModelIndex &parent, int first, int last);
     virtual void onCardRemoval(const QModelIndex &parent, int first, int last);
+    void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
     void onActiveSortCriteriaChanged(QStringList activeSortCriteria);
     void resizeEvent(QResizeEvent *event) override;
 

cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp

@@ -31,13 +31,17 @@ FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
 
     layout->addWidget(flowWidget);
 
+    // Clear all existing widgets
     for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-        FlatCardGroupDisplayWidget::removeFromLayout(indexToWidgetMap.value(idx));
+        for (auto widget : indexToWidgetMap.value(idx)) {
-        indexToWidgetMap.value(idx)->deleteLater();
+            FlatCardGroupDisplayWidget::removeFromLayout(widget);
+            widget->deleteLater();
+        }
         indexToWidgetMap.remove(idx);
     }
 
     FlatCardGroupDisplayWidget::updateCardDisplays();
+
     disconnect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
     disconnect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
 

cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp

@@ -30,9 +30,12 @@ OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *pare
 
     layout->addWidget(overlapWidget);
 
+    // Clear all existing widgets
     for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-        OverlappedCardGroupDisplayWidget::removeFromLayout(indexToWidgetMap.value(idx));
+        for (auto widget : indexToWidgetMap.value(idx)) {
-        indexToWidgetMap.value(idx)->deleteLater();
+            OverlappedCardGroupDisplayWidget::removeFromLayout(widget);
+            widget->deleteLater();
+        }
         indexToWidgetMap.remove(idx);
     }
 

libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp

@@ -450,6 +450,10 @@ QModelIndex DeckListModel::addCard(const ExactCard &card, const QString &zoneNam
         cardNode->setCardProviderId(printingInfo.getProperty("uuid"));
         deckList->refreshDeckHash();
         emit deckHashChanged();
+        // Emit dataChanged for the amount column since we modified it
+        QModelIndex cardIndex = nodeToIndex(cardNode);
+        QModelIndex amountIndex = cardIndex.sibling(cardIndex.row(), DeckListModelColumns::CARD_AMOUNT);
+        emit dataChanged(amountIndex, amountIndex, {Qt::EditRole});
     }
     sort(lastKnownColumn, lastKnownOrder);
     refreshCardFormatLegalities();