Skip to content

ADD: average transport density chart to line list screen #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kanyao1230 wants to merge 3 commits into
base: OTRP-KUTAv6
Choose a base branch
from
+36 −13
Open

ADD: average transport density chart to line list screen #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ff9dbd
ADD: average transport density chart to line list screen
kanyao1230 Jun 10, 2026
141446c
REVIEW: move MAX_LINE_COST_GUI to header and add comment for transpor…
kanyao1230 Jun 11, 2026
415e8c1
REVIEW: add not-recorded comments to cost_type and cost_type_color ar…
kanyao1230 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions documentation/ja.OTRP.tab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,3 +783,5 @@ Templates
テンプレ
crossconnect_factories is enabled!
全産業が接続済みです!
Avg. density
平均輸送密度
33 changes: 24 additions & 9 deletions gui/schedule_list.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include "depot_picker.h"


static const char *cost_type[MAX_LINE_COST] =
static const char *cost_type[schedule_list_gui_t::MAX_LINE_COST_GUI] =
{
"Free Capacity",
"Transported",
Expand All @@ -63,10 +63,11 @@ static const char *cost_type[MAX_LINE_COST] =
"Distance",
"Maxspeed",
"Road toll",
"Freight ton-kilo"
"Freight ton-kilo",
"Avg. density" // not recorded in financial_history
};

const uint8 cost_type_color[MAX_LINE_COST] =
const uint8 cost_type_color[schedule_list_gui_t::MAX_LINE_COST_GUI] =
{
COL_FREE_CAPACITY,
COL_TRANSPORTED,
Expand All @@ -77,7 +78,8 @@ const uint8 cost_type_color[MAX_LINE_COST] =
COL_DISTANCE,
COL_MAXSPEED,
COL_TOLL,
COL_TONKILO
COL_TONKILO,
COL_TRANSPORT_DENSITY // not recorded in financial_history
};

static uint8 tabs_to_lineindex[9];
Expand Down Expand Up @@ -392,7 +394,7 @@ schedule_list_gui_t::schedule_list_gui_t(player_t *player_) :
add_component(&chart);

