diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp index a553668b6..a8bec834f 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp @@ -68,12 +68,12 @@ DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatistics layout->addWidget(resultTable); // Connections - connect(criteriaCombo, &QComboBox::currentIndexChanged, this, [this] { + connect(criteriaCombo, QOverload::of(&QComboBox::currentIndexChanged), this, [this] { config.criteria = criteriaCombo->currentData().toString(); updateDisplay(); }); - connect(exactnessCombo, &QComboBox::currentIndexChanged, this, [this] { + connect(exactnessCombo, QOverload::of(&QComboBox::currentIndexChanged), this, [this] { config.atLeast = exactnessCombo->currentData().toBool(); updateDisplay(); }); diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp index 52aa8dd37..c15422298 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp @@ -3,6 +3,8 @@ #include "abstract_analytics_panel_widget.h" #include "add_analytics_panel_dialog.h" #include "analytics_panel_widget_factory.h" +#include "analyzer_modules/mana_base/mana_base_config.h" +#include "analyzer_modules/mana_devotion/mana_devotion_config.h" #include "deck_list_statistics_analyzer.h" #include "resizable_panel.h" @@ -159,7 +161,13 @@ void DeckAnalyticsWidget::addDefaultPanels() QString type; QJsonObject cfg; }; - QVector defaults = {{"manaCurve", {}}, {"manaBase", {}}, {"manaDevotion", {}}}; + + // Prepare configs + QJsonObject manaCurveCfg; // empty config + QJsonObject manaBaseCfg = ManaBaseConfig("combinedBar", {}).toJson(); + QJsonObject manaDevotionCfg = ManaDevotionConfig("combinedBar", {}).toJson(); + QVector defaults = { + {"manaCurve", manaCurveCfg}, {"manaBase", manaBaseCfg}, {"manaDevotion", manaDevotionCfg}}; for (auto &d : defaults) { AbstractAnalyticsPanelWidget *w = AnalyticsPanelWidgetFactory::instance().create(d.type, this, statsAnalyzer);