@cornerstonejs/tools 1.83.1 → 1.83.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.83.1",
+  "version": "1.83.3",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.83.1",
+    "@cornerstonejs/core": "^1.83.3",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "9188c116a405de35977a9bf379ef23ad0ae64264"
+  "gitHead": "ef300bc029ea075f451a5909cecb43cbddb12fdb"
 }

package/src/tools/ScaleOverlayTool.ts

@@ -118,28 +118,33 @@ class ScaleOverlayTool extends AnnotationDisplayTool {
 
     // viewportsWithAnnotations stores which viewports have an annotation,
     // if the viewport does not have an annotation, create a new one
-    if (!viewportsWithAnnotations.includes(viewport.id)) {
-      const newAnnotation: ScaleOverlayAnnotation = {
-        metadata: {
-          toolName: this.getToolName(),
-          viewPlaneNormal: <Types.Point3>[...viewPlaneNormal],
-          viewUp: <Types.Point3>[...viewUp],
-          FrameOfReferenceUID,
-          referencedImageId: null,
-        },
-        data: {
-          handles: {
-            points: viewportCanvasCornersInWorld,
+    enabledElements.forEach((element) => {
+      const { viewport } = element;
+      if (!viewportsWithAnnotations.includes(viewport.id)) {
+        const newAnnotation: ScaleOverlayAnnotation = {
+          metadata: {
+            toolName: this.getToolName(),
+            viewPlaneNormal: <Types.Point3>[...viewPlaneNormal],
+            viewUp: <Types.Point3>[...viewUp],
+            FrameOfReferenceUID,
+            referencedImageId: null,
           },
-          viewportId: viewport.id,
-        },
-      };
+          data: {
+            handles: {
+              points: csUtils.getViewportImageCornersInWorld(viewport),
+            },
+            viewportId: viewport.id,
+          },
+        };
+
+        viewportsWithAnnotations.push(viewport.id);
 
-      viewportsWithAnnotations.push(viewport.id);
+        addAnnotation(newAnnotation, viewport.element);
+        annotation = newAnnotation;
+      }
+    });
 
-      addAnnotation(newAnnotation, viewport.element);
-      annotation = newAnnotation;
-    } else if (
+    if (
       this.editData.annotation &&
       this.editData.annotation.data.viewportId == viewport.id
     ) {