root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-26 04:00:49 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2019-03-15 19:43:17 +01:00
parent 3176a42aa5
commit 0a24a8e466
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/GUI/cadencegraph.cpp
View File

@ -63,11 +63,11 @@ QList<GraphItem*> CadenceGraph::loadData(const Data &data)
qreal CadenceGraph::avg() const qreal CadenceGraph::avg() const
{ {
qreal sum = 0, w = 0; qreal sum = 0, w = 0;
QList<QPointF>::const_iterator it;
for (it = _avg.begin(); it != _avg.end(); it++) { for (int i = 0; i < _avg.size(); i++) {
sum += it->y() * it->x(); const QPointF &p = _avg.at(i);
w += it->x(); sum += p.y() * p.x();
w += p.x();
} }
return (sum / w); return (sum / w);

2
src/GUI/cadencegraph.h
View File

@ -21,7 +21,7 @@ private:
qreal max() const {return bounds().bottom();} qreal max() const {return bounds().bottom();}
void setInfo(); void setInfo();
QList<QPointF> _avg; QVector<QPointF> _avg;
bool _showTracks; bool _showTracks;
}; };

8
src/GUI/heartrategraph.cpp
View File

@ -63,11 +63,11 @@ QList<GraphItem*> HeartRateGraph::loadData(const Data &data)
qreal HeartRateGraph::avg() const qreal HeartRateGraph::avg() const
{ {
qreal sum = 0, w = 0; qreal sum = 0, w = 0;
QList<QPointF>::const_iterator it;
for (it = _avg.begin(); it != _avg.end(); it++) { for (int i = 0; i < _avg.size(); i++) {
sum += it->y() * it->x(); const QPointF &p = _avg.at(i);
w += it->x(); sum += p.y() * p.x();
w += p.x();
} }
return (sum / w); return (sum / w);

2
src/GUI/heartrategraph.h
View File

@ -20,7 +20,7 @@ private:
qreal max() const {return bounds().bottom();} qreal max() const {return bounds().bottom();}
void setInfo(); void setInfo();
QList<QPointF> _avg; QVector<QPointF> _avg;
bool _showTracks; bool _showTracks;
}; };

8
src/GUI/powergraph.cpp
View File

@ -63,11 +63,11 @@ QList<GraphItem*> PowerGraph::loadData(const Data &data)
qreal PowerGraph::avg() const qreal PowerGraph::avg() const
{ {
qreal sum = 0, w = 0; qreal sum = 0, w = 0;
QList<QPointF>::const_iterator it;
for (it = _avg.begin(); it != _avg.end(); it++) { for (int i = 0; i < _avg.size(); i++) {
sum += it->y() * it->x(); const QPointF &p = _avg.at(i);
w += it->x(); sum += p.y() * p.x();
w += p.x();
} }
return (sum / w); return (sum / w);

2
src/GUI/powergraph.h
View File

@ -20,7 +20,7 @@ private:
qreal max() const {return bounds().bottom();} qreal max() const {return bounds().bottom();}
void setInfo(); void setInfo();
QList<QPointF> _avg; QVector<QPointF> _avg;
bool _showTracks; bool _showTracks;
}; };

10
src/GUI/speedgraph.cpp
View File

@ -74,12 +74,12 @@ QList<GraphItem*> SpeedGraph::loadData(const Data &data)
qreal SpeedGraph::avg() const qreal SpeedGraph::avg() const
{ {
qreal sum = 0, w = 0; qreal sum = 0, w = 0;
QList<QPointF>::const_iterator it; const QVector<QPointF> &vector = (_timeType == Moving) ? _mavg : _avg;
const QList<QPointF> &list = (_timeType == Moving) ? _mavg : _avg;
for (it = list.begin(); it != list.end(); it++) { for (int i = 0; i < vector.size(); i++) {
sum += it->y() * it->x(); const QPointF &p = vector.at(i);
w += it->x(); sum += p.y() * p.x();
w += p.x();
} }
return (sum / w); return (sum / w);

4
src/GUI/speedgraph.h
View File

@ -24,8 +24,8 @@ private:
void setYUnits(); void setYUnits();
void setInfo(); void setInfo();
QList<QPointF> _avg; QVector<QPointF> _avg;
QList<QPointF> _mavg; QVector<QPointF> _mavg;
Units _units; Units _units;
TimeType _timeType; TimeType _timeType;

8
src/GUI/temperaturegraph.cpp
View File

@ -66,11 +66,11 @@ QList<GraphItem*> TemperatureGraph::loadData(const Data &data)
qreal TemperatureGraph::avg() const qreal TemperatureGraph::avg() const
{ {
qreal sum = 0, w = 0; qreal sum = 0, w = 0;
QList<QPointF>::const_iterator it;
for (it = _avg.begin(); it != _avg.end(); it++) { for (int i = 0; i < _avg.size(); i++) {
sum += it->y() * it->x(); const QPointF &p = _avg.at(i);
w += it->x(); sum += p.y() * p.x();
w += p.x();
} }
return (sum / w); return (sum / w);

2
src/GUI/temperaturegraph.h
View File

@ -23,7 +23,7 @@ private:
void setYUnits(Units units); void setYUnits(Units units);
void setInfo(); void setInfo();
QList<QPointF> _avg; QVector<QPointF> _avg;
bool _showTracks; bool _showTracks;
}; };