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

calculate ds progress from 3 parts

Browse Source
This commit is contained in:
UdjinM6 2015-07-12 19:18:03 +03:00
parent 640e721487
commit e7b00b8b7e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qt/overviewpage.cpp
View File

@ -359,26 +359,31 @@ void OverviewPage::updateDarksendProgress()
// progress of denominating // progress of denominating
float denomPart = 0; float denomPart = 0;
// mixing progress of denominated balance // mixing progress of denominated balance
float anonPart = 0; float anonNormPart = 0;
// completeness of full amount anonimization
float anonFullPart = 0;
int64_t denominatedBalance = pwalletMain->GetDenominatedBalance() + nDenominatedUnconfirmedBalance; int64_t denominatedBalance = pwalletMain->GetDenominatedBalance() + nDenominatedUnconfirmedBalance;
denomPart = (float)denominatedBalance / nMaxToAnonymize; denomPart = (float)denominatedBalance / nMaxToAnonymize;
denomPart = denomPart > 1 ? 1 : denomPart; denomPart = denomPart > 1 ? 1 : denomPart;
anonPart = (float)pwalletMain->GetNormalizedAnonymizedBalance() / nMaxToAnonymize; anonNormPart = (float)pwalletMain->GetNormalizedAnonymizedBalance() / nMaxToAnonymize;
// if anonPart is > 1 then we are done, make denomPart equal 1 too anonNormPart = anonNormPart > 1 ? 1 : anonNormPart;
anonPart = anonPart > 1 ? (denomPart = 1, 1) : anonPart;
anonFullPart = (float)pwalletMain->GetAnonymizedBalance() / nMaxToAnonymize;
anonFullPart = anonFullPart > 1 ? 1 : anonFullPart;
// 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
denomPart = ceilf((denomPart * 20) * 100) / 100; denomPart = ceilf((denomPart * 20) * 100) / 100;
anonPart = ceilf((anonPart * 80) * 100) / 100; anonNormPart = ceilf((anonNormPart * 50) * 100) / 100;
float progress = denomPart + anonPart; anonFullPart = ceilf((anonFullPart * 30) * 100) / 100;
float progress = denomPart + anonNormPart + anonFullPart;
if(progress >= 100) progress = 100; if(progress >= 100) progress = 100;
ui->darksendProgress->setValue(progress); ui->darksendProgress->setValue(progress);
QString strToolPip = tr("Progress: %1% (%2% + %3%; denominated inputs have %4 of %n rounds on average)", "", nDarksendRounds) QString strToolPip = tr("Progress: %1% (%2% + %3% + %4%; denominated inputs have %5 of %n rounds on average)", "", nDarksendRounds)
.arg(progress).arg(denomPart).arg(anonPart).arg(pwalletMain->GetAverageAnonymizedRounds()); .arg(progress).arg(denomPart).arg(anonNormPart).arg(anonFullPart).arg(pwalletMain->GetAverageAnonymizedRounds());
ui->darksendProgress->setToolTip(strToolPip); ui->darksendProgress->setToolTip(strToolPip);
} }