Browse Source

Correct market tab stats

pull/140/head
Duke Leto 4 years ago
parent
commit
b9dd78b31a
  1. 2
      src/mainwindow.ui
  2. 14
      src/rpc.cpp
  3. 2
      src/settings.cpp

2
src/mainwindow.ui

@ -978,7 +978,7 @@
<item row="13" column="2">
<widget class="QLabel" name="marketcapLocal">
<property name="text">
<string>Loading...</string>
<string></string>
</property>
</widget>
</item>

14
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;

2
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);
}

Loading…
Cancel
Save