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

some fixes, after manual testing

Browse Source
This commit is contained in:
Sander Roosendaal
2024-05-03 16:56:01 +02:00
parent ada06da0fc
commit ebea0047cc
6 changed files with 61 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rowers/interactiveplots.py
View File

@@ -2099,11 +2099,12 @@ def interactive_multiple_compare_chart(ids, xparam, yparam, plottype='line',
promember=0, workstrokesonly=True,
labeldict=None, startenddict={}):
print(startenddict)
columns = [xparam,yparam]
columns_basic = [xparam,yparam]
add_columns = [
'ftime', 'distance', 'fpace',
'spm',
'spm','cumdist',
'time', 'pace', 'workoutstate',
'workoutid'
]
@@ -2117,15 +2118,17 @@ def interactive_multiple_compare_chart(ids, xparam, yparam, plottype='line',
doclean = True
datadf = pd.DataFrame()
datadf = pl.DataFrame()
if promember:
datadf = dataprep.read_data(columns, ids=ids, doclean=doclean,
compute=compute,
workstrokesonly=workstrokesonly, for_chart=True)
workstrokesonly=workstrokesonly, for_chart=True,
startenddict=startenddict)
else:
datadf = dataprep.read_data(columns_basic, ids=ids, doclean=doclean,
compute=compute,
workstrokesonly=workstrokesonly, for_chart=True)
workstrokesonly=workstrokesonly, for_chart=True,
startenddict=startenddict)
datadf = dataprep.remove_nulls_pl(datadf)
@@ -2135,6 +2138,8 @@ def interactive_multiple_compare_chart(ids, xparam, yparam, plottype='line',
datadf = datadf.with_columns(pl.col("workoutid").cast(pl.UInt32).keep_name())
# filter for start end dict
nrworkouts = len(ids)