diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index f58e5601..68f6d5d2 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2913,9 +2913,10 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data', if type == 'water': p1 = [r.p0,r.p1,r.p2,r.p3] ratio = r.cpratio - else: + elif type == 'erg' : p1 = [r.ep0,r.ep1,r.ep2,r.ep3] ratio = r.ecpratio + fitfunc = lambda pars,x: abs(pars[0])/(1+(x/abs(pars[2]))) + abs(pars[1])/(1+(x/abs(pars[3]))) fitpower = fitfunc(p1,fitt) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index b96d702e..da6a052d 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -528,7 +528,7 @@ def cpdata(workouts, options): 'CP':cpvalue, 'workout':workoutnames, }) - + if powerdf.empty: @@ -552,6 +552,9 @@ def cpdata(workouts, options): wtype = 'water' if workouts[0].workouttype in mytypes.otetypes: wtype = 'erg' + if workouts[0].workouttype == 'bikerg': + # for Mike + wtype = 'erg' res = interactive_otwcpchart(powerdf,promember=True,rowername=rowername,r=r, cpfit=cpfit,title=title,type=wtype) script = res[0]