Changeset - r28591:6b5d921474c8
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
frosch - 10 months ago 2024-01-26 18:45:27
frosch@openttd.org
Codechange: Merge all BaseGraphWindow widget enums into one.
Previously it relied on some enum entries using the same integer value.
2 files changed with 48 insertions and 65 deletions:
src/graph_gui.cpp
40
42
src/widgets/graph_widget.h
8
23
0 comments (0 inline, 0 general)
src/graph_gui.cpp
➞
Show inline comments
 
@@ -195,7 +195,6 @@ protected:
 
	uint16_t x_values_start;
 
	uint16_t x_values_increment;
 

			




	
	
	
		
 
	WidgetID graph_widget;

			




	
	
	
		
 
	StringID format_str_y_axis;

			




	
	
	
		
 
	byte colours[GRAPH_MAX_DATASETS];

			




	
	
	
		
 
	OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][GRAPH_NUM_MONTHS]; ///< Stored costs for the last #GRAPH_NUM_MONTHS months

			




	
	
		
 
@@ -480,13 +479,12 @@ protected:

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
	BaseGraphWindow(WindowDesc *desc, WidgetID widget, StringID format_str_y_axis) :

			




	
	
	
		
 
	BaseGraphWindow(WindowDesc *desc, StringID format_str_y_axis) :

			




	
	
	
		
 
			Window(desc),

			




	
	
	
		
 
			format_str_y_axis(format_str_y_axis)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		SetWindowDirty(WC_GRAPH_LEGEND, 0);

			




	
	
	
		
 
		this->num_vert_lines = 24;

			




	
	
	
		
 
		this->graph_widget = widget;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void InitializeWindow(WindowNumber number)

			




	
	
		
 
@@ -500,7 +498,7 @@ protected:

			




	
	
	
		
 
public:

			




	
	
	
		
 
	void UpdateWidgetSize(WidgetID widget, Dimension *size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension *fill, [[maybe_unused]] Dimension *resize) override

			




	
	
	
		
 
	{

			




	
	
	
		
 
		if (widget != this->graph_widget) return;

			




	
	
	
		
 
		if (widget != WID_GRAPH_GRAPH) return;

			




	
	
	
		
 

			




	
	
	
		
 
		uint x_label_width = 0;

			




	
	
	
		
 

			




	
	
		
 
@@ -536,7 +534,7 @@ public:

			




	
	
	
		
 

			




	
	
	
		
 
	void DrawWidget(const Rect &r, WidgetID widget) const override

			




	
	
	
		
 
	{

			




	
	
	
		
 
		if (widget != this->graph_widget) return;

			




	
	
	
		
 
		if (widget != WID_GRAPH_GRAPH) return;

			




	
	
	
		
 

			




	
	
	
		
 
		DrawGraph(r);

			




	
	
	
		
 
	}

			




	
	
		
 
@@ -549,7 +547,7 @@ public:

			




	
	
	
		
 
	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override

			




	
	
	
		
 
	{

			




	
	
	
		
 
		/* Clicked on legend? */

			




	
	
	
		
 
		if (widget == WID_CV_KEY_BUTTON) ShowGraphLegend();

			




	
	
	
		
 
		if (widget == WID_GRAPH_KEY_BUTTON) ShowGraphLegend();

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void OnGameTick() override

			




	
	
		
 
@@ -628,7 +626,7 @@ public:

			




	
	
	
		
 

			




	
	
	
		
 
struct OperatingProfitGraphWindow : BaseGraphWindow {

			




	
	
	
		
 
	OperatingProfitGraphWindow(WindowDesc *desc, WindowNumber window_number) :

			




	
	
	
		
 
			BaseGraphWindow(desc, WID_CV_GRAPH, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		this->num_on_x_axis = GRAPH_NUM_MONTHS;

			




	
	
	
		
 
		this->num_vert_lines = GRAPH_NUM_MONTHS;

			




	
	
		
 
@@ -649,19 +647,19 @@ static constexpr NWidgetPart _nested_ope

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_GRAPH_OPERATING_PROFIT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CV_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_GRAPH_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_SHADEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_STICKYBOX, COLOUR_BROWN),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_CV_BACKGROUND),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),

			




	
	
	
		
 
		NWidget(NWID_VERTICAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CV_GRAPH), SetMinimalSize(576, 160), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_GRAPH_GRAPH), SetMinimalSize(576, 160), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_CV_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CV_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
		
 
