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

fixing analysis data bokeh

Browse Source
This commit is contained in:
Sander Roosendaal
2023-06-04 09:26:36 +02:00
parent b6202369c7
commit 206ee219f3
5 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/datautils.py
View File

@@ -329,7 +329,7 @@ def getmaxwattinterval(tt, ww, i):
w_roll = ww.rolling(i+2).mean().dropna()
if len(w_roll):
# now goes with # data points - should be fixed seconds
indexmax = w_roll.idxmax(axis=1)
indexmax = w_roll.idxmax(axis=0)
# indexmaxpos = indexmax.get_loc(indexmax)
indexmaxpos = indexmax
try:

5
rowers/interactiveplots.py
View File

@@ -3589,8 +3589,9 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None, cpfit='da
title = "Critical Power for "+rowername
plot.title.text = title
xaxis = plot.select(dict(type=Axis, layout="below"))[0]
xaxis.formatter = PrintfTickFormatter()
#xaxis = plot.select(dict(type=Axis, layout="below")) #[0]
#print(xaxis)
#xaxis.formatter = PrintfTickFormatter()
hover = plot.select(dict(type=HoverTool))

21
rowers/templates/user_analysis_select.html
View File

@@ -332,12 +332,18 @@
</script>
<div id="id_css_res">
<link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-3.1.1.min.css" type="text/css" />
<link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-3.1.1.min.css" type="text/css" />
</div>
<div id="id_js_res">
<script src="https://cdn.pydata.org/bokeh/release/bokeh-3.1.1.min.js"></script>
<script src="https://cdn.pydata.org/bokeh/release/bokeh-widgets-3.1.1.min.js"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-3.1.1.min.js"
crossorigin="anonymous"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.1.1.min.js"
crossorigin="anonymous"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.1.1.min.js"
crossorigin="anonymous"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-gl-3.1.1.min.js"
crossorigin="anonymous"></script>
<script src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-3.1.1.min.js"
crossorigin="anonymous"></script>
</div>
<script async="true" type="text/javascript">
@@ -533,9 +539,10 @@
var script = json.script;
var div = json.div;
$("#id_sitready").remove();
$("#id_chart").append(div);
console.log(div);
$("#id_script").append("<script>"+script+"</s"+"cript>");
$("#id_chart").append(div);
$("#id_script").append(script);
/* $("#id_script").append("<script>"+script+"</s"+"cript>"); */
});
});

17
rowers/views/analysisviews.py
View File

@@ -535,8 +535,6 @@ def trendflexdata(workouts, options, userid=0):
spmmin=spmmin, spmmax=spmmax,
workmin=workmin, workmax=workmax)
scripta = script.split('\n')[2:-1]
script = ''.join(scripta)
return(script, div)
@@ -583,9 +581,6 @@ def flexalldata(workouts, options):
script = res[0]
div = res[1]
scripta = script.split('\n')[2:-1]
script = ''.join(scripta)
return(script, div)
@@ -620,9 +615,6 @@ def histodata(workouts, options):
extratitle=extratitle,
workmin=workmin, workmax=workmax)
scripta = script.split('\n')[2:-1]
script = ''.join(scripta)
return(script, div)
@@ -718,8 +710,8 @@ def cpdata(workouts, options):
p1 = [1, 1, 1, 1]
ratio = 1
scripta = script.split('\n')[2:-1]
script = ''.join(scripta)
minutes = options['piece']
if minutes != 0:
@@ -898,9 +890,6 @@ def comparisondata(workouts, options):
script = res[0]
div = res[1]
scripta = script.split('\n')[2:-1]
script = ''.join(scripta)
return(script, div)
@@ -964,8 +953,6 @@ def boxplotdata(workouts, options):
spmmin=spmmin, spmmax=spmmax,
workmin=workmin, workmax=workmax)
scripta = script.split('\n')[2:-1]
script = ''.join(scripta)
return(script, div)

1
templates/newbase.html
View File

@@ -60,7 +60,6 @@
}(document, 'script', 'facebook-jssdk'));</script>
<script>
$(document).ready(function (){
FB.XFBML.parse();
})
</script>