Fix bugs in informations_tab

Move Wot part at the bottom of the page

res/ui/informations_tab.ui

@@ -91,15 +91,15 @@ QGroupBox::title {
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="group_wot">
+        <widget class="QGroupBox" name="group_rules">
          <property name="title">
-          <string>WoT</string>
+          <string>Rules</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
+         <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
-           <widget class="QLabel" name="label_wot">
+           <widget class="QLabel" name="label_rules">
             <property name="text">
-             <string>label_wot</string>
+             <string>label_rules</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -110,15 +110,15 @@ QGroupBox::title {
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="group_rules">
+        <widget class="QGroupBox" name="group_wot">
          <property name="title">
-          <string>Rules</string>
+          <string>WoT</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
+         <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
-           <widget class="QLabel" name="label_rules">
+           <widget class="QLabel" name="label_wot">
             <property name="text">
-             <string>label_rules</string>
+             <string>label_wot</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

src/cutecoin/gui/informations_tab.py

@@ -48,7 +48,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
             <tr><td align="right"><b>{:.2f}</b></td><td>{:} {:}</td></tr>
             <tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
             <tr><td align="right"><b>{:.2f}</b></td><td>{:} {:}</td></tr>
-            <tr><td align="right"><b>{:2.2%}</b></td><td>{:}</td></tr>
+            <tr><td align="right"><b>{:2.2%} / {:} days</b></td><td>{:}</td></tr>
             </table>
             """.format(
                 self.get_referential_value(block['dividend']),
@@ -62,9 +62,9 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
                 self.get_referential_value(block['monetaryMass'] / block['membersCount']),
                 'Monetary Mass per member M(t)/N(t) in',
                 self.get_referential_name(),
-                block['dividend'] / (block['monetaryMass'] - (block['membersCount'] * block['dividend'])) / block[
-                    'membersCount'],
-                'Actual % Growth c = UD(t)/[M(t-1)/N(t)]'
+                block['dividend'] / (block['monetaryMass'] / block['membersCount']),
+                params['dt'] / 86400,
+                'Actual growth c = UD(t)/[M(t-1)/N(t)]'
             )
         )
 
@@ -72,7 +72,7 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
         self.label_money.setText(
             """
             <table cellpadding="5">
-            <tr><td align="right"><b>{:2.0%}</b></td><td>{:}</td></tr>
+            <tr><td align="right"><b>{:2.0%} / {:} 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>
@@ -83,12 +83,13 @@ class InformationsTabWidget(QWidget, Ui_InformationsTabWidget):
             </table>
             """.format(
                 params['c'],
-                'Growth parameter c',
+                params['dt'] / 86400,
+                'Fundamental growth (c)',
                 params['ud0'],
-                'Initial Universal Dividend in',
+                'Initial Universal Dividend UD(0) in',
                 self.community.short_currency,
                 params['dt'] / 86400,
-                'Time period in days between two UD',
+                'Time period (dt) in days (86400 seconds) between two UD',
                 params['medianTimeBlocks'],
                 'Number of blocks used for calculating median time',
                 params['avgGenTime'],
@@ -102,6 +103,31 @@ 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)',
+                'UD(t+1) = MAX {{ {:.2f} {:} ; {:2.0%} * {:.2f} {:} / {:} }}'.format(
+                    self.get_referential_value(block['dividend']),
+                    self.get_referential_name(),
+                    params['c'],
+                    self.get_referential_value(block['monetaryMass']),
+                    self.get_referential_name(),
+                    block['membersCount']
+                ),
+                'Universal Dividend (computed)'
+            )
+        )
+
         # set infos in label
         self.label_wot.setText(
             """
@@ -129,30 +155,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),
-                'Growth percent (c)',
-                "UD t+1 = MAX ( UD t ; c * Mt / Nt+1 )",
-                'Universal Dividend (formula)',
-                "UD t+1 = MAX ( {:.2f} {:} ; {:2.0%} * {:.2f} {:} / Nt+1 )".format(
-                    self.get_referential_value(params['ud0']),
-                    self.get_referential_name(),
-                    params['c'],
-                    self.get_referential_value(block['monetaryMass']),
-                    self.get_referential_name()
-                ),
-                'Universal Dividend (computed)'
-            )
-        )
-
     def get_referential_value(self, value):
         return self.account.units_to_ref(value, self.community)