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

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-12 08:22:33 +01:00
parent 1a5d89fcbb
commit cd96820985
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataprep.py
View File

@@ -1605,9 +1605,10 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True):
data[c] = cdata2 data[c] = cdata2
except KeyError: except (KeyError, AttributeError):
data[c] = 0 data[c] = 0
# convert newtons # convert newtons
if doclean: if doclean:

9
rowers/interactiveplots.py
View File

@@ -2182,7 +2182,14 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
try: try:
datadf['x1'] = datadf.ix[:,xparam] datadf['x1'] = datadf.ix[:,xparam]
except KeyError: except KeyError:
datadf['x1'] = datadf['distance'] try:
datadf['x1'] = datadf['distance']
except KeyError:
try:
datadf['x1'] = datadf['time']
except KeyError:
return ['','<p>No non-zero data in selection</p>','','']
try: try:
datadf['y1'] = datadf.ix[:,yparam1] datadf['y1'] = datadf.ix[:,yparam1]
except KeyError: except KeyError: