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

Merge branch 'develop' into feature/popupregatta

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-20 11:38:31 +02:00
parent 4ec10496d7 995296b210
commit 82da46ef0c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -329,7 +329,7 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
# protect 0 spm values from being nulled # protect 0 spm values from being nulled
try: try:
datadf['spm'] = datadf['spm'] + 1.0 datadf['spm'] = datadf['spm'] + 1.0
except TypeError: except (KeyError,TypeError) as e:
pass pass
try: try:
@@ -342,7 +342,7 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
# bring spm back to real values # bring spm back to real values
try: try:
datadf['spm'] = datadf['spm'] - 1 datadf['spm'] = datadf['spm'] - 1
except TypeError: except (TypeError,KeyError) as e:
pass pass
# return from positive domain to negative # return from positive domain to negative

3
rowers/interactiveplots.py
View File

@@ -2126,7 +2126,10 @@ def interactive_chart(id=0,promember=0):
if datadf.empty: if datadf.empty:
return "","No Valid Data Available" return "","No Valid Data Available"
else: else:
try:
datadf.sort_values(by='time',ascending=True,inplace=True) datadf.sort_values(by='time',ascending=True,inplace=True)
except KeyError:
return "","No valid data available"
#datadf,row = dataprep.getrowdata_db(id=id) #datadf,row = dataprep.getrowdata_db(id=id)
#if datadf.empty: #if datadf.empty: