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

Add hemoglobin series to Editor

Browse Source
This commit is contained in:
Damien
2014-04-20 23:44:47 +02:00
parent 210ed97c8e
commit c89207ef40
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/JsonRideFile.l
View File

@@ -66,15 +66,15 @@
\"LAT\" return LAT;
\"LON\" return LON;
\"HEADWIND\" return HEADWIND;
\"SMO2\" return SMO2;
\"THB\" return THB;
\"SLOPE\" return SLOPE;
\"TEMP\" return TEMP;
\"LRBALANCE\" return LRBALANCE;
\"LTE\" return LTE;
\"RTE\" return RTE;
\"LPS\" return LPS;
\"RPS\" return RPS;
\"LTE\" return LTE;
\"RTE\" return RTE;
\"LPS\" return LPS;
\"RPS\" return RPS;
\"SMO2\" return SMO2;
\"THB\" return THB;
[-+]?[0-9]+ return JS_INTEGER;
[-+]?[0-9]+e-[0-9]+ return JS_FLOAT;
[-+]?[0-9]+\.[-+e0-9]* return JS_FLOAT;

6
src/RideEditor.cpp
View File

@@ -213,6 +213,8 @@ RideEditor::whatColumns()
<< tr("Right TE")
<< tr("Left PS")
<< tr("Right PS")
<< tr("SmO2")
<< tr("tHb")
<< tr("Interval");
return what;
@@ -803,6 +805,8 @@ RideEditor::insColumn(QString name)
if (name == tr("Right TE")) series = RideFile::rte;
if (name == tr("Left PS")) series = RideFile::lps;
if (name == tr("Right PS")) series = RideFile::rps;
if (name == tr("SmO2")) series = RideFile::smO2;
if (name == tr("tHb")) series = RideFile::tHb;
model->insertColumn(series);
}
@@ -2173,6 +2177,8 @@ PasteSpecialDialog::okClicked()
if (headings[col] == tr("Headwind")) newrow.headwind = value;
if (headings[col] == tr("Slope")) newrow.slope = value;
if (headings[col] == tr("Temperature")) newrow.temp = value;
if (headings[col] == tr("SmO2")) newrow.smo2 = value;
if (headings[col] == tr("tHb")) newrow.thb = value;
if (headings[col] == tr("Interval")) newrow.interval = value;
}

2
src/RideFile.h
View File

@@ -69,7 +69,7 @@ struct RideFileDataPresent
secs(false), cad(false), hr(false), km(false),
kph(false), nm(false), watts(false), alt(false), lon(false), lat(false),
headwind(false), slope(false), temp(false),
lrbalance(false), lte(false), rte(false), lps(false), rps(false), interval(false),
lrbalance(false), lte(false), rte(false), lps(false), rps(false), smo2(false), thb(false), interval(false),
np(false), xp(false), apower(false), wprime(false), atiss(false), antiss(false) {}
};

8
src/RideFileTableModel.cpp
View File

@@ -141,6 +141,14 @@ RideFileTableModel::setHeadings(RideFile::SeriesType series)
headings_ << tr("Right PS");
headingsType << RideFile::rps;
}
if (series == RideFile::smO2 || ride->areDataPresent()->smo2) {
headings_ << tr("SmO2");
headingsType << RideFile::smO2;
}
if (series == RideFile::tHb || ride->areDataPresent()->thb) {
headings_ << tr("tHb");
headingsType << RideFile::tHb;
}
if (series == RideFile::interval || ride->areDataPresent()->interval) {
headings_ << tr("Interval");
headingsType << RideFile::interval;