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

fixing ub

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-08 20:00:34 +02:00
parent d037ae2354
commit 766318ff40
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/datautils.py
View File

@@ -90,8 +90,15 @@ def cpfit(powerdf):
def getlogarr(maxt): def getlogarr(maxt):
maxlog10 = np.log10(maxt-5) maxlog10 = np.log10(maxt-5)
logarr = np.arange(50)*maxlog10/50. logarr = np.arange(50)*maxlog10/50.
logarr = [5+int(10.**(la)) for la in logarr] res = []
logarr = pd.Series(logarr) for la in logarr:
try:
v = 5+int(10.**(la))
except ValueError:
v = 0
res.append(v)
logarr = pd.Series(res)
logarr.drop_duplicates(keep='first',inplace=True) logarr.drop_duplicates(keep='first',inplace=True)
logarr = logarr.values logarr = logarr.values
@@ -332,4 +339,3 @@ def getmaxwattinterval(tt,ww,i):
deltat = 0 deltat = 0
return deltat,wmax return deltat,wmax

4
rowers/tasks.py
View File

@@ -30,6 +30,7 @@ import datetime
import pytz import pytz
import iso8601 import iso8601
from json.decoder import JSONDecodeError
from matplotlib.backends.backend_agg import FigureCanvas from matplotlib.backends.backend_agg import FigureCanvas
#from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas #from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas
@@ -2028,7 +2029,10 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
elif (plotnr == 2): elif (plotnr == 2):
fig1 = row.get_metersplot_erg(t,pacerange=oterange,**kwargs) fig1 = row.get_metersplot_erg(t,pacerange=oterange,**kwargs)
elif (plotnr == 3): elif (plotnr == 3):
try:
t += ' - Heart Rate Distribution' t += ' - Heart Rate Distribution'
except TypeError:
t = 'Heart Rate Distribution'
fig1 = row.get_piechart(t,**kwargs) fig1 = row.get_piechart(t,**kwargs)
elif (plotnr == 4): elif (plotnr == 4):
if haspower: if haspower: