Merge branch 'release/v20.0.3'
This commit is contained in:
+1
-1
@@ -468,7 +468,7 @@ def setcp(workout, background=False, recurrance=True):
|
|||||||
try:
|
try:
|
||||||
if strokesdf['power'].std() == 0:
|
if strokesdf['power'].std() == 0:
|
||||||
return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
|
return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
|
||||||
except KeyError:
|
except (KeyError, TypeError):
|
||||||
return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
|
return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
|
||||||
|
|
||||||
if background: # pragma: no cover
|
if background: # pragma: no cover
|
||||||
|
|||||||
@@ -1252,6 +1252,8 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
|
|||||||
columns = [c for c in columns if c != 'None']
|
columns = [c for c in columns if c != 'None']
|
||||||
columns = list(set(columns))
|
columns = list(set(columns))
|
||||||
|
|
||||||
|
df = pd.DataFrame()
|
||||||
|
|
||||||
if len(ids) > 1:
|
if len(ids) > 1:
|
||||||
for id, f in zip(ids, csvfilenames):
|
for id, f in zip(ids, csvfilenames):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -4291,8 +4291,8 @@ def instroke_multi_interactive_chart(selected, *args, **kwargs):
|
|||||||
xvals = np.arange(len(mean_vals))
|
xvals = np.arange(len(mean_vals))
|
||||||
xname = 'x_'+str(analysis.id)
|
xname = 'x_'+str(analysis.id)
|
||||||
yname = 'y_'+str(analysis.id)
|
yname = 'y_'+str(analysis.id)
|
||||||
df_plot[xname] = xvals
|
df_plot[xname] = pd.Series(xvals)
|
||||||
df_plot[yname] = mean_vals
|
df_plot[yname] = pd.Series(mean_vals)
|
||||||
|
|
||||||
if len(metrics) > 1:
|
if len(metrics) > 1:
|
||||||
for analysis in selected:
|
for analysis in selected:
|
||||||
|
|||||||
BIN
Binary file not shown.
Reference in New Issue
Block a user