dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cargo payment rate graph: Scale X-axis by day length

Browse Source 
See: #541
This commit is contained in:
Jonathan G Rennison
2023-06-18 19:01:37 +01:00
parent a7a8f4c695
commit b080433394
1 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/graph_gui.cpp
View File

@@ -287,6 +287,18 @@ protected:
return max_width; return max_width;
} }
virtual StringID PrepareXAxisText(uint16 label) const
{
SetDParam(0, label);
return STR_JUST_COMMA;
}
virtual StringID PrepareXAxisMaxSizeText(uint16 label) const
{
SetDParamMaxValue(0, label, 0, FS_SMALL);
return STR_JUST_COMMA;
}
/** /**
* Actually draw the graph. * Actually draw the graph.
* @param r the rectangle of the data field of the graph * @param r the rectangle of the data field of the graph
@@ -411,8 +423,8 @@ protected:
uint16 label = this->x_values_start; uint16 label = this->x_values_start;
for (int i = 0; i < this->num_on_x_axis; i++) { for (int i = 0; i < this->num_on_x_axis; i++) {
SetDParam(0, label); StringID str = this->PrepareXAxisText(label);
DrawString(x + 1, x + x_sep - 1, y, STR_GRAPH_Y_LABEL_NUMBER, GRAPH_AXIS_LABEL_COLOUR, SA_HOR_CENTER); DrawString(x + 1, x + x_sep - 1, y, str, GRAPH_AXIS_LABEL_COLOUR, SA_HOR_CENTER, false, FS_SMALL);
label += this->x_values_increment; label += this->x_values_increment;
x += x_sep; x += x_sep;
@@ -525,8 +537,8 @@ public:
} }
} else { } else {
/* Draw x-axis labels for graphs not based on quarterly performance (cargo payment rates). */ /* Draw x-axis labels for graphs not based on quarterly performance (cargo payment rates). */
SetDParamMaxValue(0, this->x_values_start + this->num_on_x_axis * this->x_values_increment, 0, FS_SMALL); StringID str = this->PrepareXAxisMaxSizeText(this->x_values_start + this->num_on_x_axis * this->x_values_increment);
x_label_width = GetStringBoundingBox(STR_GRAPH_Y_LABEL_NUMBER).width; x_label_width = GetStringBoundingBox(str, FS_SMALL).width;
} }
SetDParam(0, this->format_str_y_axis); SetDParam(0, this->format_str_y_axis);
@@ -1187,6 +1199,43 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
this->x_values_increment = x_scale; this->x_values_increment = x_scale;
} }
uint GetXAxisDecimals() const
{
if (_cargo_payment_x_mode) return 0;
if ((10 % _settings_game.economy.day_length_factor) == 0) return 0;
if (_settings_game.economy.day_length_factor > 50) return 2;
return 1;
}
std::pair<uint, uint> ProcessXAxisValue(uint16 label) const
{
uint val = label;
uint decimals = this->GetXAxisDecimals();
for (uint i = 0; i < decimals; i++) {
val *= 10;
}
val /= _settings_game.economy.day_length_factor;
return { val, decimals };
}
StringID PrepareXAxisText(uint16 label) const override
{
auto val = this->ProcessXAxisValue(label);
SetDParam(0, val.first);
SetDParam(1, val.second);
return STR_JUST_DECIMAL;
}
StringID PrepareXAxisMaxSizeText(uint16 label) const override
{
auto val = this->ProcessXAxisValue(label);
SetDParamMaxValue(0, val.first, 0, FS_SMALL);
SetDParam(1, val.second);
return STR_JUST_DECIMAL;
}
void OnInit() override void OnInit() override
{ {
/* Width of the legend blob. */ /* Width of the legend blob. */