nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

This patch changes the weekly summary to include the number of seconds

Browse Source 
in total time riding, which previously only included hours and minutes.
A few seconds over a week shouldn't account for much, but I think it's
desirable to use the same resultion for data values across the product
for consistancy if nothing else.

   --jtc
This commit is contained in:
Justin F. Knotzke
2009-01-17 19:33:49 +00:00
parent 842303029c
commit 7026520ec4
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/MainWindow.cpp
View File

@@ -831,8 +831,10 @@ MainWindow::rideSelected()
}
}
int minutes = ((int) round(weeklySeconds->value(true))) / 60;
int hours = (int) minutes / 60;
int seconds = ((int) round(weeklySeconds->value(true)));
int minutes = seconds / 60;
seconds %= 60;
int hours = minutes / 60;
minutes %= 60;
const char *dateFormat = "MM/dd/yyyy";
@@ -849,19 +851,20 @@ MainWindow::rideSelected()
"<p>"
"<table align=\"center\" width=\"60%\" border=0>"
"<tr><td>Total time riding:</td>"
" <td align=\"right\">%3:%4</td></tr>"
"<tr><td>Total distance (kilometers):</td>"
" <td align=\"right\">%5</td></tr>"
"<tr><td>Total work (kJ):</td>"
" <td align=\"right\">%3:%4:%5</td></tr>"
"<tr><td>Total distance (km):</td>"
" <td align=\"right\">%6</td></tr>"
"<tr><td>Daily Average work (kJ):</td>"
"<tr><td>Total work (kJ):</td>"
" <td align=\"right\">%7</td></tr>"
"<tr><td>Daily Average work (kJ):</td>"
" <td align=\"right\">%8</td></tr>"
"</table>"
)
.arg(wstart.toString(dateFormat))
.arg(wstart.addDays(6).toString(dateFormat))
.arg(hours)
.arg(minutes, 2, 10, QLatin1Char('0'))
.arg(seconds, 2, 10, QLatin1Char('0'))
.arg(weeklyDistance->value(true), 0, 'f', 1)
.arg((unsigned) round(weeklyWork->value(true)))
.arg((unsigned) round(weeklyWork->value(true) / 7));
@@ -874,13 +877,13 @@ MainWindow::rideSelected()
"<p>"
"<table align=\"center\" width=\"60%\" border=0>"
"<tr><td>Total time riding:</td>"
" <td align=\"right\">%3:%4</td></tr>"
" <td align=\"right\">%3:%4:%5</td></tr>"
"<tr><td>Total distance (miles):</td>"
" <td align=\"right\">%5</td></tr>"
"<tr><td>Total work (kJ):</td>"
" <td align=\"right\">%6</td></tr>"
"<tr><td>Daily Average work (kJ):</td>"
"<tr><td>Total work (kJ):</td>"
" <td align=\"right\">%7</td></tr>"
"<tr><td>Daily Average work (kJ):</td>"
" <td align=\"right\">%8</td></tr>"
"</table>"
// TODO: add averages
)
@@ -888,6 +891,7 @@ MainWindow::rideSelected()
.arg(wstart.addDays(6).toString(dateFormat))
.arg(hours)
.arg(minutes, 2, 10, QLatin1Char('0'))
.arg(seconds, 2, 10, QLatin1Char('0'))
.arg(weeklyDistance->value(false), 0, 'f', 1)
.arg((unsigned) round(weeklyWork->value(true)))
.arg((unsigned) round(weeklyWork->value(true) / 7));