Browse Source

New release

zolfa-add_slices_loading
Ruben Verweij 7 years ago
parent
commit
5673262295
4 changed files with 7 additions and 8 deletions
  1. +1
    -1
      docs
  2. +3
    -4
      nd2reader/reader.py
  3. +1
    -1
      setup.py
  4. +2
    -2
      sphinx/conf.py

+ 1
- 1
docs

@ -1 +1 @@
Subproject commit b41ae4f4cfb9e5cf49f4e9c806f0e0f94cbf317c
Subproject commit 9d1833182940461467048d753fc29be19bf4c9bd

+ 3
- 4
nd2reader/reader.py View File

@ -177,7 +177,7 @@ class ND2Reader(FramesSequenceND):
np.ndarray: an array of times in milliseconds. 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 return self._timesteps
timesteps = np.array([]) timesteps = np.array([])
@ -196,8 +196,7 @@ class ND2Reader(FramesSequenceND):
(timesteps, np.arange(current_time, current_time + loop['duration'], loop['sampling_interval']))) (timesteps, np.arange(current_time, current_time + loop['duration'], loop['sampling_interval'])))
current_time += loop['duration'] 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 return self._timesteps

+ 1
- 1
setup.py View File

@ -1,6 +1,6 @@
from setuptools import setup from setuptools import setup
VERSION = '3.0.7'
VERSION = '3.0.8'
if __name__ == '__main__': if __name__ == '__main__':
setup( setup(


+ 2
- 2
sphinx/conf.py View File

@ -44,9 +44,9 @@ author = 'Ruben Verweij'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '3.0.7'
version = '3.0.8'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.


Loading…
Cancel
Save