Private
Public Access
1
0

threw out a few metrics

This commit is contained in:
Sander Roosendaal
2018-04-09 15:35:12 +02:00
parent 0372acbaec
commit 2f6ec2472e
2 changed files with 14 additions and 1 deletions

View File

@@ -27,6 +27,15 @@ nometrics = [
'totalangle',
'hr_bottom',
'x_right',
'Position',
'Extensions',
'GPS Speed',
'Split (IMP)',
'Speed (IMP)',
'driveenergy',
'Distance/Stroke (IMP)',
'Distance/Stroke (GPS)',
'Distance (IMP)',
'equivergpower',
'cum_dist.1'
]

View File

@@ -7336,9 +7336,11 @@ def instroke_view(request,id=0):
return HttpResponseRedirect(url)
from metrics import nometrics
rowdata = rrdata(csvfile=row.csvfilename)
try:
instrokemetrics = rowdata.get_instroke_columns()
instrokemetrics = [m for m in instrokemetrics if not m in nometrics]
except AttributeError:
instrokemetrics = []
@@ -7427,6 +7429,7 @@ def instroke_chart(request,id=0,metric=''):
rowdata = rrdata(csvfile=w.csvfilename)
instrokemetrics = rowdata.get_instroke_columns()
if metric in instrokemetrics:
f1 = w.csvfilename[6:-4]
timestr = strftime("%Y%m%d-%H%M%S")
@@ -8456,6 +8459,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
if d['mode'] == 'water':
axchoicespro.pop(name)
from rowers.metrics import nometrics
rowdata = rdata(row.csvfilename)
try:
@@ -8464,6 +8468,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
pass
try:
additionalmetrics = rowdata.get_additional_metrics()
additionalmetrics = [m for m in additionalmetrics if not m in nometrics]
except AttributeError:
additionalmetrics = []
@@ -8474,7 +8479,6 @@ def workout_flexchart3_view(request,*args,**kwargs):
yparam1 = yparam1.replace('/','_slsh_')
yparam2 = yparam2.replace('/','_slsh_')
from rowers.metrics import nometrics
for metric in nometrics:
try: