Merge pull request #522 from jgrewe/set_dim_label

Set dim label

Author: mpsonntag

nixio/dimensions.py

@@ -249,9 +249,18 @@ def _check_index(index):
 
         return None
 
+    @property
+    def label(self):
+        return self._h5group.get_attr("label")
+
+    @label.setter
+    def label(self, label):
+        util.check_attr_type(label, str)
+        self._h5group.set_attr("label", label)
+
     @staticmethod
     def _check_link_dimensionality(data_array, index):
-        invalid_dim_msg = ("Length of linked DataArray indices ({}) does not match " 
+        invalid_dim_msg = ("Length of linked DataArray indices ({}) does not match "
                            "number of DataArray dimensions ({})"
                           ).format(len(data_array.data_extent), len(index))
 
@@ -429,15 +438,6 @@ def axis(self, count, start=None, start_position=None):
 
         return tuple(np.arange(count) * sample + start_val)
 
-    @property
-    def label(self):
-        return self._h5group.get_attr("label")
-
-    @label.setter
-    def label(self, label):
-        util.check_attr_type(label, str)
-        self._h5group.set_attr("label", label)
-
     @property
     def sampling_interval(self):
         return self._h5group.get_attr("sampling_interval")

nixio/file.py

@@ -29,7 +29,7 @@
 
 
 FILE_FORMAT = "nix"
-HDF_FF_VERSION = (1, 2, 0)
+HDF_FF_VERSION = (1, 2, 1)
 
 
 def can_write(nixfile):

nixio/info.json

@@ -1,7 +1,7 @@
 {
-    "VERSION": "1.5.0.dev",
+    "VERSION": "1.5.1.dev",
     "STATUS": "Release",
-    "RELEASE": "1.5.0 Development",
+    "RELEASE": "1.5.1 Development",
     "AUTHOR": "Christian Kellner, Adrian Stoewer, Andrey Sobolev, Jan Grewe, Balint Morvai, Achilleas Koutsou",
     "COPYRIGHT": "2014-2020, German Neuroinformatics Node, Christian Kellner, Adrian Stoewer, Andrey Sobolev, Jan Grewe, Balint Morvai, Achilleas Koutsou",
     "CONTACT": "[email protected]",

nixio/test/test_dimensions.py

@@ -50,6 +50,12 @@ def test_set_dimension(self):
         self.set_dim.labels = test_labels
         assert self.set_dim.labels == test_labels
 
+        assert self.set_dim.label is None
+        self.set_dim.label = TEST_LABEL
+        assert self.set_dim.label == TEST_LABEL
+        self.set_dim.label = None
+        assert self.set_dim.label is None
+
     def test_sample_dimension(self):
         assert self.sample_dim.index == 2
         assert self.sample_dim.dimension_type == nix.DimensionType.Sample