From 4a05ab65a45e809001d0ef14ea3314abdfe7381f Mon Sep 17 00:00:00 2001
From: Vincent Texier <vit@free.fr>
Date: Tue, 9 Jun 2015 21:29:51 +0200
Subject: [PATCH] fix rules formula in informations tab
---
src/cutecoin/gui/informations_tab.py | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/cutecoin/gui/informations_tab.py b/src/cutecoin/gui/informations_tab.py
index 990bcc0f..26d9bfe5 100644
--- a/src/cutecoin/gui/informations_tab.py
+++ b/src/cutecoin/gui/informations_tab.py
@@ -52,20 +52,27 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
if isinstance(ud, int):
# use the float type of 64bits, to avoid display a 32bit signed integer...
localized_ud = QLocale().toString(float(ud), 'f', 0)
- localized_monetary_mass = QLocale().toString(
+ localized_monetary_mass_minus_1 = QLocale().toString(
float(self.get_referential_value(block_t_minus_1['monetaryMass'])), 'f', 0
)
- localized_mass_per_member = QLocale().toString(
+ localized_mass_minus_1_per_member = QLocale().toString(
float(self.get_referential_value(block_t_minus_1['monetaryMass'] / block['membersCount'])), 'f', 0
)
+ localized_monetary_mass = QLocale().toString(
+ float(self.get_referential_value(block['monetaryMass'])), 'f', 0
+ )
+
else:
localized_ud = QLocale().toString(ud, 'f', 6)
- localized_monetary_mass = QLocale().toString(
+ localized_monetary_mass_minus_1 = QLocale().toString(
round(self.get_referential_value(block_t_minus_1['monetaryMass'])), 'f', 6
)
- localized_mass_per_member = QLocale().toString(
+ localized_mass_minus_1_per_member = QLocale().toString(
round(self.get_referential_value(block_t_minus_1['monetaryMass'] / block['membersCount']), 'f', 6)
)
+ localized_monetary_mass = QLocale().toString(
+ round(self.get_referential_value(block['monetaryMass'])), 'f', 6
+ )
# set infos in label
self.label_general.setText(
@@ -82,12 +89,12 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
localized_ud,
self.tr('Universal Dividend UD(t) in'),
self.get_referential_name(),
- localized_monetary_mass,
+ localized_monetary_mass_minus_1,
self.tr('Monetary Mass M(t-1) in'),
self.get_referential_name(),
block['membersCount'],
self.tr('Members N(t)'),
- localized_mass_per_member,
+ localized_mass_minus_1_per_member,
self.tr('Monetary Mass per member M(t-1)/N(t) in'),
self.get_referential_name(),
block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']),
@@ -139,7 +146,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
""").format(
self.tr('{:2.0%} / {:} days').format(params['c'], params['dt'] / 86400),
self.tr('Fundamental growth (c) / Delta time (dt)'),
- self.tr('UD(t+1) = MAX { UD(t) ; c * M(t-1) / N(t) }'),
+ self.tr('UD(t+1) = MAX { UD(t) ; c * M(t) / N(t+1) }'),
self.tr('Universal Dividend (formula)'),
self.tr('{:} = MAX {{ {:} {:} ; {:2.0%} * {:} {:} / {:} }}').format(
localized_ud_t1,
--
GitLab