Commit Graph

353 Commits (jgrpp)

Author SHA1 Message Date
Rubidium 85faa218ff Remove: logically dead code in graph UI 3 years ago
glx22 5844027eb8 Codechange: Remove FOR_ALL_SORTED_STANDARD_CARGOSPECS 3 years ago
Jonathan G Rennison 37c7cf9899 Remove number of days from hard-coded X axis label string
To support later day number changes and/or translations
3 years ago
Jonathan G Rennison 5698507d0b Change station cargo history storage format
Use uint16 to avoid truncation issues
Don't reserve memory for unused cargoes
Store history as ring buffer
Update history graph immediately on storage date
Show total waiting cargo
3 years ago
Andreas Schmitt 9b1783809d Add station cargo history 3 years ago
Jonathan G Rennison fd4b5cc083 Add buttons to cargo payment graph to select x-axis
Save in misc settings
3 years ago
Jonathan G Rennison f438daa0bc Use localised units for payment graph X axis
Match quantities in graph title
3 years ago
Andreas Schmitt 0acdea2852 Shows payment based on average transit speed
Prior to this change, the charts were pretty useless. They indicated at most what cargos were speed sensitive and which ones were not.

This change lets the graph show the average transit speed to profit mapping. With this graph it becomes obvious after exactly what speed any further speed increase brings no further profit. This makes train selection way easier.
3 years ago
rubidium42 44ca7d9377 Change: Use gender-neutral pronouns 3 years ago
Peter Nelson b997bb0cee Fix: Cargo legend blob in cargo payment rate window did not rescale.
(cherry picked from commit 49aa392440)
3 years ago
Peter Nelson c3cd3bae71 Fix: Company Key window scaling.
(cherry picked from commit 1df510c297)
3 years ago
Peter Nelson 49aa392440 Fix: Cargo legend blob in cargo payment rate window did not rescale. 3 years ago
Peter Nelson 1df510c297 Fix: Company Key window scaling. 3 years ago
Jonathan G Rennison 253772e9af Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in
3 years ago
Peter Nelson 2a0365b3d9 Cleanup: Remove unnecessary parameter of GetScrolledRowFromWidget()
Line height defaults to the resize height of the relevant widget, which is
set in all cases. Therefore it is not necessary to specify this value every time.