@@ -687,7 +685,7 @@ void ShowOperatingProfitGraph()

			




	
	
	
		
 

			




	
	
	
		
 
struct IncomeGraphWindow : BaseGraphWindow {

			




	
	
	
		
 
	IncomeGraphWindow(WindowDesc *desc, WindowNumber window_number) :

			




	
	
	
		
 
			BaseGraphWindow(desc, WID_CV_GRAPH, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		this->num_on_x_axis = GRAPH_NUM_MONTHS;

			




	
	
	
		
 
		this->num_vert_lines = GRAPH_NUM_MONTHS;

			




	
	
		
 
@@ -708,19 +706,19 @@ static constexpr NWidgetPart _nested_inc

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_GRAPH_INCOME_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CV_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_GRAPH_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_SHADEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_STICKYBOX, COLOUR_BROWN),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_CV_BACKGROUND),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),

			




	
	
	
		
 
		NWidget(NWID_VERTICAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CV_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_CV_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CV_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
		
 
@@ -744,7 +742,7 @@ void ShowIncomeGraph()

			




	
	
	
		
 

			




	
	
	
		
 
struct DeliveredCargoGraphWindow : BaseGraphWindow {

			




	
	
	
		
 
	DeliveredCargoGraphWindow(WindowDesc *desc, WindowNumber window_number) :

			




	
	
	
		
 
			BaseGraphWindow(desc, WID_CV_GRAPH, STR_JUST_COMMA)

			




	
	
	
		
 
			BaseGraphWindow(desc, STR_JUST_COMMA)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		this->num_on_x_axis = GRAPH_NUM_MONTHS;

			




	
	
	
		
 
		this->num_vert_lines = GRAPH_NUM_MONTHS;

			




	
	
		
 
@@ -765,19 +763,19 @@ static constexpr NWidgetPart _nested_del

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_GRAPH_CARGO_DELIVERED_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CV_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_GRAPH_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_SHADEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_STICKYBOX, COLOUR_BROWN),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_CV_BACKGROUND),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),

			




	
	
	
		
 
		NWidget(NWID_VERTICAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CV_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_CV_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CV_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
		
 
@@ -801,7 +799,7 @@ void ShowDeliveredCargoGraph()

			




	
	
	
		
 

			




	
	
	
		
 
struct PerformanceHistoryGraphWindow : BaseGraphWindow {

			




	
	
	
		
 
	PerformanceHistoryGraphWindow(WindowDesc *desc, WindowNumber window_number) :

			




	
	
	
		
 
			BaseGraphWindow(desc, WID_PHG_GRAPH, STR_JUST_COMMA)

			




	
	
	
		
 
			BaseGraphWindow(desc, STR_JUST_COMMA)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		this->num_on_x_axis = GRAPH_NUM_MONTHS;

			




	
	
	
		
 
		this->num_vert_lines = GRAPH_NUM_MONTHS;

			




	
	
		
 
@@ -829,19 +827,19 @@ static constexpr NWidgetPart _nested_per

			




	
	
	
		
 
		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_PHG_DETAILED_PERFORMANCE), SetMinimalSize(50, 0), SetDataTip(STR_PERFORMANCE_DETAIL_KEY, STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_PHG_KEY), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_GRAPH_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_SHADEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_STICKYBOX, COLOUR_BROWN),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_PHG_BACKGROUND),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),

			




	
	
	
		
 
		NWidget(NWID_VERTICAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_PHG_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_PHG_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_PHG_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
		
 
@@ -865,7 +863,7 @@ void ShowPerformanceHistoryGraph()

			




	
	
	
		
 

			




	
	
	
		
 
struct CompanyValueGraphWindow : BaseGraphWindow {

			




	
	
	
		
 
	CompanyValueGraphWindow(WindowDesc *desc, WindowNumber window_number) :

			




	
	
	
		
 
			BaseGraphWindow(desc, WID_CV_GRAPH, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		this->num_on_x_axis = GRAPH_NUM_MONTHS;

			




	
	
	
		
 
		this->num_vert_lines = GRAPH_NUM_MONTHS;

			




	
	
		
 
@@ -886,19 +884,19 @@ static constexpr NWidgetPart _nested_com

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_GRAPH_COMPANY_VALUES_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CV_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_GRAPH_KEY_BUTTON), SetMinimalSize(50, 0), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),

			




	
	
	
		
 
		NWidget(WWT_SHADEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_STICKYBOX, COLOUR_BROWN),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_CV_BACKGROUND),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),

			




	
	
	
		
 
		NWidget(NWID_VERTICAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CV_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_CV_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(WWT_TEXT, COLOUR_BROWN, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CV_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
		
 
@@ -926,7 +924,7 @@ struct PaymentRatesGraphWindow : BaseGra

			




	
	
	
		
 
	uint legend_width;  ///< Width of legend 'blob'.

			




	
	
	
		
 

			




	
	
	
		
 
	PaymentRatesGraphWindow(WindowDesc *desc, WindowNumber window_number) :

			




	
	
	
		
 
			BaseGraphWindow(desc, WID_CPR_GRAPH, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		this->num_on_x_axis = 20;

			




	
	
	
		
 
		this->num_vert_lines = 20;

			




	
	
		
 
@@ -1111,14 +1109,14 @@ static constexpr NWidgetPart _nested_car

			




	
	
	
		
 
		NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),

			




	
	
	
		
 
		NWidget(WWT_STICKYBOX, COLOUR_BROWN),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_CPR_BACKGROUND), SetMinimalSize(568, 128),

			




	
	
	
		
 
	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND), SetMinimalSize(568, 128),

			




	
	
	
		
 
		NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
			NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_HEADER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_TITLE, STR_NULL),

			




	
	
	
		
 
			NWidget(WWT_TEXT, COLOUR_BROWN, WID_GRAPH_HEADER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_TITLE, STR_NULL),

			




	
	
	
		
 
			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
		NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CPR_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_BROWN, WID_GRAPH_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1),

			




	
	
	
		
 
			NWidget(NWID_VERTICAL),

			




	
	
	
		
 
				NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),

			




	
	
	
		
 
				NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CPR_ENABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0),

			




	
	
		
 
