threw out a few metrics
This commit is contained in:
@@ -27,6 +27,15 @@ nometrics = [
|
|||||||
'totalangle',
|
'totalangle',
|
||||||
'hr_bottom',
|
'hr_bottom',
|
||||||
'x_right',
|
'x_right',
|
||||||
|
'Position',
|
||||||
|
'Extensions',
|
||||||
|
'GPS Speed',
|
||||||
|
'Split (IMP)',
|
||||||
|
'Speed (IMP)',
|
||||||
|
'driveenergy',
|
||||||
|
'Distance/Stroke (IMP)',
|
||||||
|
'Distance/Stroke (GPS)',
|
||||||
|
'Distance (IMP)',
|
||||||
'equivergpower',
|
'equivergpower',
|
||||||
'cum_dist.1'
|
'cum_dist.1'
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -7336,9 +7336,11 @@ def instroke_view(request,id=0):
|
|||||||
|
|
||||||
return HttpResponseRedirect(url)
|
return HttpResponseRedirect(url)
|
||||||
|
|
||||||
|
from metrics import nometrics
|
||||||
rowdata = rrdata(csvfile=row.csvfilename)
|
rowdata = rrdata(csvfile=row.csvfilename)
|
||||||
try:
|
try:
|
||||||
instrokemetrics = rowdata.get_instroke_columns()
|
instrokemetrics = rowdata.get_instroke_columns()
|
||||||
|
instrokemetrics = [m for m in instrokemetrics if not m in nometrics]
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
instrokemetrics = []
|
instrokemetrics = []
|
||||||
|
|
||||||
@@ -7427,6 +7429,7 @@ def instroke_chart(request,id=0,metric=''):
|
|||||||
rowdata = rrdata(csvfile=w.csvfilename)
|
rowdata = rrdata(csvfile=w.csvfilename)
|
||||||
instrokemetrics = rowdata.get_instroke_columns()
|
instrokemetrics = rowdata.get_instroke_columns()
|
||||||
|
|
||||||
|
|
||||||
if metric in instrokemetrics:
|
if metric in instrokemetrics:
|
||||||
f1 = w.csvfilename[6:-4]
|
f1 = w.csvfilename[6:-4]
|
||||||
timestr = strftime("%Y%m%d-%H%M%S")
|
timestr = strftime("%Y%m%d-%H%M%S")
|
||||||
@@ -8456,6 +8459,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
|
|||||||
if d['mode'] == 'water':
|
if d['mode'] == 'water':
|
||||||
axchoicespro.pop(name)
|
axchoicespro.pop(name)
|
||||||
|
|
||||||
|
from rowers.metrics import nometrics
|
||||||
|
|
||||||
rowdata = rdata(row.csvfilename)
|
rowdata = rdata(row.csvfilename)
|
||||||
try:
|
try:
|
||||||
@@ -8464,6 +8468,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
|
|||||||
pass
|
pass
|
||||||
try:
|
try:
|
||||||
additionalmetrics = rowdata.get_additional_metrics()
|
additionalmetrics = rowdata.get_additional_metrics()
|
||||||
|
additionalmetrics = [m for m in additionalmetrics if not m in nometrics]
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
additionalmetrics = []
|
additionalmetrics = []
|
||||||
|
|
||||||
@@ -8474,7 +8479,6 @@ def workout_flexchart3_view(request,*args,**kwargs):
|
|||||||
yparam1 = yparam1.replace('/','_slsh_')
|
yparam1 = yparam1.replace('/','_slsh_')
|
||||||
yparam2 = yparam2.replace('/','_slsh_')
|
yparam2 = yparam2.replace('/','_slsh_')
|
||||||
|
|
||||||
from rowers.metrics import nometrics
|
|
||||||
|
|
||||||
for metric in nometrics:
|
for metric in nometrics:
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user