Merge pull request #31 from rii-mango/FIX/method0-fix-in-ts

Fix/method0 fix in ts
rii-mango · May 12, 2023 · 968fd76 · 968fd76
2 parents f145529 + 6c156e8
commit 968fd76
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/dist/src/nifti1.d.ts.map b/dist/src/nifti1.d.ts.map
diff --git a/dist/src/nifti1.js b/dist/src/nifti1.js
diff --git a/dist/src/nifti1.js.map b/dist/src/nifti1.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nifti-reader-js",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "A JavaScript NIfTI file format reader.",
   "main": "dist/src/nifti.js",
   "types": "dist/src/nifti.d.ts",

diff --git a/release/current/nifti-reader-min.js b/release/current/nifti-reader-min.js
diff --git a/release/current/nifti-reader.js b/release/current/nifti-reader.js
@@ -2483,7 +2483,12 @@
           this.qoffset_x = utilities_1.Utils.getFloatAt(rawData, 268, this.littleEndian);
           this.qoffset_y = utilities_1.Utils.getFloatAt(rawData, 272, this.littleEndian);
           this.qoffset_z = utilities_1.Utils.getFloatAt(rawData, 276, this.littleEndian);
-          if (this.qform_code > 0) {
+          if (this.qform_code < 1 && this.sform_code < 1) {
+            this.affine[0][0] = this.pixDims[1];
+            this.affine[1][1] = this.pixDims[2];
+            this.affine[2][2] = this.pixDims[3];
+          }
+          if (this.qform_code > 0 && this.sform_code < this.qform_code) {
             const a = this.quatern_a;
             const b = this.quatern_b;
             const c = this.quatern_c;

diff --git a/src/nifti1.ts b/src/nifti1.ts
@@ -255,7 +255,13 @@ import { Utils } from "./utilities";
       // Added by znshje on 27/11/2021
       //
       /* See: https://nifti.nimh.nih.gov/pub/dist/src/niftilib/nifti1.h */
-      if (this.qform_code > 0) {
+      if ((this.qform_code < 1) && (this.sform_code < 1)) {
+        // METHOD 0 (used when both SFORM and QFORM are unknown)
+        this.affine[0][0] = this.pixDims[1];
+        this.affine[1][1] = this.pixDims[2];
+        this.affine[2][2] = this.pixDims[3];
+      }
+      if ((this.qform_code > 0) && (this.sform_code < this.qform_code)) {
         //   METHOD 2 (used when qform_code > 0, which should be the "normal" case):
         //    ---------------------------------------------------------------------
         //    The (x,y,z) coordinates are given by the pixdim[] scales, a rotation