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

some more error warnings removed

Browse Source
This commit is contained in:
Sander Roosendaal
2021-04-28 08:33:11 +02:00
parent f7d2890eba
commit 34f98acbc3
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rowers/interactiveplots.py
View File

@@ -211,7 +211,7 @@ def tailwind(bearing,vwind,winddir):
return vtail return vtail
from rowers.dataprep import nicepaceformat,niceformat from rowers.dataprep import nicepaceformat,niceformat,strfdelta
from rowers.dataprep import timedeltaconv from rowers.dataprep import timedeltaconv
from math import pi from math import pi
@@ -3336,7 +3336,7 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data',
title='',type='water', title='',type='water',
wcpower=[],wcdurations=[],cpoverlay=False): wcpower=[],wcdurations=[],cpoverlay=False):
powerdf = powerdf[~(powerdf == 0).any(axis=1)] powerdf2 = powerdf[~(powerdf == 0).any(axis=1)].copy()
# plot tools # plot tools
if (promember==1): # pragma: no cover if (promember==1): # pragma: no cover
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair' TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
@@ -3347,24 +3347,24 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data',
x_axis_type = 'log' x_axis_type = 'log'
y_axis_type = 'linear' y_axis_type = 'linear'
deltas = powerdf['Delta'].apply(lambda x: timedeltaconv(x)) deltas = powerdf2['Delta'].apply(lambda x: timedeltaconv(x))
powerdf['ftime'] = niceformat(deltas) powerdf2['ftime'] = deltas.apply(lambda x:strfdelta(x))
powerdf['Deltaminutes'] = powerdf['Delta']/60. powerdf2['Deltaminutes'] = powerdf2['Delta']/60.
source = ColumnDataSource( source = ColumnDataSource(
data = powerdf data = powerdf2
) )
# there is no Paul's law for OTW # there is no Paul's law for OTW
thesecs = powerdf['Delta'] thesecs = powerdf2['Delta']
theavpower = powerdf['CP'] theavpower = powerdf2['CP']
p1,fitt,fitpower,ratio = datautils.cpfit(powerdf) p1,fitt,fitpower,ratio = datautils.cpfit(powerdf2)
if cpfit == 'automatic' and r is not None: if cpfit == 'automatic' and r is not None:
if type == 'water': if type == 'water':
p1 = [r.p0,r.p1,r.p2,r.p3] p1 = [r.p0,r.p1,r.p2,r.p3]
@@ -3383,8 +3383,8 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data',
deltas = fitt.apply(lambda x: timedeltaconv(x)) deltas = fitt.apply(lambda x: timedeltaconv(x))
ftime = niceformat(deltas) ftime = niceformat(deltas)
workouts = powerdf['workout'] workouts = powerdf2['workout']
urls = powerdf['url'] urls = powerdf2['url']
# add world class # add world class
wcpower = pd.Series(wcpower,dtype='float') wcpower = pd.Series(wcpower,dtype='float')
@@ -4086,11 +4086,6 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if datadf.empty: if datadf.empty:
return "","No Valid Data Available" return "","No Valid Data Available"
#else:
# try:
# datadf.sort_values(by='time',ascending=True,inplace=True)
# except KeyError:
# return "","No valid data available"
try: try:
spm = datadf['spm'] spm = datadf['spm']
@@ -4179,7 +4174,7 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
intervaldf['itime'] = intervaldf['itime']*1.e3 intervaldf['itime'] = intervaldf['itime']*1.e3
intervaldf['time'] = intervaldf['itime'].cumsum() intervaldf['time'] = intervaldf['itime'].cumsum()
intervaldf['time'] = intervaldf['time'].shift(1) intervaldf['time'] = intervaldf['time'].shift(1)
intervaldf.loc[:,'time'].iloc[0] = 0 intervaldf.loc[0,'time'] = 0
intervaldf['time_r'] = intervaldf['time'] +intervaldf['itime'] intervaldf['time_r'] = intervaldf['time'] +intervaldf['itime']
intervaldf['value'] = 100 intervaldf['value'] = 100
mask = intervaldf['itype'] == 3 mask = intervaldf['itype'] == 3