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

Merge branch 'develop' into feature/embeddedvideo

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-16 16:58:15 +01:00
parent 465527d211 dcaec4cfa4
commit 9ddfcb20d6
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
rowers/interactiveplots.py
View File

@@ -3466,10 +3466,10 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
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 xname = data['xname']
var yname1 = data['yname1']
var yname2 = data['yname2']
var workoutid1 = data['workoutid']
var minspm = minspm.value
var maxspm = maxspm.value
@@ -3514,10 +3514,10 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
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)
data2['workoutid'].push(0)
data2['xname'].push(0)
data2['yname1'].push(0)
data2['yname2'].push(0)
xm += x1[i]
ym1 += y1[i]
@@ -3541,9 +3541,9 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
x1means.location = xm
y1means.location = ym1
y2means.location = ym2
y1label.text = yname1+': '+(ym1).toFixed(2)
y2label.text = yname2+': '+(ym2).toFixed(2)
xlabel.text = xname+': '+(xm).toFixed(2)
y1label.text = yname1[0]+': '+(ym1).toFixed(2)
y2label.text = yname2[0]+': '+(ym2).toFixed(2)
xlabel.text = xname[0]+': '+(xm).toFixed(2)
source2.change.emit();
""")
@@ -3791,6 +3791,8 @@ def interactive_flex_chart2(id=0,promember=0,
rowdata
)
# second source for filtering
source2 = ColumnDataSource(
rowdata.copy()
@@ -4045,12 +4047,11 @@ def interactive_flex_chart2(id=0,promember=0,
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 workoutstate1 = data['workoutstate'][0]
var xname = data['xname']
var yname1 = data['yname1']
var yname2 = data['yname2']
var workoutid1 = data['workoutid']
var workoutstate1 = data['workoutstate']
var annotation = annotation.value
var minspm = minspm.value
@@ -4108,11 +4109,11 @@ def interactive_flex_chart2(id=0,promember=0,
data2['hr'].push(hr1[i])
data2['distance'].push(distance1[i])
data2['power'].push(power1[i])
data2['workoutid'].push(workoutid1)
data2['workoutstate'].push(workoutstate1)
data2['xname'].push(xname)
data2['yname1'].push(yname1)
data2['yname2'].push(yname2)
data2['workoutid'].push(0)
data2['workoutstate'].push(0)
data2['xname'].push(0)
data2['yname1'].push(0)
data2['yname2'].push(0)
xm += x1[i]
@@ -4138,9 +4139,9 @@ def interactive_flex_chart2(id=0,promember=0,
x1means.location = xm
y1means.location = ym1
y2means.location = ym2
y1label.text = yname1+': '+ym1.toFixed(2)
y2label.text = yname2+': '+ym2.toFixed(2)
xlabel.text = xname+': '+xm.toFixed(2)
y1label.text = yname1[0]+': '+ym1.toFixed(2)
y2label.text = yname2[0]+': '+ym2.toFixed(2)
xlabel.text = xname[0]+': '+xm.toFixed(2)
annolabel.text = annotation
source2.change.emit();

4
rowers/templates/flexchart3otw.html
View File

@@ -32,7 +32,7 @@
<h1>Flexible Chart</h1>
<ul class="main-content">
<li class="grid_4">
<div id="theplot" class="flexplot">
@@ -56,7 +56,7 @@
</p>
</form>
</li>
<li class="grid_2">
<form enctype="multipart/form-data" action="{{ formloc }}" method="post">
{% if favoritenr > 0 %}