Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-12 03:45:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #807 from cawtds/feat/species-distribution-with-icons

Browse Source 
Redesign species distribution chart
This commit is contained in:
GriffinR
2026-07-31 16:49:11 -04:00
committed by GitHub
parent a430b3e203 542404a08b
commit 2d473707d2
7 changed files with 315 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
forms/wildmonchart.ui
View File

@@ -17,10 +17,10 @@
<item>
<widget class="QFrame" name="frame_TopBar">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
<enum>QFrame::Shadow::Plain</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin">
@@ -48,7 +48,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -85,6 +85,9 @@
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
@@ -92,12 +95,56 @@
<number>0</number>
</property>
<item>
<widget class="QChartView" name="chartView_SpeciesDistribution">
<property name="renderHints">
<set>QPainter::Antialiasing</set>
<widget class="QFrame" name="frame_speciesDistribution">
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_speciesDistribution">
<property name="topMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_speciesDistributionGroup">
<property name="text">
<string>Group</string>
</property>
</widget>
</item>
<item>
<widget class="NoScrollComboBox" name="comboBox_speciesDistributionGroup">
<property name="sizeAdjustPolicy">
<enum>QComboBox::SizeAdjustPolicy::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>8</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_speciesDistribution">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="SpeciesChartView" name="chartView_SpeciesDistribution" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabLevels">
@@ -120,10 +167,10 @@
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
<enum>QFrame::Shadow::Plain</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="topMargin">
@@ -142,7 +189,7 @@
<item>
<widget class="NoScrollComboBox" name="comboBox_Group">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
<enum>QComboBox::SizeAdjustPolicy::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>8</number>
@@ -152,7 +199,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -199,10 +246,10 @@
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
<enum>QComboBox::InsertPolicy::NoInsert</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
<enum>QComboBox::SizeAdjustPolicy::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
<property name="minimumContentsLength">
<number>12</number>
@@ -216,7 +263,7 @@
</widget>
</item>
<item>
<widget class="QChartView" name="chartView_LevelDistribution">
<widget class="SpeciesChartView" name="chartView_LevelDistribution">
<property name="renderHints">
<set>QPainter::Antialiasing</set>
</property>
@@ -229,16 +276,16 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QChartView</class>
<extends>QGraphicsView</extends>
<header>QtCharts</header>
</customwidget>
<customwidget>
<class>NoScrollComboBox</class>
<extends>QComboBox</extends>
<header>noscrollwidgets.h</header>
</customwidget>
<customwidget>
<class>SpeciesChartView</class>
<extends>QWidget</extends>
<header>specieschartview.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../resources/images.qrc"/>

45
include/ui/specieschartview.h Normal file
View File

@@ -0,0 +1,45 @@
#ifndef SPECIESCHARTVIEW_H
#define SPECIESCHARTVIEW_H
#if QT_CHARTS_LIB
#include <QtCharts/QChartView>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QT_CHARTS_USE_NAMESPACE
#endif
class Project;
struct SpeciesEntry
{
QString name;
QPixmap icon;
};
class SpeciesChartView : public QChartView
{
Q_OBJECT
public:
static constexpr int IconSize = 32;
static constexpr int IconVerticalOffset = -2;
static constexpr int Spacing = 6;
static constexpr int Padding = 10;
static constexpr int MaxLabelWidth = 230;
explicit SpeciesChartView(QWidget *parent = nullptr);
void setSpecies(const QStringList &species);
void setProject(Project *project);
protected:
void paintEvent(QPaintEvent *event) override;
private:
QVector<SpeciesEntry> m_speciesEntries;
Project *m_project = nullptr;
int m_maxTextWidth = 0;
};
#endif // __has_include(<QtCharts>)
#endif // SPECIESCHARTVIEW_H

11
include/ui/wildmonchart.h
View File

