sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/dataprep7'

Browse Source
This commit is contained in:
Sander Roosendaal
2016-11-27 22:32:43 +01:00
parent a39b5932d6 dafc0e10cc
commit 433b87fc4c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/interactiveplots.py
View File

@@ -70,7 +70,7 @@ from rowers.dataprep import timedeltaconv
def interactive_histoall(theworkouts): def interactive_histoall(theworkouts):
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair' TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair'
ids = [w.id for w in theworkouts] ids = [int(w.id) for w in theworkouts]
rowdata = dataprep.getsmallrowdata_db(['power'],ids=ids) rowdata = dataprep.getsmallrowdata_db(['power'],ids=ids)
@@ -568,7 +568,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
yparam2='spm'): yparam2='spm'):
# datadf = dataprep.smalldataprep(theworkouts,xparam,yparam1,yparam2) # datadf = dataprep.smalldataprep(theworkouts,xparam,yparam1,yparam2)
ids = [w.id for w in theworkouts] ids = [int(w.id) for w in theworkouts]
datadf = dataprep.getsmallrowdata_db([xparam,yparam1,yparam2],ids=ids) datadf = dataprep.getsmallrowdata_db([xparam,yparam1,yparam2],ids=ids)
axlabels = { axlabels = {