From b9dd78b31a029645e0d9d7a5aeac4d9f763832de Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 8 Jan 2020 16:37:16 -0500 Subject: [PATCH] Correct market tab stats --- src/mainwindow.ui | 2 +- src/rpc.cpp | 14 ++++++++------ src/settings.cpp | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 4c703e6..809f139 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -978,7 +978,7 @@ - Loading... + diff --git a/src/rpc.cpp b/src/rpc.cpp index 968baa7..6514601 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 The Hush Developers +// Copyright 2019-2020 The Hush Developers // Released under the GPLv3 #include "rpc.h" @@ -1158,16 +1158,18 @@ void RPC::refreshPrice() { s->set_marketcap(ticker, mcap); qDebug() << "Volume = " << (double) vol; - ui->volume->setText( QString::number((double) vol) + " HUSH" ); + std::for_each(ticker.begin(), ticker.end(), [](char & c){ c = ::toupper(c); }); + ui->volume->setText( QString::number((double) vol) + " " + QString::fromStdString(ticker) ); ui->volumeBTC->setText( QString::number((double) btcvol) + " BTC" ); std::for_each(ticker.begin(), ticker.end(), [](char & c){ c = ::toupper(c); }); - ui->volumeLocal->setText( QString::number((double) vol * (double) price) + " " + QString::fromStdString(ticker) ); + //TODO: we don't get an actual HUSH volume stat + if (price > 0) + ui->volumeLocal->setText( QString::number((double) vol / (double) price) + " HUSH"); qDebug() << "Mcap = " << (double) mcap; - ui->marketcap->setText( QString::number( (double) mcap) + " HUSH" ); + ui->marketcap->setText( QString::number( (double) mcap) + " " + QString::fromStdString(ticker) ); ui->marketcapBTC->setText( QString::number((double) btcmcap) + " BTC" ); - std::for_each(ticker.begin(), ticker.end(), [](char & c){ c = ::toupper(c); }); - ui->marketcapLocal->setText( QString::number((double) mcap * (double) price) + " " + QString::fromStdString(ticker) ); + //ui->marketcapLocal->setText( QString::number((double) mcap * (double) price) + " " + QString::fromStdString(ticker) ); refresh(true); return; diff --git a/src/settings.cpp b/src/settings.cpp index 804b5ee..4b364ab 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -401,7 +401,7 @@ bool Settings::isValidAddress(QString addr) { QRegExp zsexp("^zs1[a-z0-9]{75}$", Qt::CaseInsensitive); QRegExp ztsexp("^ztestsapling[a-z0-9]{76}", Qt::CaseInsensitive); QRegExp texp("^R[a-z0-9]{33}$", Qt::CaseInsensitive); - qDebug() << "isValidAddress(" << addr << ")"; + //qDebug() << "isValidAddress(" << addr << ")"; return texp.exactMatch(addr) || ztsexp.exactMatch(addr) || zsexp.exactMatch(addr); }