sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x

Browse Source
This commit is contained in:
Evan Duffield 2015-02-05 09:01:47 -07:00
commit c3b92a7103
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/forms/overviewpage.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>960</width> <width>960</width>
<height>541</height> <height>585</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@ -326,7 +326,7 @@
</size> </size>
</property> </property>
<property name="value"> <property name="value">
<number>24</number> <number>0</number>
</property> </property>
</widget> </widget>
</item> </item>

19
src/qt/overviewpage.cpp
View File

@ -287,13 +287,22 @@ void OverviewPage::updateDarksendProgress()
// calculate parts of the progress, each of them shouldn't be higher than 1: // calculate parts of the progress, each of them shouldn't be higher than 1:
// mixing progress of denominated balance // mixing progress of denominated balance
float denomPart = (float)pwalletMain->GetNormalizedAnonymizedBalance() / pwalletMain->GetDenominatedBalance(); int64_t denominatedBalance = pwalletMain->GetDenominatedBalance();
denomPart = denomPart > 1 ? 1 : denomPart; float denomPart = 0;
if(denominatedBalance > 0)
{
denomPart = (float)pwalletMain->GetNormalizedAnonymizedBalance() / pwalletMain->GetDenominatedBalance();
denomPart = denomPart > 1 ? 1 : denomPart;
}
// % of fully anonymized balance // % of fully anonymized balance
float anonPart = (float)pwalletMain->GetAnonymizedBalance() / nMaxToAnonymize; float anonPart = 0;
// if anonPart is > 1 then we are done, make denomPart equal 1 too if(nMaxToAnonymize > 0)
anonPart = anonPart > 1 ? (denomPart = 1, 1) : anonPart; {
anonPart = (float)pwalletMain->GetAnonymizedBalance() / nMaxToAnonymize;
// if anonPart is > 1 then we are done, make denomPart equal 1 too
anonPart = anonPart > 1 ? (denomPart = 1, 1) : anonPart;
}
// apply some weights to them (sum should be <=100) and calculate the whole progress // apply some weights to them (sum should be <=100) and calculate the whole progress
int progress = 80 * denomPart + 20 * anonPart; int progress = 80 * denomPart + 20 * anonPart;