Browse Source

Merge remote-tracking branch 'origin/master'

Conflicts:
	nd2reader/version.py
zolfa-add_slices_loading
Jim Rybarski 9 years ago
parent
commit
fa82f54820
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      nd2reader/interface.py

+ 2
- 1
nd2reader/interface.py View File

@ -93,7 +93,8 @@ class Nd2(object):
:return: model.ImageSet() :return: model.ImageSet()
""" """
warnings.warn("Nd2.image_sets will be removed from the nd2reader library in the near future.", DeprecationWarning)
warnings.warn("Nd2.image_sets will be removed from the nd2reader library in the near future.",
DeprecationWarning)
for frame in self.frames: for frame in self.frames:
image_group = ImageGroup() image_group = ImageGroup()


Loading…
Cancel
Save