root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-14 19:04:23 +02:00
Code Issues Projects Releases Activity

Graph loading performance improvement

Browse Source 
+ code/API cleanup
This commit is contained in:
Martin Tůma
2019-08-25 10:54:25 +02:00
parent a70c6f0f24
commit 609ac0c57a
33 changed files with 346 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/GUI/elevationgraph.cpp
View File

@ -8,26 +8,18 @@
static qreal nMin(qreal a, qreal b)
{
if (!std::isnan(a) && !std::isnan(b))
return qMin(a, b);
else if (!std::isnan(a))
return a;
else if (!std::isnan(b))
return b;
if (std::isnan(a))
return std::isnan(b) ? NAN : b;
else
return NAN;
return std::isnan(b) ? a : qMin(a, b);
}
static qreal nMax(qreal a, qreal b)
{
if (!std::isnan(a) && !std::isnan(b))
return qMax(a, b);
else if (!std::isnan(a))
return a;
else if (!std::isnan(b))
return b;
if (std::isnan(a))
return std::isnan(b) ? NAN : b;
else
return NAN;
return std::isnan(b) ? a : qMax(a, b);
}
ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
@ -49,6 +41,12 @@ ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
setMinYRange(50.0);
}
ElevationGraph::~ElevationGraph()
{
qDeleteAll(_tracks);
qDeleteAll(_routes);
}
void ElevationGraph::setInfo()
{
if (std::isnan(max()) || std::isnan(min()))
@ -70,19 +68,28 @@ void ElevationGraph::setInfo()
GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
{
if (!graph.isValid()) {
skipColor();
_palette.nextColor();
return 0;
}
ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType);
GraphView::addGraph(gi, type);
ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
_palette.nextColor());
gi->setUnits(_units);
if (type == Track) {
_tracks.append(gi);
if (_showTracks)
addGraph(gi);
_trackAscent += gi->ascent();
_trackDescent += gi->descent();
_trackMax = nMax(_trackMax, gi->max());
_trackMin = nMin(_trackMin, gi->min());
} else {
_routes.append(gi);
if (_showRoutes)
addGraph(gi);
_routeAscent += gi->ascent();
_routeDescent += gi->descent();
_routeMax = nMax(_routeMax, gi->max());
@ -101,7 +108,7 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
for (int i = 0; i < data.routes().count(); i++)
graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
for (int i = 0; i < data.areas().count(); i++)
skipColor();
_palette.nextColor();
setInfo();
redraw();
@ -111,6 +118,11 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
void ElevationGraph::clear()
{
qDeleteAll(_tracks);
_tracks.clear();
qDeleteAll(_routes);
_routes.clear();
_trackAscent = 0;
_routeAscent = 0;
_trackDescent = 0;
@ -142,12 +154,23 @@ void ElevationGraph::setUnits(Units units)
GraphView::setUnits(units);
}
void ElevationGraph::showItems(const QList<ElevationGraphItem *> &list,
bool show)
{
for (int i = 0; i < list.size(); i++) {
if (show)
addGraph(list.at(i));
else
removeGraph(list.at(i));
}
}
void ElevationGraph::showTracks(bool show)
{
_showTracks = show;
showItems(_tracks, show);
setInfo();
showGraph(show, Track);
redraw();
}
@ -156,7 +179,7 @@ void ElevationGraph::showRoutes(bool show)
{
_showRoutes = show;
showGraph(show, Route);
showItems(_routes, show);
setInfo();
redraw();