Additionally fixes scrolled padding for the framerate window.
3 years ago
Jonathan G Rennison 5e14b54a0c Merge branch 'master' into jgrpp 3 years ago
Tyler Trahan de891238d6
Change: Recolour graph windows to brown (#8700) 3 years ago
Jonathan G Rennison f4e29071be Merge tag '1.11.0-beta2' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/debug.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/lang/czech.txt
#	src/lang/english.txt
#	src/lang/italian.txt
#	src/lang/swedish.txt
#	src/lang/ukrainian.txt
#	src/network/network_server.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/follow_track.hpp
#	src/screenshot.cpp
#	src/settings_type.h
#	src/spritecache.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/video_driver.cpp
#	src/video/video_driver.hpp
#	src/video/win32_v.cpp
3 years ago
Tyler Trahan 8476f12432
Change: Improve graph period markings (#8732) 3 years ago
Jonathan G Rennison e95216b59d Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
3 years ago
Tyler Trahan d5e18feed9
Change: Darken graph grid lines for legibility (#8690) 3 years ago
Jonathan G Rennison 7154f8859d Merge tag '1.11.0-beta1' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
3 years ago
Jonathan G Rennison b7ddd486cf Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
3 years ago
Jonathan G Rennison 6c3e5642f8 Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
3 years ago
Patric Stout de44ce2092
Change: darken the background of all graph to increase contrast (#8557)
Now lines like Mauve, Dark Green and Purple are much more visible
without hurting the other colours.
3 years ago
Charles Pigott 9b800a96ed
Codechange: Remove min/max functions in favour of STL variants (#8502) 3 years ago
Charles Pigott 860c270c73 Codechange: Replace assert_compile macro with static_assert 3 years ago
Jonathan G Rennison 53f9fa139d Remove redundant year/month date globals 4 years ago
glx 3a14cea068 Codechange: Replace FOR_ALL_COMPANIES with range-based for loops 5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
glx 2db88953e7 Codechange: use std::sort() in GUIList 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
Henry Wilson a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 5 years ago
Henry Wilson 9cba6f7193 Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit() 5 years ago
Henry Wilson bfd79e59dc Codechange: Replace SmallVector::Clear() with std::vector::clear() 5 years ago
peter1138 317f69c152 Codechange: Use override specifier in Window-derived classes. 5 years ago
Peter Nelson fde5bd0ccf Change: Add scrollbar to cargo legend in cargo payment rates window. 5 years ago
Gabda 5e4f76f2f9 Fix #5654: (Re)initialise graph GUI on game (re)start (#7191) 5 years ago
Peter Nelson 15320a37b9 Change: OnGameTick() is only called when not paused. 5 years ago
Peter Nelson 2a8fa5fef9 Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks. 5 years ago
Niels Martin Hansen 810887af30 Fix #6498: Use int64 for all company rating calculations 6 years ago
PeterN 11ab3c4ea2
Change: Increase cargo type limit to 64. 6 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 04e97a0bec (svn r26116) -Codechange: validate that the number of lines in a graph is more than 0 11 years ago
frosch ce110eed32 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 11 years ago
frosch 4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
frosch b533523258 (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
rubidium 70c7fbd90e (svn r23826) -Fix [FS#4972]: the detailed performance rating window showed the cargo count of the current quarter instead of the last quarter like the tooltip says 13 years ago
rubidium 6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
truebrain e9f584ac21 (svn r23531) -Codechange: document and rename widgets to be consistent and understandable 13 years ago
truebrain 2aa774e831 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago
rubidium 3d88c74389 (svn r23526) -Codechange: unify cargos vs cargoes 13 years ago
frosch 1ea449630d (svn r23497) -Add: Advanced display setting to control the linewidth in graphs. (ChillCore) 13 years ago
rubidium b8866be093 (svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent 13 years ago
peter1138 2cfd47a09b (svn r23025) -Codechange: Support resized company colour icon in company key window. 13 years ago
planetmaker a2ebe437e6 (svn r22868) -Change: Resize the company league window according to the company icon's size 13 years ago
frosch 5e449b8fae (svn r22429) -Add: some constants for specific palette colours used in the GUI. 13 years ago
frosch 22286bd7b6 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 13 years ago
frosch 0babca04f2 (svn r22292) -Change: Increase the linewidth in plots. 13 years ago
frosch 652c9cb663 (svn r22247) -Codechange: Update comments wrt. ForceRebuild() in command-scope. 13 years ago
frosch ec9540a12a (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 13 years ago
rubidium 7eba2bf4d3 (svn r21890) -Cleanup: remove some unneeded includes 14 years ago
rubidium fba9670a62 (svn r21601) -Fix [FS#4323]: company league table used stats from two quarters ago instead of last quarter 14 years ago
alberth f5c6fd1a25 (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 14 years ago
rubidium 30637a8340 (svn r21157) -Codechange: remove information about the text direction out of the language "list" 14 years ago
rubidium cab122efef (svn r21010) -Fix [FS#4102]: the detailed performance rating window would occasionally be too narrow. Based on a patch by Krille 14 years ago
yexo 16be24e13a (svn r20558) -Codechange: use one generic function to create a list of company buttons 14 years ago
yexo 44ba57bb79 (svn r20555) -Fix [FS#4053]: wrong tooltip for the company select button in the AI debug and performance rating windows 14 years ago
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 14 years ago
rubidium e356cb9405 (svn r20281) -Codechange: unify case scope closure + break coding style 14 years ago
alberth be6c058424 (svn r20211) -Codechange: Indented code should have curly braces around it. 14 years ago
alberth 22b9bc5157 (svn r20043) -Codechange: Introduce vertical alignment for DrawStringMultiLine(). 14 years ago
rubidium 398418b8fa (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 14 years ago
terkhen 2e4e4e3147 (svn r19729) -Fix [FS#3793]: The company value graph crashed the game when displaying companies with a huge amount of money. 14 years ago
terkhen 3442b8c345 (svn r19673) -Codechange: Optimize calculation of graph grid size (method by Alberth).
-Fix: Remove a gcc 3.3 warning.
14 years ago
terkhen 320dcc7d07 (svn r19662) -Feature: Resizable graphs. 14 years ago
terkhen e959d56122 (svn r19661) -Codechange: Base the number of vertical grids of a graph on its size. 14 years ago
terkhen 22f864b0c0 (svn r19632) -Cleanup: has_negative_values is no longer used. 14 years ago
terkhen f61b9e3962 (svn r19631) -Feature: Graphs with negative values are no longer forced to have the zero axis in the middle (grid size calculation by Alberth). 14 years ago
terkhen 7ba4f98ce5 (svn r19615) -Fix [FS#3763]: Company related graphs weren't updated correctly after changing the company colour. 14 years ago
smatz fc878baee6 (svn r19579) -Codechange: auto-raise 'Enable/Disable all' buttons in the Cargo payment rates window 14 years ago
rubidium bcce2cabef (svn r19574) -Fix: graphs were not properly updated when going toggling keys (i.e. companies) 14 years ago
terkhen 869fac9964 (svn r19573) -Fix (r19541): Special cargos did not appear at the refit list. 14 years ago
terkhen 794828209b (svn r19550) -Fix (r19543): Scale graphs without taking into account excluded data. 14 years ago
terkhen 1cab553994 (svn r19543) -Feature [FS#3726]: Scale the vertical axis of graphs depending on the graph's highest value. 14 years ago
terkhen daf97ae52c (svn r19542) -Feature: Add buttons to enable / disable all cargos at the cargo payment rates graph. 14 years ago
terkhen 8660890bbb (svn r19539) -Codechange: Use a macro to loop through the list of sorted cargo specifications. 14 years ago
terkhen 33b1307343 (svn r19535) -Feature: Sort cargos at the cargo payment rates graph. 14 years ago
rubidium 7a73a7490d (svn r19090) -Codechange: some comment coding style fixes 15 years ago
terkhen 2329eacfe8 (svn r19076) -Codechange: Move graph functions to their own header. 15 years ago
frosch 88019e64e1 (svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick(). 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium b9052fff9f (svn r18765) -Fix [FS#3499] (r18750): crash when trying to show cargo payments when there are 'holes' in the cargospec array 15 years ago
rubidium 175db8d613 (svn r18750) -Fix [FS#3492]: the cargo payment button states weren't properly set on opening the window 15 years ago
rubidium b0c9b2c232 (svn r18644) -Fix [FS#3434]: company league window was too narrow 15 years ago
alberth 91872aca48 (svn r18588) -Feature [FS#2943]: Add shading and unshading of windows. 15 years ago
alberth 57e6c7fdb7 (svn r18490) -Doc: Fixed syntax of a few doxygen pre and post coditions. 15 years ago
rubidium ac4ef286f4 (svn r18447) -Change: make some more windows (e.g. graphs, company view) stickyable 15 years ago
rubidium 1f0da3710f (svn r18324) -Codechange: there's no need for a default size when the window isn't resizable 15 years ago
rubidium 293dfd7c3e (svn r18322) -Codechange: remove the WDP duplication; no need to tell the same twice. 15 years ago
rubidium 8d6e323ef8 (svn r18280) -Codechange: remove widget indices that are not needed for custom drawing/handling input 15 years ago
rubidium 14300d309c (svn r18277) -Codechange: remove unneeded widget indices for close, resize and sticky boxes and for window captions 15 years ago
rubidium 69b6d9309a (svn r18274) -Codechange: remove the unused WDF flags 15 years ago
rubidium 584c75722e (svn r18264) -Codechange: make the company league window big font aware 15 years ago
rubidium 2ee87ce100 (svn r18259) -Codechange: make the graphs big font aware 15 years ago
rubidium c7c9f24f60 (svn r18250) -Codechange: make the graph legend big font aware 15 years ago
alberth 450e40b997 (svn r18230) -Codechange: Allow fill stepsize to be set from Window::UpdateWidgetSize(). 15 years ago
alberth 2b6f792513 (svn r18229) -Codechange: Make fill_x, fill_y a number instead of a bool. 15 years ago
alberth bf93372ca2 (svn r18220) -Codechange: Reduce number of nested widget dynamic casts. 15 years ago
rubidium d786f42427 (svn r18196) -Codechange: make the performance rating details window big font and RTL aware 15 years ago
rubidium 095d64c4fc (svn r18167) -Change: make the graph legend, cargo payment graph and company league windows RTL aware 15 years ago
peter1138 d2358c5ea6 (svn r18160) -Codechange: The hyphen character may not line up in all fonts, so draw
the Y-axis ticks manually.
15 years ago
peter1138 b07c99a0fd (svn r18159) -Codechange: Rework graphs to scale to the widget they are in, instead of using absolute pixel placement. X-axis labels still need work for large fonts. 15 years ago
peter1138 61fa8d4fca (svn r18153) -Codechange: Correct height for 'key' button on graph windows. 15 years ago
rubidium 5f2ddfbc5a (svn r18152) -Codechange: remove the 'minimum window size' from the WindowDesc; it's determined from the (nested) widgets 15 years ago
peter1138 9e49386d9d (svn r18139) -Codechange: Scale company league table for font height. 15 years ago
rubidium 3d2d7af88f (svn r18086) -Codechange: remove 'widget' from WindowDesc 15 years ago
rubidium 16c2e53191 (svn r18078) -Codechange: remove some duplicate (non translatable) strings 15 years ago
rubidium d79439fb3c (svn r17963) -Codechange: some documentation style 15 years ago
rubidium 56611d13db (svn r17955) -Codechange: s/SPR_PLAYER_ICON/SPR_COMPANY_ICON/ 15 years ago
rubidium 38687193fe (svn r17866) -Codechange: make the remaining graph windows nested 15 years ago
frosch ebd916be3d (svn r17532) -Codechange: Rename several Invalidate functions to SetDirty for more consistency and distinguishability. 15 years ago
rubidium 472ed0dc76 (svn r17473) -Codechange: use the post destructor for destroying companies too instead of complicating the graph GUI invalidate code. 15 years ago
smatz 0bfea0646c (svn r17420) -Codechange: replace assert() by assert_compile() where possible 15 years ago
rubidium dcf3719ca1 (svn r17404) -Change (r17379): silence gcc warning caused by inlining of a virtual function 15 years ago
rubidium b294497f2a (svn r17400) -Fix [FS#3172] (r17380): total line of performance rating was calculated wrong 15 years ago
rubidium d8b782365b (svn r17380) -Codechange: move drawing the performance detail data to DrawWidget 15 years ago
rubidium efff517449 (svn r17379) -Codechange: make the performance rating window nested, although it still needs some improvements 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
alberth 153cfa8c70 (svn r17126) -Fix [FS#3096]: Initialize graph data from the constructor of the derived class. 15 years ago
rubidium 1fe3ad3288 (svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives 15 years ago
belugas a2b996106e (svn r17058) -Codechange: magic numbers removal.
Two values used intead of just one, as it gives more possibilities to those who dare...
15 years ago
rubidium b6cfe4d2fe (svn r17053) -Codechange: pass a Rect to DrawGraph so it knows where to draw 15 years ago
rubidium 37d4277271 (svn r17052) -Codechange: move state changes out of OnPaint for the graph windows 15 years ago
rubidium 8589fb27a0 (svn r17051) -Codechange: make the graph legend window use nested widgets 15 years ago
rubidium 2675eb4619 (svn r17041) -Fix [FS#3083] (r14735): graphical glitch with graph key 15 years ago
smatz 77d13eae61 (svn r16852) -Codechange: use FOR_ALL_CARGOSPECS for iterating over all valid CargoSpecs 15 years ago
smatz 1f29e38b83 (svn r16849) -Codechange: replace GetCargo() by CargoSpec::Get() 15 years ago
alberth 92206f2d18 (svn r16837) -Codechange: Collect largest used index while constructing nested widget tree. 15 years ago
alberth 743f12fad0 (svn r16488) -Codechange [FS#2941]: Use widget numbers of base grap window and cargo payment window in the window handling code (erikjanp) 15 years ago
smatz 8808f3beea (svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get() 15 years ago
smatz 871107f529 (svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index) 15 years ago
smatz 6221d74644 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) 15 years ago
rubidium 2664f2a2d9 (svn r16242) -Codechange: rework pausing
-Fix [FS#2864]: autopause and manual pausing conflict with eachother
-Fix: new game + pause on new game + autopause make the game not unpause on the first join
15 years ago
rubidium 53887e07bb (svn r16160) -Codechange: remove the need for explicit TC_FROMSTRING for DrawString. 15 years ago