github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 04:49:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

SpeedPlotView: Simplify code using PointData struct

Browse source
This commit is contained in:
Anton Lashkov 2016-02-27 14:22:43 +04:00
commit 8a6866d409
3 changed files with 64 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

113
src/gui/properties/speedplotview.cpp
View file

@ -34,6 +34,9 @@
SpeedPlotView::SpeedPlotView(QWidget *parent) SpeedPlotView::SpeedPlotView(QWidget *parent)
: QGraphicsView(parent) : QGraphicsView(parent)
, m_data5Min(MIN5_BUF_SIZE)
, m_data30Min(MIN30_BUF_SIZE)
, m_data6Hour(HOUR6_BUF_SIZE)
, m_viewablePointsCount(MIN5_SEC) , m_viewablePointsCount(MIN5_SEC)
, m_counter30Min(-1) , m_counter30Min(-1)
, m_counter6Hour(-1) , m_counter6Hour(-1)
@ -67,26 +70,6 @@ SpeedPlotView::SpeedPlotView(QWidget *parent)
greenPen.setStyle(Qt::DotLine); greenPen.setStyle(Qt::DotLine);
m_properties[TRACKER_UP] = GraphProperties(tr("Tracker Upload"), bluePen); m_properties[TRACKER_UP] = GraphProperties(tr("Tracker Upload"), bluePen);
m_properties[TRACKER_DOWN] = GraphProperties(tr("Tracker Download"), greenPen); m_properties[TRACKER_DOWN] = GraphProperties(tr("Tracker Download"), greenPen);
initBuffers(MIN5_BUF_SIZE, m_xData5Min, m_yData5Min);
initBuffers(MIN30_BUF_SIZE, m_xData30Min, m_yData30Min);
initBuffers(HOUR6_BUF_SIZE, m_xData6Hour, m_yData6Hour);
}
void SpeedPlotView::initBuffers(int capacity, boost::circular_buffer<uint> &xBuffer,
QMap<SpeedPlotView::GraphID, boost::circular_buffer<int> > &yBuffers)
{
xBuffer = boost::circular_buffer<uint>(capacity);
yBuffers[UP] = boost::circular_buffer<int>(capacity);
yBuffers[DOWN] = boost::circular_buffer<int>(capacity);
yBuffers[PAYLOAD_UP] = boost::circular_buffer<int>(capacity);
yBuffers[PAYLOAD_DOWN] = boost::circular_buffer<int>(capacity);
yBuffers[OVERHEAD_UP] = boost::circular_buffer<int>(capacity);
yBuffers[OVERHEAD_DOWN] = boost::circular_buffer<int>(capacity);
yBuffers[DHT_UP] = boost::circular_buffer<int>(capacity);
yBuffers[DHT_DOWN] = boost::circular_buffer<int>(capacity);
yBuffers[TRACKER_UP] = boost::circular_buffer<int>(capacity);
yBuffers[TRACKER_DOWN] = boost::circular_buffer<int>(capacity);
} }
void SpeedPlotView::setGraphEnable(GraphID id, bool enable) void SpeedPlotView::setGraphEnable(GraphID id, bool enable)
@ -95,35 +78,32 @@ void SpeedPlotView::setGraphEnable(GraphID id, bool enable)
this->viewport()->update(); this->viewport()->update();
} }
void SpeedPlotView::pushXPoint(uint x) void SpeedPlotView::pushPoint(SpeedPlotView::PointData point)
{ {
++m_counter30Min; m_counter30Min = (m_counter30Min + 1) % 3;
m_counter30Min %= 3; m_counter6Hour = (m_counter6Hour + 1) % 6;
++m_counter6Hour;
m_counter6Hour %= 6;
m_xData5Min.push_back(x); m_data5Min.push_back(point);
if (m_counter30Min == 0) if (m_counter30Min == 0) {
m_xData30Min.push_back(x); m_data30Min.push_back(point);
}
if (m_counter6Hour == 0) else {
m_xData6Hour.push_back(x); m_data30Min.back().x = (m_data30Min.back().x * m_counter30Min + point.x) / (m_counter30Min + 1);
for (int id = UP; id < NB_GRAPHS; ++id) {
m_data30Min.back().y[id] = (m_data30Min.back().y[id] * m_counter30Min + point.y[id]) / (m_counter30Min + 1);
}
} }
void SpeedPlotView::pushYPoint(GraphID id, int y) if (m_counter6Hour == 0) {
{ m_data6Hour.push_back(point);
m_yData5Min[id].push_back(y); }
else {
if (m_counter30Min == 0) m_data6Hour.back().x = (m_data6Hour.back().x * m_counter6Hour + point.x) / (m_counter6Hour + 1);
m_yData30Min[id].push_back(y); for (int id = UP; id < NB_GRAPHS; ++id) {
else m_data6Hour.back().y[id] = (m_data6Hour.back().y[id] * m_counter6Hour + point.y[id]) / (m_counter6Hour + 1);
m_yData30Min[id].back() = (m_yData30Min[id].back() * m_counter30Min + y) / (m_counter30Min + 1); }
}
if (m_counter6Hour == 0)
m_yData6Hour[id].push_back(y);
else
m_yData6Hour[id].back() = (m_yData6Hour[id].back() * m_counter6Hour + y) / (m_counter6Hour + 1);
} }
void SpeedPlotView::setViewableLastPoints(TimePeriod period) void SpeedPlotView::setViewableLastPoints(TimePeriod period)
@ -156,49 +136,33 @@ void SpeedPlotView::replot()
this->viewport()->update(); this->viewport()->update();
} }
boost::circular_buffer<uint> &SpeedPlotView::getCurrentXData() boost::circular_buffer<SpeedPlotView::PointData> &SpeedPlotView::getCurrentData()
{ {
switch (m_period) { switch (m_period) {
default: default:
case SpeedPlotView::MIN1: case SpeedPlotView::MIN1:
case SpeedPlotView::MIN5: case SpeedPlotView::MIN5:
return m_xData5Min; return m_data5Min;
case SpeedPlotView::MIN30: case SpeedPlotView::MIN30:
return m_xData30Min; return m_data30Min;
case SpeedPlotView::HOUR6: case SpeedPlotView::HOUR6:
return m_xData6Hour; return m_data6Hour;
}
}
QMap<SpeedPlotView::GraphID, boost::circular_buffer<int> > &SpeedPlotView::getCurrentYData()
{
switch (m_period) {
default:
case SpeedPlotView::MIN1:
case SpeedPlotView::MIN5:
return m_yData5Min;
case SpeedPlotView::MIN30:
return m_yData30Min;
case SpeedPlotView::HOUR6:
return m_yData6Hour;
} }
} }
int SpeedPlotView::maxYValue() int SpeedPlotView::maxYValue()
{ {
QMap<GraphID, boost::circular_buffer<int> > &yData = getCurrentYData(); boost::circular_buffer<PointData> &queue = getCurrentData();
int maxYValue = 0; int maxYValue = 0;
for (QMap<GraphID, boost::circular_buffer<int> >::const_iterator it = yData.begin(); it != yData.end(); ++it) { for (int id = UP; id < NB_GRAPHS; ++id) {
if (!m_properties[it.key()].m_enable) if (!m_properties[static_cast<GraphID>(id)].m_enable)
continue; continue;
const boost::circular_buffer<int> &queue = it.value();
for (int i = queue.size() - 1, j = 0; i >= 0 && j <= m_viewablePointsCount; --i, ++j) { for (int i = queue.size() - 1, j = 0; i >= 0 && j <= m_viewablePointsCount; --i, ++j) {
if (queue[i] > maxYValue) if (queue[i].y[id] > maxYValue)
maxYValue = queue[i]; maxYValue = queue[i].y[id];
} }
} }
@ -269,25 +233,24 @@ void SpeedPlotView::paintEvent(QPaintEvent *)
double yMultiplier = (maxY == 0) ? 0.0 : double(rect.height()) / maxY; double yMultiplier = (maxY == 0) ? 0.0 : double(rect.height()) / maxY;
double xTickSize = double(rect.width()) / m_viewablePointsCount; double xTickSize = double(rect.width()) / m_viewablePointsCount;
QMap<GraphID, boost::circular_buffer<int> > &yData = getCurrentYData(); boost::circular_buffer<PointData> &queue = getCurrentData();
for (QMap<GraphID, boost::circular_buffer<int> >::const_iterator it = yData.begin(); it != yData.end(); ++it) { for (int id = UP; id < NB_GRAPHS; ++id) {
if (!m_properties[it.key()].m_enable) if (!m_properties[static_cast<GraphID>(id)].m_enable)
continue; continue;
const boost::circular_buffer<int> &queue = it.value();
QVector<QPoint> points; QVector<QPoint> points;
for (int i = queue.size() - 1, j = 0; i >= 0 && j <= m_viewablePointsCount; --i, ++j) { for (int i = queue.size() - 1, j = 0; i >= 0 && j <= m_viewablePointsCount; --i, ++j) {
int new_x = rect.right() - j * xTickSize; int new_x = rect.right() - j * xTickSize;
int new_y = rect.bottom() - queue[i] * yMultiplier; int new_y = rect.bottom() - queue[i].y[id] * yMultiplier;
points.push_back(QPoint(new_x, new_y)); points.push_back(QPoint(new_x, new_y));
} }
painter.setPen(m_properties[it.key()].m_pen); painter.setPen(m_properties[static_cast<GraphID>(id)].m_pen);
painter.drawPolyline(points.data(), points.size()); painter.drawPolyline(points.data(), points.size());
} }

24
src/gui/properties/speedplotview.h
View file

@ -64,12 +64,17 @@ public:
HOUR6 HOUR6
}; };
struct PointData
{
uint x;
int y[NB_GRAPHS];
};
explicit SpeedPlotView(QWidget *parent = 0); explicit SpeedPlotView(QWidget *parent = 0);
void setGraphEnable(GraphID id, bool enable); void setGraphEnable(GraphID id, bool enable);
void pushXPoint(uint x); void pushPoint(PointData point);
void pushYPoint(GraphID id, int y);
void setViewableLastPoints(TimePeriod period); void setViewableLastPoints(TimePeriod period);
@ -104,12 +109,9 @@ private:
bool m_enable; bool m_enable;
}; };
boost::circular_buffer<uint> m_xData5Min; boost::circular_buffer<PointData> m_data5Min;
boost::circular_buffer<uint> m_xData30Min; boost::circular_buffer<PointData> m_data30Min;
boost::circular_buffer<uint> m_xData6Hour; boost::circular_buffer<PointData> m_data6Hour;
QMap<GraphID, boost::circular_buffer<int> > m_yData5Min;
QMap<GraphID, boost::circular_buffer<int> > m_yData30Min;
QMap<GraphID, boost::circular_buffer<int> > m_yData6Hour;
QMap<GraphID, GraphProperties> m_properties; QMap<GraphID, GraphProperties> m_properties;
TimePeriod m_period; TimePeriod m_period;
@ -120,11 +122,7 @@ private:
int maxYValue(); int maxYValue();
void initBuffers(int capacity, boost::circular_buffer<uint> &xBuffer, boost::circular_buffer<PointData> &getCurrentData();
QMap<SpeedPlotView::GraphID, boost::circular_buffer<int> > &yBuffers);
boost::circular_buffer<uint> &getCurrentXData();
QMap<SpeedPlotView::GraphID, boost::circular_buffer<int> > &getCurrentYData();
}; };
#endif // SPEEDPLOTVIEW_H #endif // SPEEDPLOTVIEW_H

