RF: make meta, numDA, and labeltable into properties.

Author: Ben Cipollini

nibabel/gifti/gifti.py

@@ -344,63 +344,48 @@ def get_metadata(self):
 
 
 class GiftiImage(object):
-
-    numDA = int
-    version = str
-    filename = str
-
     def __init__(self, meta=None, labeltable=None, darrays=None,
                  version="1.0"):
         if darrays is None:
             darrays = []
-        self.darrays = darrays
         if meta is None:
-            self.meta = GiftiMetaData()
-        else:
-            self.meta = meta
+            meta = GiftiMetaData()
         if labeltable is None:
-            self.labeltable = GiftiLabelTable()
-        else:
-            self.labeltable = labeltable
-        self.numDA = len(self.darrays)
+            labeltable = GiftiLabelTable()
+
+        self._labeltable = labeltable
+        self._meta = meta
+
+        self.darrays = darrays
         self.version = version
 
-#    @classmethod
-#    def from_array(cls):
-#        pass
-#def GiftiImage_fromarray(data, intent = GiftiIntentCode.NIFTI_INTENT_NONE, encoding=GiftiEncoding.GIFTI_ENCODING_B64GZ, endian = GiftiEndian.GIFTI_ENDIAN_LITTLE):
-#    """ Returns a GiftiImage from a Numpy array with a given intent code and
-#    encoding """
-
-#    @classmethod
-#    def from_vertices_and_triangles(cls):
-#        pass
-#    def from_vertices_and_triangles(cls, vertices, triangles, coordsys = None, \
-#                                    encoding = GiftiEncoding.GIFTI_ENCODING_B64GZ,\
-#                                    endian = GiftiEndian.GIFTI_ENDIAN_LITTLE):
-#    """ Returns a GiftiImage from two numpy arrays representing the vertices
-#    and the triangles. Additionally defining the coordinate system and encoding """
-
-    def get_labeltable(self):
-        return self.labeltable
-
-    def set_labeltable(self, labeltable):
+    @property
+    def numDA(self):
+        return len(self.darrays)
+
+    @property
+    def labeltable(self):
+        return self._labeltable
+
+    @labeltable.setter
+    def labeltable(self, labeltable):
         """ Set the labeltable for this GiftiImage
 
         Parameters
         ----------
         labeltable : GiftiLabelTable
 
         """
-        if isinstance(labeltable, GiftiLabelTable):
-            self.labeltable = labeltable
-        else:
-            print("Not a valid GiftiLabelTable instance")
+        if not isinstance(labeltable, GiftiLabelTable):
+            raise ValueError("Not a valid GiftiLabelTable instance")
+        self._labeltable = labeltable
 
-    def get_metadata(self):
-        return self.meta
+    @property
+    def meta(self):
+        return self._meta
 
-    def set_metadata(self, meta):
+    @meta.setter
+    def meta(self, meta):
         """ Set the metadata for this GiftiImage
 
         Parameters
@@ -411,13 +396,10 @@ def set_metadata(self, meta):
         -------
         None
         """
-        if isinstance(meta, GiftiMetaData):
-            self.meta = meta
-            print("New Metadata set. Be aware of changing "
-                  "coordinate transformation!")
-        else:
-            print("Not a valid GiftiMetaData instance")
-
+        if not isinstance(meta, GiftiMetaData):
+            raise ValueError("Not a valid GiftiMetaData instance")
+        self._meta = meta
+ 
     def add_gifti_data_array(self, dataarr):
         """ Adds a data array to the GiftiImage
 
@@ -427,22 +409,19 @@ def add_gifti_data_array(self, dataarr):
         """
         if isinstance(dataarr, GiftiDataArray):
             self.darrays.append(dataarr)
-            self.numDA += 1
         else:
             print("dataarr paramater must be of tzpe GiftiDataArray")
 
     def remove_gifti_data_array(self, ith):
         """ Removes the ith data array element from the GiftiImage """
         self.darrays.pop(ith)
-        self.numDA -= 1
 
     def remove_gifti_data_array_by_intent(self, intent):
         """ Removes all the data arrays with the given intent type """
         intent2remove = intent_codes.code[intent]
         for dele in self.darrays:
             if dele.intent == intent2remove:
                 self.darrays.remove(dele)
-                self.numDA -= 1
 
     def get_arrays_from_intent(self, intent):
         """ Returns a a list of GiftiDataArray elements matching

nibabel/gifti/parse_gifti_fast.py

@@ -108,9 +108,6 @@ def StartElementHandler(self, name, attrs):
             self.img = GiftiImage()
             if 'Version' in attrs:
                 self.img.version = attrs['Version']
-            if 'NumberOfDataArrays' in attrs:
-                self.img.numDA = int(attrs['NumberOfDataArrays'])
-                self.count_da = False
 
             self.fsm_state.append('GIFTI')
         elif name == 'MetaData':
@@ -234,8 +231,6 @@ def EndElementHandler(self, name):
             self.img.labeltable = self.lata
             self.lata = None
         elif name == 'DataArray':
-            if self.count_da:
-                self.img.numDA += 1
             self.fsm_state.pop()
         elif name == 'CoordinateSystemTransformMatrix':
             self.fsm_state.pop()

nibabel/gifti/tests/test_giftiio.py

@@ -112,8 +112,7 @@ def test_read_ordering():
 def test_metadata():
     for i, dat in enumerate(datafiles):
         img = gi.read(dat)
-        me = img.get_metadata()
-        medat = me.get_metadata()
+        me = img.meta
         assert_equal(numda[i], img.numDA)
         assert_equal(img.version,'1.0')
 
@@ -217,11 +216,11 @@ def test_newmetadata():
     img = gi.GiftiImage()
     attr = gi.GiftiNVPairs(name = 'mykey', value = 'val1')
     newmeta = gi.GiftiMetaData(attr)
-    img.set_metadata(newmeta)
+    img.meta = newmeta
     myme = img.meta.get_metadata()
     assert_true('mykey' in myme)
     newmeta = gi.GiftiMetaData.from_dict( {'mykey1' : 'val2'} )
-    img.set_metadata(newmeta)
+    img.meta = newmeta
     myme = img.meta.get_metadata()
     assert_true('mykey1' in myme)
     assert_false('mykey' in myme)