Update 'measurement frame' field to be a double matrix (#77)

Fixes #76
mhe · Jan 18, 2019 · c1c42d9 · c1c42d9
1 parent 3b084ed
commit c1c42d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/nrrd/reader.py b/nrrd/reader.py
@@ -101,7 +101,7 @@ def _get_field_type(field, custom_field_map):
     elif field in ['space origin']:
         return 'double vector'
     elif field in ['measurement frame']:
-        return 'int matrix'
+        return 'double matrix'
     elif field in ['space directions']:
         return 'double matrix'
     else:

diff --git a/nrrd/tests/data/test_simple4d_raw.nrrd b/nrrd/tests/data/test_simple4d_raw.nrrd
@@ -8,6 +8,6 @@ sizes: 1 1 1 1
 space directions: (1.5,0,0) (0,1.5,0) (0,0,1) none
 endian: little
 encoding: raw
-measurement frame: (1,0,0) (0,1,0) (0,0,1)
+measurement frame: (1.0001,0,0) (0,1.0000000006,0) (0,0,1.000000000000009)
 
-������?
+������?
diff --git a/nrrd/tests/test_reading.py b/nrrd/tests/test_reading.py
@@ -7,7 +7,6 @@
 from nrrd.tests.util import *
 import nrrd
 
-
 class TestReadingFunctions(unittest.TestCase):
     def setUp(self):
         self.expected_header = {u'dimension': 3,
@@ -231,14 +230,16 @@ def test_read_simple_4d_nrrd(self):
                                                          [np.NaN, np.NaN, np.NaN]]),
                            'endian': 'little',
                            'encoding': 'raw',
-                           'measurement frame': np.array([[1., 0., 0.],
-                                                          [0., 1., 0.],
-                                                          [0., 0., 1.]])}
+                           'measurement frame': np.array([[1.0001,         0.,      0.],
+                                                          [0., 1.0000000006,      0.],
+                                                          [0., 0., 1.000000000000009]])}
+
 
         data, header = nrrd.read(RAW_4D_NRRD_FILE_PATH)
 
         np.testing.assert_equal(header, expected_header)
         np.testing.assert_equal(data.dtype, np.float64)
+        np.testing.assert_equal(header['measurement frame'].dtype, np.float64)
         np.testing.assert_equal(data, np.array([[[[0.76903426]]]]))
 
         # Test that the data read is able to be edited