Skip to content

Commit 8ae3c5c

Browse files
committed
[setDim] allow a label for SetDimensions ...
in addition to the labels for the individual entries along the dimension This is a non-breaking change to the model.
1 parent b4ae900 commit 8ae3c5c

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

nixio/dimensions.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,18 @@ def _check_index(index):
249249

250250
return None
251251

252+
@property
253+
def label(self):
254+
return self._h5group.get_attr("label")
255+
256+
@label.setter
257+
def label(self, label):
258+
util.check_attr_type(label, str)
259+
self._h5group.set_attr("label", label)
260+
252261
@staticmethod
253262
def _check_link_dimensionality(data_array, index):
254-
invalid_dim_msg = ("Length of linked DataArray indices ({}) does not match "
263+
invalid_dim_msg = ("Length of linked DataArray indices ({}) does not match "
255264
"number of DataArray dimensions ({})"
256265
).format(len(data_array.data_extent), len(index))
257266

@@ -429,15 +438,6 @@ def axis(self, count, start=None, start_position=None):
429438

430439
return tuple(np.arange(count) * sample + start_val)
431440

432-
@property
433-
def label(self):
434-
return self._h5group.get_attr("label")
435-
436-
@label.setter
437-
def label(self, label):
438-
util.check_attr_type(label, str)
439-
self._h5group.set_attr("label", label)
440-
441441
@property
442442
def sampling_interval(self):
443443
return self._h5group.get_attr("sampling_interval")

nixio/test/test_dimensions.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ def test_set_dimension(self):
5050
self.set_dim.labels = test_labels
5151
assert self.set_dim.labels == test_labels
5252

53+
assert self.set_dim.label is None
54+
self.set_dim.label = TEST_LABEL
55+
assert self.set_dim.label == TEST_LABEL
56+
self.set_dim.label = None
57+
assert self.set_dim.label is None
58+
5359
def test_sample_dimension(self):
5460
assert self.sample_dim.index == 2
5561
assert self.sample_dim.dimension_type == nix.DimensionType.Sample

0 commit comments

Comments
 (0)