@@ -5,6 +5,8 @@
#include <QWidget>
class Project;
#if __has_include(<QtCharts>)
#include <QtCharts>
@@ -16,7 +18,7 @@ class WildMonChart : public QWidget
{
Q_OBJECT
public:
explicit WildMonChart(QWidget *parent, const EncounterTableModel *table);
explicit WildMonChart(QWidget *parent, const EncounterTableModel *table, Project *project);
~WildMonChart();
public slots:
@@ -27,6 +29,7 @@ public slots:
private:
Ui::WildMonChart *ui;
const EncounterTableModel *table;
Project *project = nullptr;
QStringList groupNames;
QStringList groupNamesReversed;
@@ -46,8 +49,6 @@ private:
typedef QMap<QString, Summary> GroupedData;
QMap<QString, GroupedData> speciesToGroupedData;
QMap<QString, QColor> speciesToColor;
QStringList getSpeciesNamesAlphabetical() const;
double getSpeciesFrequency(const QString&, const QString&) const;
@@ -63,8 +64,6 @@ private:
void refreshSpeciesDistributionChart();
void refreshLevelDistributionChart();
void saveSpeciesColors(const QList<QBarSet*> &);
void applySpeciesColors(const QList<QBarSet*> &);
QChart::ChartTheme currentTheme() const;
void updateTheme();
void limitChartAnimation();
@@ -78,7 +77,7 @@ class WildMonChart : public QWidget
{
Q_OBJECT
public:
explicit WildMonChart(QWidget *, const EncounterTableModel *) {};
explicit WildMonChart(QWidget *, const EncounterTableModel *, Project *) {};
~WildMonChart() {};
public slots:

2
porymap.pro
View File

@@ -144,6 +144,7 @@ SOURCES += src/config/keyvalueconfigbase.cpp \
src/ui/palettecolorsearch.cpp \
src/ui/paletteeditor.cpp \
src/ui/selectablepixmapitem.cpp \
src/ui/specieschartview.cpp \
src/ui/tileseteditor.cpp \
src/ui/tileseteditormetatileselector.cpp \
src/ui/tileseteditortileselector.cpp \
@@ -275,6 +276,7 @@ HEADERS += include/config/keyvalueconfigbase.h \
include/ui/palettecolorsearch.h \
include/ui/paletteeditor.h \
include/ui/selectablepixmapitem.h \
include/ui/specieschartview.h \
include/ui/tileseteditor.h \
include/ui/tileseteditormetatileselector.h \
include/ui/tileseteditortileselector.h \

2
src/mainwindow.cpp
View File

@@ -2839,7 +2839,7 @@ void MainWindow::on_pushButton_DeleteWildMonGroup_clicked() {
void MainWindow::on_pushButton_SummaryChart_clicked() {
if (!this->wildMonChart) {
this->wildMonChart = new WildMonChart(this, this->editor->getCurrentWildMonTable());
this->wildMonChart = new WildMonChart(this, this->editor->getCurrentWildMonTable(), this->editor->project);
connect(this->editor, &Editor::wildMonTableOpened, this->wildMonChart, &WildMonChart::setTable);
connect(this->editor, &Editor::wildMonTableClosed, this->wildMonChart, &WildMonChart::clearTable);
connect(this->editor, &Editor::wildMonTableEdited, this->wildMonChart, &WildMonChart::refresh);

107
src/ui/specieschartview.cpp Normal file
View File

@@ -0,0 +1,107 @@
#ifdef QT_CHARTS_LIB
#include "specieschartview.h"
#include "project.h"
#include <QPainter>
SpeciesChartView::SpeciesChartView(QWidget *parent)
: QChartView(parent)
{
}
void SpeciesChartView::setSpecies(const QStringList &species)
{
m_speciesEntries.clear();
const QString speciesPrefix = projectConfig.getIdentifier(ProjectIdentifier::define_species_prefix);
QFontMetrics fm(font());
m_maxTextWidth = 0;
for (const QString &name : species)
{
m_maxTextWidth = std::max(m_maxTextWidth, fm.horizontalAdvance(name));
QPixmap icon;
if (m_project) icon = m_project->getSpeciesIcon(speciesPrefix + name);
m_speciesEntries.push_back({
name,
icon.scaled(
IconSize,
IconSize,
Qt::KeepAspectRatio,
Qt::SmoothTransformation)
});
}
if (m_maxTextWidth > MaxLabelWidth) {
m_maxTextWidth = MaxLabelWidth;
}
viewport()->update();
}
void SpeciesChartView::setProject(Project *project)
{
m_project = project;
viewport()->update();
}
void SpeciesChartView::paintEvent(QPaintEvent *event)
{
QChartView::paintEvent(event);
if (!chart() || !m_project || m_speciesEntries.isEmpty())
return;
QPainter painter(viewport());
painter.setRenderHint(QPainter::TextAntialiasing);
painter.setPen(chart()->titleBrush().color());
const QRectF plot = chart()->plotArea();
if (plot.height() <= 0)
return;
const QFontMetrics fm(painter.font());
const double rowHeight = plot.height() / m_speciesEntries.size();
const int labelWidth = m_maxTextWidth + IconSize + Spacing;
const int textX = plot.left() - labelWidth - Padding;
const int iconX = textX + m_maxTextWidth + Spacing;
for (int i = 0; i < m_speciesEntries.size(); ++i)
{
const SpeciesEntry &entry = m_speciesEntries[i];
// Center text vertically
const double y = plot.top() + rowHeight * (i + 0.5);
const QRect textRect(
textX,
static_cast<int>(y - rowHeight / 2.0),
m_maxTextWidth,
static_cast<int>(rowHeight)
);
painter.drawText(
textRect,
Qt::AlignRight | Qt::AlignVCenter,
entry.name
);
// Align icon with text
const int iconY = textRect.center().y() - IconSize / 2.0 + IconVerticalOffset;
const QRect iconRect(
iconX,
iconY,
IconSize,
IconSize
);
painter.drawPixmap(iconRect, entry.icon);
}
}
#endif // QT_CHARTS_LIB

147
src/ui/wildmonchart.cpp
View File

@@ -19,9 +19,10 @@ static const QList<QPair<QString, QChart::ChartTheme>> themes = {
{"Qt", QChart::ChartThemeQt},
};
WildMonChart::WildMonChart(QWidget *parent, const EncounterTableModel *table) :
WildMonChart::WildMonChart(QWidget *parent, const EncounterTableModel *table, Project *project) :
QWidget(parent),
ui(new Ui::WildMonChart)
ui(new Ui::WildMonChart),
project(project)
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
@@ -34,6 +35,7 @@ WildMonChart::WildMonChart(QWidget *parent, const EncounterTableModel *table) :
connect(ui->groupBox_Species, &QGroupBox::clicked, this, &WildMonChart::refreshLevelDistributionChart);
connect(ui->comboBox_Species, &QComboBox::currentTextChanged, this, &WildMonChart::refreshLevelDistributionChart);
connect(ui->comboBox_Group, &QComboBox::currentTextChanged, this, &WildMonChart::refreshLevelDistributionChart);
connect(ui->comboBox_speciesDistributionGroup, &QComboBox::currentTextChanged, this, &WildMonChart::refreshSpeciesDistributionChart);
connect(ui->tabWidget, &QTabWidget::currentChanged, this, &WildMonChart::limitChartAnimation);
@@ -76,15 +78,18 @@ void WildMonChart::clearTableData() {
this->tableIndexToGroupName.clear();
this->groupedLevelRanges.clear();
this->speciesToGroupedData.clear();
this->speciesToColor.clear();
setWindowTitle(baseWindowTitle);
const QSignalBlocker blocker1(ui->comboBox_Species);
const QSignalBlocker blocker2(ui->comboBox_Group);
const QSignalBlocker blocker3(ui->comboBox_speciesDistributionGroup);
ui->comboBox_Species->clear();
ui->comboBox_Group->clear();
ui->comboBox_Group->setEnabled(false);
ui->comboBox_speciesDistributionGroup->clear();
ui->comboBox_speciesDistributionGroup->setEnabled(false);
ui->label_Group->setEnabled(false);
ui->label_speciesDistributionGroup->setEnabled(false);
}
// Extract all the data from the table that we need for the charts
@@ -109,7 +114,7 @@ void WildMonChart::readTable() {
this->groupNames.append(QString());
this->groupNamesReversed.append(QString());
}
// Read data from the table, combining data for duplicate entries
const QVector<double> tableFrequencies = this->table->percentages();
const QVector<WildPokemon> tablePokemon = this->table->encounterData().wildPokemon;
@@ -149,20 +154,27 @@ void WildMonChart::readTable() {
// Populate combo boxes
const QSignalBlocker blocker1(ui->comboBox_Species);
const QSignalBlocker blocker2(ui->comboBox_Group);
const QSignalBlocker blocker3(ui->comboBox_speciesDistributionGroup);
ui->comboBox_Species->clear();
ui->comboBox_Species->addItems(getSpeciesNamesAlphabetical());
ui->comboBox_Group->clear();
ui->comboBox_Group->addItems(this->groupNames);
ui->comboBox_speciesDistributionGroup->clear();
ui->comboBox_speciesDistributionGroup->addItems(this->groupNames);
bool enableGroupSelection = usesGroupLabels();
ui->comboBox_Group->setEnabled(enableGroupSelection);
ui->comboBox_speciesDistributionGroup->setEnabled(enableGroupSelection);
ui->label_Group->setEnabled(enableGroupSelection);
ui->label_speciesDistributionGroup->setEnabled(enableGroupSelection);
}
void WildMonChart::refresh() {
const QSignalBlocker blocker1(ui->comboBox_Species);
const QSignalBlocker blocker2(ui->comboBox_Group);
const QSignalBlocker blocker3(ui->comboBox_speciesDistributionGroup);
const QString oldSpecies = ui->comboBox_Species->currentText();
const QString oldGroup = ui->comboBox_Group->currentText();
const QString oldSpeciesGroup = ui->comboBox_speciesDistributionGroup->currentText();
readTable();
@@ -173,6 +185,9 @@ void WildMonChart::refresh() {
index = ui->comboBox_Group->findText(oldGroup);
if (index >= 0) ui->comboBox_Group->setCurrentIndex(index);
index = ui->comboBox_speciesDistributionGroup->findText(oldSpeciesGroup);
if (index >= 0) ui->comboBox_speciesDistributionGroup->setCurrentIndex(index);
refreshSpeciesDistributionChart();
refreshLevelDistributionChart();
}
@@ -180,7 +195,11 @@ void WildMonChart::refresh() {
void WildMonChart::refreshSpeciesDistributionChart() {
if (ui->chartView_SpeciesDistribution->chart())
ui->chartView_SpeciesDistribution->chart()->deleteLater();
ui->chartView_SpeciesDistribution->setChart(createSpeciesDistributionChart());
QChart *chart = createSpeciesDistributionChart();
ui->chartView_SpeciesDistribution->setChart(chart);
ui->chartView_SpeciesDistribution->setProject(this->project);
ui->chartView_SpeciesDistribution->setSpecies(this->speciesInLegendOrder);
if (ui->tabWidget->currentWidget() == ui->tabSpecies)
limitChartAnimation();
}
@@ -223,64 +242,91 @@ bool WildMonChart::usesGroupLabels() const {
return this->groupNames.length() > 1;
}
struct SpeciesFrequency
{
QString name;
double frequency;
};
QChart* WildMonChart::createSpeciesDistributionChart() {
const QString groupName = ui->comboBox_speciesDistributionGroup->currentText();
QList<QBarSet*> barSets;
QStringList categories;
QList<SpeciesFrequency> speciesList;
for (const auto &species : getSpeciesNamesAlphabetical()) {
// Add encounter chance data
auto set = new QBarSet(species);
for (auto groupName : this->groupNamesReversed)
set->append(getSpeciesFrequency(species, groupName) * 100);
// We order the bar sets from lowest to highest total, left-to-right.
for (int i = 0; i < barSets.length() + 1; i++){
if (i >= barSets.length() || barSets.at(i)->sum() > set->sum()) {
barSets.insert(i, set);
break;
}
}
// Show species name and % when hovering over a bar set. This covers some shortfalls in our ability to control the chart design
// (i.e. bar segments may be too narrow to see the % label, or colors may be hard to match to the legend).
connect(set, &QBarSet::hovered, [set] (bool on, int i) {
QString text = on ? QString("%1 (%2%)").arg(set->label()).arg(set->at(i)) : "";
QToolTip::showText(QCursor::pos(), text);
});
speciesList.append({species, getSpeciesFrequency(species, groupName) * 100.0});
}
// Preserve the order we set earlier so that the legend isn't shuffling around for the other all-species charts.
this->speciesInLegendOrder.clear();
for (auto set : barSets)
this->speciesInLegendOrder.append(set->label());
std::sort(speciesList.begin(), speciesList.end(), [](const auto &a, const auto &b) {
return a.frequency < b.frequency;
});
auto *set = new QBarSet("Encounter Rates");
for (const auto &entry : speciesList) {
if (entry.frequency > 0.0) {
set->append(entry.frequency);
categories.append(entry.name);
}
}
barSets.append(set);
// Show species name and % when hovering over a bar set. This covers some shortfalls in our ability to control the chart design
// (i.e. bar segments may be too narrow to see the % label).
connect(set, &QBarSet::hovered, [set] (bool on, int i) {
QString text = on ? QString("%1 (%2%)").arg(set->label()).arg(set->at(i)) : "";
QToolTip::showText(QCursor::pos(), text);
});
// Reverse the order for specieschartview
this->speciesInLegendOrder = categories;
std::reverse(speciesInLegendOrder.begin(),
speciesInLegendOrder.end());
// Set up series
auto series = new QHorizontalPercentBarSeries();
auto series = new QHorizontalBarSeries();
series->setLabelsVisible();
series->append(barSets);
series->setBarWidth(0.8);
// Set up chart
auto chart = new QChart();
chart->addSeries(series);
chart->setTheme(currentTheme());
chart->setAnimationOptions(QChart::SeriesAnimations);
chart->legend()->setVisible(true);
chart->legend()->setShowToolTips(true);
chart->legend()->setAlignment(Qt::AlignBottom);
saveSpeciesColors(barSets);
chart->legend()->hide();
// X-axis is the % frequency. We're already showing percentages on the bar, so we just display 0/50/100%
QFontMetrics fm(chart->font());
int maxTextWidth = 0;
for (const QString &category : categories) {
maxTextWidth = std::max(maxTextWidth, fm.horizontalAdvance(category));
if (maxTextWidth > SpeciesChartView::MaxLabelWidth) {
maxTextWidth = SpeciesChartView::MaxLabelWidth;
break;
}
}
int labelWidth = maxTextWidth + SpeciesChartView::IconSize + SpeciesChartView::Spacing;
int leftMargin = labelWidth + 2 * SpeciesChartView::Padding;
chart->setMargins(QMargins(leftMargin, 20, 20, 20));
// X-axis is the % frequency.
auto axisX = new QValueAxis();
axisX->setRange(0, 100);
axisX->setLabelFormat("%u%%");
axisX->setTickCount(3);
axisX->setTickCount(6);
chart->addAxis(axisX, Qt::AlignBottom);
series->attachAxis(axisX);
// Y-axis is the names of encounter groups (e.g. Old Rod, Good Rod...)
if (usesGroupLabels()) {
auto axisY = new QBarCategoryAxis();
axisY->setCategories(this->groupNamesReversed);
chart->addAxis(axisY, Qt::AlignLeft);
series->attachAxis(axisY);
}
// Y-axis is species names + icons
auto axisY = new QBarCategoryAxis();
axisY->setCategories(categories);
axisY->setLabelsVisible(false); // handled in specieschartview.c/h
chart->addAxis(axisY, Qt::AlignLeft);
series->attachAxis(axisY);
return chart;
}
@@ -333,7 +379,7 @@ QChart* WildMonChart::createLevelDistributionChart() {
levelRange = getLevelRange(species, groupName);
} else {
// Species box is inactive, we display data for all species in the table.
for (const auto &species : this->speciesInLegendOrder)
for (const auto &species : getSpeciesNamesAlphabetical())
barSets.append(createLevelDistributionBarSet(species, groupName, false));
levelRange = this->groupedLevelRanges.value(groupName);
}
@@ -351,7 +397,6 @@ QChart* WildMonChart::createLevelDistributionChart() {
chart->legend()->setVisible(true);
chart->legend()->setShowToolTips(true);
chart->legend()->setAlignment(Qt::AlignBottom);
applySpeciesColors(barSets); // Has to happen after theme is set
// X-axis is the level range.
QBarCategoryAxis *axisX = new QBarCategoryAxis();
@@ -389,24 +434,12 @@ void WildMonChart::updateTheme() {
if (!chart || chart->series().isEmpty())
return;
chart->setTheme(theme);
saveSpeciesColors(static_cast<QAbstractBarSeries*>(chart->series().at(0))->barSets());
chart = ui->chartView_LevelDistribution->chart();
if (!chart || chart->series().isEmpty())
return;
chart->setTheme(theme);
applySpeciesColors(static_cast<QAbstractBarSeries*>(chart->series().at(0))->barSets());
}
void WildMonChart::saveSpeciesColors(const QList<QBarSet*> &barSets) {
this->speciesToColor.clear();
for (auto set : barSets)
this->speciesToColor.insert(set->label(), set->color());
}
void WildMonChart::applySpeciesColors(const QList<QBarSet*> &barSets) {
for (auto set : barSets)
set->setColor(this->speciesToColor.value(set->label()));
}
// Turn off the chart animation once it's played, otherwise it replays any time the window changes size.