diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 359229ed..a9ad37f1 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -865,14 +865,16 @@ def getrowdata_db(id=0,doclean=False): return data,row # 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) data = read_cols_df_sql(ids,columns) - - # if 'peakforce' in columns: - # data['peakforce'] = data['peakforce']*lbstoN - # if 'averageforce' in columns: - # data['averageforce'] = data['averageforce']*lbstoN + + if convertnewtons: + if 'peakforce' in columns: + data['peakforce'] = data['peakforce']*lbstoN + if 'averageforce' in columns: + data['averageforce'] = data['averageforce']*lbstoN if doclean: data = clean_df_stats(data,ignorehr=True, diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 72607cbf..b13841e0 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1328,7 +1328,8 @@ def interactive_flex_chart2(id=0,promember=0, 'time','pace','workoutstate','time'] rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True, - workstrokesonly=workstrokesonly) + workstrokesonly=workstrokesonly, + convertnewtons=False) try: tests = rowdata[yparam2]