Merge branch 'v0.33'

ivmartel · Jun 13, 2024 · a4fba19 · a4fba19
2 parents 528eb0b + dcb2e8d
commit a4fba19
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.33.1](https://github.com/ivmartel/dwv/releases/tag/v0.33.1) - 13/06/2024
+
+### Fixed
+
+- Wrong slice spacing for DICOM Seg [#1677](https://github.com/ivmartel/dwv/issues/1677)
+
 ## [v0.33.0](https://github.com/ivmartel/dwv/releases/tag/v0.33.0) - 06/06/2024
 
 ### Added

diff --git a/dist/dwv.min.js b/dist/dwv.min.js
diff --git a/dist/dwv.min.js.map b/dist/dwv.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dwv",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "description": "DICOM Web Viewer.",
   "keywords": [
     "DICOM",

diff --git a/resources/doc/jsdoc.conf.json b/resources/doc/jsdoc.conf.json
@@ -25,7 +25,7 @@
       "package": "package.json",
       "theme_opts": {
         "title": "DWV",
-        "footer": "<i>Documentation generated for dwv v0.33.0.</i>",
+        "footer": "<i>Documentation generated for dwv v0.33.1.</i>",
         "sections": [
           "Tutorials",
           "Namespaces",
@@ -50,7 +50,7 @@
         "codepen": {
           "enable_for": ["examples"],
           "options": {
-            "js_external": "https://github.com/ivmartel/dwv/releases/download/v0.33.0/dwv-0.33.0.min.js",
+            "js_external": "https://github.com/ivmartel/dwv/releases/download/v0.33.1/dwv-0.33.1.min.js",
             "html": "<div id='dwv'><div id='layerGroup0'></div></div>"
           }
         }

diff --git a/resources/doc/tutorials/test-results.md b/resources/doc/tutorials/test-results.md
@@ -2,18 +2,18 @@
 
 ## Context
 
-Date: Thu Jun 06 2024 18:05:34 GMT+0200 (Central European Summer Time)
+Date: Thu Jun 13 2024 11:56:35 GMT+0200 (Central European Summer Time)
 
-Commit: [677e076](git://github.com/ivmartel/dwv.git/commit/677e076a81724d1e2b659aca942d899175d203ea)
+Commit: [5909e54](git://github.com/ivmartel/dwv.git/commit/5909e54fa860694e4867a83d0a3446704373db3c)
 
-Browser: Chrome Headless 125.0.6422.112 (Linux x86_64)
+Browser: Chrome Headless 125.0.6422.141 (Linux x86_64)
 
 ## Summary
 Success: 163 ✅
 
 Failed: 0 ❌
 
-(total: 163, skipped: 0, total time: 1650ms)
+(total: 163, skipped: 0, total time: 1600ms)
 
 ## Tests details
 

diff --git a/src/dicom/dicomElementsWrapper.js b/src/dicom/dicomElementsWrapper.js
@@ -676,11 +676,8 @@ export function getSpacingFromMeasure(dataElements) {
     parseFloat(pixelSpacing.value[1]),
     parseFloat(pixelSpacing.value[0]),
   ];
-  // Slice Thickness
-  if (typeof dataElements['00180050'] !== 'undefined') {
-    spacingValues.push(parseFloat(dataElements['00180050'].value[0]));
-  } else if (typeof dataElements['00180088'] !== 'undefined') {
-    // Spacing Between Slices
+  // Spacing Between Slices
+  if (typeof dataElements['00180088'] !== 'undefined') {
     spacingValues.push(parseFloat(dataElements['00180088'].value[0]));
   }
   return new Spacing(spacingValues);

diff --git a/src/dicom/dicomParser.js b/src/dicom/dicomParser.js
@@ -38,7 +38,7 @@ import {DataElement} from '../dicom/dataElement';
  * @returns {string} The version of the library.
  */
 export function getDwvVersion() {
-  return '0.33.0';
+  return '0.33.1';
 }
 
 /**

diff --git a/src/image/maskFactory.js b/src/image/maskFactory.js
@@ -512,9 +512,15 @@ export class MaskFactory {
     if (typeof spacing === 'undefined') {
       throw new Error('No spacing found for DICOM SEG');
     }
+    if (spacing.length() !== 3) {
+      throw new Error('Incomplete spacing found for DICOM SEG');
+    }
     if (typeof imageOrientationPatient === 'undefined') {
       throw new Error('No imageOrientationPatient found for DICOM SEG');
     }
+    if (imageOrientationPatient.length !== 6) {
+      throw new Error('Incomplete imageOrientationPatient found for DICOM SEG');
+    }
 
     // orientation
     const rowCosines = new Vector3D(