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

some small improvments

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-24 17:28:19 +02:00
parent c3b404f8b6
commit 462e1e2f81
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rowers/interactiveplots.py
View File

@@ -5092,6 +5092,8 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
deltas = [pair[1]-pair[0] for key,pair in startenddict.items()] deltas = [pair[1]-pair[0] for key,pair in startenddict.items()]
xaxmin = 0 xaxmin = 0
xaxmax = pd.Series(deltas).max()*1000. xaxmax = pd.Series(deltas).max()*1000.
if xaxmax == 0:
xaxmax = tseconds.max()
else: else:
xaxmax = datadf['distance'].max() xaxmax = datadf['distance'].max()
xaxmin = datadf['distance'].min() xaxmin = datadf['distance'].min()
@@ -5182,21 +5184,21 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
group.sort_values(by='time',ascending=True,inplace=True) group.sort_values(by='time',ascending=True,inplace=True)
group['time'] = group['time'] - 1.e3*startsecond if endsecond > 0:
group['time'] = group['time'] - 1.e3*startsecond
mask = group['time'] < 0 mask = group['time'] < 0
group.mask(mask,inplace=True) group.mask(mask,inplace=True)
mask = group['time'] > 1.e3*(endsecond-startsecond) mask = group['time'] > 1.e3*(endsecond-startsecond)
group.mask(mask,inplace=True) group.mask(mask,inplace=True)
if xparam == 'cumdist': if xparam == 'cumdist':
group['cumdist'] = group['cumdist'] - group['cumdist'].min() group['cumdist'] = group['cumdist'] - group['cumdist'].min()
res = make_cumvalues(group[xparam]) res = make_cumvalues(group[xparam])
group[xparam] = res[0] group[xparam] = res[0]
elif xparam == 'distance':
group['distance'] = group['distance'] - group['distance'].min()
try: try:
group['x'] = group[xparam] group['x'] = group[xparam]
except KeyError: except KeyError:

6
rowers/views/workoutviews.py
View File

@@ -1542,7 +1542,11 @@ def virtualevent_compare_view(request,id=0):
if request.method == 'GET': if request.method == 'GET':
xparam = race.sessionmode if race.sessionmode in ['distance','time'] else 'time' xparam = 'time'
if race.sessionmode == 'distance':
xparam = 'cumdist'
yparam = 'pace' yparam = 'pace'
plottype = 'line' plottype = 'line'