nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Zone Colors on Map

Browse Source 
A patch to use the GC zone color scheme (or preferences) when
plotting power on the Map tab.

fixes #82
This commit is contained in:
Mark Liversedge
2010-04-14 20:48:52 +01:00
committed by Sean Rhea
parent fc7dce1634
commit 3f4adc2d31
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/GoogleMapControl.cpp
View File

@@ -139,7 +139,7 @@ using namespace gm;
#define GOOGLE_KEY "ABQIAAAAS9Z2oFR8vUfLGYSzz40VwRQ69UCJw2HkJgivzGoninIyL8-QPBTtnR-6pM84ljHLEk3PDql0e2nJmg"
GoogleMapControl::GoogleMapControl(MainWindow *mw) : current(NULL)
GoogleMapControl::GoogleMapControl(MainWindow *mw) : main(mw), range(-1), current(NULL)
{
parent = mw;
view = new QWebView();
@@ -164,14 +164,14 @@ GoogleMapControl::rideSelected()
else
current = ride;
int zone =ride->zoneRange();
if(zone < 0)
range =ride->zoneRange();
if(range < 0)
{
rideCP = 300; // default cp to 300 watts
}
else
{
rideCP = ride->zones->getCP(zone);
rideCP = ride->zones->getCP(range);
}
rideData.clear();
@@ -326,21 +326,10 @@ void GoogleMapControl::createHtml()
}
QColor GoogleMapControl::GetColor(int cp, int watts)
QColor GoogleMapControl::GetColor(int watts)
{
double effort = watts/ (double) cp /1.25;
if(effort < 0.25)
{
effort = 0;
}
if(effort > 1.0)
{
effort = 1;
}
QColor color;
color.setHsv(int(360 - (360 * effort)), 255, 255);
return color;
if (range < 0) return Qt::red;
else return zoneColor(main->zones()->whichZone(range, watts), 7);
}
@@ -380,7 +369,7 @@ void GoogleMapControl::CreateSubPolyLine(const std::vector<RideFilePoint> &point
int avgPower)
{
oss.precision(6);
QColor color = GetColor(rideCP,avgPower);
QColor color = GetColor(avgPower);
QString colorstr = color.name();
oss.setf(ios::fixed,ios::floatfield);
oss << "var polyline = new GPolyline([";

5
src/GoogleMapControl.h
View File

@@ -26,6 +26,7 @@
#include <sstream>
#include <string>
#include "RideFile.h"
#include "MainWindow.h"
class QMouseEvent;
class RideItem;
@@ -39,10 +40,12 @@ class GoogleMapControl : public QWidget
Q_OBJECT
private:
MainWindow *main;
QVBoxLayout *layout;
QWebView *view;
MainWindow *parent;
GoogleMapControl(); // default ctor
int range;
std::string CreatePolyLine();
void CreateSubPolyLine(const std::vector<RideFilePoint> &points,
std::ostringstream &oss,
@@ -55,7 +58,7 @@ Q_OBJECT
// the ride has changed, load a new page
bool newRideToLoad;
QColor GetColor(int cp, int watts);
QColor GetColor(int watts);
// a GPS normalized vectory of ride data points,
// when a GPS unit loses signal it seems to