add shape gifti

Author: htwangtw

nibabel/gifti/tests/test_gifti.py

@@ -24,24 +24,29 @@
 
 
 def test_agg_data():
-    surf_gii_fname = test_data('gifti', 'ascii.gii')
-    surf_gii_img = nib.load(surf_gii_fname)
-    func_gii_fname = test_data('gifti', 'task.func.gii')
-    func_gii_img = nib.load(func_gii_fname)
+    surf_gii_img = nib.load(test_data('gifti', 'ascii.gii'))
+    func_gii_img = nib.load(test_data('gifti', 'task.func.gii'))
+    shape_gii_img = nib.load(test_data('gifti', 'rh.shape.curv.gii'))
+    # add timeseries data with intent code ``none``
 
     point_data = surf_gii_img.get_arrays_from_intent('pointset')[0].data
     triangle_data = surf_gii_img.get_arrays_from_intent('triangle')[0].data
     func_da = func_gii_img.get_arrays_from_intent('time series')
     func_data = np.column_stack(tuple(da.data for da in func_da))
+    shape_data = shape_gii_img.get_arrays_from_intent('shape')
 
-    assert_equal(surf_gii_img.agg_data(), (point_data, triangle_data))  # surface file
-    assert_array_equal(func_gii_img.agg_data(), func_data)  # functional 
-    assert_array_equal(surf_gii_img.agg_data('pointset'), point_data)  # surface pointset
-    assert_array_equal(surf_gii_img.agg_data('triangle'), triangle_data)  # surface triangle
-    assert_array_equal(func_gii_img.agg_data('time series'), func_data)  # functional 
+    assert_equal(surf_gii_img.agg_data(), (point_data, triangle_data))
+    assert_array_equal(func_gii_img.agg_data(), func_data)
+    assert_array_equal(shape_gii_img.agg_data(), shape_data)
+
+    assert_array_equal(surf_gii_img.agg_data('pointset'), point_data)
+    assert_array_equal(surf_gii_img.agg_data('triangle'), triangle_data)
+    assert_array_equal(func_gii_img.agg_data('time series'), func_data) 
+    assert_array_equal(shape_gii_img.agg_data('shape'), shape_data)
 
     assert_equal(surf_gii_img.agg_data('time series'), ())
     assert_equal(func_gii_img.agg_data('triangle'), ())
+    assert_equal(shape_gii_img.agg_data('pointset'), ())
 
     assert_equal(surf_gii_img.agg_data(('pointset', 'triangle')), (point_data, triangle_data))
     assert_equal(surf_gii_img.agg_data(('triangle', 'pointset')), (triangle_data, point_data))