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

impeller stuff working, need beta testers

Browse Source
This commit is contained in:
Sander Roosendaal
2021-04-07 11:36:38 +02:00
parent 13af1d3d71
commit 9469fe6200
6 changed files with 75 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/dataprep.py
View File

@@ -1853,9 +1853,16 @@ parsers = {
'nklinklogbook': NKLiNKLogbookParser,
}
def parsenonpainsled(fileformat,f2,summary,startdatetime=''):
def parsenonpainsled(fileformat,f2,summary,startdatetime='',empowerfirmware=None,inboard=None,oarlength=None):
try:
row = parsers[fileformat](f2)
if fileformat == 'nklinklogbook' and empowerfirmware is not None:
if inboard is not None and oarlength is not None:
row = NKLiNKLogbookParser(f2,firmware=empowerfirmware,inboard=inboard,oarlength=oarlength)
print(row,'aap')
else:
row = NKLiNKLogbookParser(f2)
else:
row = parsers[fileformat](f2)
if startdatetime != '':
row.rowdatetime = arrow.get(startdatetime).datetime
hasrecognized = True
@@ -1875,6 +1882,8 @@ def parsenonpainsled(fileformat,f2,summary,startdatetime=''):
summary = row.allstats()
except ZeroDivisionError:
summary = ''
else:
fileformat = fileformat+'v'+str(empowerfirmware)
# handle FIT
if (fileformat == 'fit'):
@@ -1889,13 +1898,14 @@ def parsenonpainsled(fileformat,f2,summary,startdatetime=''):
return row,hasrecognized,summary,fileformat
def handle_nonpainsled(f2, fileformat, summary='',startdatetime=''):
def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmware=None):
oarlength = 2.89
inboard = 0.88
hasrecognized = False
impeller = False
row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary,startdatetime=startdatetime)
row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary,startdatetime=startdatetime,
empowerfirmware=empowerfirmware)
# Handle c2log
if (fileformat == 'c2log' or fileformat == 'rowprolog'):
@@ -1909,7 +1919,7 @@ def handle_nonpainsled(f2, fileformat, summary='',startdatetime=''):
f2 = f2[:-4] + 'o.csv'
row2 = rrdata(df = row.df)
if 'speedcoach2' in fileformat:
if 'speedcoach2' in fileformat or 'nklinklogbook' in fileformat:
# impeller consistency
impellerdata, consistent, ratio = row.impellerconsistent(threshold=0.3)
if impellerdata and consistent:
@@ -1990,6 +2000,9 @@ def new_workout_from_file(r, f2,
makeprivate=False,
startdatetime='',
notes='',
oarlockfirmware='',
inboard=None,
oarlength=None,
uploadoptions={'boattype':'1x','workouttype':'rower'}):
message = ""
impeller = False
@@ -2095,7 +2108,8 @@ def new_workout_from_file(r, f2,
f2,
fileformat,
startdatetime=startdatetime,
summary=summary
summary=summary,
empowerfirmware=oarlockfirmware,
)
if not f2:
message = 'Something went wrong'