// add filter buttons
for( int i=0; i<MAX_LINE_COST; i++ ) {
for( int i=0; i<MAX_LINE_COST_GUI; i++ ) {
filterButtons[i].init(button_t::box_state,cost_type[i],scr_coord(0,0), scr_size(D_BUTTON_WIDTH, D_BUTTON_HEIGHT));
filterButtons[i].add_listener(this);
filterButtons[i].background_color = color_idx_to_rgb(cost_type_color[i]);
Expand Down Expand Up @@ -605,7 +607,7 @@ bool schedule_list_gui_t::action_triggered( gui_action_creator_t *comp, value_t
}
else {
if( line.is_bound() ) {
for( int i=0; i<MAX_LINE_COST; i++ ) {
for( int i=0; i<MAX_LINE_COST_GUI; i++ ) {
if( comp == &filterButtons[i] ) {
filterButtons[i].pressed ^= 1;
if( filterButtons[i].pressed ) {
Expand Down Expand Up @@ -766,7 +768,7 @@ void schedule_list_gui_t::set_windowsize(scr_size size)

int rest_width = get_windowsize().w-RIGHT_COLUMN_OFFSET-D_MARGIN_RIGHT;
int button_per_row = max(1, (rest_width+D_H_SPACE)/(D_BUTTON_WIDTH+D_H_SPACE));
int button_rows = MAX_LINE_COST/button_per_row + ((MAX_LINE_COST%button_per_row)!=0);
int button_rows = MAX_LINE_COST_GUI/button_per_row + ((MAX_LINE_COST_GUI%button_per_row)!=0);

scrolly_convois.set_size( scr_size(rest_width+D_MARGIN_RIGHT, get_client_windowsize().h-scrolly_convois.get_pos().y) );
scrolly_haltestellen.set_size( scr_size(RIGHT_COLUMN_OFFSET, get_client_windowsize().h-scrolly_haltestellen.get_pos().y) );
Expand All @@ -778,7 +780,7 @@ void schedule_list_gui_t::set_windowsize(scr_size size)
bt_colour_line.set_size(scr_size(rest_width-D_BUTTON_WIDTH - D_H_SPACE, D_EDIT_HEIGHT));

int y = D_MARGIN_TOP + SCL_HEIGHT-D_V_SPACE-(button_rows*(D_BUTTON_HEIGHT+D_V_SPACE));
for( int i=0; i<MAX_LINE_COST; i++ ) {
for( int i=0; i<MAX_LINE_COST_GUI; i++ ) {
filterButtons[i].set_pos( scr_coord(RIGHT_COLUMN_OFFSET+(i%button_per_row)*(D_BUTTON_WIDTH+D_H_SPACE), y+(i/button_per_row)*(D_BUTTON_HEIGHT+D_V_SPACE)) );
}
}
Expand Down Expand Up @@ -884,6 +886,19 @@ void schedule_list_gui_t::update_lineinfo(linehandle_t new_line)
chart.show_curve(i);
}
}
// transport density (ton-kilo / distance): computed dynamically, not recorded in financial_history; curve index is MAX_LINE_COST, outside the saved range
{
const sint64 *history = new_line->get_finance_history();
for( int month=0; month<MAX_MONTHS; month++ ) {
sint64 distance = history[month * MAX_LINE_COST + LINE_DISTANCE];
sint64 tonkilo = history[month * MAX_LINE_COST + LINE_TONKILO];
transport_density_history[month] = (distance > 0) ? tonkilo / distance : 0;
}
}
chart.add_curve(color_idx_to_rgb(COL_TRANSPORT_DENSITY), transport_density_history, 1, 0, MAX_MONTHS, STANDARD, filterButtons[MAX_LINE_COST].pressed, true, 0);
if( filterButtons[MAX_LINE_COST].pressed ) {
chart.show_curve(MAX_LINE_COST);
}
chart.set_visible(true);

// has this line a single running convoy?
Expand Down Expand Up @@ -920,7 +935,7 @@ void schedule_list_gui_t::update_lineinfo(linehandle_t new_line)
bt_copy_data.disable();
bt_show_journey_time.disable();
bt_goods_waiting_time.disable();
for( int i=0; i<MAX_LINE_COST; i++ ) {
for( int i=0; i<MAX_LINE_COST_GUI; i++ ) {
chart.hide_curve(i);
}
chart.set_visible(true);
Expand Down
7 changes: 6 additions & 1 deletion gui/schedule_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ class player_t;
*/
class schedule_list_gui_t : public gui_frame_t, public action_listener_t
{
public:
// not recorded in financial_history; index is outside the MAX_LINE_COST saved range
static const int MAX_LINE_COST_GUI = MAX_LINE_COST + 1;

private:
player_t *player, *old_player;

Expand All @@ -43,7 +47,8 @@ class schedule_list_gui_t : public gui_frame_t, public action_listener_t
gui_textinput_t inp_name, inp_filter, inp_memo;
gui_label_t lbl_filter, lbl_memo, lbl_name, lbl_colour;
gui_chart_t chart;
button_t filterButtons[MAX_LINE_COST];
button_t filterButtons[MAX_LINE_COST_GUI];
sint64 transport_density_history[MAX_MONTHS];
gui_tab_panel_t tabs;

gui_combobox_t freight_type_c, sort_type_c;
Expand Down
7 changes: 4 additions & 3 deletions simcolor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@ typedef unsigned int FLAGGED_PIXVAL;
#define COL_MARGIN COL_LIGHT_YELLOW
#define COL_WEALTH 95

#define COL_CONVOI_COUNT COL_LIGHT_TURQUOISE
#define COL_FREE_CAPACITY COL_TOLL
#define COL_DISTANCE COL_OPS_PROFIT
#define COL_CONVOI_COUNT COL_LIGHT_TURQUOISE
#define COL_FREE_CAPACITY COL_TOLL
#define COL_DISTANCE COL_OPS_PROFIT
#define COL_TRANSPORT_DENSITY COL_PURPLE

#define COL_CITIZENS COL_WHITE
#define COL_GROWTH 122
Expand Down
Loading