Feature: Industry production graph #7575

kiwitreekor · 2019-05-07T10:40:03Z

This patch adds a window showing industry production history in last 24 months. (which already exists in Chris Sawyer's Locomotion)

src/graph_gui.cpp

src/industry_cmd.cpp

src/widgets/graph_widget.h

nielsmh · 2019-05-07T12:53:42Z

Commit checker found some whitespace problems:

*** b/src/graph_gui.cpp:1667: Trailing whitespace: '					'
*** b/src/graph_gui.cpp:1750: Trailing whitespace: '			'
*** b/src/graph_gui.cpp:1752: Trailing whitespace: '			'

kiwitreekor · 2019-05-08T10:56:59Z

Commit checker found some whitespace problems:

*** b/src/graph_gui.cpp:1667: Trailing whitespace: '					'
*** b/src/graph_gui.cpp:1750: Trailing whitespace: '			'
*** b/src/graph_gui.cpp:1752: Trailing whitespace: '			'

Should be fixed in 889a104.

src/industry_gui.cpp

src/saveload/saveload.h

resolved

nielsmh · 2019-05-11T13:39:48Z

This needs to be updated as the savegame version as been bumped.

PeterN · 2019-05-11T13:42:09Z

Currently display units for weight and volume are ignored, which is not ideal. This will also affect how the graph scales, and I'm not sure how it should handle oil rigs which have passengers tens and oil in the tens of thousands of litres.

PeterN · 2019-05-11T13:49:29Z

Another issue, graphs are not being redrawn properly on new a month, leading to visual glitches.

kiwitreekor · 2019-05-11T15:32:35Z

This needs to be updated as the savegame version as been bumped.

Now rebased to e7f6f07.

kiwitreekor · 2019-05-11T16:43:53Z

Another issue, graphs are not being redrawn properly on new a month, leading to visual glitches.

Now graphs are set dirty in UpdateStatisitics. This may resolve the issue.

kiwitreekor · 2019-05-12T04:05:55Z

Currently display units for weight and volume are ignored, which is not ideal. This will also affect how the graph scales, and I'm not sure how it should handle oil rigs which have passengers tens and oil in the tens of thousands of litres.

hmm... maybe should I limit the number of showing cargoes to one at once?

PeterN · 2019-05-12T06:24:41Z

I don't think that's useful. The player can do that themselves with the filter anyway.

kiwitreekor · 2019-05-30T22:10:36Z

bump?

src/graph_gui.cpp

kiwitreekor · 2019-06-16T06:11:12Z

Sorry for late reply...

kiwitreekor · 2019-07-23T08:12:11Z

bump

2TallTyler · 2022-10-28T15:42:30Z

Rebased for review. We can squash my merge commit when fixing stuff or merging.

2TallTyler · 2022-10-28T15:57:01Z

Sorry @kiwitreekor, I rebased and it no longer works. (I think because of other changes to the codebase since you last updated this, not because of the rebase itself.)

Do you plan to update this for review, or should I try to update it myself?

kiwitreekor · 2022-11-09T12:11:32Z

@2TallTyler Sorry for late reply. I don't have enough time to update code now.. so could you update the code?

2TallTyler · 2022-11-09T12:50:02Z

Sure, I'll try to fix and update.

ldpl · 2022-12-19T17:32:30Z

Month isn't really a good period to measure production though. IIRC there can be 8 or 9 production cycles in one month making it look like there was a production change on the chart when there was none.
Also did anyone test how much does this add to the savegame? For example, last game I played had around 5k industries, afaict this would add 600Kb of data to the save before compression. It's kind of significant for a server especially since vast majority of this data is useless and is never going to be looked at.

2TallTyler · 2022-12-19T17:39:30Z

What period would you suggest instead?

I have not tested savegame size increases, but 5,000 industries sounds like a stress-test more than a typical usecase.

ldpl · 2022-12-19T18:24:21Z

I don't really know what would be the best period. As I can see there are 3 options:

Fixed number of prod cycles.
"normalized" month. Count like a month but adjust the number to reflect the amount of observed cycles (multiply by DAY_TICKS * 30 / (num_cycles * INDUSTRY_PRODUCE_TICKS))
Regular month (as it is.)
Each has it's disadvantage: 3 introduces jitter, 1 has non-intuitive interval, 2 doesn't match the production number in industry window. I'd personally would prefer 1 or 2 though as it represents the production dynamic more accurately.

I quickly checked and a regular 2k*2k map on temperate is already around 5k industries on high density. So 4k*4k will be about 4 times that.

ldpl · 2022-12-19T18:45:35Z

Thinking a bit more about it, maybe game can split produced cargo between two months when calculating production for cycles that happen to cover both.

glx22 · 2022-12-20T02:23:42Z

I rebased from 4dd7f62 (to start with a clean base)
The differences between my rebase and @2TallTyler's rebase are minimal (ignoring the 3 extra commits from master).
So good job Tyler as it was not an easy one.

Resolved

2TallTyler · 2022-12-20T12:06:13Z

src/graph_gui.cpp

+			/* Redraw box if lowered */
+			if (lowered) DrawFrameRect(r.left, y, r.right, y + this->line_height - 1, COLOUR_ORANGE, lowered ? FR_LOWERED : FR_NONE);
+
+			byte clk_dif = lowered ? 1 : 0;
+			int rect_x = clk_dif + (rtl ? r.right - 12 : r.left + WidgetDimensions::scaled.framerect.left);
+
+			GfxFillRect(rect_x, y + clk_dif, rect_x + 8, y + 5 + clk_dif, PC_BLACK);
+			GfxFillRect(rect_x + 1, y + 1 + clk_dif, rect_x + 7, y + 4 + clk_dif, cs->legend_colour);
+			SetDParam(0, cs->name);


There's a cleaner implementation of this in PaymentRatesGraphWindow::DrawWidget which should be used instead.

2TallTyler · 2022-12-20T12:09:30Z

src/graph_gui.cpp

+				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_IP_ENABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_IP_DISABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0),
+				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
+				NWidget(NWID_HORIZONTAL),
+					NWidget(WWT_MATRIX, COLOUR_ORANGE, WID_IP_MATRIX), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_IP_MATRIX_SCROLLBAR),
+					NWidget(NWID_VSCROLLBAR, COLOUR_ORANGE, WID_IP_MATRIX_SCROLLBAR),


