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

Merge branch 'release/v2.33'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-03 21:48:33 +02:00
parent 58faaa8565 d19c3e7785
commit 6c418c3099
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/interactiveplots.py
View File

@@ -947,6 +947,12 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
x_axis_type = 'linear' x_axis_type = 'linear'
y_axis_type = 'linear' y_axis_type = 'linear'
if xparam == 'time':
x_axis_type = 'datetime'
if yparam1 == 'pace':
y_axis_type = 'datetime'
y1mean = datadf.ix[:,'pace'].mean()
datadf['xname'] = xparam datadf['xname'] = xparam
datadf['yname1'] = yparam1 datadf['yname1'] = yparam1
@@ -1002,7 +1008,8 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
text_color='blue', text_color='blue',
) )
plot.add_layout(y1label) if yparam1 != 'time' and yparam1 != 'pace':
plot.add_layout(y1label)
y2label = y1label y2label = y1label
plot.circle('x1','y1',source=source2,fill_alpha=0.3,line_color=None, plot.circle('x1','y1',source=source2,fill_alpha=0.3,line_color=None,
@@ -1019,6 +1026,11 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
xrange1 = Range1d(start=yaxminima[xparam],end=yaxmaxima[xparam]) xrange1 = Range1d(start=yaxminima[xparam],end=yaxmaxima[xparam])
plot.x_range = xrange1 plot.x_range = xrange1
if yparam1 == 'pace':
plot.yaxis[0].formatter = DatetimeTickFormatter(
seconds = ["%S"],
minutes = ["%M"]
)
if yparam2 != 'None': if yparam2 != 'None':
yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2]) yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2])