Browse Source

Minor changes for dev branched version release

zolfa-add_slices_loading
Zolfa 3 years ago
parent
commit
cd06fd90ff
3 changed files with 6 additions and 5 deletions
  1. +1
    -0
      COPYING
  2. +1
    -1
      nd2reader/parser.py
  3. +4
    -4
      setup.py

+ 1
- 0
COPYING View File

@ -1,4 +1,5 @@
Copyright 2014-2016 Jim Rybarski, 2017 Ruben Verweij Copyright 2014-2016 Jim Rybarski, 2017 Ruben Verweij
Copyright 2020-2021 Lorenzo Zolfanelli, ESPCI Paris - PSL
nd2reader is free software: you can redistribute it and/or modify nd2reader is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by


+ 1
- 1
nd2reader/parser.py View File

@ -332,7 +332,7 @@ class Parser(object):
fh.seek(image_start_pos + size_c*2*((width)*y+x0) + y*rowskip) fh.seek(image_start_pos + size_c*2*((width)*y+x0) + y*rowskip)
return np.frombuffer(fh.read(size_c*2*w), np.byte)[line_bytemask] return np.frombuffer(fh.read(size_c*2*w), np.byte)[line_bytemask]
data = [get_line(y) for y in tqdm(range(y0, y0+h))]
data = [get_line(y) for y in range(y0, y0+h)]
data = bytes().join(data) data = bytes().join(data)
image_group_data = array.array("H", data) image_group_data = array.array("H", data)


+ 4
- 4
setup.py View File

@ -1,5 +1,5 @@
from setuptools import setup from setuptools import setup
from nd2reader import __version__ as VERSION
#from nd2reader import __version__ as VERSION
if __name__ == '__main__': if __name__ == '__main__':
setup( setup(
@ -9,14 +9,14 @@ if __name__ == '__main__':
'numpy>=1.6.2', 'numpy>=1.6.2',
'six>=1.4', 'six>=1.4',
'xmltodict>=0.9.2', 'xmltodict>=0.9.2',
'pims>=0.3.0'
'PIMS>=0.5.0'
], ],
version=VERSION,
version="3.2.3-zolfa-dev0",
description='A tool for reading ND2 files produced by NIS Elements', description='A tool for reading ND2 files produced by NIS Elements',
author='Ruben Verweij', author='Ruben Verweij',
author_email='ruben@lighthacking.nl', author_email='ruben@lighthacking.nl',
url='https://github.com/rbnvrw/nd2reader', url='https://github.com/rbnvrw/nd2reader',
download_url='https://github.com/rbnvrw/nd2reader/tarball/%s' % VERSION,
download_url='https://github.com/rbnvrw/nd2reader/tarball/%s' % "3.2.3-zolfa-dev0",
keywords=['nd2', 'nikon', 'microscopy', 'NIS Elements'], keywords=['nd2', 'nikon', 'microscopy', 'NIS Elements'],
classifiers=['Development Status :: 5 - Production/Stable', classifiers=['Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research', 'Intended Audience :: Science/Research',


Loading…
Cancel
Save