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

Merge branch 'release/v12.11'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-04-11 15:22:37 +02:00
parent d4a095dcf2 f332819daf
commit ea5c25f1dc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/interactiveplots.py
View File

@@ -4775,7 +4775,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
for id,color in items: for id,color in items:
group = datadf[datadf['workoutid']==int(id)].copy() group = datadf[datadf['workoutid']==int(id)].copy()
print(group.info(),'compare 1',ids)
group.sort_values(by='time',ascending=True,inplace=True) group.sort_values(by='time',ascending=True,inplace=True)
@@ -4794,6 +4794,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
ymean = group['y'].mean() ymean = group['y'].mean()
print(ymean,'compare 2',ids)
ylabel = Label(x=100,y=60+nrworkouts*20-20*cntr, ylabel = Label(x=100,y=60+nrworkouts*20-20*cntr,
x_units='screen',y_units='screen', x_units='screen',y_units='screen',
text=axlabels[yparam]+": {ymean:6.2f}".format(ymean=ymean), text=axlabels[yparam]+": {ymean:6.2f}".format(ymean=ymean),