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

hr pie chart label now with new hR zones

Browse Source
This commit is contained in:
Sander Roosendaal
2021-02-08 08:23:46 +01:00
parent cdc7c5b3d0
commit 3b6c2cf84b
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rowers/interactiveplots.py
View File

@@ -230,7 +230,7 @@ def interactive_hr_piechart(df,rower,title,totalseconds=0):
if totalseconds == 0: if totalseconds == 0:
totalseconds = sumtimehr totalseconds = sumtimehr
hrzones = rower.hrzones
qry = 'hr < {ut2}'.format(ut2=rower.ut2) qry = 'hr < {ut2}'.format(ut2=rower.ut2)
qrydata = df.query(qry) qrydata = df.query(qry)
@@ -253,12 +253,12 @@ def interactive_hr_piechart(df,rower,title,totalseconds=0):
frac_an = totalseconds*df.query(qry)['deltat'].sum()/sumtimehr frac_an = totalseconds*df.query(qry)['deltat'].sum()/sumtimehr
datadict = { datadict = {
'<ut2':frac_lut2, '<{ut2}'.format(ut2=hrzones[1]):frac_lut2,
'ut2': frac_ut2, '{ut2}'.format(ut2=hrzones[1]): frac_ut2,
'ut1': frac_ut1, '{ut1}'.format(ut1=hrzones[2]): frac_ut1,
'at': frac_at, '{at}'.format(at=hrzones[3]): frac_at,
'tr': frac_tr, '{tr}'.format(tr=hrzones[4]): frac_tr,
'an': frac_an, '{an}'.format(an=hrzones[5]): frac_an,
} }
@@ -270,7 +270,15 @@ def interactive_hr_piechart(df,rower,title,totalseconds=0):
data = pd.Series(datadict).reset_index(name='value').rename(columns={'index':'zone'}) data = pd.Series(datadict).reset_index(name='value').rename(columns={'index':'zone'})
data['angle'] = data['value']/data['value'].sum() * 2*pi data['angle'] = data['value']/data['value'].sum() * 2*pi
data['color'] = colors data['color'] = colors
data['zone'] = ['<ut2','ut2','ut1','at','tr','an'] data['zone'] = [
'<{ut2}'.format(ut2=hrzones[1]),
'{ut2}'.format(ut2=hrzones[1]),
'{ut1}'.format(ut1=hrzones[2]),
'{at}'.format(at=hrzones[3]),
'{tr}'.format(tr=hrzones[4]),
'{an}'.format(an=hrzones[5])
]
data['totaltime'] = pd.Series([pretty_timedelta(v) for v in data['value']]) data['totaltime'] = pd.Series([pretty_timedelta(v) for v in data['value']])