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

lbston confusion

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-13 17:47:54 +02:00
parent dcb2bcc3ae
commit 3cfc7597d9
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/dataprep.py
View File

@@ -865,14 +865,16 @@ def getrowdata_db(id=0,doclean=False):
return data,row return data,row
# Fetch a subset of the data from the DB # Fetch a subset of the data from the DB
def getsmallrowdata_db(columns,ids=[],doclean=True,workstrokesonly=True): def getsmallrowdata_db(columns,ids=[],doclean=True,workstrokesonly=True,
convertnewtons=False):
prepmultipledata(ids) prepmultipledata(ids)
data = read_cols_df_sql(ids,columns) data = read_cols_df_sql(ids,columns)
# if 'peakforce' in columns: if convertnewtons:
# data['peakforce'] = data['peakforce']*lbstoN if 'peakforce' in columns:
# if 'averageforce' in columns: data['peakforce'] = data['peakforce']*lbstoN
# data['averageforce'] = data['averageforce']*lbstoN if 'averageforce' in columns:
data['averageforce'] = data['averageforce']*lbstoN
if doclean: if doclean:
data = clean_df_stats(data,ignorehr=True, data = clean_df_stats(data,ignorehr=True,

3
rowers/interactiveplots.py
View File

@@ -1328,7 +1328,8 @@ def interactive_flex_chart2(id=0,promember=0,
'time','pace','workoutstate','time'] 'time','pace','workoutstate','time']
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True, rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True,
workstrokesonly=workstrokesonly) workstrokesonly=workstrokesonly,
convertnewtons=False)
try: try:
tests = rowdata[yparam2] tests = rowdata[yparam2]