25
src/gui/properties/speedwidget.cpp
View file

@ -138,17 +138,20 @@ void SpeedWidget::update()
BitTorrent::SessionStatus btStatus = BitTorrent::Session::instance()->status(); BitTorrent::SessionStatus btStatus = BitTorrent::Session::instance()->status();
m_plot->pushXPoint(QDateTime::currentDateTime().toTime_t()); SpeedPlotView::PointData point;
m_plot->pushYPoint(SpeedPlotView::UP, btStatus.uploadRate()); point.x = QDateTime::currentDateTime().toTime_t();
m_plot->pushYPoint(SpeedPlotView::DOWN, btStatus.downloadRate()); point.y[SpeedPlotView::UP] = btStatus.uploadRate();
m_plot->pushYPoint(SpeedPlotView::PAYLOAD_UP, btStatus.payloadUploadRate()); point.y[SpeedPlotView::DOWN] = btStatus.downloadRate();
m_plot->pushYPoint(SpeedPlotView::PAYLOAD_DOWN, btStatus.payloadDownloadRate()); point.y[SpeedPlotView::PAYLOAD_UP] = btStatus.payloadUploadRate();
m_plot->pushYPoint(SpeedPlotView::OVERHEAD_UP, btStatus.ipOverheadUploadRate()); point.y[SpeedPlotView::PAYLOAD_DOWN] = btStatus.payloadDownloadRate();
m_plot->pushYPoint(SpeedPlotView::OVERHEAD_DOWN, btStatus.ipOverheadDownloadRate()); point.y[SpeedPlotView::OVERHEAD_UP] = btStatus.ipOverheadUploadRate();
m_plot->pushYPoint(SpeedPlotView::DHT_UP, btStatus.dhtUploadRate()); point.y[SpeedPlotView::OVERHEAD_DOWN] = btStatus.ipOverheadDownloadRate();
m_plot->pushYPoint(SpeedPlotView::DHT_DOWN, btStatus.dhtDownloadRate()); point.y[SpeedPlotView::DHT_UP] = btStatus.dhtUploadRate();
m_plot->pushYPoint(SpeedPlotView::TRACKER_UP, btStatus.trackerUploadRate()); point.y[SpeedPlotView::DHT_DOWN] = btStatus.dhtDownloadRate();
m_plot->pushYPoint(SpeedPlotView::TRACKER_DOWN, btStatus.trackerDownloadRate()); point.y[SpeedPlotView::TRACKER_UP] = btStatus.trackerUploadRate();
point.y[SpeedPlotView::TRACKER_DOWN] = btStatus.trackerDownloadRate();
m_plot->pushPoint(point);
QMetaObject::invokeMethod(this, "graphUpdate", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "graphUpdate", Qt::QueuedConnection);
Utils::Misc::msleep(1000); Utils::Misc::msleep(1000);