Private
Public Access
1
0

ritmotime implemented

This commit is contained in:
Sander Roosendaal
2018-06-20 20:30:01 +02:00
parent 4ec6dd2a4e
commit a8ca762ee9
2 changed files with 25 additions and 16 deletions

View File

@@ -34,6 +34,7 @@ from rowingdata import (
MysteryParser, BoatCoachOTWParser,QuiskeParser, MysteryParser, BoatCoachOTWParser,QuiskeParser,
painsledDesktopParser, speedcoachParser, ErgStickParser, painsledDesktopParser, speedcoachParser, ErgStickParser,
SpeedCoach2Parser, FITParser, fitsummarydata, SpeedCoach2Parser, FITParser, fitsummarydata,
RitmoTimeParser,
make_cumvalues,cumcpdata,ExcelTemplate, make_cumvalues,cumcpdata,ExcelTemplate,
summarydata, get_file_type, summarydata, get_file_type,
) )
@@ -1109,6 +1110,11 @@ def parsenonpainsled(fileformat,f2,summary):
row = MysteryParser(f2) row = MysteryParser(f2)
hasrecognized = True hasrecognized = True
# handle ritmo
if (fileformat == 'ritmotime'):
row = RitmoTimeParser(f2)
hasrecognized = True
# handle Quiske # handle Quiske
if (fileformat == 'quiske'): if (fileformat == 'quiske'):
row = QuiskeParser(f2) row = QuiskeParser(f2)
@@ -1312,6 +1318,7 @@ def new_workout_from_file(r, f2,
fileformat, fileformat,
summary=summary summary=summary
) )
print f2,'noot'
if not f2: if not f2:
message = 'Something went wrong' message = 'Something went wrong'
return (0, message, '') return (0, message, '')

View File

@@ -2220,7 +2220,9 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
plot.legend.location = "bottom_right" plot.legend.location = "bottom_right"
# add shaded bar chart areas # add shaded bar chart areas
if intervaldata:
intervaldf = pd.DataFrame(intervaldata) intervaldf = pd.DataFrame(intervaldata)
intervaldf['itime'] = intervaldf['itime']*1.e3 intervaldf['itime'] = intervaldf['itime']*1.e3
intervaldf['time'] = intervaldf['itime'].cumsum() intervaldf['time'] = intervaldf['itime'].cumsum()