diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index d00c8a53..1130e22d 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -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(); diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index 0355b053..e89e394b 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -32,7 +32,7 @@

Flexible Chart

- +
  • @@ -56,7 +56,7 @@

  • - +
  • {% if favoritenr > 0 %}