diff --git a/client/portstatsmodel.cpp b/client/portstatsmodel.cpp index 714de74..1fc0d85 100644 --- a/client/portstatsmodel.cpp +++ b/client/portstatsmodel.cpp @@ -156,11 +156,13 @@ QVariant PortStatsModel::data(const QModelIndex &index, int role) const case e_STAT_BYTES_SENT: return QString("%L1").arg(quint64(stats.tx_bytes())); +#if 0 case e_STAT_BYTE_SEND_RATE: return QString("%L1").arg(quint64(stats.tx_bps())); case e_STAT_BYTE_RECV_RATE: return QString("%L1").arg(quint64(stats.rx_bps())); +#endif case e_STAT_BIT_SEND_RATE: return QString("%L1").arg(quint64( diff --git a/client/portstatsmodel.h b/client/portstatsmodel.h index 0fcddf8..2d8aa02 100644 --- a/client/portstatsmodel.h +++ b/client/portstatsmodel.h @@ -43,14 +43,16 @@ typedef enum { // Statistics e_STATISTICS_START, - e_STAT_FRAMES_RCVD = e_STATISTICS_START, - e_STAT_FRAMES_SENT, + e_STAT_FRAMES_SENT = e_STATISTICS_START, + e_STAT_FRAMES_RCVD, + e_STAT_BYTES_SENT, + e_STAT_BYTES_RCVD, e_STAT_FRAME_SEND_RATE, e_STAT_FRAME_RECV_RATE, - e_STAT_BYTES_RCVD, - e_STAT_BYTES_SENT, +#if 0 e_STAT_BYTE_SEND_RATE, e_STAT_BYTE_RECV_RATE, +#endif e_STAT_BIT_SEND_RATE, e_STAT_BIT_RECV_RATE, #if 0 @@ -72,19 +74,21 @@ typedef enum { e_STAT_MAX } PortStat; -static QStringList PortStatName = (QStringList() +static const QStringList PortStatName = (QStringList() << "User" << "Status" - << "Frames Received" << "Frames Sent" + << "Frames Received" + << "Bytes Sent" + << "Bytes Received" << "Frame Send Rate (fps)" << "Frame Receive Rate (fps)" - << "Bytes Received" - << "Bytes Sent" +#if 0 << "Byte Send Rate (Bps)" << "Byte Receive Rate (Bps)" +#endif << "Bit Send Rate (bps)" << "Bit Receive Rate (bps)" #if 0