From faa459ac24dca79d7bb22c314d9974861f1e7755 Mon Sep 17 00:00:00 2001 From: Christian Daniel Jensen Date: Mon, 2 Nov 2026 05:53:19 -0700 Subject: [PATCH] Use chart-only Essence palettes and canonical Essence ordering --- .../mana_devotion/mana_devotion_widget.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp index b958a733f..47ad1405d 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp @@ -1,5 +1,6 @@ #include "mana_devotion_widget.h" +#include "../../../../essence_chart_colors.h" #include "../../../general/display/charts/bars/bar_widget.h" #include "../../../general/display/charts/bars/color_bar.h" #include "../../../general/display/charts/pies/color_pie.h" @@ -29,7 +30,7 @@ namespace { AnalyticsPanelWidgetRegistrar registerManaDevotion{ - "manaDevotion", ManaDevotionWidget::tr("Mana Devotion"), + "manaDevotion", ManaDevotionWidget::tr("Essence Cost Symbols"), [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaDevotionWidget(parent, analyzer); }}; } // anonymous namespace @@ -82,18 +83,13 @@ void ManaDevotionWidget::updateDisplay() mapSorted.insert(QString(it.key()), it.value()); } - // Color map - QHash colors = {{'W', QColor(248, 231, 185)}, {'U', QColor(14, 104, 171)}, - {'B', QColor(21, 11, 0)}, {'R', QColor(211, 32, 42)}, - {'G', QColor(0, 115, 62)}, {'C', QColor(150, 150, 150)}}; - // Choose display mode if (config.displayType == "bar") { // One BarWidget per devotion color for (auto c : devoMap.keys()) { QString label = QString("%1 %2 (%3)").arg(c).arg(devoMap[c]).arg(cardCount.value(QString(c))); - BarWidget *bar = new BarWidget(label, devoMap[c], highest, colors.value(c, Qt::gray), this); + BarWidget *bar = new BarWidget(label, devoMap[c], highest, EssenceCharts::colorFor(QString(c)), this); barLayout->addWidget(bar); }