diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e738b735..1fc6236d 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1605,8 +1605,9 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True): data[c] = cdata2 - except KeyError: + except (KeyError, AttributeError): data[c] = 0 + # convert newtons diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 7f1b9af3..cbe08d1e 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2182,7 +2182,14 @@ def interactive_cum_flex_chart2(theworkouts,promember=0, try: datadf['x1'] = datadf.ix[:,xparam] except KeyError: - datadf['x1'] = datadf['distance'] + try: + datadf['x1'] = datadf['distance'] + except KeyError: + try: + datadf['x1'] = datadf['time'] + except KeyError: + return ['','

No non-zero data in selection

','',''] + try: datadf['y1'] = datadf.ix[:,yparam1] except KeyError: @@ -2198,7 +2205,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0, else: datadf['y2'] = datadf['y1'] - + if xparam=='distance': xaxmax = datadf['x1'].max() xaxmin = datadf['x1'].min()