Skip to content
Snippets Groups Projects
Commit f6f7fa5b authored by Vincent Texier's avatar Vincent Texier
Browse files

[fix] use t values in display of monetary mass and mass_per_member

Was using t (last ud block) for t-1 values. Fixed.
parent 4b4fa1ab
No related branches found
No related tags found
1 merge request!7750.50.0
...@@ -100,7 +100,7 @@ class ToolbarModel(QObject): ...@@ -100,7 +100,7 @@ class ToolbarModel(QObject):
localized_data[ localized_data[
"members_count" "members_count"
] = self.blockchain_service.current_members_count() ] = self.blockchain_service.last_members_count()
computed_dividend = self.blockchain_service.computed_dividend() computed_dividend = self.blockchain_service.computed_dividend()
# display float values # display float values
...@@ -109,7 +109,7 @@ class ToolbarModel(QObject): ...@@ -109,7 +109,7 @@ class ToolbarModel(QObject):
).diff_localized(False, True) ).diff_localized(False, True)
localized_data["mass"] = self.app.current_ref.instance( localized_data["mass"] = self.app.current_ref.instance(
self.blockchain_service.current_mass(), self.app.currency, self.app self.blockchain_service.last_monetary_mass(), self.app.currency, self.app
).localized(False, True) ).localized(False, True)
ud_median_time = self.blockchain_service.last_ud_time() ud_median_time = self.blockchain_service.last_ud_time()
...@@ -145,22 +145,19 @@ class ToolbarModel(QObject): ...@@ -145,22 +145,19 @@ class ToolbarModel(QObject):
) )
if last_ud: if last_ud:
mass_minus_1_per_member = ( mass_per_member = (
float(0) float(0)
if last_ud == 0 or last_members_count == 0 if last_ud == 0 or last_members_count == 0
else last_mass / last_members_count else last_mass / last_members_count
) )
localized_data["members_count_minus_1"] = last_members_count localized_data["members_count"] = last_members_count
localized_data[ localized_data[
"mass_minus_1_per_member" "mass_per_member"
] = self.app.current_ref.instance( ] = self.app.current_ref.instance(
mass_minus_1_per_member, self.app.currency, self.app mass_per_member, self.app.currency, self.app
).localized( ).localized(
False, True False, True
) )
localized_data["mass_minus_1"] = self.app.current_ref.instance(
last_mass, self.app.currency, self.app
).localized(False, True)
# avoid divide by zero ! # avoid divide by zero !
if last_members_count == 0: if last_members_count == 0:
localized_data["actual_growth"] = float(0) localized_data["actual_growth"] = float(0)
......
...@@ -209,12 +209,12 @@ class ToolbarView(QFrame, Ui_SakiaToolbar): ...@@ -209,12 +209,12 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
self.tr("Universal Dividend UD(t) in"), self.tr("Universal Dividend UD(t) in"),
localized_data["diff_units"], localized_data["diff_units"],
localized_data.get("mass", "###"), localized_data.get("mass", "###"),
self.tr("Monetary Mass M in"), self.tr("Monetary Mass M(t) in"),
localized_data["units"], localized_data["units"],
localized_data.get("members_count", "####"), localized_data.get("members_count", "####"),
self.tr("Members N"), self.tr("Members N(t)"),
localized_data.get("mass_minus_1_per_member", "####"), localized_data.get("mass_per_member", "####"),
self.tr("Monetary Mass per member M(t-1)/N(t-1) in"), self.tr("Monetary Mass per member M(t)/N(t) in"),
localized_data["diff_units"], localized_data["diff_units"],
localized_data.get("actual_growth", 0), localized_data.get("actual_growth", 0),
localized_data.get("days_per_dividend", "####"), localized_data.get("days_per_dividend", "####"),
...@@ -249,14 +249,14 @@ class ToolbarView(QFrame, Ui_SakiaToolbar): ...@@ -249,14 +249,14 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
localized_data["growth"], localized_data["days_per_dividend"] localized_data["growth"], localized_data["days_per_dividend"]
), ),
self.tr("Fundamental growth (c) / Delta time (dt)"), self.tr("Fundamental growth (c) / Delta time (dt)"),
self.tr("UDĞ(t) = UDĞ(t-1) + c²*M(t-1)/N(t-1)"), self.tr("UDĞ(t) = UDĞ(t-1) + c²*M(t)/N(t)"),
self.tr("Universal Dividend (formula)"), self.tr("Universal Dividend (formula)"),
self.tr("{:} = {:} + {:2.2%}² * {:} / {:}").format( self.tr("{:} = {:} + {:2.2%}² * {:} / {:}").format(
localized_data.get("ud_plus_1", "####"), localized_data.get("ud_plus_1", "####"),
localized_data.get("ud", "####"), localized_data.get("ud", "####"),
localized_data.get("growth", "####"), localized_data.get("growth", "####"),
localized_data.get("mass_minus_1", "####"), localized_data.get("mass", "####"),
localized_data.get("members_count_minus_1", "####"), localized_data.get("members_count", "####"),
), ),
self.tr("Universal Dividend (computed)"), self.tr("Universal Dividend (computed)"),
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment