removing x_right from metrics

rowers/metrics.py

@@ -34,7 +34,6 @@ nometrics = [
     'workoutid',
     'totalangle',
     'hr_bottom',
-    'x_right',
     'Position',
     'Extensions',
     'GPS Speed',
@@ -57,7 +56,7 @@ rowingmetrics = (
         'ax_max': 1e5,
         'mode':'both',
         'type': 'basic'}),
-    
+
     ('hr',{
         'numtype':'integer',
         'null':True,
@@ -94,7 +93,7 @@ rowingmetrics = (
 #        'ax_max':300,
 #        'mode':'both',
 #        'type':'pro'}),
-    
+
     ('spm',{
         'numtype':'float',
         'null':True,
@@ -103,7 +102,7 @@ rowingmetrics = (
         'ax_max': 45,
         'mode':'both',
         'type': 'basic'}),
-    
+
     ('driveenergy',{
         'numtype':'float',
         'null':True,
@@ -112,7 +111,7 @@ rowingmetrics = (
         'ax_max': 1000,
         'mode':'both',
         'type': 'pro'}),
-    
+
     ('power',{
         'numtype':'float',
         'null':True,
@@ -121,7 +120,7 @@ rowingmetrics = (
         'ax_max': 600,
         'mode':'both',
         'type': 'basic'}),
-    
+
     ('averageforce',{
         'numtype':'float',
         'null':True,
@@ -130,7 +129,7 @@ rowingmetrics = (
         'ax_max': 1200,
         'mode':'both',
         'type': 'pro'}),
-    
+
     ('peakforce',{
         'numtype':'float',
         'null':True,
@@ -139,7 +138,7 @@ rowingmetrics = (
         'ax_max': 1500,
         'mode':'both',
         'type': 'pro'}),
-    
+
     ('drivelength',{
         'numtype':'float',
         'null':True,
@@ -236,7 +235,7 @@ rowingmetrics = (
         'mode':'water',
         'type': 'pro'}),
 
-    
+
     ('totalangle',{
         'numtype':'float',
         'null':True,
@@ -247,7 +246,7 @@ rowingmetrics = (
         'mode':'water',
         'type': 'pro'}),
 
-    
+
     ('effectiveangle',{
         'numtype':'float',
         'null':True,
@@ -289,7 +288,7 @@ rowingmetrics = (
         'type': 'basic'}),
 
     )
-    
+
 dtypes = {}
 
 for name,d in rowingmetrics:
@@ -297,11 +296,11 @@ for name,d in rowingmetrics:
         dtypes[name] = float
     elif d['numtype'] == 'int':
         dtypes[name] = int
-        
+
 axesnew = [
     (name,d['verbose_name'],d['ax_min'],d['ax_max'],d['type']) for name,d in rowingmetrics
     ]
-    
+
 axes = tuple(axesnew+[('None','<None>',0,1,'basic')])
 
 axlabels = {ax[0]:ax[1] for ax in axes}
@@ -328,7 +327,7 @@ defaultfavoritecharts = (
         'workouttype':'both',
         'reststrokes':True,
         'notes':"""This chart shows your pace and heart rate versus time.
-Heart rate values will be shown only when it is in your data, i.e. 
+Heart rate values will be shown only when it is in your data, i.e.
 in case you recorded your heart rate during your workout""",
         },
     {
@@ -358,9 +357,9 @@ plotted versus time. """,
         'plottype':'scatter',
         'workouttype':'otw',
         'reststrokes':True,
-        'notes':"""This chart shows the Distance per Stroke versus stroke 
+        'notes':"""This chart shows the Distance per Stroke versus stroke
 stroke rate. You should see a steady decline of the Distance per Stroke
-as you increase stroke rate. Typical values are > 10m for steady state 
+as you increase stroke rate. Typical values are > 10m for steady state
 dropping to 8m for race pace in the single.""",
         },
     {
@@ -395,5 +394,3 @@ def calc_trimp(df,sex,hrmax,hrmin,hrftp):
     hrtss = 100*trimp/trimp1hr
 
     return trimp,hrtss
-
-