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

Reintroduce Heartrate Zone Summary on RideSummary Window

Browse Source 
The refactoring of the summary window to use metricDB and the
introduction of HR zone config in options removed (temporarily)
the table on ride summary.

This patch re-introduces it.
This commit is contained in:
Mark Liversedge
2011-04-09 14:08:28 +01:00
parent 08110333c7
commit 8698aaa76b
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/HrZones.cpp
View File

@@ -601,7 +601,7 @@ QString HrZones::summarize(int rnum, QVector<double> &time_in_zone) const
{
assert(rnum < ranges.size());
const HrZoneRange &range = ranges[rnum];
assert(time_in_zone.size() == range.zones.size());
assert(time_in_zone.size() >= range.zones.size());
QString summary;
if(range.lt > 0){
summary += "<table align=\"center\" width=\"70%\" border=\"0\">";

2
src/RideItem.cpp
View File

@@ -146,13 +146,11 @@ int RideItem::numZones()
return (zone_range >= 0) ? zones->numZones(zone_range) : 0;
}
#if 0
int RideItem::numHrZones()
{
int hr_zone_range = hrZoneRange();
return (hr_zone_range >= 0) ? hrZones->numZones(hr_zone_range) : 0;
}
#endif
#if 0

2
src/RideItem.h
View File

@@ -90,8 +90,8 @@ class RideItem : public QObject, public QTreeWidgetItem //<< for signals/slots
int hrZoneRange();
int numZones();
#if 0
int numHrZones();
#if 0
double timeInZone(int zone);
double timeInHrZone(int zone);
#endif

25
src/RideSummaryWindow.cpp
View File

@@ -169,6 +169,20 @@ RideSummaryWindow::htmlSummary() const
NULL
};
const char *timeInZonesHR[] = {
"time_in_zone_H1",
"time_in_zone_H2",
"time_in_zone_H3",
"time_in_zone_H4",
"time_in_zone_H5",
"time_in_zone_H6",
"time_in_zone_H7",
"time_in_zone_H8",
"time_in_zone_H9",
"time_in_zone_H10",
NULL
};
// Use pre-computed and saved metric values if the ride has not
// been edited. Otherwise we need to re-compute every time.
SummaryMetrics metrics;
@@ -250,6 +264,17 @@ RideSummaryWindow::htmlSummary() const
summary += mainWindow->zones()->summarize(rideItem->zoneRange(), time_in_zone);
}
//
// Time In Zones HR
//
if (rideItem->numHrZones() > 0) {
QVector<double> time_in_zone(rideItem->numZones());
for (int i = 0; i < rideItem->numZones(); ++i)
time_in_zone[i] = metrics.getForSymbol(timeInZonesHR[i]);
summary += tr("<h2>Heart Rate Zones</h2>");
summary += mainWindow->hrZones()->summarize(rideItem->hrZoneRange(), time_in_zone);
}
//
// Interval Summary (recalculated on every refresh since they are not cached at present)
//