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

fixed cum_flex sliders and fixed #439

Browse Source
This commit is contained in:
Sander Roosendaal
2019-03-17 10:58:14 +01:00
parent ae1e12a511
commit 290b624a8b
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rowers/interactiveplots.py
View File

@@ -2814,7 +2814,6 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
if yparam2 != 'pace' and yparam2 != 'time':
plot.add_layout(y2label)
callback = CustomJS(args = dict(source=source,source2=source2,
x1means=x1means,
y1means=y1means,
@@ -2828,11 +2827,16 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
var y1 = data['y1']
var y2 = data['y2']
var spm1 = data['spm']
var index1 = data['index']
var distance1 = data['distance']
var power1 = data['power']
var driveenergy1 = data['driveenergy']
var xname = data['xname'][0]
var yname1 = data['yname1'][0]
var yname2 = data['yname2'][0]
var workoutid1 = data['workoutid'][0]
var minspm = minspm.value
var maxspm = maxspm.value
@@ -2847,14 +2851,18 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
data2['x1'] = []
data2['y1'] = []
data2['y2'] = []
data2['spm'] = []
data2['index'] = []
data2['distance'] = []
data2['power'] = []
data2['x1mean'] = []
data2['y1mean'] = []
data2['y2mean'] = []
data2['xvals'] = []
data2['y1vals'] = []
data2['y2vals'] = []
data2['driveenergy'] = []
data2['workoutid'] = []
data2['xname'] = []
data2['yname1'] = []
data2['yname2'] = []
data2['spm'] = []
for (i=0; i<x1.length; i++) {
if (spm1[i]>=minspm && spm1[i]<=maxspm) {
@@ -2864,7 +2872,14 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
data2['y1'].push(y1[i])
data2['y2'].push(y2[i])
data2['spm'].push(spm1[i])
data2['index'].push(index1[i])
data2['driveenergy'].push(driveenergy1[i])
data2['distance'].push(distance1[i])
data2['power'].push(power1[i])
data2['workoutid'].push(workoutid1)
data2['xname'].push(xname)
data2['yname1'].push(yname1)
data2['yname2'].push(yname2)
xm += x1[i]
ym1 += y1[i]
@@ -2874,13 +2889,17 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
}
}
xm /= data2['x1'].length
ym1 /= data2['x1'].length
ym2 /= data2['x1'].length
data2['x1mean'] = [xm,xm]
data2['y1mean'] = [ym1,ym1]
data2['y2mean'] = [ym2,ym2]
for (i=0; i<data2['x1'].length; i++) {
data2['x1mean'].push(xm)
data2['y1mean'].push(ym1)
data2['y2mean'].push(ym2)
}
x1means.location = xm
y1means.location = ym1
y2means.location = ym2
@@ -3467,9 +3486,7 @@ def interactive_flex_chart2(id=0,promember=0,
}
// data2['x1mean'] = [xm,xm]
// data2['y1mean'] = [ym1,ym1]
// data2['y2mean'] = [ym2,ym2]
x1means.location = xm
y1means.location = ym1
y2means.location = ym2