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

Merge branch 'hotfix/v1.42'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-01 12:05:58 +01:00
parent 60568b756f ae854037f2
commit d4fbe7d3fb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/interactiveplots.py
View File

@@ -154,6 +154,8 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
except KeyError: except KeyError:
pass pass
if rowdata.empty:
return "","No Valid Data Available","",""
catchav = rowdata['catch'].mean() catchav = rowdata['catch'].mean()
finishav = rowdata['finish'].mean() finishav = rowdata['finish'].mean()
@@ -348,7 +350,7 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
slider_spm_max = Slider(start=15.0, end=55,value=55.0, step=.1, slider_spm_max = Slider(start=15.0, end=55,value=55.0, step=.1,
title="Max SPM",callback=callback) title="Max SPM",callback=callback)
callback.args["maxspm"] = slider_spm_max callback.args["maxspm"] = slider_spm_max
distmax = 100+100*int(rowdata['distance'].max()/100.) distmax = 100+100*int(rowdata['distance'].max()/100.)
slider_dist_min = Slider(start=0,end=distmax,value=0,step=1, slider_dist_min = Slider(start=0,end=distmax,value=0,step=1,
@@ -386,6 +388,9 @@ def interactive_histoall(theworkouts):
rowdata = dataprep.getsmallrowdata_db(['power'],ids=ids,doclean=True) rowdata = dataprep.getsmallrowdata_db(['power'],ids=ids,doclean=True)
rowdata.dropna(axis=0,how='any',inplace=True) rowdata.dropna(axis=0,how='any',inplace=True)
if rowdata.empty:
return "","No Valid Data Available","",""
histopwr = rowdata['power'].values histopwr = rowdata['power'].values
if len(histopwr) == 0: if len(histopwr) == 0:
return "","No valid data available","","" return "","No valid data available","",""