From b202b09c3cf8757178a1607960ff662c1e5e9016 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Mon, 9 Oct 2017 12:01:10 +0800 Subject: [PATCH] dont show '?' when fee is zero. --- src/MempoolStatus.cpp | 2 +- src/page.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/MempoolStatus.cpp b/src/MempoolStatus.cpp index d562401..76c91a6 100644 --- a/src/MempoolStatus.cpp +++ b/src/MempoolStatus.cpp @@ -174,7 +174,7 @@ MempoolStatus::read_mempool() last_tx.mixin_no = sum_data[2]; last_tx.num_nonrct_inputs = sum_data[3]; - last_tx.fee_str = xmreg::xmr_amount_to_str(_tx_info.fee, "{:0.3f}"); + last_tx.fee_str = xmreg::xmr_amount_to_str(_tx_info.fee, "{:0.3f}", false); last_tx.xmr_inputs_str = xmreg::xmr_amount_to_str(last_tx.sum_inputs , "{:0.3f}"); last_tx.xmr_outputs_str = xmreg::xmr_amount_to_str(last_tx.sum_outputs, "{:0.3f}"); last_tx.timestamp_str = xmreg::timestamp_to_str_gm(_tx_info.receive_time); diff --git a/src/page.h b/src/page.h index ab3bfa8..b87108d 100644 --- a/src/page.h +++ b/src/page.h @@ -1141,7 +1141,7 @@ namespace xmreg // add total fees in the block to the context context["sum_fees"] - = xmreg::xmr_amount_to_str(sum_fees, "{:0.6f}"); + = xmreg::xmr_amount_to_str(sum_fees, "{:0.6f}", "0"); // get xmr in the block reward context["blk_reward"] @@ -1623,7 +1623,7 @@ namespace xmreg {"blk_height" , tx_blk_height_str}, {"tx_size" , fmt::format("{:0.4f}", static_cast(txd.size) / 1024.0)}, - {"tx_fee" , xmreg::xmr_amount_to_str(txd.fee)}, + {"tx_fee" , xmreg::xmr_amount_to_str(txd.fee, "{:0.12f}", true)}, {"blk_timestamp" , blk_timestamp}, {"delta_time" , age.first}, {"outputs_no" , static_cast(txd.output_pub_keys.size())}, @@ -4946,7 +4946,7 @@ namespace xmreg string emission_blk_no = std::to_string(current_values.blk_no - 1); string emission_coinbase = xmr_amount_to_str(current_values.coinbase, "{:0.3f}"); - string emission_fee = xmr_amount_to_str(current_values.fee, "{:0.3f}"); + string emission_fee = xmr_amount_to_str(current_values.fee, "{:0.3f}", false); j_data = json { {"blk_no" , current_values.blk_no - 1}, @@ -5297,7 +5297,7 @@ namespace xmreg {"tx_blk_height" , tx_blk_height}, {"tx_size" , fmt::format("{:0.4f}", static_cast(txd.size) / 1024.0)}, - {"tx_fee" , xmreg::xmr_amount_to_str(txd.fee)}, + {"tx_fee" , xmreg::xmr_amount_to_str(txd.fee, "{:0.12f}", false)}, {"tx_version" , static_cast(txd.version)}, {"blk_timestamp" , blk_timestamp}, {"blk_timestamp_uint" , blk.timestamp},