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

small fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2022-10-23 15:40:56 +02:00
parent 086b1f9f1f
commit bad7978e6f
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/dataroutines.py
View File

@@ -1262,7 +1262,20 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
try: try:
df = pd.read_parquet(csvfilenames[0], columns=columns) df = pd.read_parquet(csvfilenames[0], columns=columns)
rowdata, row = getrowdata(id=ids[0]) rowdata, row = getrowdata(id=ids[0])
except (OSError, ArrowInvalid, IndexError): except (OSError, IndexError):
rowdata, row = getrowdata(id=ids[0])
if rowdata and len(rowdata.df): # pragma: no cover
data = dataprep(
rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
df = pd.read_parquet(csvfilenames[0], columns=columns)
# df = dd.read_parquet(csvfilenames[0],
# column=columns,engine='pyarrow',
# )
# df = df.loc[:,~df.columns.duplicated()]
else:
df = pd.DataFrame()
except:
rowdata, row = getrowdata(id=ids[0]) rowdata, row = getrowdata(id=ids[0])
if rowdata and len(rowdata.df): # pragma: no cover if rowdata and len(rowdata.df): # pragma: no cover
data = dataprep( data = dataprep(

5
rowers/interactiveplots.py
View File

@@ -4197,7 +4197,10 @@ def instroke_interactive_chart(df,metric, workout, spm_min, spm_max,
df_plot['high'].update(df_plot.pop('high 2')) df_plot['high'].update(df_plot.pop('high 2'))
df_plot['low'].update(df_plot.pop('low 2')) df_plot['low'].update(df_plot.pop('low 2'))
df_plot.interpolate(axis=1,inplace=True) try:
df_plot.interpolate(axis=1,inplace=True)
except TypeError:
pass
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,crosshair' TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,crosshair'
plot = Figure(plot_width=920,tools=TOOLS, plot = Figure(plot_width=920,tools=TOOLS,