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

Fix bug in informations_tab if no UD block exists

parent 11ea368d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
res/ui/informations_tab.ui
+ 10
− 10
View file @ 7864c117
...@@ -72,15 +72,15 @@ QGroupBox::title { ...@@ -72,15 +72,15 @@ QGroupBox::title {
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="group_money"> <widget class="QGroupBox" name="group_rules">
<property name="title"> <property name="title">
<string>Money</string> <string>Rules</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item> <item>
<widget class="QLabel" name="label_money"> <widget class="QLabel" name="label_rules">
<property name="text"> <property name="text">
<string>label_money</string> <string>label_rules</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
...@@ -91,15 +91,15 @@ QGroupBox::title { ...@@ -91,15 +91,15 @@ QGroupBox::title {
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="group_rules"> <widget class="QGroupBox" name="group_money">
<property name="title"> <property name="title">
<string>Rules</string> <string>Money</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QLabel" name="label_rules"> <widget class="QLabel" name="label_money">
<property name="text"> <property name="text">
<string>label_rules</string> <string>label_money</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
......
src/cutecoin/gui/informations_tab.py
+ 63
− 55
View file @ 7864c117
...@@ -47,36 +47,70 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -47,36 +47,70 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
logging.debug('community get_ud_block error : ' + str(e)) logging.debug('community get_ud_block error : ' + str(e))
return False return False
# set infos in label block = False
self.label_general.setText(
""" if block:
<table cellpadding="5"> # set infos in label
<tr><td align="right"><b>{:}</b></div></td><td>{:} {:}</td></tr> self.label_general.setText(
<tr><td align="right"><b>{:}</b></td><td>{:} {:}</td></tr> """
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> <table cellpadding="5">
<tr><td align="right"><b>{:}</b></td><td>{:} {:}</td></tr> <tr><td align="right"><b>{:}</b></div></td><td>{:} {:}</td></tr>
<tr><td align="right"><b>{:2.2%} / {:} days</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:}</b></td><td>{:} {:}</td></tr>
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr> <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
</table> <tr><td align="right"><b>{:}</b></td><td>{:} {:}</td></tr>
""".format( <tr><td align="right"><b>{:2.2%} / {:} days</b></td><td>{:}</td></tr>
round(self.get_referential_diff_value(block['dividend'])), <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
'Universal Dividend UD(t) in', </table>
self.get_referential_name(), """.format(
round(self.get_referential_value(block['monetaryMass'])), round(self.get_referential_diff_value(block['dividend'])),
'Monetary Mass M(t) in', 'Universal Dividend UD(t) in',
self.get_referential_name(), self.get_referential_name(),
block['membersCount'], round(self.get_referential_value(block['monetaryMass'])),
'Members N(t)', 'Monetary Mass M(t) in',
round(self.get_referential_value(block['monetaryMass'] / block['membersCount'])), self.get_referential_name(),
'Monetary Mass per member M(t)/N(t) in', block['membersCount'],
self.get_referential_name(), 'Members N(t)',
block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']), round(self.get_referential_value(block['monetaryMass'] / block['membersCount'])),
params['dt'] / 86400, 'Monetary Mass per member M(t)/N(t) in',
'Actual growth c = UD(t)/[M(t-1)/N(t)]', self.get_referential_name(),
datetime.datetime.fromtimestamp(block['medianTime'] + params['dt']).strftime("%d/%m/%Y %I:%M"), block['dividend'] / (block_t_minus_1['monetaryMass'] / block['membersCount']),
'Next UD date and time (t+1)' params['dt'] / 86400,
'Actual growth c = UD(t)/[M(t-1)/N(t)]',
datetime.datetime.fromtimestamp(block['medianTime'] + params['dt']).strftime("%d/%m/%Y %I:%M"),
'Next UD date and time (t+1)'
)
) )
) else:
self.label_general.setText('No Universal Dividend created yet.')
if block:
# set infos in label
self.label_rules.setText(
"""
<table cellpadding="5">
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
</table>
""".format(
'{:2.0%} / {:} days'.format(params['c'], params['dt'] / 86400),
'Fundamental growth (c) / Delta time (dt)',
'UD(t+1) = MAX { UD(t) ; c * M(t) / N(t) }',
'Universal Dividend (formula)',
'{:} = MAX {{ {:} {:} ; {:2.0%} * {:} {:} / {:} }}'.format(
math.ceil(max(block['dividend'], params['c'] * block['monetaryMass'] / block['membersCount'])),
round(self.get_referential_diff_value(block['dividend'])),
self.get_referential_name(),
params['c'],
round(self.get_referential_value(block['monetaryMass'])),
self.get_referential_name(),
block['membersCount']
),
'Universal Dividend (computed)'
)
)
else:
self.label_rules.setText('No Universal Dividend created yet.')
# set infos in label # set infos in label
self.label_money.setText( self.label_money.setText(
...@@ -113,32 +147,6 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget): ...@@ -113,32 +147,6 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
) )
) )
# set infos in label
self.label_rules.setText(
"""
<table cellpadding="5">
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
</table>
""".format(
'{:2.0%} / {:} days'.format(params['c'], params['dt'] / 86400),
'Fundamental growth (c) / Delta time (dt)',
'UD(t+1) = MAX { UD(t) ; c * M(t) / N(t) }',
'Universal Dividend (formula)',
'{:} = MAX {{ {:} {:} ; {:2.0%} * {:} {:} / {:} }}'.format(
math.ceil(max(block['dividend'], params['c'] * block['monetaryMass'] / block['membersCount'])),
round(self.get_referential_diff_value(block['dividend'])),
self.get_referential_name(),
params['c'],
round(self.get_referential_value(block['monetaryMass'])),
self.get_referential_name(),
block['membersCount']
),
'Universal Dividend (computed)'
)
)
# set infos in label # set infos in label
self.label_wot.setText( self.label_wot.setText(
""" """
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment