miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Generic type and container for history statistics.

Browse Source
This commit is contained in:
Peter Nelson
2025-06-24 19:59:41 +01:00
committed by Peter Nelson
parent f6e78a480d
commit 9b55ad5b8d
6 changed files with 87 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/graph_gui.cpp
View File

@@ -8,6 +8,7 @@
/** @file graph_gui.cpp GUI that shows performance graphs. */
#include "stdafx.h"
#include "misc/history_func.hpp"
#include "graph_gui.h"
#include "window_gui.h"
#include "company_base.h"
@@ -215,6 +216,14 @@ protected:
uint8_t highlight_range = UINT8_MAX; ///< Data range that should be highlighted, or UINT8_MAX for none.
bool highlight_state = false; ///< Current state of highlight, toggled every TIMER_BLINK_INTERVAL period.
template <typename Tprojection>
struct Filler {
DataSet &dataset; ///< Dataset to fill.
const Tprojection &proj; ///< Projection to apply.
inline void Fill(uint i, const auto &data) const { this->dataset.values[i] = std::invoke(this->proj, data); }
};
/**
* Get appropriate part of dataset values for the current number of horizontal points.
* @param dataset Dataset to get values of
@@ -1661,24 +1670,22 @@ struct IndustryProductionGraphWindow : BaseCargoGraphWindow {
if (!IsValidCargoType(p.cargo)) continue;
const CargoSpec *cs = CargoSpec::Get(p.cargo);
this->data.reserve(this->data.size() + 2);
DataSet &produced = this->data.emplace_back();
produced.colour = cs->legend_colour;
produced.exclude_bit = cs->Index();
produced.range_bit = 0;
for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) {
produced.values[j] = p.history[GRAPH_NUM_MONTHS - j].production;
}
auto produced_filler = Filler{produced, &Industry::ProducedHistory::production};
DataSet &transported = this->data.emplace_back();
transported.colour = cs->legend_colour;
transported.exclude_bit = cs->Index();
transported.range_bit = 1;
transported.dash = 2;
auto transported_filler = Filler{transported, &Industry::ProducedHistory::transported};
for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) {
transported.values[j] = p.history[GRAPH_NUM_MONTHS - j].transported;
}
FillFromHistory<GRAPH_NUM_MONTHS>(p.history, produced_filler, transported_filler);
}
this->SetDirty();