Skip to content
Snippets Groups Projects
Commit a1a43aad authored by Sander Snoo's avatar Sander Snoo
Browse files

Fixed bug in lazy reset time

parent fad14c11
No related branches found
No related tags found
No related merge requests found
......@@ -141,6 +141,8 @@ class segment_acquisition():
if self.is_slice or time is None:
self._reset_time(time)
else:
if self._pending_reset_time is not None:
time = np.fmax(time, self._pending_reset_time)
self._pending_reset_time = time
def _lazy_reset_time(self):
......@@ -274,6 +276,8 @@ class segment_acquisition():
def total_time(self):
if not self.render_mode:
# use end time from numpy array instead of individual lookup of data elements.
if self._pending_reset_time is not None:
return np.fmax(self._pending_reset_time, self._end_times)
return self._end_times
# return self.data.total_time
else:
......
......@@ -237,6 +237,8 @@ class segment_base():
@property
def total_time(self):
if not self.render_mode:
if self._pending_reset_time is not None:
return np.fmax(self._pending_reset_time, self._end_times)
# use end time from numpy array instead of individual lookup of data elements.
return self._end_times
# return self.data.total_time
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment