Skip to content

FinceptTerminal is a modern finance application offering advanced market analytics, investment research, and economic data tools, designed for interactive exploration and data-driven decision-making in a user-friendly environment.

feat(dbnomics): comparison view, loading animations, improved table UX, 2x2 chart grid

jaimin-ptl07e5ed8cd630ba
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.cpp b/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.cpp
index 6a778a2fe..1190b027a 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.cpp
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.cpp
@@ -15,6 +15,9 @@
#include <QLegend>
#include <QVBoxLayout>
+#include <QStackedWidget>
+#include <QLabel>
+#include <QTimer>
#include <QSet>
#include <algorithm>
#include <limits>
@@ -30,9 +33,24 @@ void DBnomicsChartWidget::build_ui() {
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- chart_view_ = new QChartView(this);
+ stack_ = new QStackedWidget(this);
+
+ // ── Page 0: loading spinner ───────────────────────────────────────────────
+ auto* loading_page = new QWidget(stack_);
+ loading_page->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ auto* loading_vl = new QVBoxLayout(loading_page);
+ spin_label_ = new QLabel(loading_page);
+ spin_label_->setAlignment(Qt::AlignCenter);
+ spin_label_->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:16px; background:transparent;")
+ .arg(ui::colors::AMBER)
+ .arg(ui::fonts::DATA_FAMILY));
+ loading_vl->addWidget(spin_label_);
+ stack_->addWidget(loading_page); // index 0
+
+ // ── Page 1: chart view ────────────────────────────────────────────────────
+ chart_view_ = new QChartView(stack_);
chart_view_->setRenderHint(QPainter::Antialiasing, false);
-
auto* chart = new QChart();
chart->setBackgroundBrush(QBrush(QColor(ui::colors::BG_BASE)));
chart->setPlotAreaBackgroundBrush(QBrush(QColor(ui::colors::BG_BASE)));
@@ -44,8 +62,31 @@ void DBnomicsChartWidget::build_ui() {
chart->setTitleBrush(QBrush(QColor(ui::colors::AMBER)));
chart_view_->setChart(chart);
chart_view_->setBackgroundBrush(QBrush(QColor(ui::colors::BG_BASE)));
+ stack_->addWidget(chart_view_); // index 1
+
+ stack_->setCurrentIndex(1);
+ root->addWidget(stack_);
+
+ // ── Animation timer ───────────────────────────────────────────────────────
+ spin_timer_ = new QTimer(this);
+ spin_timer_->setInterval(120);
+ connect(spin_timer_, &QTimer::timeout, this, [this]() {
+ static const QString frames[] = {"⣾","⣽","⣻","⢿","⡿","⣟","⣯","⣷"};
+ spin_label_->setText(QString("%1 FETCHING DATA...").arg(frames[frame_ % 8]));
+ ++frame_;
+ });
+}
- root->addWidget(chart_view_);
+void DBnomicsChartWidget::set_loading(bool on) {
+ if (on) {
+ frame_ = 0;
+ spin_label_->setText("⣾ FETCHING DATA...");
+ stack_->setCurrentIndex(0);
+ spin_timer_->start();
+ } else {
+ spin_timer_->stop();
+ stack_->setCurrentIndex(1);
+ }
}
void DBnomicsChartWidget::clear() {
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.h b/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.h
index 9d518c294..f510edbb0 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.h
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsChartWidget.h
@@ -2,6 +2,9 @@
#pragma once
#include "services/dbnomics/DBnomicsModels.h"
#include <QWidget>
+#include <QStackedWidget>
+#include <QLabel>
+#include <QTimer>
#include <QtCharts/QChartView>
namespace fincept::screens {
@@ -14,6 +17,7 @@ public:
void set_data(const QVector<services::DbnDataPoint>& series,
services::DbnChartType chart_type);
void clear();
+ void set_loading(bool on);
private:
void build_ui();
@@ -22,7 +26,11 @@ private:
void render_bar(const QVector<services::DbnDataPoint>& series);
void render_scatter(const QVector<services::DbnDataPoint>& series);
- QChartView* chart_view_ = nullptr;
+ QStackedWidget* stack_ = nullptr;
+ QLabel* spin_label_ = nullptr;
+ QTimer* spin_timer_ = nullptr;
+ QChartView* chart_view_ = nullptr;
+ int frame_ = 0;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp b/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp
index 1addc40a6..a6cea0045 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp
@@ -2,6 +2,8 @@
#include "screens/dbnomics/DBnomicsDataTable.h"
#include "ui/theme/Theme.h"
#include <QVBoxLayout>
+#include <QStackedWidget>
+#include <QTimer>
#include <QHeaderView>
#include <QTableWidgetItem>
#include <QLabel>
@@ -19,9 +21,9 @@ void DBnomicsDataTable::build_ui() {
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- auto* label = new QLabel("OBSERVATION DATA");
- label->setObjectName("tableTitle");
- label->setStyleSheet(QString(
+ // ── Section header (always visible) ──────────────────────────────────────
+ auto* header_label = new QLabel("OBSERVATION DATA", this);
+ header_label->setStyleSheet(QString(
"color: %1; font-size: 11px; font-weight: 700; "
"font-family: 'Consolas','Courier New',monospace; "
"padding: 6px 12px; background: %2; "
@@ -29,32 +31,83 @@ void DBnomicsDataTable::build_ui() {
.arg(ui::colors::AMBER)
.arg(ui::colors::BG_RAISED)
.arg(ui::colors::BORDER_DIM));
- root->addWidget(label);
+ root->addWidget(header_label);
- table_ = new QTableWidget(this);
+ stack_ = new QStackedWidget(this);
+
+ // ── Page 0: loading spinner ───────────────────────────────────────────────
+ auto* loading_page = new QWidget(stack_);
+ loading_page->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ auto* loading_vl = new QVBoxLayout(loading_page);
+ spin_label_ = new QLabel(loading_page);
+ spin_label_->setAlignment(Qt::AlignCenter);
+ spin_label_->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:13px; background:transparent;")
+ .arg(ui::colors::TEXT_TERTIARY)
+ .arg(ui::fonts::DATA_FAMILY));
+ loading_vl->addWidget(spin_label_);
+ stack_->addWidget(loading_page); // index 0
+
+ // ── Page 1: table ─────────────────────────────────────────────────────────
+ table_ = new QTableWidget(stack_);
table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
table_->setSelectionBehavior(QAbstractItemView::SelectRows);
- table_->setAlternatingRowColors(false);
+ table_->setAlternatingRowColors(true);
table_->horizontalHeader()->setStretchLastSection(true);
table_->horizontalHeader()->setDefaultAlignment(Qt::AlignRight | Qt::AlignVCenter);
+ table_->horizontalHeader()->setMinimumSectionSize(70);
table_->verticalHeader()->setVisible(false);
- table_->setShowGrid(false);
+ table_->verticalHeader()->setDefaultSectionSize(28);
+ table_->setShowGrid(true);
+ table_->setWordWrap(false);
table_->setStyleSheet(QString(
- "QTableWidget { background: %1; color: %2; "
- " font-family: 'Consolas','Courier New',monospace; font-size: 12px; "
- " border: none; gridline-color: %3; }"
- "QTableWidget::item { padding: 3px 8px; border-bottom: 1px solid %3; }"
+ "QTableWidget { background: %1; alternate-background-color: %7;"
+ " color: %2; font-family: 'Consolas','Courier New',monospace; font-size: 12px;"
+ " border: none; gridline-color: %3; selection-background-color: %4; }"
+ "QTableWidget::item { padding: 4px 10px; border: none; }"
"QTableWidget::item:selected { background: %4; color: %2; }"
- "QHeaderView::section { background: %5; color: %6; "
- " font-size: 11px; font-weight: 700; padding: 4px 8px; "
- " border: none; border-bottom: 1px solid %3; }")
- .arg(ui::colors::BG_BASE)
- .arg(ui::colors::TEXT_PRIMARY)
- .arg(ui::colors::BORDER_DIM)
- .arg(ui::colors::BG_HOVER)
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY));
- root->addWidget(table_);
+ "QHeaderView::section { background: %5; color: %6;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ " font-size: 11px; font-weight: 700; padding: 6px 10px;"
+ " border: none; border-bottom: 2px solid %3; border-right: 1px solid %3; }"
+ "QScrollBar:vertical { background: %1; width: 8px; border: none; }"
+ "QScrollBar::handle:vertical { background: %3; border-radius: 4px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }"
+ "QScrollBar:horizontal { background: %1; height: 8px; border: none; }"
+ "QScrollBar::handle:horizontal { background: %3; border-radius: 4px; }"
+ "QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0; }")
+ .arg(ui::colors::BG_BASE) // %1
+ .arg(ui::colors::TEXT_PRIMARY) // %2
+ .arg(ui::colors::BORDER_DIM) // %3
+ .arg(ui::colors::BG_HOVER) // %4
+ .arg(ui::colors::BG_RAISED) // %5
+ .arg(ui::colors::TEXT_SECONDARY) // %6
+ .arg("#0a0a0a")); // %7 alternate row
+ stack_->addWidget(table_); // index 1
+
+ stack_->setCurrentIndex(1);
+ root->addWidget(stack_);
+
+ // ── Animation timer ───────────────────────────────────────────────────────
+ spin_timer_ = new QTimer(this);
+ spin_timer_->setInterval(120);
+ connect(spin_timer_, &QTimer::timeout, this, [this]() {
+ static const QString frames[] = {"⣾","⣽","⣻","⢿","⡿","⣟","⣯","⣷"};
+ spin_label_->setText(QString("%1 LOADING OBSERVATIONS...").arg(frames[frame_ % 8]));
+ ++frame_;
+ });
+}
+
+void DBnomicsDataTable::set_loading(bool on) {
+ if (on) {
+ frame_ = 0;
+ spin_label_->setText("⣾ LOADING OBSERVATIONS...");
+ stack_->setCurrentIndex(0);
+ spin_timer_->start();
+ } else {
+ spin_timer_->stop();
+ stack_->setCurrentIndex(1);
+ }
}
void DBnomicsDataTable::clear() {
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.h b/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.h
index 6c9e4333e..b843f8a41 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.h
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.h
@@ -2,6 +2,9 @@
#pragma once
#include "services/dbnomics/DBnomicsModels.h"
#include <QWidget>
+#include <QStackedWidget>
+#include <QLabel>
+#include <QTimer>
#include <QTableWidget>
namespace fincept::screens {
@@ -11,14 +14,18 @@ class DBnomicsDataTable : public QWidget {
public:
explicit DBnomicsDataTable(QWidget* parent = nullptr);
- // Replace the entire table with a new set of series
void set_data(const QVector<services::DbnDataPoint>& series);
void clear();
+ void set_loading(bool on);
private:
void build_ui();
- QTableWidget* table_ = nullptr;
+ QStackedWidget* stack_ = nullptr;
+ QLabel* spin_label_ = nullptr;
+ QTimer* spin_timer_ = nullptr;
+ QTableWidget* table_ = nullptr;
+ int frame_ = 0;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp
index 263294e21..83b6a27aa 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp
@@ -9,16 +9,19 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
+#include <QGridLayout>
#include <QSplitter>
#include <QLabel>
#include <QPushButton>
#include <QComboBox>
#include <QStackedWidget>
+#include <QScrollArea>
#include <QFileDialog>
#include <QDateTime>
#include <QTextStream>
#include <QFile>
#include <QSet>
+#include <algorithm>
namespace fincept::screens {
@@ -84,6 +87,10 @@ DBnomicsScreen::DBnomicsScreen(QWidget* parent) : QWidget(parent) {
this, &DBnomicsScreen::on_add_slot);
connect(selection_panel_, &DBnomicsSelectionPanel::add_to_slot_clicked,
this, &DBnomicsScreen::on_add_to_slot);
+ connect(selection_panel_, &DBnomicsSelectionPanel::remove_from_slot_clicked,
+ this, &DBnomicsScreen::on_remove_from_slot);
+ connect(selection_panel_, &DBnomicsSelectionPanel::remove_slot_clicked,
+ this, &DBnomicsScreen::on_remove_slot);
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -94,6 +101,7 @@ void DBnomicsScreen::showEvent(QShowEvent* event) {
LOG_INFO("DBnomicsScreen", "Screen shown");
if (provider_count_ == 0) {
LOG_INFO("DBnomicsScreen", "No providers cached — fetching providers");
+ selection_panel_->set_providers_loading(true);
services::DBnomicsService::instance().fetch_providers();
}
}
@@ -229,31 +237,74 @@ void DBnomicsScreen::build_ui() {
// view_stack_
view_stack_ = new QStackedWidget(right_widget);
- // Page 0: single view (chart + table)
+ // Page 0: single view (chart + table with draggable splitter)
auto* single_page = new QWidget(view_stack_);
auto* single_vl = new QVBoxLayout(single_page);
single_vl->setContentsMargins(0, 0, 0, 0);
single_vl->setSpacing(0);
- chart_widget_ = new DBnomicsChartWidget(single_page);
- data_table_ = new DBnomicsDataTable(single_page);
+ auto* single_splitter = new QSplitter(Qt::Vertical, single_page);
+ single_splitter->setHandleWidth(5);
+ single_splitter->setChildrenCollapsible(false);
+ single_splitter->setStyleSheet(
+ "QSplitter::handle:vertical {"
+ " background: #1a1a1a; height: 5px;"
+ " border-top: 1px solid #222; border-bottom: 1px solid #222; }"
+ "QSplitter::handle:vertical:hover { background: #d97706; }");
- single_vl->addWidget(chart_widget_, 3);
- single_vl->addWidget(data_table_, 1);
+ chart_widget_ = new DBnomicsChartWidget(single_splitter);
+ data_table_ = new DBnomicsDataTable(single_splitter);
+ chart_widget_->setMinimumHeight(120);
+ data_table_->setMinimumHeight(150);
+
+ single_splitter->addWidget(chart_widget_);
+ single_splitter->addWidget(data_table_);
+ single_splitter->setStretchFactor(0, 3); // chart ~65 %
+ single_splitter->setStretchFactor(1, 2); // table ~35 %
+
+ single_vl->addWidget(single_splitter);
view_stack_->addWidget(single_page); // index 0
- // Page 1: comparison placeholder
+ // Page 1: comparison view (scrollable slot cards)
auto* compare_page = new QWidget(view_stack_);
compare_page->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
- auto* compare_placeholder = new QLabel("COMPARISON VIEW — COMING SOON", compare_page);
- compare_placeholder->setAlignment(Qt::AlignCenter);
- compare_placeholder->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:14px;")
+ auto* compare_vl = new QVBoxLayout(compare_page);
+ compare_vl->setContentsMargins(0, 0, 0, 0);
+ compare_vl->setSpacing(0);
+
+ auto* compare_scroll = new QScrollArea(compare_page);
+ compare_scroll->setWidgetResizable(true);
+ compare_scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ compare_scroll->setStyleSheet(QString(
+ "QScrollArea { border: none; background: %1; }"
+ "QScrollBar:vertical { background: %1; width: 6px; }"
+ "QScrollBar::handle:vertical { background: %2; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BG_BASE)
+ .arg(ui::colors::BORDER_DIM));
+
+ comparison_content_ = new QWidget(compare_scroll);
+ comparison_content_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ comparison_layout_ = new QVBoxLayout(comparison_content_);
+ comparison_layout_->setContentsMargins(8, 8, 8, 8);
+ comparison_layout_->setSpacing(8);
+
+ // Initial placeholder
+ auto* init_placeholder = new QLabel(
+ "NO COMPARISON SLOTS\nClick + ADD SLOT in the left panel to begin",
+ comparison_content_);
+ init_placeholder->setAlignment(Qt::AlignCenter);
+ init_placeholder->setWordWrap(true);
+ init_placeholder->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:13px;")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::DATA_FAMILY));
- auto* compare_vl = new QVBoxLayout(compare_page);
- compare_vl->addWidget(compare_placeholder);
+ comparison_layout_->addWidget(init_placeholder);
+ comparison_layout_->addStretch();
+
+ compare_scroll->setWidget(comparison_content_);
+ compare_vl->addWidget(compare_scroll);
view_stack_->addWidget(compare_page); // index 1
view_stack_->setCurrentIndex(0);
@@ -379,6 +430,7 @@ void DBnomicsScreen::assign_series_colors() {
// ─────────────────────────────────────────────────────────────────────────────
void DBnomicsScreen::on_providers_loaded(const QVector<services::DbnProvider>& providers) {
provider_count_ = providers.size();
+ selection_panel_->set_providers_loading(false);
selection_panel_->populate_providers(providers);
stats_label_->setText(QString("%1 providers").arg(provider_count_));
set_status(QString("Loaded %1 providers").arg(provider_count_));
@@ -387,11 +439,15 @@ void DBnomicsScreen::on_providers_loaded(const QVector<services::DbnProvider>& p
void DBnomicsScreen::on_datasets_loaded(const QVector<services::DbnDataset>& datasets,
const services::DbnPagination& page, bool append) {
+ if (!append)
+ selection_panel_->set_datasets_loading(false);
selection_panel_->populate_datasets(datasets, page, append);
}
void DBnomicsScreen::on_series_loaded(const QVector<services::DbnSeriesInfo>& series,
const services::DbnPagination& page, bool append) {
+ if (!append)
+ selection_panel_->set_series_loading(false);
selection_panel_->populate_series(series, page, append);
set_status(QString("Loaded %1 series").arg(series.size()));
}
@@ -400,10 +456,13 @@ void DBnomicsScreen::on_observations_loaded(const services::DbnDataPoint& data)
last_loaded_data_ = data;
has_pending_data_ = true;
+ // Always stop loading spinners — data has arrived
+ chart_widget_->set_loading(false);
+ data_table_->set_loading(false);
+
// Check if this series is already in single_series_
for (auto& s : single_series_) {
if (s.series_id == data.series_id) {
- // Update existing series observations
s.observations = data.observations;
s.series_name = data.series_name;
render_single_view();
@@ -418,12 +477,20 @@ void DBnomicsScreen::on_observations_loaded(const services::DbnDataPoint& data)
void DBnomicsScreen::on_search_results_loaded(const QVector<services::DbnSearchResult>& results,
const services::DbnPagination& page, bool append) {
+ selection_panel_->set_search_loading(false);
selection_panel_->populate_search_results(results, page, append);
}
void DBnomicsScreen::on_service_error(const QString& context, const QString& message) {
LOG_ERROR("DBnomicsScreen", QString("[%1] %2").arg(context, message));
set_status(QString("ERROR [%1]: %2").arg(context, message));
+ // Stop any active loading spinners so they don't hang on error
+ selection_panel_->set_providers_loading(false);
+ selection_panel_->set_datasets_loading(false);
+ selection_panel_->set_series_loading(false);
+ selection_panel_->set_search_loading(false);
+ chart_widget_->set_loading(false);
+ data_table_->set_loading(false);
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -431,6 +498,7 @@ void DBnomicsScreen::on_service_error(const QString& context, const QString& mes
// ─────────────────────────────────────────────────────────────────────────────
void DBnomicsScreen::on_fetch_clicked() {
set_status("Fetching providers...");
+ selection_panel_->set_providers_loading(true);
services::DBnomicsService::instance().fetch_providers();
}
@@ -522,11 +590,13 @@ void DBnomicsScreen::on_export_csv() {
// ─────────────────────────────────────────────────────────────────────────────
void DBnomicsScreen::on_provider_selected(const QString& code) {
set_status(QString("Loading datasets for %1...").arg(code));
+ selection_panel_->set_datasets_loading(true);
services::DBnomicsService::instance().fetch_datasets(code, 0);
}
void DBnomicsScreen::on_dataset_selected(const QString& code) {
set_status(QString("Loading series for %1...").arg(code));
+ selection_panel_->set_series_loading(true);
services::DBnomicsService::instance().fetch_series(
selection_panel_->selected_provider(), code, {}, 0);
}
@@ -534,6 +604,8 @@ void DBnomicsScreen::on_dataset_selected(const QString& code) {
void DBnomicsScreen::on_series_selected(const QString& prov, const QString& ds,
const QString& code) {
set_status("Fetching observations...");
+ chart_widget_->set_loading(true);
+ data_table_->set_loading(true);
services::DBnomicsService::instance().fetch_observations(prov, ds, code);
}
@@ -589,6 +661,8 @@ void DBnomicsScreen::on_clear_all() {
has_pending_data_ = false;
chart_widget_->clear();
data_table_->clear();
+ selection_panel_->clear_slots();
+ rebuild_comparison_view();
set_status("Cleared");
LOG_INFO("DBnomicsScreen", "All series cleared");
}
@@ -596,6 +670,7 @@ void DBnomicsScreen::on_clear_all() {
void DBnomicsScreen::on_add_slot() {
slots_.append(services::DbnSlot{});
selection_panel_->add_comparison_slot();
+ rebuild_comparison_view();
LOG_INFO("DBnomicsScreen", QString("Comparison slot added. Total slots: %1").arg(slots_.size()));
}
@@ -605,7 +680,6 @@ void DBnomicsScreen::on_add_to_slot(int slot_index) {
return;
}
- // Resize slots vector if needed
if (slot_index >= slots_.size())
slots_.resize(slot_index + 1);
@@ -616,10 +690,212 @@ void DBnomicsScreen::on_add_to_slot(int slot_index) {
}
slots_[slot_index].series.append(last_loaded_data_);
+
+ // Assign colors for this slot's series
+ for (int i = 0; i < slots_[slot_index].series.size(); ++i)
+ slots_[slot_index].series[i].color = services::DBnomicsService::chart_color(i);
+
selection_panel_->update_slot_series(slot_index, slots_[slot_index].series);
+ rebuild_comparison_view();
+ set_status(QString("Added %1 to slot %2").arg(last_loaded_data_.series_name).arg(slot_index + 1));
LOG_INFO("DBnomicsScreen",
QString("Series added to slot %1: %2").arg(slot_index).arg(last_loaded_data_.series_id));
}
+// ─────────────────────────────────────────────────────────────────────────────
+// Comparison view slot management
+// ─────────────────────────────────────────────────────────────────────────────
+void DBnomicsScreen::on_remove_from_slot(int slot_index, const QString& series_id) {
+ if (slot_index < 0 || slot_index >= slots_.size()) return;
+
+ auto& slot = slots_[slot_index];
+ slot.series.erase(
+ std::remove_if(slot.series.begin(), slot.series.end(),
+ [&series_id](const services::DbnDataPoint& dp) {
+ return dp.series_id == series_id;
+ }),
+ slot.series.end());
+
+ // Re-assign colors after removal
+ for (int i = 0; i < slot.series.size(); ++i)
+ slot.series[i].color = services::DBnomicsService::chart_color(i);
+
+ selection_panel_->update_slot_series(slot_index, slot.series);
+ rebuild_comparison_view();
+
+ set_status(QString("Removed series from slot %1").arg(slot_index + 1));
+ LOG_INFO("DBnomicsScreen",
+ QString("Removed %1 from slot %2").arg(series_id).arg(slot_index));
+}
+
+void DBnomicsScreen::on_remove_slot(int slot_index) {
+ if (slot_index < 0 || slot_index >= slots_.size()) return;
+ slots_.removeAt(slot_index);
+ selection_panel_->remove_comparison_slot(slot_index);
+ rebuild_comparison_view();
+ set_status(QString("Slot removed. %1 slot(s) remaining").arg(slots_.size()));
+ LOG_INFO("DBnomicsScreen",
+ QString("Slot %1 removed. Remaining: %2").arg(slot_index + 1).arg(slots_.size()));
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// rebuild_comparison_view — 2-column grid, 4 charts visible at once
+// ─────────────────────────────────────────────────────────────────────────────
+void DBnomicsScreen::rebuild_comparison_view() {
+ if (!comparison_layout_) return;
+
+ // Clear every item
+ while (comparison_layout_->count() > 0) {
+ QLayoutItem* item = comparison_layout_->takeAt(0);
+ if (item) {
+ if (item->widget())
+ item->widget()->deleteLater();
+ delete item;
+ }
+ }
+ slot_cards_.clear();
+
+ if (slots_.isEmpty()) {
+ auto* placeholder = new QLabel(
+ "NO COMPARISON SLOTS\nClick + ADD SLOT in the left panel to begin",
+ comparison_content_);
+ placeholder->setAlignment(Qt::AlignCenter);
+ placeholder->setWordWrap(true);
+ placeholder->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:13px;")
+ .arg(ui::colors::TEXT_TERTIARY)
+ .arg(ui::fonts::DATA_FAMILY));
+ comparison_layout_->addWidget(placeholder);
+ comparison_layout_->addStretch();
+ return;
+ }
+
+ // ── 2-column grid: up to 2 rows × 2 cols fit on screen without scrolling ─
+ auto* grid_widget = new QWidget(comparison_content_);
+ grid_widget->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ auto* grid = new QGridLayout(grid_widget);
+ grid->setContentsMargins(6, 6, 6, 6);
+ grid->setSpacing(6);
+ grid->setColumnStretch(0, 1);
+ grid->setColumnStretch(1, 1);
+
+ const int n = slots_.size();
+ for (int i = 0; i < n; ++i) {
+ const auto& slot = slots_[i];
+ const int row = i / 2;
+ const int col = i % 2;
+ // Odd last card spans both columns for visual balance
+ const int col_span = (i == n - 1 && n % 2 == 1) ? 2 : 1;
+
+ // ── Card ─────────────────────────────────────────────────────────────
+ auto* card = new QWidget(grid_widget);
+ card->setMinimumHeight(240);
+ card->setObjectName("slotCard");
+ card->setStyleSheet(
+ "QWidget#slotCard { background:#0d0d0d; border:1px solid #1f1f1f; }");
+
+ auto* card_vl = new QVBoxLayout(card);
+ card_vl->setContentsMargins(0, 0, 0, 0);
+ card_vl->setSpacing(0);
+
+ // ── Card header (32px) ────────────────────────────────────────────────
+ auto* header = new QWidget(card);
+ header->setFixedHeight(32);
+ header->setObjectName("cardHeader");
+ header->setStyleSheet(
+ "QWidget#cardHeader { background:#111; border-bottom:1px solid #1f1f1f; }");
+
+ auto* header_hl = new QHBoxLayout(header);
+ header_hl->setContentsMargins(10, 0, 8, 0);
+ header_hl->setSpacing(8);
+
+ auto* slot_label = new QLabel(QString("SLOT %1").arg(i + 1), header);
+ slot_label->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:12px; font-weight:700;"
+ " background:transparent; border:none;")
+ .arg(ui::colors::AMBER)
+ .arg(ui::fonts::DATA_FAMILY));
+ header_hl->addWidget(slot_label);
+
+ auto* count_label = new QLabel(
+ QString("(%1 series)").arg(slot.series.size()), header);
+ count_label->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:10px;"
+ " background:transparent; border:none;")
+ .arg(ui::colors::TEXT_TERTIARY)
+ .arg(ui::fonts::DATA_FAMILY));
+ header_hl->addWidget(count_label);
+ header_hl->addStretch();
+
+ auto* chart_combo = new QComboBox(header);
+ chart_combo->addItems({"LINE", "AREA", "BAR", "SCATTER"});
+ chart_combo->setCurrentIndex(static_cast<int>(slot.chart_type));
+ chart_combo->setFixedHeight(22);
+ chart_combo->setStyleSheet(
+ QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
+ " font-family:%4; font-size:10px; padding:0 4px; }"
+ "QComboBox::drop-down { border:none; }"
+ "QComboBox QAbstractItemView { background:%1; color:%2; border:1px solid %3; }")
+ .arg(ui::colors::BG_HOVER)
+ .arg(ui::colors::TEXT_PRIMARY)
+ .arg(ui::colors::BORDER_MED)
+ .arg(ui::fonts::DATA_FAMILY));
+ header_hl->addWidget(chart_combo);
+ card_vl->addWidget(header);
+
+ // ── Chart + Table (draggable splitter) ────────────────────────────────
+ auto* card_splitter = new QSplitter(Qt::Vertical, card);
+ card_splitter->setHandleWidth(4);
+ card_splitter->setChildrenCollapsible(false);
+ card_splitter->setStyleSheet(
+ "QSplitter::handle:vertical { background:#1a1a1a; height:4px; }"
+ "QSplitter::handle:vertical:hover { background:#d97706; }");
+
+ auto* chart = new DBnomicsChartWidget(card_splitter);
+ auto* table = new DBnomicsDataTable(card_splitter);
+ chart->setMinimumHeight(80);
+ table->setMinimumHeight(80);
+
+ if (!slot.series.isEmpty()) {
+ chart->set_data(slot.series, slot.chart_type);
+ table->set_data(slot.series);
+ } else {
+ chart->clear();
+ table->clear();
+ }
+
+ card_splitter->addWidget(chart);
+ card_splitter->addWidget(table);
+ card_splitter->setStretchFactor(0, 3);
+ card_splitter->setStretchFactor(1, 2);
+
+ card_vl->addWidget(card_splitter, 1);
+
+ // Connect chart type combo
+ const int slot_i = i;
+ connect(chart_combo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+ this, [this, slot_i, chart](int idx) {
+ if (slot_i >= slots_.size()) return;
+ services::DbnChartType ct;
+ switch (idx) {
+ case 1: ct = services::DbnChartType::Area; break;
+ case 2: ct = services::DbnChartType::Bar; break;
+ case 3: ct = services::DbnChartType::Scatter; break;
+ default: ct = services::DbnChartType::Line; break;
+ }
+ slots_[slot_i].chart_type = ct;
+ if (!slots_[slot_i].series.isEmpty())
+ chart->set_data(slots_[slot_i].series, ct);
+ });
+
+ slot_cards_.append({chart, table, chart_combo});
+ grid->addWidget(card, row, col, 1, col_span);
+ grid->setRowStretch(row, 1);
+ }
+
+ // grid_widget expands to fill all available space in comparison_content_
+ comparison_layout_->addWidget(grid_widget, 1);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h
index 6aad601fd..c31acbcaa 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h
@@ -8,6 +8,7 @@
#include <QComboBox>
#include <QPushButton>
#include <QStackedWidget>
+#include <QVBoxLayout>
namespace fincept::screens {
@@ -45,6 +46,8 @@ private slots:
void on_clear_all();
void on_add_slot();
void on_add_to_slot(int slot_index);
+ void on_remove_from_slot(int slot_index, const QString& series_id);
+ void on_remove_slot(int slot_index);
private:
void build_ui();
@@ -52,6 +55,13 @@ private:
void set_status(const QString& message);
void render_single_view();
void assign_series_colors();
+ void rebuild_comparison_view();
+
+ struct SlotCard {
+ DBnomicsChartWidget* chart = nullptr;
+ DBnomicsDataTable* table = nullptr;
+ QComboBox* chart_combo = nullptr;
+ };
DBnomicsSelectionPanel* selection_panel_ = nullptr;
DBnomicsChartWidget* chart_widget_ = nullptr;
@@ -70,6 +80,10 @@ private:
services::DbnDataPoint last_loaded_data_;
bool has_pending_data_ = false;
int provider_count_ = 0;
+
+ QWidget* comparison_content_ = nullptr;
+ QVBoxLayout* comparison_layout_ = nullptr;
+ QVector<SlotCard> slot_cards_;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp b/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp
index d04e3c21e..33e7f588c 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp
@@ -9,6 +9,21 @@
namespace fincept::screens {
+// ── Shared constants ─────────────────────────────────────────────────────────
+
+static const QString kSpinStyle =
+ "QLabel { color: #525252; font-family: 'Consolas','Courier New',monospace;"
+ " font-size: 11px; background: transparent; }";
+
+static QLabel* make_spin_label(const QString& text, QWidget* parent) {
+ auto* lbl = new QLabel(text, parent);
+ lbl->setFixedHeight(80);
+ lbl->setAlignment(Qt::AlignCenter);
+ lbl->setStyleSheet(kSpinStyle);
+ lbl->hide();
+ return lbl;
+}
+
// ── Style constants ─────────────────────────────────────────────────────────
static const QString kListStyle = R"(
@@ -45,6 +60,10 @@ static const QString kLoadMoreStyle = R"(
DBnomicsSelectionPanel::DBnomicsSelectionPanel(QWidget* parent) : QWidget(parent) {
build_ui();
+
+ anim_timer_ = new QTimer(this);
+ anim_timer_->setInterval(120);
+ connect(anim_timer_, &QTimer::timeout, this, &DBnomicsSelectionPanel::tick_anim);
}
// ── Helper builders ──────────────────────────────────────────────────────────
@@ -88,25 +107,39 @@ QWidget* DBnomicsSelectionPanel::build_search_section() {
layout->addWidget(make_section_label("GLOBAL SEARCH"));
- global_search_input_ = new QLineEdit();
+ global_search_input_ = new QLineEdit(w);
global_search_input_->setStyleSheet(kInputStyle);
global_search_input_->setFixedHeight(28);
global_search_input_->setPlaceholderText("Search providers, datasets...");
layout->addWidget(global_search_input_);
+ // Loading spinner (hidden by default, appears between input and results)
+ search_spin_ = make_spin_label("⣾ SEARCHING...", w);
+ layout->addWidget(search_spin_);
+
+ // Search results content
+ search_content_ = new QWidget(w);
+ auto* sc_layout = new QVBoxLayout(search_content_);
+ sc_layout->setContentsMargins(0, 0, 0, 0);
+ sc_layout->setSpacing(0);
+
search_results_list_ = make_styled_list(120);
search_results_list_->hide();
- layout->addWidget(search_results_list_);
+ sc_layout->addWidget(search_results_list_);
search_load_more_btn_ = make_load_more_button();
- layout->addWidget(search_load_more_btn_);
+ sc_layout->addWidget(search_load_more_btn_);
+
+ layout->addWidget(search_content_);
// Connect global search input
connect(global_search_input_, &QLineEdit::textChanged, this, [this](const QString& q) {
const QString trimmed = q.trimmed();
if (!trimmed.isEmpty()) {
+ set_search_loading(true);
emit global_search_changed(trimmed);
} else {
+ set_search_loading(false);
search_results_list_->hide();
search_load_more_btn_->hide();
}
@@ -139,14 +172,24 @@ QWidget* DBnomicsSelectionPanel::build_provider_section() {
layout->addWidget(make_section_label("PROVIDERS"));
- provider_filter_input_ = new QLineEdit();
+ prov_spin_ = make_spin_label("⣾ LOADING PROVIDERS...", w);
+ layout->addWidget(prov_spin_);
+
+ prov_content_ = new QWidget(w);
+ auto* pc_layout = new QVBoxLayout(prov_content_);
+ pc_layout->setContentsMargins(0, 0, 0, 0);
+ pc_layout->setSpacing(0);
+
+ provider_filter_input_ = new QLineEdit(prov_content_);
provider_filter_input_->setStyleSheet(kInputStyle);
provider_filter_input_->setFixedHeight(26);
provider_filter_input_->setPlaceholderText("Filter providers...");
- layout->addWidget(provider_filter_input_);
+ pc_layout->addWidget(provider_filter_input_);
provider_list_ = make_styled_list(130);
- layout->addWidget(provider_list_);
+ pc_layout->addWidget(provider_list_);
+
+ layout->addWidget(prov_content_);
// Filter providers by code or name
connect(provider_filter_input_, &QLineEdit::textChanged, this, [this](const QString& q) {
@@ -182,11 +225,21 @@ QWidget* DBnomicsSelectionPanel::build_dataset_section() {
layout->addWidget(make_section_label("DATASETS"));
+ ds_spin_ = make_spin_label("⣾ LOADING DATASETS...", w);
+ layout->addWidget(ds_spin_);
+
+ ds_content_ = new QWidget(w);
+ auto* dc_layout = new QVBoxLayout(ds_content_);
+ dc_layout->setContentsMargins(0, 0, 0, 0);
+ dc_layout->setSpacing(0);
+
dataset_list_ = make_styled_list(130);
- layout->addWidget(dataset_list_);
+ dc_layout->addWidget(dataset_list_);
dataset_load_more_btn_ = make_load_more_button();
- layout->addWidget(dataset_load_more_btn_);
+ dc_layout->addWidget(dataset_load_more_btn_);
+
+ layout->addWidget(ds_content_);
// Handle dataset selection
connect(dataset_list_, &QListWidget::itemClicked, this, [this](QListWidgetItem* item) {
@@ -214,17 +267,27 @@ QWidget* DBnomicsSelectionPanel::build_series_section() {
layout->addWidget(make_section_label("SERIES"));
- series_search_input_ = new QLineEdit();
+ series_spin_ = make_spin_label("⣾ LOADING SERIES...", w);
+ layout->addWidget(series_spin_);
+
+ series_content_ = new QWidget(w);
+ auto* sc_layout = new QVBoxLayout(series_content_);
+ sc_layout->setContentsMargins(0, 0, 0, 0);
+ sc_layout->setSpacing(0);
+
+ series_search_input_ = new QLineEdit(series_content_);
series_search_input_->setStyleSheet(kInputStyle);
series_search_input_->setFixedHeight(26);
series_search_input_->setPlaceholderText("Search series...");
- layout->addWidget(series_search_input_);
+ sc_layout->addWidget(series_search_input_);
series_list_ = make_styled_list(130);
- layout->addWidget(series_list_);
+ sc_layout->addWidget(series_list_);
series_load_more_btn_ = make_load_more_button();
- layout->addWidget(series_load_more_btn_);
+ sc_layout->addWidget(series_load_more_btn_);
+
+ layout->addWidget(series_content_);
// Search series when typing
connect(series_search_input_, &QLineEdit::textChanged, this, [this](const QString& q) {
@@ -431,21 +494,32 @@ void DBnomicsSelectionPanel::add_comparison_slot() {
}
void DBnomicsSelectionPanel::remove_comparison_slot(int index) {
- Q_UNUSED(index)
- // Remove the last slot widget
- const int count = slots_layout_->count();
- if (count > 0) {
- QLayoutItem* item = slots_layout_->takeAt(count - 1);
+ if (index < 0 || index >= slots_layout_->count()) {
+ // Fall back: remove the last slot
+ index = slots_layout_->count() - 1;
+ }
+ if (index < 0) return;
+
+ QLayoutItem* item = slots_layout_->takeAt(index);
+ if (item) {
+ if (item->widget())
+ item->widget()->deleteLater();
+ delete item;
+ }
+ if (slot_count_ > 0)
+ --slot_count_;
+}
+
+void DBnomicsSelectionPanel::clear_slots() {
+ while (slots_layout_->count() > 0) {
+ QLayoutItem* item = slots_layout_->takeAt(0);
if (item) {
- if (item->widget()) {
+ if (item->widget())
item->widget()->deleteLater();
- }
delete item;
}
}
- if (slot_count_ > 0) {
- --slot_count_;
- }
+ slot_count_ = 0;
}
// ── Public data population methods ──────────────────────────────────────────
@@ -548,6 +622,52 @@ void DBnomicsSelectionPanel::set_status(const QString& message) {
status_label_->setText(message);
}
+// ── Loading state ─────────────────────────────────────────────────────────────
+
+void DBnomicsSelectionPanel::tick_anim() {
+ static const QString frames[] = {"⣾","⣽","⣻","⢿","⡿","⣟","⣯","⣷"};
+ const QString f = frames[anim_frame_ % 8];
+ ++anim_frame_;
+ if (prov_loading_ && prov_spin_) prov_spin_->setText(f + " LOADING PROVIDERS...");
+ if (ds_loading_ && ds_spin_) ds_spin_->setText(f + " LOADING DATASETS...");
+ if (series_loading_ && series_spin_) series_spin_->setText(f + " LOADING SERIES...");
+ if (search_loading_ && search_spin_) search_spin_->setText(f + " SEARCHING...");
+}
+
+static void apply_loading(bool on, bool& flag, QLabel* spin, QWidget* content,
+ QTimer* timer, int& frame) {
+ flag = on;
+ if (on) {
+ if (content) content->hide();
+ if (spin) spin->show();
+ if (!timer->isActive()) { frame = 0; timer->start(); }
+ } else {
+ if (spin) spin->hide();
+ if (content) content->show();
+ // timer stopped only when all flags are false — caller handles that
+ }
+}
+
+void DBnomicsSelectionPanel::set_providers_loading(bool on) {
+ apply_loading(on, prov_loading_, prov_spin_, prov_content_, anim_timer_, anim_frame_);
+ if (!on && !ds_loading_ && !series_loading_ && !search_loading_) anim_timer_->stop();
+}
+
+void DBnomicsSelectionPanel::set_datasets_loading(bool on) {
+ apply_loading(on, ds_loading_, ds_spin_, ds_content_, anim_timer_, anim_frame_);
+ if (!on && !prov_loading_ && !series_loading_ && !search_loading_) anim_timer_->stop();
+}
+
+void DBnomicsSelectionPanel::set_series_loading(bool on) {
+ apply_loading(on, series_loading_, series_spin_, series_content_, anim_timer_, anim_frame_);
+ if (!on && !prov_loading_ && !ds_loading_ && !search_loading_) anim_timer_->stop();
+}
+
+void DBnomicsSelectionPanel::set_search_loading(bool on) {
+ apply_loading(on, search_loading_, search_spin_, search_content_, anim_timer_, anim_frame_);
+ if (!on && !prov_loading_ && !ds_loading_ && !series_loading_) anim_timer_->stop();
+}
+
void DBnomicsSelectionPanel::update_slot_series(int slot_index,
const QVector<services::DbnDataPoint>& series) {
QLayoutItem* layout_item = slots_layout_->itemAt(slot_index);
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.h b/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.h
index b369b23cb..bca836e0f 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.h
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.h
@@ -6,6 +6,7 @@
#include <QListWidget>
#include <QPushButton>
#include <QLabel>
+#include <QTimer>
#include <QVBoxLayout>
namespace fincept::screens {
@@ -47,12 +48,20 @@ signals:
void remove_slot_clicked(int slot_index);
void search_result_selected(const QString& provider_code, const QString& dataset_code);
+public:
+ void set_providers_loading(bool on);
+ void set_datasets_loading(bool on);
+ void set_series_loading(bool on);
+ void set_search_loading(bool on);
+
public slots:
void add_comparison_slot();
void remove_comparison_slot(int index);
+ void clear_slots();
private:
void build_ui();
+ void tick_anim();
QWidget* build_search_section();
QWidget* build_provider_section();
QWidget* build_dataset_section();
@@ -86,6 +95,22 @@ private:
int search_next_offset_ = 0;
QVector<services::DbnProvider> all_providers_;
+
+ // ── Loading state ──────────────────────────────────────────────────────
+ QWidget* prov_content_ = nullptr;
+ QWidget* ds_content_ = nullptr;
+ QWidget* series_content_ = nullptr;
+ QWidget* search_content_ = nullptr;
+ QLabel* prov_spin_ = nullptr;
+ QLabel* ds_spin_ = nullptr;
+ QLabel* series_spin_ = nullptr;
+ QLabel* search_spin_ = nullptr;
+ QTimer* anim_timer_ = nullptr;
+ int anim_frame_ = 0;
+ bool prov_loading_ = false;
+ bool ds_loading_ = false;
+ bool series_loading_ = false;
+ bool search_loading_ = false;
};
} // namespace fincept::screens