In the similar Cargo Payment Rates GUI, these are all COLOUR_BROWN to match the window background.

anatolyeltsov · 2023-03-05T00:35:37Z

Was messing around with fixing requested changes locally and find out strange behavior: when you have both cargo payment rates and production graph windows opened clicking on cargo in an any legend will toggle it and it's graph on both windows (and it will be very laggy in a cargo payment rates window).

I don't think that it's an intended behavior so I fixed it by simply adding _legend_excluded_cargo_production alongside _legend_excluded_cargo.

But maybe it'll be a good idea to rename _legend_excluded_cargo to _legend_excluded_cargo_payment_rates accordingly to make it clearer what is what.

I also rebased it on a recent master.
The only thing that is not clear for me is how can I update this pull request? Or should I create a new one?

Original behavior:

Fixed one:

2TallTyler · 2023-03-05T00:49:53Z

I agree that this is not intended behavior. Good catch.

Yes, you'll have to open a new PR to continue development. Since the original author hasn't touched this PR in two years, it shouldn't be a problem (like the source code, PRs are GPL-licensed so you wouldn't need permission no matter the timeline).

kiwitreekor · 2023-05-06T07:42:21Z

superceded by #10541

nielsmh reviewed May 7, 2019

View reviewed changes

src/graph_gui.cpp Outdated Show resolved Hide resolved

src/industry_cmd.cpp Outdated Show resolved Hide resolved

src/widgets/graph_widget.h Show resolved Hide resolved

nielsmh added the savegame upgrade label May 7, 2019

kiwitreekor force-pushed the industry-production-graph branch 2 times, most recently from 889a104 to af3332c Compare May 8, 2019 10:56

kiwitreekor force-pushed the industry-production-graph branch from af3332c to 966b7cd Compare May 8, 2019 11:04

PeterN previously requested changes May 9, 2019

View reviewed changes

src/industry_gui.cpp Outdated Show resolved Hide resolved

src/saveload/saveload.h Outdated Show resolved Hide resolved

kiwitreekor force-pushed the industry-production-graph branch from 966b7cd to ee7478d Compare May 9, 2019 10:19

PeterN reviewed May 9, 2019

View reviewed changes

src/saveload/saveload.h Outdated Show resolved Hide resolved

kiwitreekor force-pushed the industry-production-graph branch from ee7478d to a1f6475 Compare May 9, 2019 10:42

kiwitreekor force-pushed the industry-production-graph branch from a1f6475 to d7eea7d Compare May 11, 2019 15:30

kiwitreekor force-pushed the industry-production-graph branch from d7eea7d to 754eb30 Compare May 11, 2019 16:38

kiwitreekor force-pushed the industry-production-graph branch from 754eb30 to 400135d Compare May 11, 2019 16:46

LordAro reviewed Jun 6, 2019

View reviewed changes

src/graph_gui.cpp Outdated Show resolved Hide resolved

src/graph_gui.cpp Outdated Show resolved Hide resolved

kiwitreekor force-pushed the industry-production-graph branch from 400135d to bb5d93f Compare June 16, 2019 06:08

