mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use vector instead of fixed array for graph data.

pull/13038/head
Peter Nelson 2024-11-02 16:11:06 +00:00 committed by Peter Nelson
parent 67a0fccfad
commit 598fdf04a4
1 changed files with 92 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/graph_gui.cpp
View File

@ -185,7 +185,6 @@ protected:
static const int MIN_GRID_PIXEL_SIZE = 20; ///< Minimum distance between graph lines. static const int MIN_GRID_PIXEL_SIZE = 20; ///< Minimum distance between graph lines.
uint64_t excluded_data; ///< bitmask of the datasets that shouldn't be displayed. uint64_t excluded_data; ///< bitmask of the datasets that shouldn't be displayed.
uint8_t num_dataset;
uint8_t num_on_x_axis; uint8_t num_on_x_axis;
uint8_t num_vert_lines; uint8_t num_vert_lines;
@ -202,8 +201,23 @@ protected:
uint16_t x_values_increment; uint16_t x_values_increment;
StringID format_str_y_axis; StringID format_str_y_axis;
uint8_t colours[GRAPH_MAX_DATASETS];
OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][GRAPH_NUM_MONTHS]; ///< Stored costs for the last #GRAPH_NUM_MONTHS months struct DataSet {
std::array<OverflowSafeInt64, GRAPH_NUM_MONTHS> values;
uint8_t colour;
uint8_t exclude_bit;
};
std::vector<DataSet> data;
/**
* Get appropriate part of dataset values for the current number of horizontal points.
* @param dataset Dataset to get values of
* @returns span covering dataset's current valid range.
*/
std::span<const OverflowSafeInt64> GetDataSetRange(const DataSet &dataset) const
{
return {std::begin(dataset.values), std::begin(dataset.values) + this->num_on_x_axis};
}
/** /**
* Get the interval that contains the graph's data. Excluded data is ignored to show smaller values in * Get the interval that contains the graph's data. Excluded data is ignored to show smaller values in
@ -219,11 +233,10 @@ protected:
current_interval.highest = INT64_MIN; current_interval.highest = INT64_MIN;
current_interval.lowest = INT64_MAX; current_interval.lowest = INT64_MAX;
for (int i = 0; i < this->num_dataset; i++) { for (const DataSet &dataset : this->data) {
if (HasBit(this->excluded_data, i)) continue; if (HasBit(this->excluded_data, dataset.exclude_bit)) continue;
for (int j = 0; j < this->num_on_x_axis; j++) {
OverflowSafeInt64 datapoint = this->cost[i][j];
for (const OverflowSafeInt64 &datapoint : this->GetDataSetRange(dataset)) {
if (datapoint != INVALID_DATAPOINT) { if (datapoint != INVALID_DATAPOINT) {
current_interval.highest = std::max(current_interval.highest, datapoint); current_interval.highest = std::max(current_interval.highest, datapoint);
current_interval.lowest = std::min(current_interval.lowest, datapoint); current_interval.lowest = std::min(current_interval.lowest, datapoint);
@ -441,18 +454,17 @@ protected:
uint linewidth = _settings_client.gui.graph_line_thickness; uint linewidth = _settings_client.gui.graph_line_thickness;
uint pointoffs1 = (linewidth + 1) / 2; uint pointoffs1 = (linewidth + 1) / 2;
uint pointoffs2 = linewidth + 1 - pointoffs1; uint pointoffs2 = linewidth + 1 - pointoffs1;
for (int i = 0; i < this->num_dataset; i++) {
if (!HasBit(this->excluded_data, i)) { for (const DataSet &dataset : this->data) {
if (HasBit(this->excluded_data, dataset.exclude_bit)) continue;
/* Centre the dot between the grid lines. */ /* Centre the dot between the grid lines. */
x = r.left + (x_sep / 2); x = r.left + (x_sep / 2);
uint8_t colour = this->colours[i];
uint prev_x = INVALID_DATAPOINT_POS; uint prev_x = INVALID_DATAPOINT_POS;
uint prev_y = INVALID_DATAPOINT_POS; uint prev_y = INVALID_DATAPOINT_POS;
for (int j = 0; j < this->num_on_x_axis; j++) { for (OverflowSafeInt64 datapoint : this->GetDataSetRange(dataset)) {
OverflowSafeInt64 datapoint = this->cost[i][j];
if (datapoint != INVALID_DATAPOINT) { if (datapoint != INVALID_DATAPOINT) {
/* /*
* Check whether we need to reduce the 'accuracy' of the * Check whether we need to reduce the 'accuracy' of the
@ -477,10 +489,10 @@ protected:
y = r.top + x_axis_offset - ((r.bottom - r.top) * datapoint) / (interval_size >> reduce_range); y = r.top + x_axis_offset - ((r.bottom - r.top) * datapoint) / (interval_size >> reduce_range);
/* Draw the point. */ /* Draw the point. */
GfxFillRect(x - pointoffs1, y - pointoffs1, x + pointoffs2, y + pointoffs2, colour); GfxFillRect(x - pointoffs1, y - pointoffs1, x + pointoffs2, y + pointoffs2, dataset.colour);
/* Draw the line connected to the previous point. */ /* Draw the line connected to the previous point. */
if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, colour, linewidth); if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, dataset.colour, linewidth);
prev_x = x; prev_x = x;
prev_y = y; prev_y = y;
@ -493,8 +505,6 @@ protected:
} }
} }
} }
}
BaseGraphWindow(WindowDesc &desc, StringID format_str_y_axis) : BaseGraphWindow(WindowDesc &desc, StringID format_str_y_axis) :
Window(desc), Window(desc),
@ -627,26 +637,26 @@ public:
this->year = yr; this->year = yr;
this->month = mo; this->month = mo;
int numd = 0; this->data.clear();
for (CompanyID k = COMPANY_FIRST; k < MAX_COMPANIES; k++) { for (CompanyID k = COMPANY_FIRST; k < MAX_COMPANIES; k++) {
const Company *c = Company::GetIfValid(k); const Company *c = Company::GetIfValid(k);
if (c != nullptr) { if (c == nullptr) continue;
this->colours[numd] = GetColourGradient(c->colour, SHADE_LIGHTER);
DataSet &dataset = this->data.emplace_back();
dataset.colour = GetColourGradient(c->colour, SHADE_LIGHTER);
dataset.exclude_bit = k;
for (int j = this->num_on_x_axis, i = 0; --j >= 0;) { for (int j = this->num_on_x_axis, i = 0; --j >= 0;) {
if (j >= c->num_valid_stat_ent) { if (j >= c->num_valid_stat_ent) {
this->cost[numd][i] = INVALID_DATAPOINT; dataset.values[i] = INVALID_DATAPOINT;
} else { } else {
/* Ensure we never assign INVALID_DATAPOINT, as that has another meaning. /* Ensure we never assign INVALID_DATAPOINT, as that has another meaning.
* Instead, use the value just under it. Hopefully nobody will notice. */ * Instead, use the value just under it. Hopefully nobody will notice. */
this->cost[numd][i] = std::min(GetGraphData(c, j), INVALID_DATAPOINT - 1); dataset.values[i] = std::min(GetGraphData(c, j), INVALID_DATAPOINT - 1);
} }
i++; i++;
} }
} }
numd++;
}
this->num_dataset = numd;
} }
}; };
@ -1120,15 +1130,16 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
{ {
this->UpdateExcludedData(); this->UpdateExcludedData();
int i = 0; this->data.clear();
for (const CargoSpec *cs : _sorted_standard_cargo_specs) { for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
this->colours[i] = cs->legend_colour; DataSet &dataset = this->data.emplace_back();
dataset.colour = cs->legend_colour;
dataset.exclude_bit = cs->Index();
for (uint j = 0; j != this->num_on_x_axis; j++) { for (uint j = 0; j != this->num_on_x_axis; j++) {
this->cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 4 + 4, cs->Index()); dataset.values[j] = GetTransportedGoodsIncome(10, 20, j * 4 + 4, cs->Index());
} }
i++;
} }
this->num_dataset = i;
} }
}; };
@ -1463,12 +1474,10 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
{ {
this->excluded_data = 0; this->excluded_data = 0;
int index = 0;
const Industry *i = Industry::Get(this->window_number); const Industry *i = Industry::Get(this->window_number);
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoID(p.cargo)) continue;
if (HasBit(_legend_excluded_cargo_production_history, p.cargo)) SetBit(this->excluded_data, index); if (HasBit(_legend_excluded_cargo_production_history, p.cargo)) SetBit(this->excluded_data, p.cargo);
index++;
} }
} }
@ -1555,14 +1564,12 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
case WID_GRAPH_DISABLE_CARGOES: { case WID_GRAPH_DISABLE_CARGOES: {
/* Add all cargoes to the excluded lists. */ /* Add all cargoes to the excluded lists. */
int index = 0;
const Industry *i = Industry::Get(this->window_number); const Industry *i = Industry::Get(this->window_number);
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoID(p.cargo)) continue;
SetBit(_legend_excluded_cargo_production_history, p.cargo); SetBit(_legend_excluded_cargo_production_history, p.cargo);
SetBit(this->excluded_data, index); SetBit(this->excluded_data, p.cargo);
index++;
} }
this->SetDirty(); this->SetDirty();
break; break;
@ -1617,22 +1624,23 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
this->year = yr; this->year = yr;
this->month = mo; this->month = mo;
int index = 0;
const Industry *i = Industry::Get(this->window_number); const Industry *i = Industry::Get(this->window_number);
this->data.clear();
for (const auto &p : i->produced) { for (const auto &p : i->produced) {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoID(p.cargo)) continue;
const CargoSpec *cs = CargoSpec::Get(p.cargo); const CargoSpec *cs = CargoSpec::Get(p.cargo);
this->colours[index] = cs->legend_colour; DataSet &dataset = this->data.emplace_back();
dataset.colour = cs->legend_colour;
dataset.exclude_bit = cs->Index();
for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) { for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) {
this->cost[index][j] = p.history[GRAPH_NUM_MONTHS - j].production; dataset.values[j] = p.history[GRAPH_NUM_MONTHS - j].production;
} }
index++;
} }
this->num_dataset = index; this->vscroll->SetCount(std::size(this->data));
this->vscroll->SetCount(index);
this->SetDirty(); this->SetDirty();
} }