nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Globals from ErgFilePlot

Browse Source 
The original ErgFilePlot code used local static variables
to bridge between the selected ErgFile and the Qwt data
handlers.

This was not an issue when we only allowed one chart of this
type to be available at once. But now, with a more configurable
layout it is possible to have multiple.

The currently selected ErgFile can now be referenced from
MainWindow in the same manner as the current RideFile can.

This patch introduces no functional change for users.
This commit is contained in:
Mark Liversedge
2011-11-05 13:06:31 +00:00
parent cd6e9df377
commit 368aeba04d
6 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ErgFile.cpp
View File

@@ -361,12 +361,17 @@ ErgFile::calculateMetrics()
XP = CP = AP = NP = IF = RI = TSS = BS = SVI = VI = 0;
ELE = ELEDIST = GRADE = 0;
maxY = 0; // we need to reset it
if (format == CRS) {
ErgFilePoint last;
bool first = true;
foreach (ErgFilePoint p, Points) {
// set the maximum Y value
if (p.y > maxY) maxY= p.y;
if (first == true) {
first = false;
} else if (p.y > last.y) {
@@ -407,6 +412,9 @@ ErgFile::calculateMetrics()
ErgFilePoint last;
foreach (ErgFilePoint p, Points) {
// set the maximum Y value
if (p.y > maxY) maxY= p.y;
while (nextSecs < p.x) {
// CALCULATE NP