at master 923 B view raw
1diff --git a/stytra/gui/fishplots.py b/stytra/gui/fishplots.py 2index 49ef1fe..fd1cc50 100644 3--- a/stytra/gui/fishplots.py 4+++ b/stytra/gui/fishplots.py 5@@ -13,7 +13,7 @@ from lightparam.gui import ParameterGui 6 from scipy.ndimage.filters import gaussian_filter1d 7 8 9-class StreamingPositionPlot(pg.GraphicsWindow): 10+class StreamingPosition(pg.GraphicsView): 11 """Plot that displays the virtual position of the fish""" 12 13 def __init__(self, *args, data_accumulator, n_points=500, **kwargs): 14diff --git a/stytra/utilities.py b/stytra/utilities.py 15index f79c4db..feaa7ef 100644 16--- a/stytra/utilities.py 17+++ b/stytra/utilities.py 18@@ -239,7 +239,7 @@ def recursive_update(d, u): 19 :return: 20 """ 21 for k, v in u.items(): 22- if isinstance(v, collections.Mapping): 23+ if isinstance(v, collections.ChainMap): 24 d[k] = recursive_update(d.get(k, {}), v) 25 else: 26 d[k] = v