jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

additional ellipsis cases

Browse source
This commit is contained in:
jevans 2014-10-04 22:16:09 -04:00
commit 50cccf89be
2 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
glymur/jp2k.py
View file

@ -18,6 +18,7 @@ else:
from collections import Counter from collections import Counter
import ctypes import ctypes
import itertools
import math import math
import os import os
import re import re
@ -807,19 +808,40 @@ class Jp2k(Jp2kBox):
return pixel[pargs[2]] return pixel[pargs[2]]
if isinstance(pargs, tuple) and any(x is ... for x in pargs): if isinstance(pargs, tuple) and any(x is ... for x in pargs):
nrows = codestream.segment[1].ysiz nrows = codestream.segment[1].ysiz
ncols = codestream.segment[1].xsiz ncols = codestream.segment[1].xsiz
nbands = codestream.segment[1].Csiz nbands = codestream.segment[1].Csiz
# Reformulate without the ellipsis. # Reformulate without the ellipsis.
if pargs[0] is ...: if pargs[0] is ...:
newindex = (slice(0, nrows), slice(0, ncols), pargs[1]) if len(pargs) == 2:
newindex = (slice(0, nrows), slice(0, ncols), pargs[1])
else:
newindex = (slice(0, nrows), pargs[1], pargs[2])
elif pargs[1] is ...: elif pargs[1] is ...:
# Assume we have something like (r,...) where r is a scalar. if len(pargs) == 2:
newindex = pargs[0] newindex = (pargs[0], slice(0, ncols), slice(0, nbands))
else:
newindex = (pargs[0], slice(0, ncols), pargs[2])
else:
newindex = (pargs[0], pargs[1], slice(0, nbands))
return self.__getitem__(newindex) return self.__getitem__(newindex)
if isinstance(pargs, tuple) and not all(isinstance(x, slice) for x in pargs):
# Search out any remaining non-slices and turn them into slices.
lst = list(pargs)
predicate = lambda x: not isinstance(x[1], int)
g = itertools.filterfalse(predicate, enumerate(pargs))
idx = list(g)[0][0]
lst[idx] = slice(pargs[idx], pargs[idx] + 1)
newindex = tuple(lst)
data = self.__getitem__(newindex)
# Reduce dimensionality in the scalar dimension.
return np.squeeze(data, axis=idx)
# Assuming pargs is a tuple of slices from now on. # Assuming pargs is a tuple of slices from now on.
rows = pargs[0] rows = pargs[0]
cols = pargs[1] cols = pargs[1]

10
glymur/test/test_jp2k.py
View file

@ -261,6 +261,16 @@ class TestSliceProtocolRead(SliceProtocolBase):
expected = self.j2k_data[0, ...] expected = self.j2k_data[0, ...]
np.testing.assert_array_equal(actual, expected) np.testing.assert_array_equal(actual, expected)
def test_two_ellipsis_band_select(self):
actual = self.j2k[..., ..., 1]
expected = self.j2k_data[:, :, 1]
np.testing.assert_array_equal(actual, expected)
def test_two_ellipsis_row_select(self):
actual = self.j2k[1, ..., ...]
expected = self.j2k_data[1, :, :]
np.testing.assert_array_equal(actual, expected)
def test_slice_protocol_2d_reduce_resolution(self): def test_slice_protocol_2d_reduce_resolution(self):
d = self.j2k[:] d = self.j2k[:]
self.assertEqual(d.shape, (800, 480, 3)) self.assertEqual(d.shape, (800, 480, 3))