From a8ca762ee9009e047e3d8d47712dbbfe3e326927 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 20 Jun 2018 20:30:01 +0200 Subject: [PATCH] ritmotime implemented --- rowers/dataprep.py | 7 +++++++ rowers/interactiveplots.py | 34 ++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 24869490..d4f73744 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -34,6 +34,7 @@ from rowingdata import ( MysteryParser, BoatCoachOTWParser,QuiskeParser, painsledDesktopParser, speedcoachParser, ErgStickParser, SpeedCoach2Parser, FITParser, fitsummarydata, + RitmoTimeParser, make_cumvalues,cumcpdata,ExcelTemplate, summarydata, get_file_type, ) @@ -1109,6 +1110,11 @@ def parsenonpainsled(fileformat,f2,summary): row = MysteryParser(f2) hasrecognized = True + # handle ritmo + if (fileformat == 'ritmotime'): + row = RitmoTimeParser(f2) + hasrecognized = True + # handle Quiske if (fileformat == 'quiske'): row = QuiskeParser(f2) @@ -1312,6 +1318,7 @@ def new_workout_from_file(r, f2, fileformat, summary=summary ) + print f2,'noot' if not f2: message = 'Something went wrong' return (0, message, '') diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 8c48f881..0f5e4594 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2220,23 +2220,25 @@ def interactive_chart(id=0,promember=0,intervaldata = {}): plot.legend.location = "bottom_right" - # add shaded bar chart areas - intervaldf = pd.DataFrame(intervaldata) - intervaldf['itime'] = intervaldf['itime']*1.e3 - intervaldf['time'] = intervaldf['itime'].cumsum() - intervaldf['time_r'] = intervaldf['time'] +intervaldf['itime'].shift(-1) - intervaldf['value'] = 10 - mask = intervaldf['itype'] == 3 - intervaldf.loc[mask,'value'] = 45 - intervaldf['bottom'] = 10 - - intervalsource = ColumnDataSource( - intervaldf - ) - plot.quad(left='time',top='value',bottom='bottom', - right='time_r',source=intervalsource,color='pink', - y_range_name='spmax',fill_alpha=0.2,line_alpha=0.2) + # add shaded bar chart areas + if intervaldata: + intervaldf = pd.DataFrame(intervaldata) + intervaldf['itime'] = intervaldf['itime']*1.e3 + intervaldf['time'] = intervaldf['itime'].cumsum() + intervaldf['time_r'] = intervaldf['time'] +intervaldf['itime'].shift(-1) + intervaldf['value'] = 10 + mask = intervaldf['itype'] == 3 + intervaldf.loc[mask,'value'] = 45 + intervaldf['bottom'] = 10 + + intervalsource = ColumnDataSource( + intervaldf + ) + + plot.quad(left='time',top='value',bottom='bottom', + right='time_r',source=intervalsource,color='pink', + y_range_name='spmax',fill_alpha=0.2,line_alpha=0.2) script, div = components(plot)