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

fix rules formula in informations tab

parent e396af4b
No related branches found
No related tags found
No related merge requests found
...@@ -52,20 +52,27 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -52,20 +52,27 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
if isinstance(ud, int): if isinstance(ud, int):
# use the float type of 64bits, to avoid display a 32bit signed integer... # use the float type of 64bits, to avoid display a 32bit signed integer...
localized_ud = QLocale().toString(float(ud), 'f', 0) 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 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 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: else:
localized_ud = QLocale().toString(ud, 'f', 6) 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 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) 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 # set infos in label
self.label_general.setText( self.label_general.setText(
...@@ -82,12 +89,12 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -82,12 +89,12 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
localized_ud, localized_ud,
self.tr('Universal Dividend UD(t) in'), self.tr('Universal Dividend UD(t) in'),
self.get_referential_name(), self.get_referential_name(),
localized_monetary_mass, localized_monetary_mass_minus_1,
self.tr('Monetary Mass M(t-1) in'), self.tr('Monetary Mass M(t-1) in'),
self.get_referential_name(), self.get_referential_name(),
block['membersCount'], block['membersCount'],
self.tr('Members N(t)'), 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.tr('Monetary Mass per member M(t-1)/N(t) in'),
self.get_referential_name(), self.get_referential_name(),
block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']), block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']),
...@@ -139,7 +146,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -139,7 +146,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
""").format( """).format(
self.tr('{:2.0%} / {:} days').format(params['c'], params['dt'] / 86400), self.tr('{:2.0%} / {:} days').format(params['c'], params['dt'] / 86400),
self.tr('Fundamental growth (c) / Delta time (dt)'), 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('Universal Dividend (formula)'),
self.tr('{:} = MAX {{ {:} {:} ; {:2.0%} * {:} {:} / {:} }}').format( self.tr('{:} = MAX {{ {:} {:} ; {:2.0%} * {:} {:} / {:} }}').format(
localized_ud_t1, localized_ud_t1,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment