Page loading for visual database display.

cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp

@@ -28,7 +28,6 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
     visualDatabaseDisplay =
         new VisualDatabaseDisplayWidget(this, this->cardDatabaseModel, this->cardDatabaseDisplayModel);
     visualDatabaseDisplay->setObjectName("visualDatabaseView");
-    visualDatabaseDisplay->updateDisplay();
     connect(visualDatabaseDisplay, SIGNAL(cardHoveredDatabaseDisplay(CardInfoPtr)), this,
             SLOT(onCardChangedDatabaseDisplay(CardInfoPtr)));
     connect(visualDatabaseDisplay,

cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp

@@ -29,15 +29,22 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     flow_widget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
     main_layout->addWidget(flow_widget);
 
-    overlap_control_widget = new OverlapControlWidget(80, 10, 10, Qt::Vertical, flow_widget);
+    cardSizeWidget = new CardSizeWidget(this, flow_widget);
-    main_layout->addWidget(overlap_control_widget);
+    main_layout->addWidget(cardSizeWidget);
 
     debounce_timer = new QTimer(this);
     debounce_timer->setSingleShot(true); // Ensure it only fires once after the timeout
 
     connect(debounce_timer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::searchModelChanged);
-    setupPaginationControls();
+
-    loadCurrentPage(); // Load the first page of cards
+    auto loadCardsTimer = new QTimer(this);
+    loadCardsTimer->setSingleShot(true); // Ensure it only fires once after the timeout
+
+    connect(loadCardsTimer, &QTimer::timeout, this, [this]() {
+        qDebug() << "timer timed out";
+        loadCurrentPage();
+    });
+    loadCardsTimer->start(5000);
 }
 
 void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event)
@@ -56,31 +63,52 @@ void VisualDatabaseDisplayWidget::onHover(CardInfoPtr hoveredCard)
     emit cardHoveredDatabaseDisplay(hoveredCard);
 }
 
+void VisualDatabaseDisplayWidget::addCard(CardInfoPtr cardToAdd)
+{
+    cards->append(cardToAdd);
+    CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flow_widget, false);
+    display->setScaleFactor(cardSizeWidget->getSlider()->value());
+    display->setCard(cardToAdd);
+    flow_widget->addWidget(display);
+    connect(display, SIGNAL(imageClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this,
+            SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)));
+    connect(display, SIGNAL(hoveredOnCard(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr)));
+    connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor);
+}
+
 void VisualDatabaseDisplayWidget::populateCards()
 {
-    this->cards->clear();
     int rowCount = databaseDisplayModel->rowCount();
+    cards->clear();
 
     // Calculate the start and end indices for the current page
     int start = currentPage * cardsPerPage;
     int end = qMin(start + cardsPerPage, rowCount);
 
+    qDebug() << "Fetching from " << start << " to " << end << " cards";
     // Load more cards if we are at the end of the current list and can fetch more
     if (end >= rowCount && databaseDisplayModel->canFetchMore(QModelIndex())) {
+        qDebug() << "We gotta load more";
         databaseDisplayModel->fetchMore(QModelIndex());
     }
 
     for (int row = start; row < end; ++row) {
+        qDebug() << "Adding " << row;
         QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn);
         QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole);
+        qDebug() << name.toString();
         CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString());
-        cards->append(info);
+        if (info) {
+            addCard(info);
+        } else {
+            qDebug() << "Card not found in database!";
+        }
     }
+    currentPage++;
 }
 
 void VisualDatabaseDisplayWidget::searchModelChanged()
 {
-    qDebug() << "Search Model changed";
     // Clear the current page and prepare for new data
     flow_widget->clearLayout(); // Clear existing cards
     cards->clear();             // Clear the card list
@@ -92,14 +120,14 @@ void VisualDatabaseDisplayWidget::searchModelChanged()
 
     currentPage = 0;
     loadCurrentPage();
-    updateDisplay();
+    qDebug() << "Search model changed";
 }
 
 void VisualDatabaseDisplayWidget::loadNextPage()
 {
     // Calculate the start and end indices for the next page
     int rowCount = databaseDisplayModel->rowCount();
-    int start = (currentPage + 1) * cardsPerPage;
+    int start = currentPage * cardsPerPage;
     int end = qMin(start + cardsPerPage, rowCount);
 
     // Load more cards if we are at the end of the current list and can fetch more
@@ -113,12 +141,7 @@ void VisualDatabaseDisplayWidget::loadNextPage()
         QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole);
         CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString());
         if (info) {
-            CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flow_widget, true);
+            addCard(info);
-            display->setCard(info);
-            flow_widget->addWidget(display);
-            connect(display, SIGNAL(imageClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this,
-                    SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)));
-            connect(display, SIGNAL(hoveredOnCard(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr)));
         } else {
             qDebug() << "Card not found in database!";
         }
