From c89207ef403850ae070ce00a65237e4973b7eb0a Mon Sep 17 00:00:00 2001
From: Damien <Damien.Grauser@pev-geneve.ch>
Date: Sun, 20 Apr 2014 23:44:47 +0200
Subject: [PATCH] Add hemoglobin series to Editor

---
 src/JsonRideFile.l         | 12 ++++++------
 src/RideEditor.cpp         |  6 ++++++
 src/RideFile.h             |  2 +-
 src/RideFileTableModel.cpp |  8 ++++++++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/JsonRideFile.l b/src/JsonRideFile.l
index 7705453f9..3d8eeb68f 100644
--- a/src/JsonRideFile.l
+++ b/src/JsonRideFile.l
@@ -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;
diff --git a/src/RideEditor.cpp b/src/RideEditor.cpp
index c4fab24fc..e29948f5a 100644
--- a/src/RideEditor.cpp
+++ b/src/RideEditor.cpp
@@ -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;
             }
 
diff --git a/src/RideFile.h b/src/RideFile.h
index a34c95269..9e539b2d5 100644
--- a/src/RideFile.h
+++ b/src/RideFile.h
@@ -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) {}
 
 };
diff --git a/src/RideFileTableModel.cpp b/src/RideFileTableModel.cpp
index ce4c206d4..043021405 100644
--- a/src/RideFileTableModel.cpp
+++ b/src/RideFileTableModel.cpp
@@ -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;