fixes tools Roi and Length + default (#332)

* fixes tools Roi and Length + default * Update docs * removed ../../dist/ * Update docs --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dvisionlab · Mar 19, 2024 · 25d47ff · 25d47ff
1 parent 2a92943
commit 25d47ff
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@
 
 ## Dicom Image Toolkit for CornerstoneJS
 
-### Current version: 2.4.12
+### Current version: 2.4.13
 
-### Latest Published Release: 2.4.12
+### Latest Published Release: 2.4.13
 
 This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornerstone-js environment.
 

diff --git a/dist/larvitar.js b/dist/larvitar.js
diff --git a/dist/larvitar.js.map b/dist/larvitar.js.map
diff --git a/docs/documentation/index.html b/docs/documentation/index.html
@@ -74,8 +74,8 @@ <h3> </h3>
 <h1 id="larvitar">Larvitar</h1>
 <p><a href="https://github.com/dvisionlab/Larvitar"><img src="https://img.shields.io/badge/dynamic/json.svg?label=type-coverage&amp;prefix=%E2%89%A5&amp;suffix=%25&amp;query=$.typeCoverage.atLeast&amp;uri=https%3A%2F%2Fraw.githubusercontent.com%2Fplantain-00%2Ftype-coverage%2Fmaster%2Fpackage.json" alt="type-coverage"></a></p>
 <h2 id="dicom-image-toolkit-for-cornerstonejs">Dicom Image Toolkit for CornerstoneJS</h2>
-<h3 id="current-version%3A-2.4.12">Current version: 2.4.12</h3>
-<h3 id="latest-published-release%3A-2.4.12">Latest Published Release: 2.4.12</h3>
+<h3 id="current-version%3A-2.4.13">Current version: 2.4.13</h3>
+<h3 id="latest-published-release%3A-2.4.13">Latest Published Release: 2.4.13</h3>
 <p>This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornerstone-js environment.</p>
 <h2 id="features%3A">Features:</h2>
 <ul>

diff --git a/docs/examples/defaultTools.html b/docs/examples/defaultTools.html
@@ -238,7 +238,8 @@
             "PanMultiTouch",
             "OrientationMarkers",
             "ScaleOverlay",
-            "ManualLengthPlot"
+            "ManualLengthPlot",
+            "WSToggle"
           );
           // remove not working tools for the live example
           // see open issue

