Change order that plot lines are rendered so E1RM is always visible

This commit is contained in:
Peter Stockings
2023-12-09 20:59:50 +11:00
parent c4a4af6307
commit 26f4a84d0b

12
db.py
View File

@@ -515,11 +515,6 @@ class DataBase():
repetitions_points = zip(repetitions_scaled, relative_positions, messages) repetitions_points = zip(repetitions_scaled, relative_positions, messages)
weight_points = zip(weight_scaled, relative_positions, messages) weight_points = zip(weight_scaled, relative_positions, messages)
estimated_1rm = {
'label': 'E1RM',
'color': '#2ca02c',
'points': list(estimated_1rm_points)
}
repetitions = { repetitions = {
'label': 'Reps', 'label': 'Reps',
'color': '#388fed', 'color': '#388fed',
@@ -530,6 +525,11 @@ class DataBase():
'color': '#bd3178', 'color': '#bd3178',
'points': list(weight_points) 'points': list(weight_points)
} }
estimated_1rm = {
'label': 'E1RM',
'color': '#2ca02c',
'points': list(estimated_1rm_points)
}
plot_labels = zip(relative_positions, messages) plot_labels = zip(relative_positions, messages)
@@ -538,7 +538,7 @@ class DataBase():
'exercise_name': topsets[0]['exercise_name'], 'exercise_name': topsets[0]['exercise_name'],
'vb_width': vb_width, 'vb_width': vb_width,
'vb_height': vb_height, 'vb_height': vb_height,
'plots': [estimated_1rm, repetitions, weight], 'plots': [repetitions, weight, estimated_1rm],
'best_fit_points': list(best_fit_points), 'best_fit_points': list(best_fit_points),
'plot_labels': plot_labels 'plot_labels': plot_labels
} }