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

Fix lap data auto-reset in slope workouts

Browse Source 
+ Lap Distance was wrong until the first lap due to currentLap
  not checking the lap lower bound.
+ Lap Time was not reset due to workoutLap being also modified in
  guiUpdate, so the newLap signal was never generated.
+ Additionally newLap slot remove duplicate functions called on newLap signal
  and moved counters reset to the signal handling slot.
Fixes #4411
This commit is contained in:
Alejandro Martinez
2023-10-31 19:30:50 -03:00
parent c2f440c1c0
commit 72de6bbee1
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Train/ErgFile.cpp
View File

@@ -1662,7 +1662,7 @@ ErgFile::currentLap(double x) const
// If the current position is before the start of the next lap, return this lap
for (int i=0; i<Laps.count() - 1; i++) {
if (x<Laps.at(i+1).x) return Laps.at(i).x;
if (x>=Laps.at(i).x && x<Laps.at(i+1).x) return Laps.at(i).x;
}
return -1; // No matching lap
}

20
src/Train/TrainSidebar.cpp
View File

@@ -1858,10 +1858,11 @@ void TrainSidebar::guiUpdate() // refreshes the telemetry
// If ergfile has no gradient then there is no location, or altitude (or slope.)
if (ergFile->hasGradient()) {
bool fAltitudeSet = false;
int curLap; // displayWorkoutLap is updated by loadUpdate
if (!ergFile->StrictGradient) {
// Attempt to obtain location and derived slope from altitude in ergfile.
geolocation geoloc;
if (ergFileQueryAdapter.locationAt(displayWorkoutDistance * 1000, displayWorkoutLap, geoloc, slope)) {
if (ergFileQueryAdapter.locationAt(displayWorkoutDistance * 1000, curLap, geoloc, slope)) {
displayLatitude = geoloc.Lat();
displayLongitude = geoloc.Long();
displayAltitude = geoloc.Alt();
@@ -1875,12 +1876,12 @@ void TrainSidebar::guiUpdate() // refreshes the telemetry
}
if (ergFile->StrictGradient || !fAltitudeSet) {
slope = ergFileQueryAdapter.gradientAt(displayWorkoutDistance * 1000, displayWorkoutLap);
slope = ergFileQueryAdapter.gradientAt(displayWorkoutDistance * 1000, curLap);
}
if (!fAltitudeSet) {
// Since we have gradient, we also have altitude
displayAltitude = ergFileQueryAdapter.altitudeAt(displayWorkoutDistance * 1000, displayWorkoutLap);
displayAltitude = ergFileQueryAdapter.altitudeAt(displayWorkoutDistance * 1000, curLap);
}
rtData.setSlope(slope);
@@ -2032,15 +2033,6 @@ void TrainSidebar::newLap()
if ((status&RT_RUNNING) && ((status&RT_PAUSED) == 0) &&
ergFileQueryAdapter.addNewLap(displayWorkoutDistance * 1000.) >= 0) {
pwrcount = 0;
cadcount = 0;
hrcount = 0;
spdcount = 0;
resetTextAudioEmitTracking();
maintainLapDistanceState();
context->notifyNewLap();
emit setNotification(tr("New lap.."), 2);
@@ -2052,6 +2044,10 @@ void TrainSidebar::resetLapTimer()
lap_time.restart();
lap_elapsed_msec = 0;
displayLapDistance = 0;
pwrcount = 0;
cadcount = 0;
hrcount = 0;
spdcount = 0;
this->resetTextAudioEmitTracking();
this->maintainLapDistanceState();
}