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

Updated - flex chart only, only pace

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-04 08:36:50 +01:00
parent 2fc303a664
commit d0cf9c745e
3 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rowers/interactiveplots.py
View File

@@ -85,7 +85,7 @@ import rowers.dataprep as dataprep
import rowers.metrics as metrics
import rowers.c2stuff as c2stuff
from rowers.metrics import axes,axlabels,yaxminima,yaxmaxima
from rowers.metrics import axes,axlabels,yaxminima,yaxmaxima,get_yaxminima,get_yaxmaxima
from rowers.utils import lbstoN
from rowers.datautils import p0
@@ -4418,7 +4418,8 @@ def interactive_flex_chart2(id,r,promember=0,
yparam1='pace',
yparam2='hr',
plottype='line',
workstrokesonly=False):
workstrokesonly=False,
mode='rower'):
watermarkurl = "/static/img/logo7.png"
watermarksource = ColumnDataSource(dict(
@@ -4535,8 +4536,8 @@ def interactive_flex_chart2(id,r,promember=0,
xaxmin = rowdata['x1'].min()
else:
try:
xaxmax = yaxmaxima[xparam]
xaxmin = yaxminima[xparam]
xaxmax = get_yaxmaxima(r,xparam,mode)
xaxmin = get_yaxminima(r,xparam,mode)
except KeyError:
xaxmax = rowdata['x1'].max()
xaxmin = rowdata['x1'].min()
@@ -4733,8 +4734,8 @@ def interactive_flex_chart2(id,r,promember=0,
try:
yrange1 = Range1d(start=yaxminima[yparam1],
end=yaxmaxima[yparam1])
yrange1 = Range1d(start=get_yaxminima(r,yparam1,mode),
end=get_yaxmaxima(r,yparam1,mode))
except KeyError:
yrange1 = Range1d(start=rowdata[yparam1].min(),
end=rowdata[yparam1].max())
@@ -4743,8 +4744,8 @@ def interactive_flex_chart2(id,r,promember=0,
if (xparam != 'time') and (xparam != 'distance') and (xparam != 'cumdist'):
try:
xrange1 = Range1d(start=yaxminima[xparam],
end=yaxmaxima[xparam])
xrange1 = Range1d(start=get_yaxminima(r,xparam,mode),
end=get_yaxmaxima(r,xparam,mode))
except KeyError:
xrange1 = Range1d(start=rowdata[xparam].min(),
end=rowdata[xparam].max())
@@ -4773,8 +4774,8 @@ def interactive_flex_chart2(id,r,promember=0,
if yparam2 != 'None':
try:
yrange2 = Range1d(start=yaxminima[yparam2],
end=yaxmaxima[yparam2])
yrange2 = Range1d(start=get_yaxminima(r,yparam2,mode),
end=get_yaxmaxima(r,yparam2,mode))
except KeyError:
yrange2 = Range1d(start=rowdata[yparam2].min(),
end=rowdata[yparam2].max())