@@ -1134,9 +1132,9 @@ static constexpr NWidgetPart _nested_car

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
		NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
			NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
			NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
			NWidget(WWT_TEXT, COLOUR_BROWN, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_TIME_LABEL, STR_NULL),

			




	
	
	
		
 
			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),

			




	
	
	
		
 
			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CPR_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetDataTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
};

			




        

    


    
    

    

        

                

                    src/widgets/graph_widget.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,32 +21,17 @@ enum GraphLegendWidgets : WidgetID {

			




	
	
	
		
 
	WID_GL_LAST_COMPANY = WID_GL_FIRST_COMPANY + MAX_COMPANIES - 1, ///< Last company in the legend.

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/** Widgets of the #OperatingProfitGraphWindow class, #IncomeGraphWindow class, #DeliveredCargoGraphWindow class, and #CompanyValueGraphWindow class. */

			




	
	
	
		
 
enum CompanyValueWidgets : WidgetID {

			




	
	
	
		
 
	WID_CV_KEY_BUTTON, ///< Key button.

			




	
	
	
		
 
	WID_CV_BACKGROUND, ///< Background of the window.

			




	
	
	
		
 
	WID_CV_GRAPH,      ///< Graph itself.

			




	
	
	
		
 
	WID_CV_RESIZE,     ///< Resize button.

			




	
	
	
		
 
	WID_CV_FOOTER,     ///< Footer.

			




	
	
	
		
 
};

			




	
	
	
		
 
/** Widgets of the #BaseGraphWindow class and derived classes. */

			




	
	
	
		
 
enum GraphWidgets : WidgetID {

			




	
	
	
		
 
	WID_GRAPH_KEY_BUTTON, ///< Key button.

			




	
	
	
		
 
	WID_GRAPH_BACKGROUND, ///< Background of the window.

			




	
	
	
		
 
	WID_GRAPH_GRAPH,      ///< Graph itself.

			




	
	
	
		
 
	WID_GRAPH_RESIZE,     ///< Resize button.

			




	
	
	
		
 
	WID_GRAPH_HEADER,     ///< Header.

			




	
	
	
		
 
	WID_GRAPH_FOOTER,     ///< Footer.

			




	
	
	
		
 

			




	
	
	
		
 
/** Widget of the #PerformanceHistoryGraphWindow class. */

			




	
	
	
		
 
enum PerformanceHistoryGraphWidgets : WidgetID {

			




	
	
	
		
 
	WID_PHG_KEY,                  ///< Key button.

			




	
	
	
		
 
	WID_PHG_DETAILED_PERFORMANCE, ///< Detailed performance.

			




	
	
	
		
 
	WID_PHG_BACKGROUND,           ///< Background of the window.

			




	
	
	
		
 
	WID_PHG_GRAPH,                ///< Graph itself.

			




	
	
	
		
 
	WID_PHG_RESIZE,               ///< Resize button.

			




	
	
	
		
 
	WID_PHG_FOOTER,               ///< Footer.

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/** Widget of the #PaymentRatesGraphWindow class. */

			




	
	
	
		
 
enum CargoPaymentRatesWidgets : WidgetID {

			




	
	
	
		
 
	WID_CPR_BACKGROUND,      ///< Background of the window.

			




	
	
	
		
 
	WID_CPR_HEADER,          ///< Header.

			




	
	
	
		
 
	WID_CPR_GRAPH,           ///< Graph itself.

			




	
	
	
		
 
	WID_CPR_RESIZE,          ///< Resize button.

			




	
	
	
		
 
	WID_CPR_FOOTER,          ///< Footer.

			




	
	
	
		
 
	WID_CPR_ENABLE_CARGOES,  ///< Enable cargoes button.

			




	
	
	
		
 
	WID_CPR_DISABLE_CARGOES, ///< Disable cargoes button.

			




	
	
	
		
 
	WID_CPR_MATRIX,          ///< Cargo list.

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support