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

Add: Add cargo transported to industry production graph.

pull/13038/head
Peter Nelson 2024-11-03 09:21:54 +00:00 committed by Peter Nelson
parent 22035a4f2a
commit a951896364
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/graph_gui.cpp
View File

@ -1504,6 +1504,11 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
Scrollbar *vscroll; ///< Cargo list scrollbar. Scrollbar *vscroll; ///< Cargo list scrollbar.
uint legend_width; ///< Width of legend 'blob'. uint legend_width; ///< Width of legend 'blob'.
static inline constexpr StringID RANGE_LABELS[] = {
STR_GRAPH_INDUSTRY_RANGE_PRODUCED,
STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED
};
IndustryProductionGraphWindow(WindowDesc &desc, WindowNumber window_number) : IndustryProductionGraphWindow(WindowDesc &desc, WindowNumber window_number) :
BaseGraphWindow(desc, STR_JUST_COMMA) BaseGraphWindow(desc, STR_JUST_COMMA)
{ {
@ -1513,6 +1518,7 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
this->x_values_start = ECONOMY_MONTH_MINUTES; this->x_values_start = ECONOMY_MONTH_MINUTES;
this->x_values_increment = ECONOMY_MONTH_MINUTES; this->x_values_increment = ECONOMY_MONTH_MINUTES;
this->draw_dates = !TimerGameEconomy::UsingWallclockUnits(); this->draw_dates = !TimerGameEconomy::UsingWallclockUnits();
this->ranges = RANGE_LABELS;
this->CreateNestedTree(); this->CreateNestedTree();
this->vscroll = this->GetScrollbar(WID_GRAPH_MATRIX_SCROLLBAR); this->vscroll = this->GetScrollbar(WID_GRAPH_MATRIX_SCROLLBAR);
@ -1705,12 +1711,23 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
if (!IsValidCargoID(p.cargo)) continue; if (!IsValidCargoID(p.cargo)) continue;
const CargoSpec *cs = CargoSpec::Get(p.cargo); const CargoSpec *cs = CargoSpec::Get(p.cargo);
DataSet &dataset = this->data.emplace_back(); DataSet &produced = this->data.emplace_back();
dataset.colour = cs->legend_colour; produced.colour = cs->legend_colour;
dataset.exclude_bit = cs->Index(); produced.exclude_bit = cs->Index();
produced.range_bit = 0;
for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) { for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) {
dataset.values[j] = p.history[GRAPH_NUM_MONTHS - j].production; produced.values[j] = p.history[GRAPH_NUM_MONTHS - j].production;
}
DataSet &transported = this->data.emplace_back();
transported.colour = cs->legend_colour;
transported.exclude_bit = cs->Index();
transported.range_bit = 1;
transported.dash = 2;
for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) {
transported.values[j] = p.history[GRAPH_NUM_MONTHS - j].transported;
} }
} }

2
src/lang/english.txt
View File

@ -628,6 +628,8 @@ STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle g
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING} STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_INDUSTRY_PRODUCTION_CAPTION :{WHITE}{INDUSTRY} - Production History STR_GRAPH_INDUSTRY_PRODUCTION_CAPTION :{WHITE}{INDUSTRY} - Production History
STR_GRAPH_INDUSTRY_RANGE_PRODUCED :Produced
STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED :Transported
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Show detailed performance ratings STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Show detailed performance ratings