nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 17:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Google Map refresh on rideChanged()

Browse Source 
.. just forces a replot
This commit is contained in:
Mark Liversedge
2014-12-29 22:04:25 +00:00
parent 3d0d747534
commit 2cfdb68ada
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/GoogleMapControl.cpp
View File

@@ -39,7 +39,7 @@
#include <QDebug>
GoogleMapControl::GoogleMapControl(Context *context) : GcChartWindow(context), context(context),
range(-1), current(NULL), firstShow(true)
range(-1), current(NULL), firstShow(true), stale(false)
{
setControls(NULL);
@@ -71,6 +71,7 @@ GoogleMapControl::GoogleMapControl(Context *context) : GcChartWindow(context), c
//
connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected()));
connect(view->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(updateFrame()));
connect(context, SIGNAL(rideChanged(RideItem*)), this, SLOT(forceReplot()));
connect(context, SIGNAL(intervalsChanged()), webBridge, SLOT(intervalsChanged()));
connect(context, SIGNAL(intervalSelected()), webBridge, SLOT(intervalsChanged()));
connect(context, SIGNAL(intervalZoom(IntervalItem*)), this, SLOT(zoomInterval(IntervalItem*)));
@@ -94,6 +95,13 @@ GoogleMapControl::configChanged(qint32)
#endif
}
void
GoogleMapControl::forceReplot()
{
stale=true;
rideSelected();
}
void
GoogleMapControl::rideSelected()
{
@@ -105,8 +113,13 @@ GoogleMapControl::rideSelected()
// skip display if data already drawn or invalid
if (myRideItem == NULL || !amVisible()) return;
if (ride == current || !ride || !ride->ride()) return;
else current = ride;
// nothing to plot
if (!ride || !ride->ride()) return;
else if (!stale && ride == current) return;
// remember what we last plotted
current = ride;
// Route metadata ...
setSubTitle(ride->ride()->getTag("Route", tr("Route")));
@@ -114,6 +127,7 @@ GoogleMapControl::rideSelected()
// default to ..
range = -1;
rideCP = 300;
stale = false;
if (context->athlete->zones()) {
range = context->athlete->zones()->whichRange(ride->dateTime.date());