@@ -126,7 +149,6 @@ void VisualDatabaseDisplayWidget::loadNextPage()
 
     // Update the current page
     currentPage++;
-    adjustCardsPerPage(); // Adjust the cards per page if needed
 }
 
 void VisualDatabaseDisplayWidget::loadCurrentPage()
@@ -134,6 +156,7 @@ void VisualDatabaseDisplayWidget::loadCurrentPage()
     // Ensure only the initial page is loaded
     if (currentPage == 0) {
         // Only load the first page initially
+        qDebug() << "Loading the first page";
         populateCards();
     } else {
         // If not the first page, just load the next page and append to the flow widget
@@ -141,76 +164,6 @@ void VisualDatabaseDisplayWidget::loadCurrentPage()
     }
 }
 
-void VisualDatabaseDisplayWidget::updateDisplay()
-{
-    // Clear the layout first
-    flow_widget->clearLayout();
-
-    OverlapWidget *printings_group_widget = new OverlapWidget(flow_widget, 0, cardsPerRow, rowsPerColumn, Qt::Vertical);
-
-    // Create card widgets and store their sizes
-    QList<CardInfoPictureWithTextOverlayWidget *> cardDisplays;
-    for (const auto &info : *cards) {
-        if (info) {
-            CardInfoPictureWithTextOverlayWidget *display =
-                new CardInfoPictureWithTextOverlayWidget(printings_group_widget, true);
-            display->setCard(info);
-            cardDisplays.append(display);
-            printings_group_widget->addWidget(display);
-            connect(display, SIGNAL(imageClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this,
-                    SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)));
-            connect(display, SIGNAL(hoveredOnCard(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr)));
-        } else {
-            qDebug() << "Card not found in database!";
-        }
-    }
-
-    // Calculate the maximum size of the card widgets after they've been added to the layout
-    // adjustCardsPerPage();
-
-    overlap_control_widget->connectOverlapWidget(printings_group_widget);
-    flow_widget->addWidget(printings_group_widget);
-    flow_widget->update();
-
-    update(); // Update the widget display
-}
-
-void VisualDatabaseDisplayWidget::adjustCardsPerPage()
-{
-    // Calculate available width and height in the OverlapWidget
-    int availableWidth = flow_widget->width();
-    int availableHeight = flow_widget->height();
-
-    QList<CardInfoPictureWithTextOverlayWidget *> cardDisplays;
-    for (OverlapWidget *child : flow_widget->findChildren<OverlapWidget *>()) {
-        for (CardInfoPictureWithTextOverlayWidget *overlapChild :
-             child->findChildren<CardInfoPictureWithTextOverlayWidget *>()) {
-            if (CardInfoPictureWithTextOverlayWidget *cardDisplay =
-                    qobject_cast<CardInfoPictureWithTextOverlayWidget *>(overlapChild)) {
-                cardDisplays.append(cardDisplay);
-            }
-        }
-    }
-
-    // Measure the size of the first card display to determine the size of cards
-    if (!cardDisplays.isEmpty()) {
-        int cardWidth = cardDisplays.first()->sizeHint().width();
-        int cardHeight = cardDisplays.first()->sizeHint().height();
-        const int overlapMargin = 10; // Margin between cards
-
-        // Calculate how many cards can fit horizontally and vertically
-        cardsPerRow = availableWidth / (cardWidth + overlapMargin);
-        rowsPerColumn = availableHeight / (cardHeight + overlapMargin);
-        // qDebug() << "available width " << availableWidth << "available height: " << availableHeight;
-        // qDebug() << "width: " << cardWidth << "height: " << cardHeight << "cardsPerRow: " << cardsPerRow <<
-        // "rowsPerColumn: " << rowsPerColumn;
-
-        // Update cardsPerPage based on rows and columns
-        cardsPerPage = cardsPerRow * rowsPerColumn;
-        // qDebug() << "Adjusted cards per page to:" << cardsPerPage;
-    }
-}
-
 void VisualDatabaseDisplayWidget::modelDirty()
 {
     debounce_timer->start(debounce_time);
@@ -226,58 +179,25 @@ void VisualDatabaseDisplayWidget::databaseDataChanged(QModelIndex topLeft, QMode
 {
     (void)topLeft;
     (void)bottomRight;
-    updateDisplay();
+    qDebug() << "Database Data changed";
 }
 
 void VisualDatabaseDisplayWidget::wheelEvent(QWheelEvent *event)
 {
-    if (isAnimating) {
+    int totalRows = databaseDisplayModel->rowCount(); // Total number of cards
-        return;
+    int nextPageStartIndex = (currentPage + 1) * cardsPerPage;
-    }
+
-    // Check scroll direction
+    // Handle scrolling down
-    if (event->angleDelta().y() > 0) {
+    if (event->angleDelta().y() < 0) {
-        // Scrolling up
+        // Check if the next page has any cards to load
-        if (currentPage > 0) {
+        if (nextPageStartIndex < totalRows) {
-            currentPage--;
-            loadCurrentPage(); // Load the previous page
-        }
-    } else if (event->angleDelta().y() < 0) {
-        // Scrolling down
-        if ((currentPage + 1) * cardsPerPage < databaseDisplayModel->rowCount()) {
-            currentPage++;
             loadCurrentPage(); // Load the next page
+            event->accept();   // Accept the event as valid
+            return;
         }
+        qDebug() << nextPageStartIndex << ":" << totalRows;
     }
 
-    // Prevent overscrolling by stopping the event if needed
+    // Prevent overscrolling when there's no more data to load
-    if ((currentPage == 0 && event->angleDelta().y() > 0) ||
+    event->ignore();
-        ((currentPage + 1) * cardsPerPage >= databaseDisplayModel->rowCount() && event->angleDelta().y() < 0)) {
-        event->ignore(); // Ignore the event to prevent overscrolling
-    } else {
-        event->accept(); // Accept the event if scrolling is valid
-    }
-}
-
-void VisualDatabaseDisplayWidget::setupPaginationControls()
-{
-    QPushButton *prevButton = new QPushButton("Previous", this);
-    QPushButton *nextButton = new QPushButton("Next", this);
-
-    connect(prevButton, &QPushButton::clicked, this, [this]() {
-        if (currentPage > 0) {
-            currentPage--;
-            loadCurrentPage();
-        }
-    });
-
-    connect(nextButton, &QPushButton::clicked, this, [this]() {
-        if ((currentPage + 1) * cardsPerPage < databaseDisplayModel->rowCount()) {
-            currentPage++;
-            loadCurrentPage();
-        }
-    });
-
-    // Add buttons to layout (for example, at the bottom of the main layout)
-    main_layout->addWidget(prevButton);
-    main_layout->addWidget(nextButton);
 }

cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h

@@ -6,6 +6,7 @@
 #include "../../../../game/cards/card_database_model.h"
 #include "../../layouts/flow_layout.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
+#include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../general/layout_containers/overlap_control_widget.h"
 
@@ -38,9 +39,9 @@ signals:
 protected slots:
     void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
     void onHover(CardInfoPtr hoveredCard);
+    void addCard(CardInfoPtr cardToAdd);
     void databaseDataChanged(QModelIndex topLeft, QModelIndex bottomRight);
     void wheelEvent(QWheelEvent *event) override;
-    void setupPaginationControls();
     void modelDirty();
 
 private:
@@ -53,15 +54,13 @@ private:
     QWidget *overlap_categories;
     QVBoxLayout *overlap_categories_layout;
     OverlapControlWidget *overlap_control_widget;
+    CardSizeWidget *cardSizeWidget;
     QWidget *container;
     QTimer *debounce_timer;
 
-    bool isAnimating = false;
     int debounce_time = 300;
-    int currentPage = 0;  // Current page index
+    int currentPage = 0;    // Current page index
-    int cardsPerPage = 9; // Number of cards per page
+    int cardsPerPage = 200; // Number of cards per page
-    int cardsPerRow = 0;
-    int rowsPerColumn = 0;
 
 protected:
     void resizeEvent(QResizeEvent *event) override;