diff --git a/src/economy.cpp b/src/economy.cpp index 03ed9a9053..77862c5fb5 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1070,6 +1070,7 @@ static uint DeliverGoodsToIndustry(const Station *st, CargoType cargo_type, uint uint amount = std::min(num_pieces, 0xFFFFu - it->waiting); it->waiting += amount; + it->history[THIS_MONTH].accepted += amount; it->last_accepted = TimerGameEconomy::date; num_pieces -= amount; accepted += amount; diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 70b1ce92bd..324b2dbfdb 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -8,6 +8,7 @@ /** @file graph_gui.cpp GUI that shows performance graphs. */ #include "stdafx.h" +#include "misc/history_func.hpp" #include "graph_gui.h" #include "window_gui.h" #include "company_base.h" @@ -181,8 +182,9 @@ protected: static const int MIN_GRAPH_NUM_LINES_Y = 9; ///< Minimal number of horizontal lines to draw. static const int MIN_GRID_PIXEL_SIZE = 20; ///< Minimum distance between graph lines. - uint64_t excluded_data = 0; ///< bitmask of the datasets that shouldn't be displayed. - uint64_t excluded_range = 0; ///< bitmask of ranges that should not be displayed. + uint64_t excluded_data = 0; ///< bitmask of datasets hidden by the player. + uint64_t excluded_range = 0; ///< bitmask of ranges hidden by the player. + uint64_t masked_range = 0; ///< bitmask of ranges that are not available for the current data. uint8_t num_on_x_axis = 0; uint8_t num_vert_lines = GRAPH_NUM_MONTHS; @@ -215,6 +217,14 @@ protected: uint8_t highlight_range = UINT8_MAX; ///< Data range that should be highlighted, or UINT8_MAX for none. bool highlight_state = false; ///< Current state of highlight, toggled every TIMER_BLINK_INTERVAL period. + template + struct Filler { + DataSet &dataset; ///< Dataset to fill. + const Tprojection &proj; ///< Projection to apply. + + inline void Fill(uint i, const auto &data) const { this->dataset.values[i] = std::invoke(this->proj, data); } + }; + /** * Get appropriate part of dataset values for the current number of horizontal points. * @param dataset Dataset to get values of @@ -663,13 +673,17 @@ public: uint index = 0; Rect line = r.WithHeight(line_height); for (const auto &str : this->ranges) { - bool lowered = !HasBit(this->excluded_range, index); + bool lowered = !HasBit(this->excluded_range, index) && !HasBit(this->masked_range, index); /* Redraw frame if lowered */ if (lowered) DrawFrameRect(line, COLOUR_BROWN, FrameFlag::Lowered); const Rect text = line.Shrink(WidgetDimensions::scaled.framerect); - DrawString(text, str, TC_BLACK, SA_CENTER, false, FS_SMALL); + DrawString(text, str, (this->highlight_state && this->highlight_range == index) ? TC_WHITE : TC_BLACK, SA_CENTER, false, FS_SMALL); + + if (HasBit(this->masked_range, index)) { + GfxFillRect(line.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(COLOUR_BROWN, SHADE_DARKER), FILLRECT_CHECKER); + } line = line.Translate(0, line_height); ++index; @@ -692,6 +706,7 @@ public: case WID_GRAPH_RANGE_MATRIX: { int row = GetRowFromWidget(pt.y, widget, 0, GetCharacterHeight(FS_SMALL) + WidgetDimensions::scaled.framerect.Vertical()); + if (HasBit(this->masked_range, row)) break; ToggleBit(this->excluded_range, row); this->SetDirty(); break; @@ -1103,6 +1118,7 @@ struct BaseCargoGraphWindow : BaseGraphWindow { { this->CreateNestedTree(); + this->excluded_range = this->masked_range; this->cargo_types = this->GetCargoTypes(number); this->vscroll = this->GetScrollbar(WID_GRAPH_MATRIX_SCROLLBAR); @@ -1596,7 +1612,9 @@ CompanyID PerformanceRatingDetailWindow::company = CompanyID::Invalid(); struct IndustryProductionGraphWindow : BaseCargoGraphWindow { static inline constexpr StringID RANGE_LABELS[] = { STR_GRAPH_INDUSTRY_RANGE_PRODUCED, - STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED + STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED, + STR_GRAPH_INDUSTRY_RANGE_DELIVERED, + STR_GRAPH_INDUSTRY_RANGE_WAITING, }; static inline CargoTypes excluded_cargo_types{}; @@ -1611,6 +1629,10 @@ struct IndustryProductionGraphWindow : BaseCargoGraphWindow { this->draw_dates = !TimerGameEconomy::UsingWallclockUnits(); this->ranges = RANGE_LABELS; + const Industry *i = Industry::Get(window_number); + if (!i->IsCargoProduced()) this->masked_range = (1U << 0) | (1U << 1); + if (!i->IsCargoAccepted()) this->masked_range = (1U << 2) | (1U << 3); + this->InitializeWindow(window_number, STR_GRAPH_LAST_24_MINUTES_TIME_LABEL); } @@ -1618,6 +1640,9 @@ struct IndustryProductionGraphWindow : BaseCargoGraphWindow { { CargoTypes cargo_types{}; const Industry *i = Industry::Get(window_number); + for (const auto &a : i->accepted) { + if (IsValidCargoType(a.cargo)) SetBit(cargo_types, a.cargo); + } for (const auto &p : i->produced) { if (IsValidCargoType(p.cargo)) SetBit(cargo_types, p.cargo); } @@ -1631,7 +1656,7 @@ struct IndustryProductionGraphWindow : BaseCargoGraphWindow { std::string GetWidgetString(WidgetID widget, StringID stringid) const override { - if (widget == WID_GRAPH_CAPTION) return GetString(STR_GRAPH_INDUSTRY_PRODUCTION_CAPTION, this->window_number); + if (widget == WID_GRAPH_CAPTION) return GetString(STR_GRAPH_INDUSTRY_CAPTION, this->window_number); return this->Window::GetWidgetString(widget, stringid); } @@ -1661,24 +1686,41 @@ struct IndustryProductionGraphWindow : BaseCargoGraphWindow { if (!IsValidCargoType(p.cargo)) continue; const CargoSpec *cs = CargoSpec::Get(p.cargo); + this->data.reserve(this->data.size() + 2); + DataSet &produced = this->data.emplace_back(); produced.colour = cs->legend_colour; produced.exclude_bit = cs->Index(); produced.range_bit = 0; - for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) { - produced.values[j] = p.history[GRAPH_NUM_MONTHS - j].production; - } - DataSet &transported = this->data.emplace_back(); transported.colour = cs->legend_colour; transported.exclude_bit = cs->Index(); transported.range_bit = 1; transported.dash = 2; - for (uint j = 0; j < GRAPH_NUM_MONTHS; j++) { - transported.values[j] = p.history[GRAPH_NUM_MONTHS - j].transported; - } + FillFromHistory(p.history, Filler{produced, &Industry::ProducedHistory::production}, Filler{transported, &Industry::ProducedHistory::transported}); + } + + for (const auto &a : i->accepted) { + if (!IsValidCargoType(a.cargo)) continue; + const CargoSpec *cs = CargoSpec::Get(a.cargo); + + this->data.reserve(this->data.size() + 2); + + DataSet &accepted = this->data.emplace_back(); + accepted.colour = cs->legend_colour; + accepted.exclude_bit = cs->Index(); + accepted.range_bit = 2; + accepted.dash = 1; + + DataSet &waiting = this->data.emplace_back(); + waiting.colour = cs->legend_colour; + waiting.exclude_bit = cs->Index(); + waiting.range_bit = 3; + waiting.dash = 4; + + FillFromHistory(a.history, Filler{accepted, &Industry::AcceptedHistory::accepted}, Filler{waiting, &Industry::AcceptedHistory::waiting}); } this->SetDirty(); diff --git a/src/industry.h b/src/industry.h index 50e669ce4d..ca0159e275 100644 --- a/src/industry.h +++ b/src/industry.h @@ -11,6 +11,7 @@ #define INDUSTRY_H #include "core/flatset_type.hpp" +#include "misc/history_type.hpp" #include "newgrf_storage.h" #include "subsidy_type.h" #include "industry_map.h" @@ -55,9 +56,6 @@ enum class IndustryControlFlag : uint8_t { }; using IndustryControlFlags = EnumBitSet; -static const int THIS_MONTH = 0; -static const int LAST_MONTH = 1; - /** * Defines the internal data of a functional industry. */ @@ -72,18 +70,24 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> { return ClampTo(this->transported * 256 / this->production); } }; - struct ProducedCargo { CargoType cargo = 0; ///< Cargo type uint16_t waiting = 0; ///< Amount of cargo produced uint8_t rate = 0; ///< Production rate - std::array history{}; ///< History of cargo produced and transported for this month and 24 previous months + HistoryData history{}; ///< History of cargo produced and transported for this month and 24 previous months + }; + + struct AcceptedHistory { + uint16_t accepted = 0; /// Total accepted. + uint16_t waiting = 0; /// Average waiting. }; struct AcceptedCargo { CargoType cargo = 0; ///< Cargo type uint16_t waiting = 0; ///< Amount of cargo waiting to processed + uint32_t accumulated_waiting = 0; ///< Accumulated waiting total over the last month, used to calculate average. TimerGameEconomy::Date last_accepted{}; ///< Last day cargo was accepted by this industry + HistoryData history{}; ///< History of accepted and waiting cargo. }; using ProducedCargoes = std::vector; @@ -153,7 +157,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> { */ inline const AcceptedCargo &GetAccepted(size_t slot) const { - static const AcceptedCargo empty{INVALID_CARGO, 0, {}}; + static const AcceptedCargo empty{INVALID_CARGO, 0, 0, {}, {}}; return slot < this->accepted.size() ? this->accepted[slot] : empty; } diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 617bb91847..cdfb4eb8f5 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -8,6 +8,8 @@ /** @file industry_cmd.cpp Handling of industry tiles. */ #include "stdafx.h" +#include "misc/history_type.hpp" +#include "misc/history_func.hpp" #include "clear_map.h" #include "industry.h" #include "station_base.h" @@ -1243,6 +1245,10 @@ void OnTick_Industry() for (Industry *i : Industry::Iterate()) { ProduceIndustryGoods(i); + + if ((TimerGameTick::counter + i->index) % Ticks::DAY_TICKS == 0) { + for (auto &a : i->accepted) a.accumulated_waiting += a.waiting; + } } } @@ -2497,11 +2503,15 @@ static void UpdateIndustryStatistics(Industry *i) if (p.history[THIS_MONTH].production != 0) i->last_prod_year = TimerGameEconomy::year; /* Move history from this month to last month. */ - std::rotate(std::rbegin(p.history), std::rbegin(p.history) + 1, std::rend(p.history)); - p.history[THIS_MONTH].production = 0; - p.history[THIS_MONTH].transported = 0; + RotateHistory(p.history); } } + + for (auto &a : i->accepted) { + if (!IsValidCargoType(a.cargo)) continue; + a.history[THIS_MONTH].waiting = GetAndResetAccumulatedAverage(a.accumulated_waiting); + RotateHistory(a.history); + } } /** diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 6119c486dd..c8cc21f83e 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -845,7 +845,7 @@ public: nvp->InitializeViewport(this, Industry::Get(window_number)->location.GetCenterTile(), ScaleZoomGUI(ZoomLevel::Industry)); const Industry *i = Industry::Get(window_number); - if (!i->IsCargoProduced()) this->DisableWidget(WID_IV_GRAPH); + if (!i->IsCargoProduced() && !i->IsCargoAccepted()) this->DisableWidget(WID_IV_GRAPH); this->InvalidateData(); } @@ -1242,7 +1242,7 @@ static constexpr NWidgetPart _nested_industry_view_widgets[] = { EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_DISPLAY), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_INDUSTRY_DISPLAY_CHAIN, STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_GRAPH), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_INDUSTRY_VIEW_PRODUCTION_GRAPH, STR_INDUSTRY_VIEW_PRODUCTION_GRAPH_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_GRAPH), SetFill(1, 0), SetResize(1, 0), SetStringTip(STR_INDUSTRY_VIEW_CARGO_GRAPH, STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP), NWidget(WWT_RESIZEBOX, COLOUR_CREAM), EndContainer(), }; diff --git a/src/lang/english.txt b/src/lang/english.txt index 2fd8d027b9..8138510853 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -633,9 +633,11 @@ STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Display STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph of this cargo type STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING} -STR_GRAPH_INDUSTRY_PRODUCTION_CAPTION :{WHITE}{INDUSTRY} - Production History +STR_GRAPH_INDUSTRY_CAPTION :{WHITE}{INDUSTRY} - Cargo History STR_GRAPH_INDUSTRY_RANGE_PRODUCED :Produced STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED :Transported +STR_GRAPH_INDUSTRY_RANGE_DELIVERED :Delivered +STR_GRAPH_INDUSTRY_RANGE_WAITING :Waiting STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Show detailed performance ratings @@ -4015,8 +4017,8 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Producti STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE :{BLACK}Production last minute: STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{RAW_STRING}{BLACK} ({COMMA}% transported) STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Centre the main view on industry location. Ctrl+Click to open a new viewport on industry location -STR_INDUSTRY_VIEW_PRODUCTION_GRAPH :{BLACK}Production Graph -STR_INDUSTRY_VIEW_PRODUCTION_GRAPH_TOOLTIP :{BLACK}Shows the graph of industry production history +STR_INDUSTRY_VIEW_CARGO_GRAPH :{BLACK}Cargo Graph +STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP :{BLACK}Shows the graph of industry cargo history STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Production level: {YELLOW}{COMMA}% STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}The industry has announced imminent closure! diff --git a/src/misc/CMakeLists.txt b/src/misc/CMakeLists.txt index f6df9b38eb..d26249165c 100644 --- a/src/misc/CMakeLists.txt +++ b/src/misc/CMakeLists.txt @@ -8,5 +8,7 @@ add_files( getoptdata.cpp getoptdata.h hashtable.hpp + history_func.hpp + history_type.hpp lrucache.hpp ) diff --git a/src/misc/history_func.hpp b/src/misc/history_func.hpp new file mode 100644 index 0000000000..fd16f236e0 --- /dev/null +++ b/src/misc/history_func.hpp @@ -0,0 +1,57 @@ +/* + * This file is part of OpenTTD. + * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. + * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . + */ + +/** @file history_func.hpp Functions for storing historical data. */ + +#ifndef HISTORY_FUNC_HPP +#define HISTORY_FUNC_HPP + +#include "../core/math_func.hpp" + +#include "../timer/timer_game_economy.h" +#include "history_type.hpp" + +/** + * Rotate history. + * @tparam T type of history data element. + * @param history Historical data to rotate. + */ +template +void RotateHistory(HistoryData &history) +{ + std::rotate(std::rbegin(history), std::rbegin(history) + 1, std::rend(history)); + history[THIS_MONTH] = {}; +} + +/** + * Get an average value for the previous month, as reset for the next month. + * @param total Accrued total to average. Will be reset to zero. + * @return Average value for the month. + */ +template +T GetAndResetAccumulatedAverage(Taccrued &total) +{ + T result = ClampTo(total / std::max(1U, TimerGameEconomy::days_since_last_month)); + total = 0; + return result; +} + +/** + * Fill some data with historical data. + * @param history Historical data to fill from. + * @param fillers Fillers to fill with history data. + */ +template +void FillFromHistory(const HistoryData &history, Tfillers... fillers) +{ + for (uint i = 0; i != N; ++i) { + auto &data = history[N - i]; + (fillers.Fill(i, data), ...); + } +} + +#endif /* HISTORY_FUNC_HPP */ diff --git a/src/misc/history_type.hpp b/src/misc/history_type.hpp new file mode 100644 index 0000000000..5036ca3b40 --- /dev/null +++ b/src/misc/history_type.hpp @@ -0,0 +1,25 @@ +/* + * This file is part of OpenTTD. + * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. + * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . + */ + +/** @file history_type.hpp Types for storing historical data. */ + +#ifndef HISTORY_TYPE_HPP +#define HISTORY_TYPE_HPP + +static constexpr uint8_t HISTORY_RECORDS = 25; + +static constexpr uint8_t THIS_MONTH = 0; +static constexpr uint8_t LAST_MONTH = 1; + +/** + * Container type for storing history data. + * @tparam T type of history data. + */ +template +using HistoryData = std::array; + +#endif /* HISTORY_TYPE_HPP */ diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp index 750a729136..eaa776710f 100644 --- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -19,12 +19,48 @@ static OldPersistentStorage _old_ind_persistent_storage; +class SlIndustryAcceptedHistory : public DefaultSaveLoadHandler { +public: + static inline const SaveLoad description[] = { + SLE_VAR(Industry::AcceptedHistory, accepted, SLE_UINT16), + SLE_VAR(Industry::AcceptedHistory, waiting, SLE_UINT16), + }; + static inline const SaveLoadCompatTable compat_description = _industry_produced_history_sl_compat; + + void Save(Industry::AcceptedCargo *a) const override + { + if (!IsValidCargoType(a->cargo)) { + /* Don't save any history if cargo slot isn't used. */ + SlSetStructListLength(0); + return; + } + + SlSetStructListLength(a->history.size()); + + for (auto &h : a->history) { + SlObject(&h, this->GetDescription()); + } + } + + void Load(Industry::AcceptedCargo *a) const override + { + size_t len = SlGetStructListLength(a->history.size()); + + for (auto &h : a->history) { + if (--len > a->history.size()) break; // unsigned so wraps after hitting zero. + SlObject(&h, this->GetDescription()); + } + } +}; + class SlIndustryAccepted : public VectorSaveLoadHandler { public: static inline const SaveLoad description[] = { SLE_VAR(Industry::AcceptedCargo, cargo, SLE_UINT8), SLE_VAR(Industry::AcceptedCargo, waiting, SLE_UINT16), SLE_VAR(Industry::AcceptedCargo, last_accepted, SLE_INT32), + SLE_CONDVAR(Industry::AcceptedCargo, accumulated_waiting, SLE_UINT32, SLV_INDUSTRY_ACCEPTED_HISTORY, SL_MAX_VERSION), + SLEG_CONDSTRUCTLIST("history", SlIndustryAcceptedHistory, SLV_INDUSTRY_ACCEPTED_HISTORY, SL_MAX_VERSION), }; static inline const SaveLoadCompatTable compat_description = _industry_accepts_sl_compat; diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 7ab7c06742..44d1462555 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -404,6 +404,7 @@ enum SaveLoadVersion : uint16_t { SLV_ORDERS_OWNED_BY_ORDERLIST, ///< 354 PR#13948 Orders stored in OrderList, pool removed. SLV_FACE_STYLES, ///< 355 PR#14319 Addition of face styles, replacing gender and ethnicity. + SLV_INDUSTRY_ACCEPTED_HISTORY, ///< 356 PR#14321 Add per-industry history of cargo delivered and waiting. SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/timer/timer_game_economy.cpp b/src/timer/timer_game_economy.cpp index 8ac08a1ba2..607c2ae856 100644 --- a/src/timer/timer_game_economy.cpp +++ b/src/timer/timer_game_economy.cpp @@ -37,6 +37,7 @@ TimerGameEconomy::Year TimerGameEconomy::year = {}; TimerGameEconomy::Month TimerGameEconomy::month = {}; TimerGameEconomy::Date TimerGameEconomy::date = {}; TimerGameEconomy::DateFract TimerGameEconomy::date_fract = {}; +uint TimerGameEconomy::days_since_last_month = {}; /** * Converts a Date to a Year, Month & Day. @@ -133,6 +134,7 @@ bool TimerManager::Elapsed([[maybe_unused]] TimerGameEconomy:: /* increase day counter */ TimerGameEconomy::date++; + ++TimerGameEconomy::days_since_last_month; TimerGameEconomy::YearMonthDay ymd = TimerGameEconomy::ConvertDateToYMD(TimerGameEconomy::date); @@ -177,6 +179,8 @@ bool TimerManager::Elapsed([[maybe_unused]] TimerGameEconomy:: } } + if (new_month) TimerGameEconomy::days_since_last_month = 0; + /* check if we reached the maximum year, decrement dates by a year */ if (TimerGameEconomy::year == EconomyTime::MAX_YEAR + 1) { TimerGameEconomy::year--; diff --git a/src/timer/timer_game_economy.h b/src/timer/timer_game_economy.h index 81df5ff179..9c51086e9e 100644 --- a/src/timer/timer_game_economy.h +++ b/src/timer/timer_game_economy.h @@ -37,6 +37,8 @@ public: static Date date; ///< Current date in days (day counter). static DateFract date_fract; ///< Fractional part of the day. + static uint days_since_last_month; ///< Number of days that have elapsed since the last month. + static YearMonthDay ConvertDateToYMD(Date date); static Date ConvertYMDToDate(Year year, Month month, Day day); static void SetDate(Date date, DateFract fract);