diff --git a/src/sakia/gui/main_window/toolbar/model.py b/src/sakia/gui/main_window/toolbar/model.py index 254c74bfa20b7438bcadf262eea0ea95a41c1699..f09eac5d575de9833e19f9ece82d48e839932161 100644 --- a/src/sakia/gui/main_window/toolbar/model.py +++ b/src/sakia/gui/main_window/toolbar/model.py @@ -76,6 +76,9 @@ class ToolbarModel(QObject): localized_data["currency"] = ROOT_SERVERS[self.app.currency]["display"] localized_data["growth"] = params.c + localized_data["growth_per_dt"] = QLocale().toString( + params.c / (params.dt_reeval / params.dt), "f", 8 + ) localized_data["dt_reeval_in_days"] = QLocale().toString( params.dt_reeval / 86400, "f", 2 ) diff --git a/src/sakia/gui/main_window/toolbar/view.py b/src/sakia/gui/main_window/toolbar/view.py index dfc7db2621683db0c2b31287f506264fc76cae39..0ed0d1ea195706152cc49c7ce2c8ec931be2ef2d 100644 --- a/src/sakia/gui/main_window/toolbar/view.py +++ b/src/sakia/gui/main_window/toolbar/view.py @@ -251,10 +251,10 @@ class ToolbarView(QFrame, Ui_SakiaToolbar): self.tr("Fundamental growth (c) / Reevaluation delta time (dt_reeval)"), self.tr("UDĞ(t) = UDĞ(t-1) + c²*M(t)/N(t)"), self.tr("Universal Dividend (formula)"), - self.tr("{:} = {:} + {:2.2%}² * {:} / {:}").format( + self.tr("{:} = {:} + {:}² * {:} / {:}").format( localized_data.get("ud_plus_1", "####"), localized_data.get("ud", "####"), - localized_data.get("growth", "####"), + localized_data.get("growth_per_dt", "##########"), localized_data.get("mass", "####"), localized_data.get("members_count", "####"), ), diff --git a/src/sakia/services/blockchain.py b/src/sakia/services/blockchain.py index 99d322a9dcd6db770b9186a50e436eb4ecee2fb6..6647a4a77d83302288bcae0fc0d88975edd3b825 100644 --- a/src/sakia/services/blockchain.py +++ b/src/sakia/services/blockchain.py @@ -175,8 +175,7 @@ class BlockchainService(QObject): last_ud = self.last_ud()[0] * 10 ** self.last_ud()[1] next_ud = ( last_ud - + parameters.c - * parameters.c + + pow(parameters.c / (parameters.dt_reeval / parameters.dt), 2) * self.previous_monetary_mass() / self.last_members_count() )