kiwitreekor force-pushed the industry-production-graph branch from bb5d93f to 69a95a5 Compare June 16, 2019 06:13

kiwitreekor force-pushed the industry-production-graph branch 2 times, most recently from 30299e5 to d470426 Compare September 9, 2019 17:56

kiwitreekor force-pushed the industry-production-graph branch from d470426 to f6c21f6 Compare September 9, 2019 17:58

TrueBrain removed the savegame upgrade label Sep 25, 2021

2TallTyler added this to the 13.0 milestone Oct 27, 2022

DorpsGek temporarily deployed to preview-pr-7575 October 28, 2022 15:38 Inactive

2TallTyler removed this from the 13.0 milestone Nov 24, 2022

2TallTyler force-pushed the industry-production-graph branch from 3d0cfbf to 956be74 Compare December 19, 2022 17:46

DorpsGek temporarily deployed to preview-pr-7575 December 19, 2022 17:46 Inactive

2TallTyler force-pushed the industry-production-graph branch from 956be74 to fc0c134 Compare December 19, 2022 18:47

DorpsGek temporarily deployed to preview-pr-7575 December 19, 2022 18:51 Inactive

glx22 force-pushed the industry-production-graph branch from fc0c134 to bfbdf61 Compare December 20, 2022 01:54

DorpsGek temporarily deployed to preview-pr-7575 December 20, 2022 01:55 Inactive

Feature: Industry production graph

a3df54f

glx22 force-pushed the industry-production-graph branch from bfbdf61 to a3df54f Compare December 20, 2022 02:09

DorpsGek temporarily deployed to preview-pr-7575 December 20, 2022 02:09 Inactive

2TallTyler requested changes Dec 20, 2022

View reviewed changes

2TallTyler added the work: minor details label Dec 20, 2022

anatolyeltsov mentioned this pull request Mar 5, 2023

Feature: Industry production graph #10541

Merged

kiwitreekor closed this May 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Industry production graph #7575

Feature: Industry production graph #7575

kiwitreekor commented May 7, 2019 •

edited

Loading

nielsmh commented May 7, 2019

kiwitreekor commented May 8, 2019

nielsmh commented May 11, 2019

PeterN commented May 11, 2019

PeterN commented May 11, 2019

kiwitreekor commented May 11, 2019

kiwitreekor commented May 11, 2019

kiwitreekor commented May 12, 2019

PeterN commented May 12, 2019

kiwitreekor commented May 30, 2019

kiwitreekor commented Jun 16, 2019

kiwitreekor commented Jul 23, 2019

2TallTyler commented Oct 28, 2022

2TallTyler commented Oct 28, 2022

kiwitreekor commented Nov 9, 2022

2TallTyler commented Nov 9, 2022

ldpl commented Dec 19, 2022

2TallTyler commented Dec 19, 2022

ldpl commented Dec 19, 2022 •

edited

Loading

ldpl commented Dec 19, 2022

glx22 commented Dec 20, 2022

2TallTyler Dec 20, 2022

2TallTyler Dec 20, 2022

anatolyeltsov commented Mar 5, 2023

2TallTyler commented Mar 5, 2023 •

edited

Loading

kiwitreekor commented May 6, 2023

Feature: Industry production graph #7575

Feature: Industry production graph #7575

Conversation

kiwitreekor commented May 7, 2019 • edited Loading

nielsmh commented May 7, 2019

kiwitreekor commented May 8, 2019

nielsmh commented May 11, 2019

PeterN commented May 11, 2019

PeterN commented May 11, 2019

kiwitreekor commented May 11, 2019

kiwitreekor commented May 11, 2019

kiwitreekor commented May 12, 2019

PeterN commented May 12, 2019

kiwitreekor commented May 30, 2019

kiwitreekor commented Jun 16, 2019

kiwitreekor commented Jul 23, 2019

2TallTyler commented Oct 28, 2022

2TallTyler commented Oct 28, 2022

kiwitreekor commented Nov 9, 2022

2TallTyler commented Nov 9, 2022

ldpl commented Dec 19, 2022

2TallTyler commented Dec 19, 2022

ldpl commented Dec 19, 2022 • edited Loading

ldpl commented Dec 19, 2022

glx22 commented Dec 20, 2022

2TallTyler Dec 20, 2022

Choose a reason for hiding this comment

2TallTyler Dec 20, 2022

Choose a reason for hiding this comment

anatolyeltsov commented Mar 5, 2023

2TallTyler commented Mar 5, 2023 • edited Loading

kiwitreekor commented May 6, 2023

kiwitreekor commented May 7, 2019 •

edited

Loading

ldpl commented Dec 19, 2022 •

edited

Loading

2TallTyler commented Mar 5, 2023 •

edited

Loading