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

cumulative flex now also for OTW

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-03 15:54:54 +02:00
parent b0bb1d7d25
commit e2b8ab4664
4 changed files with 220 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/interactiveplots.py
View File

@@ -889,12 +889,14 @@ def interactive_chart(id=0,promember=0):
def interactive_cum_flex_chart2(theworkouts,promember=0,
xparam='spm',
yparam1='power',
yparam2='spm'):
yparam2='spm',
workstrokesonly=False):
# datadf = dataprep.smalldataprep(theworkouts,xparam,yparam1,yparam2)
ids = [int(w.id) for w in theworkouts]
columns = [xparam,yparam1,yparam2,'spm','driveenergy','distance']
datadf = dataprep.getsmallrowdata_db(columns,ids=ids,doclean=False)
datadf = dataprep.getsmallrowdata_db(columns,ids=ids,doclean=False,
workstrokesonly=workstrokesonly)
try:
tests = datadf[yparam2]
@@ -1176,7 +1178,6 @@ def interactive_flex_chart2(id=0,promember=0,
workstrokesonly=False):
#rowdata,row = dataprep.getrowdata_db(id=id)
columns = [xparam,yparam1,yparam2,
'ftime','distance','fpace',