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

Fixed rounding error on loading and saving erg files (#4455)

Browse Source
This commit is contained in:
enngq11k
2024-03-25 19:45:18 +01:00
committed by GitHub
parent 65deb0f7fa
commit 16ccc43d7a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Train/ErgFile.cpp
View File

@@ -26,6 +26,7 @@
#include <QXmlSimpleReader>
#include <stdint.h>
#include <cmath>
#include "Units.h"
#include "Utils.h"
@@ -599,13 +600,12 @@ void ErgFile::parseComputrainer(QString p)
switch (format) {
case ERG: // its an absolute wattage
if (Ftp) { // adjust if target FTP is set.
if (Ftp && Ftp != CP) { // adjust if target FTP is set.
// if ftp is set then convert to the users CP
double watts = add.y;
double ftp = Ftp;
watts *= CP/ftp;
add.y = add.val = int(watts);
add.y = add.val = int(std::round(watts));
}
break;
case MRC: // its a percent relative to CP (mrc file)
@@ -1264,7 +1264,9 @@ ErgFile::save(QStringList &errors)
double minutes = double(p.x) / (1000.0f*60.0f);
// we scale back if needed
if (Ftp && CP) watts = (double(p.y)/CP) * Ftp;
if (Ftp && CP && Ftp != CP) {
watts = std::round(p.y / CP * Ftp);
}
// check if a lap marker should be inserted
foreach(ErgFileLap l, Laps) {