From a0b4119ac17eceaa6bc06c0232027449c1d8b159 Mon Sep 17 00:00:00 2001 From: Ruben Verweij Date: Thu, 4 Jan 2018 16:30:57 +0100 Subject: [PATCH] New release --- docs | 2 +- nd2reader/reader.py | 7 +++---- setup.py | 2 +- sphinx/conf.py | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs b/docs index b41ae4f..9d18331 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit b41ae4f4cfb9e5cf49f4e9c806f0e0f94cbf317c +Subproject commit 9d1833182940461467048d753fc29be19bf4c9bd diff --git a/nd2reader/reader.py b/nd2reader/reader.py index 350d6f5..c2ffcc5 100644 --- a/nd2reader/reader.py +++ b/nd2reader/reader.py @@ -177,7 +177,7 @@ class ND2Reader(FramesSequenceND): np.ndarray: an array of times in milliseconds. """ - if self._timesteps is not None: + if self._timesteps is not None and len(timesteps) > 0: return self._timesteps timesteps = np.array([]) @@ -196,8 +196,7 @@ class ND2Reader(FramesSequenceND): (timesteps, np.arange(current_time, current_time + loop['duration'], loop['sampling_interval']))) current_time += loop['duration'] - if len(timesteps) > 0: - # if experiment did not finish, number of timesteps is wrong. Take correct amount of leading timesteps. - self._timesteps = timesteps[:self.metadata['num_frames']] + # if experiment did not finish, number of timesteps is wrong. Take correct amount of leading timesteps. + self._timesteps = timesteps[:self.metadata['num_frames']] return self._timesteps diff --git a/setup.py b/setup.py index a1078fb..83ccd5c 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup -VERSION = '3.0.7' +VERSION = '3.0.8' if __name__ == '__main__': setup( diff --git a/sphinx/conf.py b/sphinx/conf.py index 43a061c..a4ed196 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -44,9 +44,9 @@ author = 'Ruben Verweij' # built documents. # # The short X.Y version. -version = '3.0.7' +version = '3.0.8' # The full version, including alpha/beta/rc tags. -release = '3.0.7' +release = '3.0.8' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.