From bc290b397c2f537ded9db40cf13536e598619063 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Tue, 10 Jun 2014 21:20:40 +0100 Subject: [PATCH] Fixup interval select in Maps .. deleting things removed signal/slot connections ! --- src/BingMap.cpp | 2 ++ src/GoogleMapControl.cpp | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BingMap.cpp b/src/BingMap.cpp index 2d085428f..9f3386afc 100644 --- a/src/BingMap.cpp +++ b/src/BingMap.cpp @@ -100,6 +100,8 @@ void BingMap::updateFrame() // reset state between it and the webpage. delete webBridge; webBridge = new BWebBridge(context, this); + connect(context, SIGNAL(intervalsChanged()), webBridge, SLOT(intervalsChanged())); + connect(context, SIGNAL(intervalSelected()), webBridge, SLOT(intervalsChanged())); view->page()->mainFrame()->addToJavaScriptWindowObject("webBridge", webBridge); } diff --git a/src/GoogleMapControl.cpp b/src/GoogleMapControl.cpp index 7ab728f66..102ac63db 100644 --- a/src/GoogleMapControl.cpp +++ b/src/GoogleMapControl.cpp @@ -113,6 +113,8 @@ void GoogleMapControl::updateFrame() // reset state between it and the webpage. delete webBridge; webBridge = new WebBridge(context, this); + connect(context, SIGNAL(intervalsChanged()), webBridge, SLOT(intervalsChanged())); + connect(context, SIGNAL(intervalSelected()), webBridge, SLOT(intervalsChanged())); view->page()->mainFrame()->addToJavaScriptWindowObject("webBridge", webBridge); } @@ -484,16 +486,12 @@ GoogleMapControl::createMarkers() " var marker = new google.maps.Marker({ title: '%3', animation: google.maps.Animation.DROP, position: latlng });" " marker.setMap(map);" " markerList.push(marker);" // keep track of those suckers -#if 0 " google.maps.event.addListener(marker, 'click', function(event) { webBridge.toggleInterval(%4); });" -#endif "}") .arg(myRideItem->ride()->dataPoints()[offset]->lat,0,'g',GPS_COORD_TO_STRING) .arg(myRideItem->ride()->dataPoints()[offset]->lon,0,'g',GPS_COORD_TO_STRING) .arg(x.name) -#if 0 .arg(interval) -#endif ; view->page()->mainFrame()->evaluateJavaScript(code); interval++; @@ -637,7 +635,7 @@ WebBridge::drawOverlays() void WebBridge::toggleInterval(int x) { -return; IntervalItem *current = dynamic_cast(context->athlete->allIntervalItems()->child(x)); if (current) current->setSelected(!current->isSelected()); + return; }