diff --git a/rowers/dataprep.py b/rowers/dataprep.py index bf527500..5ce1a5d6 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -403,6 +403,15 @@ def timedeltaconv(x): 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 def save_workout_database(f2,r,dosmooth=True,workouttype='rower', dosummary=True,title='Workout', diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 18262087..82325366 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1331,11 +1331,16 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', hover = HoverTool(names=['data'], tooltips = [ (groupby,'@groupval{1.1}'), + (xparamname,'@x{1.1}'), + (yparamname,'@y') ]) else: hover = HoverTool(names=['data'], tooltips = [ (groupby,'@groupval'), + (xparamname,'@x{1.1}'), + (yparamname,'@y') + , ]) hover.mode = 'mouse' diff --git a/rowers/views.py b/rowers/views.py index 1d73ac7d..fc671f05 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3631,11 +3631,16 @@ def multiflex_view(request,userid=0, df = pd.DataFrame({ xparam:xvalues, yparam:yvalues, + 'x':xvalues, + 'y':yvalues, 'xerror':xerror, 'yerror':yerror, 'groupsize':groupsize, }) + if yparam == 'pace': + df['y'] = dataprep.paceformatsecs(df['y']/1.0e3) + aantal = len(df) if groupby != 'date':