diff --git a/docs/examples/larvitar.js b/docs/examples/larvitar.js
diff --git a/imaging/tools/custom/EllipticalRoiUSTool.ts b/imaging/tools/custom/EllipticalRoiUSTool.ts
@@ -202,7 +202,7 @@ export default class EllipticalRoiTool extends BaseAnnotationTool {
   ) {
     const pixelSpacing: PixelSpacing = getPixelSpacing(image);
     if (
-      pixelSpacing.rowPixelSpacing ||
+      pixelSpacing.rowPixelSpacing === undefined ||
       pixelSpacing.colPixelSpacing === undefined
     ) {
       let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
@@ -258,7 +258,7 @@ export default class EllipticalRoiTool extends BaseAnnotationTool {
       colPixelSpacing = image.columnPixelSpacing;
       rowPixelSpacing = image.rowPixelSpacing;
     }
-    if (rowPixelSpacing || colPixelSpacing === undefined) {
+    if (rowPixelSpacing === undefined || colPixelSpacing === undefined) {
       let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
         eventData.image.imageId
       );

diff --git a/imaging/tools/custom/FreehandRoiUSTool.js b/imaging/tools/custom/FreehandRoiUSTool.js
@@ -321,7 +321,7 @@ export default class FreehandRoiTool extends BaseAnnotationTool {
       colPixelSpacing = image.columnPixelSpacing;
       rowPixelSpacing = image.rowPixelSpacing;
     }
-    if (rowPixelSpacing || colPixelSpacing === undefined) {
+    if (rowPixelSpacing === undefined || colPixelSpacing === undefined) {
       let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
         image.imageId
       );
@@ -566,7 +566,7 @@ export default class FreehandRoiTool extends BaseAnnotationTool {
           colPixelSpacing = image.columnPixelSpacing;
           rowPixelSpacing = image.rowPixelSpacing;
         }
-        if (rowPixelSpacing || colPixelSpacing === undefined) {
+        if (rowPixelSpacing === undefined || colPixelSpacing === undefined) {
           let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
             eventData.image.imageId
           );

diff --git a/imaging/tools/custom/LengthUSTool.ts b/imaging/tools/custom/LengthUSTool.ts
@@ -153,7 +153,22 @@ export default class LengthTool extends BaseAnnotationTool {
       colPixelSpacing = image.columnPixelSpacing;
       rowPixelSpacing = image.rowPixelSpacing;
     }
-
+    if (rowPixelSpacing === undefined || colPixelSpacing === undefined) {
+      let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
+        image.imageId
+      );
+      let rootImageId = parsedImageId.scheme + ":" + parsedImageId.url;
+      let imageTracker = getLarvitarImageTracker();
+      let seriesId = imageTracker[rootImageId];
+      let manager = getLarvitarManager() as LarvitarManager;
+      if (manager && seriesId) {
+        let series = manager[seriesId] as Series;
+        rowPixelSpacing =
+          series.instances[image.imageId].metadata.pixelSpacing![0];
+        colPixelSpacing =
+          series.instances[image.imageId].metadata.pixelSpacing![1];
+      }
+    }
     // Set rowPixelSpacing and columnPixelSpacing to 1 if they are undefined (or zero)
     const dx =
       (data.handles.end!.x - data.handles.start!.x) * (colPixelSpacing || 1);
@@ -198,7 +213,7 @@ export default class LengthTool extends BaseAnnotationTool {
       rowPixelSpacing = image.rowPixelSpacing;
     }
 
-    if (rowPixelSpacing || colPixelSpacing === undefined) {
+    if (rowPixelSpacing === undefined || colPixelSpacing === undefined) {
       let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
         eventData.image.imageId
       );

diff --git a/imaging/tools/custom/RectangleRoiUSTool.ts b/imaging/tools/custom/RectangleRoiUSTool.ts
@@ -175,8 +175,9 @@ export default class RectangleRoiTool extends BaseAnnotationTool {
   ) {
     const pixelSpacing: { colPixelSpacing: number; rowPixelSpacing: number } =
       getPixelSpacing(image);
+
     if (
-      pixelSpacing.rowPixelSpacing ||
+      pixelSpacing.rowPixelSpacing === undefined ||
       pixelSpacing.colPixelSpacing === undefined
     ) {
       let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
@@ -227,12 +228,14 @@ export default class RectangleRoiTool extends BaseAnnotationTool {
     const context: CanvasRenderingContext2D = getNewContext(
       eventData.canvasContext.canvas
     );
-    let { rowPixelSpacing, colPixelSpacing }: PixelSpacing = getPixelSpacing;
+    let { rowPixelSpacing, colPixelSpacing }: PixelSpacing =
+      getPixelSpacing(image);
     if (this.modality === "US") {
       colPixelSpacing = image.columnPixelSpacing;
       rowPixelSpacing = image.rowPixelSpacing;
     }
-    if (rowPixelSpacing || colPixelSpacing === undefined) {
+
+    if (rowPixelSpacing === undefined || colPixelSpacing === undefined) {
       let parsedImageId = cornerstoneDICOMImageLoader.wadouri.parseImageId(
         eventData.image.imageId
       );

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "medical",
     "cornerstone"
   ],
-  "version": "2.4.12",
+  "version": "2.4.13",
   "description": "typescript library for parsing, loading, rendering and interacting with DICOM images",
   "repository": {
     "url": "https://github.com/dvisionlab/Larvitar.git",