BF+TEST - set data array datatype correctly

Author: matthew-brett

nibabel/gifti/gifti.py

@@ -224,9 +224,9 @@ def from_array(klass,
                    intent,
                    datatype = None,
                    encoding = "GIFTI_ENCODING_B64GZ",
-                   endian = "GIFTI_ENDIAN_LITTLE",
+                   endian = sys.byteorder,
                    coordsys = None,
-                   ordering = "RowMajorOrder",
+                   ordering = "C",
                    meta = None):
         """ Creates a new Gifti data array
 
@@ -235,33 +235,35 @@ def from_array(klass,
         darray : ndarray
             NumPy data array
         intent : string
-            NIFTI intent codes, see util.intent_codes
-        datatype : string
-            NIFTI data type codes, see util.data_type_codes
+            NIFTI intent code, see nifti1.intent_codes
+        datatype : None or string, optional
+            NIFTI data type codes, see nifti1.data_type_codes
             If None, the datatype of the NumPy array is taken.
-        encoding : string, default: GIFTI_ENCODING_B64GZ
-            Encoding of the data, see util.gifti_encoding_codes
-        endian : string, default: GIFTI_ENDIAN_LITTLE
-            The Endianness to store the data array.
-            Should correspond to the machine endianness.
+        encoding : string, optionaal
+            Encoding of the data, see util.gifti_encoding_codes;
+            default: GIFTI_ENCODING_B64GZ
+        endian : string, optional
+            The Endianness to store the data array.  Should correspond to the
+            machine endianness.  default: system byteorder
         coordsys : GiftiCoordSystem, optional
             If None, a identity transformation is taken.
-        ordering : string, default: RowMajorOrder
-            The ordering of the array. see util.array_index_order_codes
+        ordering : string, optional
+            The ordering of the array. see util.array_index_order_codes;
+            default: RowMajorOrder - C ordering
         meta : None or dict, optional
             A dictionary for metadata information.  If None, gives empty dict.
 
         Returns
         -------
-        da : instance of class `klass`
+        da : instance of our own class
         """
         if meta is None:
             meta = {}
         cda = klass(darray)
         cda.num_dim = len(darray.shape)
         cda.dims = list(darray.shape)
         if datatype == None:
-            cda.datatype = data_type_codes.code[darray.dtype.type]
+            cda.datatype = data_type_codes.code[darray.dtype]
         else:
             cda.datatype = data_type_codes.code[datatype]
         cda.intent = intent_codes.code[intent]
@@ -271,7 +273,6 @@ def from_array(klass,
             cda.coordsys = coordsys
         cda.ind_ord = array_index_order_codes.code[ordering]
         cda.meta = GiftiMetaData.from_dict(meta)
-
         return cda
 
     def to_xml(self):

nibabel/gifti/tests/test_gifti.py

@@ -3,15 +3,17 @@
 
 import numpy as np
 
-from ..gifti import GiftiImage
+from ...nifti1 import data_type_codes, intent_codes
+
+from ..gifti import GiftiImage, GiftiDataArray
 
 from numpy.testing import (assert_array_almost_equal,
                            assert_array_equal)
 
 from nose.tools import assert_true, assert_equal, assert_raises
 
 
-def test_gifti_data():
+def test_gifti_image():
     # Check that we're not modifying the default empty list in the default
     # arguments.
     gi = GiftiImage()
@@ -22,3 +24,15 @@ def test_gifti_data():
     gi = GiftiImage()
     assert_equal(gi.darrays, [])
 
+
+def test_dataarray():
+    for dt_code in data_type_codes.value_set():
+        data_type = data_type_codes.type[dt_code]
+        if data_type is np.void: # not supported
+            continue
+        arr = np.zeros((10,3), dtype=data_type)
+        da = GiftiDataArray.from_array(arr, 'triangle')
+        assert_equal(da.datatype, data_type_codes[arr.dtype])
+        bs_arr = arr.byteswap().newbyteorder()
+        da = GiftiDataArray.from_array(bs_arr, 'triangle')
+        assert_equal(da.datatype, data_type_codes[arr.dtype])