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

fix date sorting strava

Browse Source
This commit is contained in:
Sander Roosendaal
2022-10-24 21:03:15 +02:00
parent 88c3cb36e2
commit 8d8e12315e
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/interactiveplots.py
View File

@@ -4082,6 +4082,9 @@ def instroke_multi_interactive_chart(selected):
df_plot = pd.DataFrame()
ids = [analysis.id for analysis in selected]
metrics = list(set([analysis.metric for analysis in selected]))
maximum_values = {}
for metric in metrics:
maximum_values[metric] = 0
for analysis in selected:
#start_second, end_second, spm_min, spm_max, name
activeminutesmin = int(analysis.start_second/60.)
@@ -4095,14 +4098,22 @@ def instroke_multi_interactive_chart(selected):
activeminutesmax=activeminutesmax,
)
mean_vals = data.mean()
if len(metrics)>1:
mean_vals = mean_vals/mean_vals.max()
if analysis.metric == 'boat accelerator curve':
mean_vals[0] = (mean_vals[1]+ mean_vals[len(mean_vals)-1])/2.
if len(metrics) > 1:
if mean_vals.max() > maximum_values[analysis.metric]:
maximum_values[analysis.metric] = mean_vals.max()
xvals = np.arange(len(mean_vals))
xname = 'x_'+str(analysis.id)
yname = 'y_'+str(analysis.id)
df_plot[xname] = xvals
df_plot[yname] = mean_vals
if len(metrics) > 1:
for analysis in selected:
yname = 'y_'+str(analysis.id)
df_plot[yname] = df_plot[yname] / maximum_values[analysis.metric]
source = ColumnDataSource(
df_plot
)