diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index ab1bdef8..4fc5677e 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -954,12 +954,12 @@ def interactive_cum_flex_chart2(theworkouts,promember=0, y_axis_type = 'datetime' y1mean = datadf.ix[:,'pace'].mean() - datadf['xname'] = xparam - datadf['yname1'] = yparam1 + datadf['xname'] = axlabels[xparam] + datadf['yname1'] = axlabels[yparam1] if yparam2 != 'None': - datadf['yname2'] = yparam2 + datadf['yname2'] = axlabels[yparam2] else: - datadf['yname2'] = yparam1 + datadf['yname2'] = axlabels[yparam1] source = ColumnDataSource( @@ -1292,12 +1292,12 @@ def interactive_flex_chart2(id=0,promember=0, y1mean = rowdata.ix[:,'pace'].mean() - rowdata['xname'] = xparam - rowdata['yname1'] = yparam1 + rowdata['xname'] = axlabels[xparam] + rowdata['yname1'] = axlabels[yparam1] if yparam2 != 'None': - rowdata['yname2'] = yparam2 + rowdata['yname2'] = axlabels[yparam2] else: - rowdata['yname2'] = yparam1 + rowdata['yname2'] = axlabels[yparam1] # prepare data source = ColumnDataSource(