Private
Public Access
1
0

adding fitness-fit chart (hidden)

This commit is contained in:
Sander Roosendaal
2020-11-23 21:12:10 +01:00
parent c77c6b899a
commit 3a600a392d
4 changed files with 301 additions and 0 deletions

View File

@@ -1527,6 +1527,139 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
return [script,div,js_resources,css_resources]
def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
enddate=None,nrdays=20):
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
dates = []
fourminpower = []
hourpower = []
workouts = workouts.order_by('date')
for w in workouts:
ws = workouts.filter(date__gte=w.date-datetime.timedelta(days=nrdays),
date__lte=w.date)
wws = [ww for ww in ws]
delta,cpvalue,avgpower,workoutnames = dataprep.fetchcp_new(user.rower,wws)
powerdf = pd.DataFrame({
'Delta':delta,
'CP':cpvalue,
'workout':workoutnames,
})
powerdf = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True)
powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True)
powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True)
p1,fitt,fitpower,ratio = datautils.cpfit(powerdf)
fitfunc = lambda pars,x: abs(pars[0])/(1+(x/abs(pars[2]))) + abs(pars[1])/(1+(x/abs(pars[3])))
powerfourmin = fitfunc(p1,240.)
powerhour = fitfunc(p1,3600)
dates.append(datetime.datetime.combine(w.date,datetime.datetime.min.time()))
fourminpower.append(powerfourmin)
hourpower.append(powerhour)
df = pd.DataFrame({
'date':dates,
'fourminpower':fourminpower,
'hourpower':hourpower,
})
df.sort_values(['date'],inplace=True)
df['hourdup'] = df['hourpower'].shift(1)
df['fourmindup'] = df['fourminpower'].shift(1)
df['hourpower'] = df.apply(lambda x: np.nan if abs(x['hourpower'] - x['hourdup']) < 4 \
else x['hourpower'],axis=1)
df['fourminpower'] = df.apply(lambda x: np.nan if abs(x['fourminpower'] - x['fourmindup']) < 4 \
else x['fourminpower'],axis=1)
source = ColumnDataSource(
data = dict(
fourminpower = df['fourminpower'],
hourpower = df['hourpower'],
date = df['date'],
fdate = df['date'].map(lambda x: x.strftime('%d-%m-%Y'))
)
)
plot = Figure(tools=TOOLS,x_axis_type='datetime',
plot_width=900,
toolbar_location="above",
toolbar_sticky=False)
# add watermark
watermarkurl = "/static/img/logo7.png"
watermarksource = ColumnDataSource(dict(
url = [watermarkurl],))
watermarkrange = Range1d(start=0,end=1)
watermarkalpha = 0.6
watermarkx = 0.99
watermarky = 0.01
watermarkw = 184
watermarkh = 35
watermarkanchor = 'bottom_right'
plot.extra_y_ranges = {"watermark": watermarkrange}
plot.extra_x_ranges = {"watermark": watermarkrange}
plot.image_url([watermarkurl],watermarkx,watermarky,
watermarkw,watermarkh,
global_alpha=watermarkalpha,
w_units='screen',
h_units='screen',
anchor=watermarkanchor,
dilate=True,
x_range_name = "watermark",
y_range_name = "watermark",
)
plot.circle('date','fourminpower',source=source,fill_color='green',size=10,legend_label='4 min power')
plot.circle('date','hourpower',source=source,fill_color='blue',size=10,legend_label='60 min power')
plot.xaxis.axis_label = 'Date'
plot.yaxis.axis_label = 'Power (W)'
plot.xaxis.formatter = DatetimeTickFormatter(
days=["%d %B %Y"],
months=["%d %B %Y"],
years=["%d %B %Y"],
)
plot.xaxis.major_label_orientation = pi/4
plot.sizing_mode = 'stretch_both'
plot.y_range = Range1d(0,1.5*max(fourminpower))
startdate = datetime.datetime.combine(startdate,datetime.datetime.min.time())
enddate = datetime.datetime.combine(enddate,datetime.datetime.min.time())
plot.x_range = Range1d(
startdate,enddate+datetime.timedelta(days=5),
)
plot.title.text = 'Power levels ('+workoutmode+') from workouts '+user.first_name
hover = plot.select(dict(type=HoverTool))
hover.tooltips = OrderedDict([
('Power 4 minutes','@fourminpower'),
('Power 1 hour','@hourpower'),
('Date','@fdate')
])
script,div = components(plot)
return [script,div]
def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
enddate=None):