Browse Source

Merge remote-tracking branch 'origin/master'

master
jim 10 years ago
parent
commit
8b4589d21b
2 changed files with 1 additions and 4 deletions
  1. +1
    -1
      nd2reader/model/__init__.py
  2. +0
    -3
      nd2reader/service/__init__.py

+ 1
- 1
nd2reader/model/__init__.py View File

@ -128,6 +128,7 @@ class MetadataItem(object):
6: self._parse_double,
8: self._parse_string,
9: self._parse_char_array,
11: self._parse_metadata_item
}
return parser[self._datatype]()
@ -238,7 +239,6 @@ class Chunkmap(object):
length -= data.tell()-lastpos
nextdata = data.read(length)
value = self.parse(nextdata, newcount)
print("WE GOT A NEW DICT")
# Skip some offsets
data.read(newcount * 8)
else:


+ 0
- 3
nd2reader/service/__init__.py View File

@ -263,9 +263,6 @@ class Nd2Reader(object):
return np.frombuffer(arr)
def _z_level_count(self):
"""read the microscope coordinates and temperatures
Missing: get chunknames and types from xml metadata"""
res = {}
name = "CustomData|Z!"
st = self._read_chunk(self._label_map[name].location)
res = array.array("d", st)


Loading…
Cancel
Save