Private
Public Access
1
0

improved callout on trend flex

This commit is contained in:
Sander Roosendaal
2017-08-04 10:25:49 +02:00
parent d7a1cef4e8
commit e673255f43
3 changed files with 19 additions and 0 deletions

View File

@@ -403,6 +403,15 @@ def timedeltaconv(x):
return dt return dt
def paceformatsecs(values):
out = []
for v in values:
td = timedeltaconv(v)
formattedv = strfdelta(td)
out.append(formattedv)
return out
# Processes painsled CSV file to database # Processes painsled CSV file to database
def save_workout_database(f2,r,dosmooth=True,workouttype='rower', def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
dosummary=True,title='Workout', dosummary=True,title='Workout',

View File

@@ -1331,11 +1331,16 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='',
hover = HoverTool(names=['data'], hover = HoverTool(names=['data'],
tooltips = [ tooltips = [
(groupby,'@groupval{1.1}'), (groupby,'@groupval{1.1}'),
(xparamname,'@x{1.1}'),
(yparamname,'@y')
]) ])
else: else:
hover = HoverTool(names=['data'], hover = HoverTool(names=['data'],
tooltips = [ tooltips = [
(groupby,'@groupval'), (groupby,'@groupval'),
(xparamname,'@x{1.1}'),
(yparamname,'@y')
,
]) ])
hover.mode = 'mouse' hover.mode = 'mouse'

View File

@@ -3631,11 +3631,16 @@ def multiflex_view(request,userid=0,
df = pd.DataFrame({ df = pd.DataFrame({
xparam:xvalues, xparam:xvalues,
yparam:yvalues, yparam:yvalues,
'x':xvalues,
'y':yvalues,
'xerror':xerror, 'xerror':xerror,
'yerror':yerror, 'yerror':yerror,
'groupsize':groupsize, 'groupsize':groupsize,
}) })
if yparam == 'pace':
df['y'] = dataprep.paceformatsecs(df['y']/1.0e3)
aantal = len(df) aantal = len(df)
if groupby != 'date': if groupby != 'date':