@cornerstonejs/tools 2.1.0 → 2.1.2

package/dist/esm/tools/OrientationMarkerTool.d.ts

@@ -44,6 +44,7 @@ declare class OrientationMarkerTool extends BaseTool {
     static AXIS: number;
     static VTPFILE: number;
     orientationMarkers: any;
+    updatingOrientationMarker: any;
     polyDataURL: any;
     _resizeObservers: Map<any, any>;
     static OVERLAY_MARKER_TYPES: typeof OverlayMarkerType;

package/dist/esm/tools/OrientationMarkerTool.js

@@ -91,6 +91,7 @@ class OrientationMarkerTool extends BaseTool {
             orientationWidget.updateViewport();
         };
         this.orientationMarkers = {};
+        this.updatingOrientationMarker = {};
     }
     _unsubscribeToViewportNewVolumeSet() {
         const unsubscribe = () => {
@@ -173,53 +174,58 @@ class OrientationMarkerTool extends BaseTool {
         let viewports = renderingEngine.getViewports();
         viewports = filterViewportsWithToolEnabled(viewports, this.getToolName());
         viewports.forEach((viewport) => {
-            if (!viewport.getWidget(this.getToolName())) {
+            const widget = viewport.getWidget(this.getToolName());
+            if (!widget || widget.isDeleted()) {
                 this.addAxisActorInViewport(viewport);
             }
         });
     }
     async addAxisActorInViewport(viewport) {
         const viewportId = viewport.id;
-        const type = this.configuration.overlayMarkerType;
-        const overlayConfiguration = this.configuration.overlayConfiguration[type];
-        if (this.orientationMarkers[viewportId]) {
-            const { actor, orientationWidget } = this.orientationMarkers[viewportId];
-            viewport.getRenderer().removeActor(actor);
-            orientationWidget.setEnabled(false);
-        }
-        let actor;
-        if (type === 1) {
-            actor = this.createAnnotationCube(overlayConfiguration);
-        }
-        else if (type === 2) {
-            actor = vtkAxesActor.newInstance();
-        }
-        else if (type === 3) {
-            actor = await this.createCustomActor();
+        if (!this.updatingOrientationMarker[viewportId]) {
+            this.updatingOrientationMarker[viewportId] = true;
+            const type = this.configuration.overlayMarkerType;
+            const overlayConfiguration = this.configuration.overlayConfiguration[type];
+            if (this.orientationMarkers[viewportId]) {
+                const { actor, orientationWidget } = this.orientationMarkers[viewportId];
+                viewport.getRenderer().removeActor(actor);
+                orientationWidget.setEnabled(false);
+            }
+            let actor;
+            if (type === 1) {
+                actor = this.createAnnotationCube(overlayConfiguration);
+            }
+            else if (type === 2) {
+                actor = vtkAxesActor.newInstance();
+            }
+            else if (type === 3) {
+                actor = await this.createCustomActor();
+            }
+            const renderer = viewport.getRenderer();
+            const renderWindow = viewport
+                .getRenderingEngine()
+                .offscreenMultiRenderWindow.getRenderWindow();
+            const { enabled, viewportCorner, viewportSize, minPixelSize, maxPixelSize, } = this.configuration.orientationWidget;
+            const orientationWidget = vtkOrientationMarkerWidget.newInstance({
+                actor,
+                interactor: renderWindow.getInteractor(),
+                parentRenderer: renderer,
+            });
+            orientationWidget.setEnabled(enabled);
+            orientationWidget.setViewportCorner(viewportCorner);
+            orientationWidget.setViewportSize(viewportSize);
+            orientationWidget.setMinPixelSize(minPixelSize);
+            orientationWidget.setMaxPixelSize(maxPixelSize);
+            orientationWidget.updateMarkerOrientation();
+            this.orientationMarkers[viewportId] = {
+                orientationWidget,
+                actor,
+            };
+            viewport.addWidget(this.getToolName(), orientationWidget);
+            renderWindow.render();
+            viewport.getRenderingEngine().render();
+            this.updatingOrientationMarker[viewportId] = false;
         }
-        const renderer = viewport.getRenderer();
-        const renderWindow = viewport
-            .getRenderingEngine()
-            .offscreenMultiRenderWindow.getRenderWindow();
-        const { enabled, viewportCorner, viewportSize, minPixelSize, maxPixelSize, } = this.configuration.orientationWidget;
-        const orientationWidget = vtkOrientationMarkerWidget.newInstance({
-            actor,
-            interactor: renderWindow.getInteractor(),
-            parentRenderer: renderer,
-        });
-        orientationWidget.setEnabled(enabled);
-        orientationWidget.setViewportCorner(viewportCorner);
-        orientationWidget.setViewportSize(viewportSize);
-        orientationWidget.setMinPixelSize(minPixelSize);
-        orientationWidget.setMaxPixelSize(maxPixelSize);
-        orientationWidget.updateMarkerOrientation();
-        this.orientationMarkers[viewportId] = {
-            orientationWidget,
-            actor,
-        };
-        viewport.addWidget(this.getToolName(), orientationWidget);
-        renderWindow.render();
-        viewport.getRenderingEngine().render();
     }
     async createCustomActor() {
         const url = this.configuration.overlayConfiguration[OverlayMarkerType.CUSTOM]

package/dist/esm/tools/segmentation/CircleROIStartEndThresholdTool.js

@@ -17,7 +17,6 @@ import { getCalibratedLengthUnitsAndScale, getCalibratedAspect, } from '../../ut
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 import { pointInEllipse } from '../../utilities/math/ellipse';
 import { BasicStatsCalculator } from '../../utilities/math/basic';
-import cloneDeep from 'lodash.clonedeep';
 import { filterAnnotationsWithinSamePlane } from '../../utilities/planar';
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
 const { transformWorldToIndex } = csUtils;
@@ -295,7 +294,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
         const { points } = data.handles;
         const startIJK = transformWorldToIndex(imageData, points[0]);
         const endIJK = transformWorldToIndex(imageData, points[0]);
-        const handlesToStart = cloneDeep(points);
+        const handlesToStart = csUtils.deepClone(points);
         const startWorld = vec3.create();
         imageData.indexToWorldVec3(startIJK, startWorld);
         const endWorld = vec3.create();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Cornerstone3D Tools",
   "main": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -105,7 +105,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.1.0",
+    "@cornerstonejs/core": "^2.1.2",
     "@kitware/vtk.js": "32.1.0",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -124,5 +124,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "36016cf1416e1b7faf5ef82ce07f8a973c199da2"
+  "gitHead": "b7246ebfa82367e338a6cf7d09fa0be14be00822"
 }