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

first bit of plotting extra metrics

Browse Source 
Need to look at the data duplication - where does it come from
This commit is contained in:
Sander Roosendaal
2017-11-28 23:12:32 +01:00
parent 79d20bb860
commit 4e5b661923
2 changed files with 65 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
rowers/interactiveplots.py
View File

@@ -2175,13 +2175,19 @@ def interactive_flex_chart2(id=0,promember=0,
except KeyError:
y1mean = 0
rowdata['xname'] = axlabels[xparam]
rowdata['yname1'] = axlabels[yparam1]
try:
rowdata['yname1'] = axlabels[yparam1]
except KeyError:
rowdata['yname1'] = yparam1
if yparam2 != 'None':
rowdata['yname2'] = axlabels[yparam2]
try:
rowdata['yname2'] = axlabels[yparam2]
except KeyError:
rowdata['yname2'] = yparam2
else:
rowdata['yname2'] = axlabels[yparam1]
rowdata['yname2'] = rowdata['yname1']
# prepare data
@@ -2281,7 +2287,12 @@ def interactive_flex_chart2(id=0,promember=0,
plot.title.text_font_size=value("1.0em")
plot.xaxis.axis_label = axlabels[xparam]
plot.yaxis.axis_label = axlabels[yparam1]
try:
yaxlabel = axlabels[yparam1]
except KeyError:
yaxlabel = yparam1
plot.yaxis.axis_label = yaxlabel
@@ -2289,7 +2300,13 @@ def interactive_flex_chart2(id=0,promember=0,
plot.y_range = yrange1
if (xparam != 'time') and (xparam != 'distance') and (xparam != 'cumdist'):
xrange1 = Range1d(start=yaxminima[xparam],end=yaxmaxima[xparam])
try:
xrange1 = Range1d(start=yaxminima[xparam],
end=yaxmaxima[xparam])
except KeyError:
xrange1 = Range1d(start=rowdata[xparam].min(),
end=rowdata[xparam].max())
plot.x_range = xrange1
if xparam == 'time':
@@ -2313,22 +2330,32 @@ def interactive_flex_chart2(id=0,promember=0,
if yparam2 != 'None':
yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2])
try:
yrange2 = Range1d(start=yaxminima[yparam2],
end=yaxmaxima[yparam2])
except KeyError:
yrange2 = Range1d(start=rowdata[yparam2].min(),
end=rowdata[yparam2].max())
plot.extra_y_ranges["yax2"] = yrange2
#= {"yax2": yrange2}
try:
axlegend = axlabels[yparam2]
except KeyError:
axlegend = str(yparam2)+' '
if plottype=='line':
plot.line('x1','y2',color="red",y_range_name="yax2",
legend=axlabels[yparam2],
legend=axlegend,
source=source2)
elif plottype=='scatter':
plot.scatter('x1','y2',source=source2,legend=axlabels[yparam2]
,fill_alpha=0.4,
plot.scatter('x1','y2',source=source2,legend=axlegend,
fill_alpha=0.4,
line_color=None,color="red",y_range_name="yax2")
plot.add_layout(LinearAxis(y_range_name="yax2",
axis_label=axlabels[yparam2]),'right')
axis_label=axlegend),'right')
y2means = Span(location=y2mean,dimension='width',line_color='red',
line_dash=[6,6],line_width=2,y_range_name="yax2")
@@ -2336,7 +2363,7 @@ def interactive_flex_chart2(id=0,promember=0,
plot.add_layout(y2means)
y2label = Label(x=100,y=70,x_units='screen',y_units='screen',
text=axlabels[yparam2]+": {y2mean:6.2f}".format(y2mean=y2mean),
text=axlegend+": {y2mean:6.2f}".format(y2mean=y2mean),
background_fill_alpha=.7,
background_fill_color='white',
text_color='red',