neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #456 from UdjinM6/v0.12.0.x_info_mn_count

Browse Source 
V0.12.0.x more info for masternode count output/rpcconsole dialog
This commit is contained in:
evan82 2015-07-25 06:32:41 -07:00
commit 24183b156b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/clientmodel.cpp
View File

@ -69,8 +69,9 @@ int ClientModel::getNumConnections(unsigned int flags) const
QString ClientModel::getMasternodeCountString() const QString ClientModel::getMasternodeCountString() const
{ {
return QString::number((int)mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION)) + return "Total: " + QString::number((int)mnodeman.size()) +
" / " + QString::number((int)mnodeman.CountEnabled()) + " / " + QString::number((int)mnodeman.size()); " (DS compatible: " + QString::number((int)mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION)) +
" / Enabled: " + QString::number((int)mnodeman.CountEnabled()) + ")";
} }
int ClientModel::getNumBlocks() const int ClientModel::getNumBlocks() const

2
src/qt/forms/rpcconsole.ui
View File

@ -325,7 +325,7 @@
<item row="10" column="0"> <item row="10" column="0">
<widget class="QLabel" name="masternodeCountLabel"> <widget class="QLabel" name="masternodeCountLabel">
<property name="text"> <property name="text">
<string>Masternode Count</string> <string>Number of Masternodes</string>
</property> </property>
</widget> </widget>
</item> </item>

5
src/rpcmasternode.cpp
View File

@ -192,9 +192,10 @@ Value masternode(const Array& params, bool fHelp)
{ {
if(params[1] == "ds") return mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION); if(params[1] == "ds") return mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION);
if(params[1] == "enabled") return mnodeman.CountEnabled(); if(params[1] == "enabled") return mnodeman.CountEnabled();
if(params[1] == "all") return strprintf("%d / %d / %d", if(params[1] == "all") return strprintf("Total: %d (DS Compatible: %d / Enabled: %d)",
mnodeman.size(),
mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION), mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION),
mnodeman.CountEnabled(), mnodeman.size()); mnodeman.CountEnabled());
} }
return mnodeman.size(); return mnodeman.size();
} }