From 34f98acbc3af5c8813485f58f47c79ccd516ac9b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 28 Apr 2021 08:33:11 +0200 Subject: [PATCH] some more error warnings removed --- rowers/interactiveplots.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 3db9885f..de8ef74c 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -211,7 +211,7 @@ def tailwind(bearing,vwind,winddir): return vtail -from rowers.dataprep import nicepaceformat,niceformat +from rowers.dataprep import nicepaceformat,niceformat,strfdelta from rowers.dataprep import timedeltaconv from math import pi @@ -3336,7 +3336,7 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data', title='',type='water', wcpower=[],wcdurations=[],cpoverlay=False): - powerdf = powerdf[~(powerdf == 0).any(axis=1)] + powerdf2 = powerdf[~(powerdf == 0).any(axis=1)].copy() # plot tools if (promember==1): # pragma: no cover 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' y_axis_type = 'linear' - deltas = powerdf['Delta'].apply(lambda x: timedeltaconv(x)) - powerdf['ftime'] = niceformat(deltas) - powerdf['Deltaminutes'] = powerdf['Delta']/60. + deltas = powerdf2['Delta'].apply(lambda x: timedeltaconv(x)) + powerdf2['ftime'] = deltas.apply(lambda x:strfdelta(x)) + powerdf2['Deltaminutes'] = powerdf2['Delta']/60. source = ColumnDataSource( - data = powerdf + data = powerdf2 ) # there is no Paul's law for OTW - thesecs = powerdf['Delta'] - theavpower = powerdf['CP'] + thesecs = powerdf2['Delta'] + 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 type == 'water': 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)) ftime = niceformat(deltas) - workouts = powerdf['workout'] - urls = powerdf['url'] + workouts = powerdf2['workout'] + urls = powerdf2['url'] # add world class wcpower = pd.Series(wcpower,dtype='float') @@ -4086,11 +4086,6 @@ def interactive_chart(id=0,promember=0,intervaldata = {}): row = Workout.objects.get(id=id) if datadf.empty: return "","No Valid Data Available" - #else: - # try: - # datadf.sort_values(by='time',ascending=True,inplace=True) - # except KeyError: - # return "","No valid data available" try: spm = datadf['spm'] @@ -4179,7 +4174,7 @@ def interactive_chart(id=0,promember=0,intervaldata = {}): intervaldf['itime'] = intervaldf['itime']*1.e3 intervaldf['time'] = intervaldf['itime'].cumsum() 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['value'] = 100 mask = intervaldf['itype'] == 3