ENH - Supporting key attribute for Gifti labeltables

Author: Stephan Gerhard

nibabel/gifti/gifti.py

@@ -77,7 +77,7 @@ def __init__(self):
     def get_labels_as_dict(self):
         self.labels_as_dict = {}
         for ele in self.labels:
-            self.labels_as_dict[ele.index] = ele.label
+            self.labels_as_dict[ele.key] = ele.label
         return self.labels_as_dict
 
     def to_xml(self):
@@ -94,8 +94,8 @@ def to_xml(self):
                 col += ' Blue="%s"' % str(ele.blue)
             if not ele.alpha is None:
                 col += ' Alpha="%s"' % str(ele.alpha)
-            lab = """\t<Label Index="%s"%s><![CDATA[%s]]></Label>\n""" % \
-                (str(ele.index), col, ele.label)
+            lab = """\t<Label Key="%s"%s><![CDATA[%s]]></Label>\n""" % \
+                (str(ele.key), col, ele.label)
             res = res + lab
         res = res + "</LabelTable>\n" 
         return res
@@ -105,7 +105,7 @@ def print_summary(self):
 
 
 class GiftiLabel(object):
-    index = int
+    key = int
     label = str
     # rgba
     # freesurfer examples seem not to conform
@@ -116,9 +116,9 @@ class GiftiLabel(object):
     blue = float
     alpha = float
 
-    def __init__(self, index = 0, label = '', red = None,\
+    def __init__(self, key = 0, label = '', red = None,\
                   green = None, blue = None, alpha = None):
-        self.index = index
+        self.key = key
         self.label = label
         self.red = red
         self.green = green

nibabel/gifti/parse_gifti_fast.py

@@ -134,7 +134,9 @@ def StartElementHandler(self, name, attrs):
         elif name == 'Label':
             self.label = gi.GiftiLabel()
             if "Index" in attrs:
-                self.label.index = int(attrs["Index"])
+                self.label.key = int(attrs["Index"])
+            if "Key" in attrs:
+                self.label.key = int(attrs["Key"])
             if "Red" in attrs:
                 self.label.red = float(attrs["Red"])
             if "Green" in attrs: