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

Summary fixups

Browse Source 
* Show time in zone as a percent
* Annotate heading to show units

Fixes #473.
Fixes #474.
This commit is contained in:
Mark Liversedge
2011-10-11 21:52:19 +01:00
parent 51bf53ae92
commit 12dfc5ccc5
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/HrZones.cpp
View File

@@ -609,7 +609,7 @@ QString HrZones::summarize(int rnum, QVector<double> &time_in_zone) const
if(range.lt > 0){
summary += "<table align=\"center\" width=\"70%\" border=\"0\">";
summary += "<tr><td align=\"center\">";
summary += tr("Threshold: %1").arg(range.lt);
summary += tr("Threshold (bpm): %1").arg(range.lt);
summary += "</td></tr></table>";
}
summary += "<table align=\"center\" width=\"70%\" ";
@@ -617,12 +617,17 @@ QString HrZones::summarize(int rnum, QVector<double> &time_in_zone) const
summary += "<tr>";
summary += tr("<td align=\"center\">Zone</td>");
summary += tr("<td align=\"center\">Description</td>");
summary += tr("<td align=\"center\">Low</td>");
summary += tr("<td align=\"center\">High</td>");
summary += tr("<td align=\"center\">Low (bpm)</td>");
summary += tr("<td align=\"center\">High (bpm)</td>");
summary += tr("<td align=\"center\">Time</td>");
summary += tr("<td align=\"center\">%</td>");
summary += "</tr>";
QColor color = QApplication::palette().alternateBase().color();
color = QColor::fromHsv(color.hue(), color.saturation() * 2, color.value());
double duration = 0;
foreach(double v, time_in_zone) { duration += v; }
for (int zone = 0; zone < time_in_zone.size(); ++zone) {
if (time_in_zone[zone] > 0.0) {
QString name, desc;
@@ -642,6 +647,8 @@ QString HrZones::summarize(int rnum, QVector<double> &time_in_zone) const
summary += QString("<td align=\"center\">%1</td>").arg(hi);
summary += QString("<td align=\"center\">%1</td>")
.arg(time_to_string((unsigned) round(time_in_zone[zone])));
summary += QString("<td align=\"center\">%1</td>")
.arg((double)time_in_zone[zone]/duration * 100, 0, 'f', 0);
summary += "</tr>";
}
}

13
src/Zones.cpp
View File

@@ -568,7 +568,7 @@ QString Zones::summarize(int rnum, QVector<double> &time_in_zone) const
if(range.cp > 0){
summary += "<table align=\"center\" width=\"70%\" border=\"0\">";
summary += "<tr><td align=\"center\">";
summary += tr("Critical Power: %1").arg(range.cp);
summary += tr("Critical Power (watts): %1").arg(range.cp);
summary += "</td></tr></table>";
}
summary += "<table align=\"center\" width=\"70%\" ";
@@ -576,12 +576,17 @@ QString Zones::summarize(int rnum, QVector<double> &time_in_zone) const
summary += "<tr>";
summary += tr("<td align=\"center\">Zone</td>");
summary += tr("<td align=\"center\">Description</td>");
summary += tr("<td align=\"center\">Low</td>");
summary += tr("<td align=\"center\">High</td>");
summary += tr("<td align=\"center\">Low (watts)</td>");
summary += tr("<td align=\"center\">High (watts)</td>");
summary += tr("<td align=\"center\">Time</td>");
summary += tr("<td align=\"center\">%</td>");
summary += "</tr>";
QColor color = QApplication::palette().alternateBase().color();
color = QColor::fromHsv(color.hue(), color.saturation() * 2, color.value());
double duration = 0;
foreach(double v, time_in_zone) { duration += v; }
for (int zone = 0; zone < time_in_zone.size(); ++zone) {
if (time_in_zone[zone] > 0.0) {
QString name, desc;
@@ -600,6 +605,8 @@ QString Zones::summarize(int rnum, QVector<double> &time_in_zone) const
summary += QString("<td align=\"center\">%1</td>").arg(hi);
summary += QString("<td align=\"center\">%1</td>")
.arg(time_to_string((unsigned) round(time_in_zone[zone])));
summary += QString("<td align=\"center\">%1</td>")
.arg((double)time_in_zone[zone]/duration * 100, 0, 'f', 0);
summary += "</tr>";
}
}