From 6fa6cc92e9bb1055546f0ceb6fe3c9544dd6d5b3 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 31 Oct 2019 22:27:23 +0100
Subject: [PATCH] lbs to N misery

---
 rowers/dataprep.py                        | 5 +++++
 rowers/dataprepnodjango.py                | 3 +++
 rowers/tests/testdata/.~lock.empower.csv# | 1 +
 3 files changed, 9 insertions(+)
 create mode 100644 rowers/tests/testdata/.~lock.empower.csv#

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 3f81d02e..d092b039 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -2351,6 +2351,10 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
         else:
             drivenergy = drivelength * averageforce
 
+    if forceunit == 'lbs':
+        averageforce *= lbstoN
+        peakforce *= lbstoN
+
     powerhr = 60.*power/hr
     powerhr = powerhr.fillna(value=0)
 
@@ -2362,6 +2366,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
 
     distanceperstroke = 60. * velo / spm
 
+
     data = DataFrame(
         dict(
             time=t * 1e3,
diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py
index 9dd79427..cdf2580a 100644
--- a/rowers/dataprepnodjango.py
+++ b/rowers/dataprepnodjango.py
@@ -1062,6 +1062,9 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
 
     distanceperstroke = 60.*velo/spm
 
+    if forceunit == 'lbs':
+        averageforce *= lbstoN
+        peakforce *= lbstoN
 
 
     data = DataFrame(
diff --git a/rowers/tests/testdata/.~lock.empower.csv# b/rowers/tests/testdata/.~lock.empower.csv#
new file mode 100644
index 00000000..f0eb9e3b
--- /dev/null
+++ b/rowers/tests/testdata/.~lock.empower.csv#
@@ -0,0 +1 @@
+,sander,sander-pc,31.10.2019 22:19,file:///home/sander/.config/libreoffice/4;
\ No newline at end of file