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

removing some warnings

Browse Source
This commit is contained in:
Sander Roosendaal
2021-04-14 13:06:34 +02:00
parent 196548fdcc
commit aa2315cb9b
12 changed files with 250 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
rowers/interactiveplots.py
View File

@@ -1556,13 +1556,13 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
slider_dist_max.js_on_change('value',callback)
callback.args["maxdist"] = slider_dist_max
annotation.sizing_mode = 'fixed'
slider_spm_min.sizing_mode = 'fixed'
slider_spm_max.sizing_mode = 'fixed'
slider_work_min.sizing_mode = 'fixed'
slider_work_max.sizing_mode = 'fixed'
slider_dist_min.sizing_mode = 'fixed'
slider_dist_max.sizing_mode = 'fixed'
#annotation.sizing_mode = 'fixed'
#slider_spm_min.sizing_mode = 'fixed'
#slider_spm_max.sizing_mode = 'fixed'
#slider_work_min.sizing_mode = 'fixed'
#slider_work_max.sizing_mode = 'fixed'
#slider_dist_min.sizing_mode = 'fixed'
#slider_dist_max.sizing_mode = 'fixed'
thesliders = layoutcolumn([annotation,
slider_spm_min,
@@ -1573,7 +1573,7 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
slider_work_max,
]
)
thesliders.sizing_mode = 'fixed'
#thesliders.sizing_mode = 'fixed'
layout = layoutrow([thesliders,
plot])
@@ -3663,7 +3663,12 @@ def interactive_cpchart(rower,thedistances,thesecs,theavpower,
success = 0
p1 = p0
if len(thesecs)>=4:
p1, success = optimize.leastsq(errfunc, p0[:], args = (thesecs,theavpower))
try:
p1, success = optimize.leastsq(errfunc, p0[:], args = (thesecs,theavpower))
except (RuntimeError,RuntimeWarning):
factor = fitfunc(p0,thesecs.mean())/theavpower.mean()
p1 = [p0[0]/factor,p0[1]/factor,p0[2],p0[3]]
success = 0
else:
factor = fitfunc(p0,thesecs.mean())/theavpower.mean()
p1 = [p0[0]/factor,p0[1]/factor,p0[2],p0[3]]
@@ -4889,12 +4894,12 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
slider_dist_max.js_on_change('value',callback)
callback.args["maxdist"] = slider_dist_max
slider_spm_min.sizing_mode = 'fixed'
slider_spm_max.sizing_mode = 'fixed'
slider_work_min.sizing_mode = 'fixed'
slider_work_max.sizing_mode = 'fixed'
slider_dist_min.sizing_mode = 'fixed'
slider_dist_max.sizing_mode = 'fixed'
#slider_spm_min.sizing_mode = 'fixed'
#slider_spm_max.sizing_mode = 'fixed'
#slider_work_min.sizing_mode = 'fixed'
#slider_work_max.sizing_mode = 'fixed'
#slider_dist_min.sizing_mode = 'fixed'
#slider_dist_max.sizing_mode = 'fixed'
thesliders = layoutcolumn([slider_spm_min,
slider_spm_max,
@@ -4905,7 +4910,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
],
)
thesliders.sizing_mode = 'fixed'
#thesliders.sizing_mode = 'fixed'
layout = layoutrow([thesliders,
plot])
@@ -5917,13 +5922,13 @@ def interactive_flex_chart2(id,r,promember=0,
slider_dist_max.js_on_change('value',callback)
callback.args["maxdist"] = slider_dist_max
annotation.sizing_mode = 'fixed'
slider_spm_min.sizing_mode = 'fixed'
slider_spm_max.sizing_mode = 'fixed'
slider_work_min.sizing_mode = 'fixed'
slider_work_max.sizing_mode = 'fixed'
slider_dist_min.sizing_mode = 'fixed'
slider_dist_max.sizing_mode = 'fixed'
#annotation.sizing_mode = 'fixed'
#slider_spm_min.sizing_mode = 'fixed'
#slider_spm_max.sizing_mode = 'fixed'
#slider_work_min.sizing_mode = 'fixed'
#slider_work_max.sizing_mode = 'fixed'
#slider_dist_min.sizing_mode = 'fixed'
#slider_dist_max.sizing_mode = 'fixed'
thesliders = layoutcolumn([
annotation,
@@ -5935,7 +5940,7 @@ def interactive_flex_chart2(id,r,promember=0,
slider_work_max,
])
thesliders.sizing_mode = 'fixed'
#thesliders.sizing_mode = 'fixed'
layout = layoutrow([thesliders,
plot])