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

some more improvements

Browse Source
This commit is contained in:
Sander Roosendaal
2016-11-24 00:03:33 +01:00
parent bf32c1cc21
commit b8643ca897
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rowers/dataprep.py
View File

@@ -102,17 +102,16 @@ def getrowdata_db(id=0):
return data,row
def getsmallrowdata_db(xparam,yparam1,yparam2,ids=[]):
if yparam2 == 'None':
yparam2 = yparam1
def getsmallrowdata_db(columns,ids=[]):
prepmultipledata(ids)
data = read_cols_df_sql(ids,xparam,yparam1,yparam2)
if xparam == 'time':
data['time'] = data['time']/1.0e6
if yparam1 == 'pace':
data['pace'] = data['pace']/1.0e6
if yparam2 == 'pace':
data['pace'] = data['pace']/1.0e6
data = read_cols_df_sql(ids,columns)
for column in columns:
if column == 'time':
data['time'] = data['time']/1.0e6
if column == 'pace':
data['pace'] = data['pace']/1.0e6
if column == 'pace':
data['pace'] = data['pace']/1.0e6
return data
@@ -143,15 +142,17 @@ def prepmultipledata(ids):
res = list(itertools.chain.from_iterable(res.fetchall()))
res = list(set(ids)-set(res))
print "aap", res
for id in res:
rowdata,row = getrowdata(id=id)
if rowdata:
data = dataprep(rowdata.df,id=id,bands=True,barchart=True,otwpower=True)
return res
def read_cols_df_sql(ids,col1,col2,col3):
columns = list(set((col1,col2,col3,'distance','spm')))
def read_cols_df_sql(ids,columns):
columns = list(columns)+['distance','spm']
columns = [x for x in columns if x != 'None']
columns = list(set(columns))
cls = ''
for column in columns:
cls += column+', '