@cornerstonejs/tools 4.21.8 → 4.22.0

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

@@ -18,6 +18,11 @@ declare class OrientationControllerTool extends BaseTool {
             showEdgeFaces: boolean;
             showCornerFaces: boolean;
             keepOrientationUp: boolean;
+            highlightColor: number[];
+            edgeColor: number[];
+            cornerColor: number[];
+            restingAmbient: number;
+            hoverAmbient: number;
         };
     });
     private _getViewportsInfo;

package/dist/esm/tools/OrientationControllerTool.js

@@ -78,6 +78,11 @@ class OrientationControllerTool extends BaseTool {
             showEdgeFaces: true,
             showCornerFaces: true,
             keepOrientationUp: true,
+            highlightColor: [255, 255, 255],
+            edgeColor: [200, 200, 200],
+            cornerColor: [150, 150, 150],
+            restingAmbient: 1.0,
+            hoverAmbient: 1.0,
         },
     }) {
         super(toolProps, defaultToolProps);
@@ -258,6 +263,11 @@ class OrientationControllerTool extends BaseTool {
             opacity: this.configuration.opacity ?? 1.0,
             showEdgeFaces: this.configuration.showEdgeFaces !== false,
             showCornerFaces: this.configuration.showCornerFaces !== false,
+            highlightColor: this.configuration.highlightColor ?? [255, 255, 255],
+            edgeColor: this.configuration.edgeColor ?? [200, 200, 200],
+            cornerColor: this.configuration.cornerColor ?? [150, 150, 150],
+            restingAmbient: this.configuration.restingAmbient ?? 1.0,
+            hoverAmbient: this.configuration.hoverAmbient ?? 1.0,
         });
     }
     addMarkerToViewport(viewportId, renderingEngineId) {

package/dist/esm/tools/VolumeCroppingTool.js

@@ -66,8 +66,10 @@ class VolumeCroppingTool extends BaseTool {
             const enabledElement = getEnabledElement(element);
             const { viewport } = enabledElement;
             this.suppressPlaneRotationForCurrentDrag = isDragOwnedBy(viewport.id, 'orientation-controller');
-            const actorEntry = viewport.getDefaultActor();
-            const actor = actorEntry.actor;
+            const actor = this._getVolumeActor(viewport);
+            if (!actor) {
+                return false;
+            }
             const mapper = actor.getMapper();
             const mouseCanvas = [
                 evt.detail.currentPoints.canvas[0],
@@ -296,12 +298,12 @@ class VolumeCroppingTool extends BaseTool {
             if (!viewport) {
                 return;
             }
-            const volumeActors = viewport.getActors();
-            if (!volumeActors || volumeActors.length === 0) {
+            const volumeActor = this._getVolumeActor(viewport);
+            if (!volumeActor) {
                 console.warn('VolumeCroppingTool: No volume actors found in the viewport.');
                 return;
             }
-            const imageData = volumeActors[0].actor.getMapper().getInputData();
+            const imageData = volumeActor.getMapper().getInputData();
             if (!imageData) {
                 console.warn('VolumeCroppingTool: No image data found for volume actor.');
                 return;
@@ -423,9 +425,7 @@ class VolumeCroppingTool extends BaseTool {
                     this.edgeLines[uid] = { actor, source, key1, key2 };
                 }
             });
-            const mapper = viewport
-                .getDefaultActor()
-                .actor.getMapper();
+            const mapper = volumeActor.getMapper();
             mapper.addClippingPlane(planeXMin);
             mapper.addClippingPlane(planeXMax);
             mapper.addClippingPlane(planeYMin);
@@ -883,9 +883,11 @@ class VolumeCroppingTool extends BaseTool {
         }
     }
     _updateClippingPlanes(viewport) {
-        const actorEntry = viewport.getDefaultActor();
-        const actor = actorEntry.actor;
-        const mapper = actor.getMapper();
+        const actor = this._getVolumeActor(viewport);
+        const mapper = this._getVolumeMapper(viewport);
+        if (!actor || !mapper) {
+            return;
+        }
         const matrix = actor.getMatrix();
         if (!this.configuration.showClippingPlanes) {
             mapper.removeAllClippingPlanes();
@@ -1022,7 +1024,10 @@ class VolumeCroppingTool extends BaseTool {
     }
     _getVolumeActor(viewport) {
         const vp = viewport || this._getViewport();
-        return vp?.getDefaultActor()?.actor;
+        return vp
+            ?.getActors?.()
+            ?.find((entry) => entry.actor?.getClassName?.() === 'vtkVolume')
+            ?.actor;
     }
     _getVolumeMapper(viewport) {
         const actor = this._getVolumeActor(viewport);
@@ -1039,7 +1044,10 @@ class VolumeCroppingTool extends BaseTool {
         }
     }
     _updateClippingPlanesFromFaceSpheres(viewport) {
-        const mapper = viewport.getDefaultActor().actor.getMapper();
+        const mapper = this._getVolumeMapper(viewport);
+        if (!mapper) {
+            return;
+        }
         this.originalClippingPlanes[PLANEINDEX.XMIN].origin = [
             ...this.sphereStates[SPHEREINDEX.XMIN].point,
         ];

package/dist/esm/utilities/vtkjs/AnnotatedRhombicuboctahedronActor/index.js

@@ -242,7 +242,7 @@ function vtkAnnotatedRhombicuboctahedronActor(publicAPI, model) {
             }
         }
         if (model.showEdgeFaces !== false) {
-            const edgeColor = [200, 200, 200];
+            const edgeColor = model.edgeColor ?? [200, 200, 200];
             const edgeData = createEdgeFacesMesh(sourceScale, edgeColor);
             if (edgeData) {
                 const edgeFacesActor = vtkActor.newInstance();
@@ -263,7 +263,7 @@ function vtkAnnotatedRhombicuboctahedronActor(publicAPI, model) {
             }
         }
         if (model.showCornerFaces !== false) {
-            const cornerColor = [150, 150, 150];
+            const cornerColor = model.cornerColor ?? [150, 150, 150];
             const cornerData = createCornerFacesMesh(sourceScale, cornerColor);
             if (cornerData) {
                 const cornerFacesActor = vtkActor.newInstance();

package/dist/esm/utilities/vtkjs/OrientationControllerWidget/index.d.ts

@@ -18,6 +18,11 @@ export interface OrientationControllerConfig {
     opacity: number;
     showEdgeFaces: boolean;
     showCornerFaces: boolean;
+    highlightColor?: number[];
+    edgeColor?: number[];
+    cornerColor?: number[];
+    restingAmbient?: number;
+    hoverAmbient?: number;
 }
 export interface PickResult {
     pickedActor: vtkActor;
@@ -39,6 +44,9 @@ export declare class vtkOrientationControllerWidget {
     private renderWindows;
     private highlightedFace;
     private mouseHandlers;
+    private _highlightColor;
+    private _restingAmbient;
+    private _hoverAmbient;
     createActors(config: OrientationControllerConfig): vtkActor[];
     addActorsToViewport(viewportId: string, viewport: Types.IVolumeViewport, actors: vtkActor[]): void;
     removeActorsFromViewport(viewportId: string, _viewport: Types.IVolumeViewport): void;

package/dist/esm/utilities/vtkjs/OrientationControllerWidget/index.js

@@ -16,6 +16,9 @@ export class vtkOrientationControllerWidget {
         this.renderWindows = new Map();
         this.highlightedFace = null;
         this.mouseHandlers = new Map();
+        this._highlightColor = [255, 255, 255];
+        this._restingAmbient = 1.0;
+        this._hoverAmbient = 1.0;
     }
     createActors(config) {
         const rgbToHex = (rgb) => {
@@ -29,7 +32,10 @@ export class vtkOrientationControllerWidget {
         const rgbToHexColor = (rgb) => {
             return `rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`;
         };
-        const actorFactory = vtkAnnotatedRhombicuboctahedronActor.newInstance();
+        const actorFactory = vtkAnnotatedRhombicuboctahedronActor.newInstance({
+            edgeColor: config.edgeColor ?? [200, 200, 200],
+            cornerColor: config.cornerColor ?? [150, 150, 150],
+        });
         const defaultStyle = {
             fontStyle: 'bold',
             fontFamily: 'Arial',
@@ -79,9 +85,13 @@ export class vtkOrientationControllerWidget {
         actorFactory.setShowEdgeFaces(config.showEdgeFaces);
         actorFactory.setShowCornerFaces(config.showCornerFaces);
         const actors = actorFactory.getActors();
+        this._highlightColor = config.highlightColor ?? [255, 255, 255];
+        this._restingAmbient = config.restingAmbient ?? 1.0;
+        this._hoverAmbient = config.hoverAmbient ?? 1.0;
         actors.forEach((actor) => {
             const property = actor.getProperty();
             property.setOpacity(config.opacity);
+            property.setAmbient(this._restingAmbient);
             actor.setVisibility(true);
         });
         return actors;
@@ -462,9 +472,10 @@ export class vtkOrientationControllerWidget {
             viewport,
             isMainFace: false,
         };
-        colorArray[offset] = 255;
-        colorArray[offset + 1] = 255;
-        colorArray[offset + 2] = 255;
+        const hc = this._highlightColor;
+        colorArray[offset] = hc[0];
+        colorArray[offset + 1] = hc[1];
+        colorArray[offset + 2] = hc[2];
         colorArray[offset + 3] = 255;
         colors.modified();
         inputData.modified();
@@ -533,6 +544,14 @@ export class vtkOrientationControllerWidget {
     }
     setupMouseHandlers(viewportId, element, viewport, actors, callbacks) {
         let isMouseDown = false;
+        let isCubeHovered = false;
+        const setAmbient = (full) => {
+            actors.forEach((actor) => {
+                const property = actor.getProperty();
+                property.setAmbient(full ? this._hoverAmbient : this._restingAmbient);
+            });
+            viewport.render();
+        };
         let didDrag = false;
         let pendingPickResult = null;
         let mouseDownCanvas = null;
@@ -550,6 +569,10 @@ export class vtkOrientationControllerWidget {
             }
             const pickResult = this.pickAtPosition(evt, viewportId, viewport, element, actors);
             if (pickResult) {
+                if (!isCubeHovered) {
+                    isCubeHovered = true;
+                    setAmbient(true);
+                }
                 const { pickedActor, cellId, actorIndex } = pickResult;
                 this.highlightFace(pickedActor, cellId, viewport, actorIndex === 0);
                 if (callbacks.onFaceHover) {
@@ -557,6 +580,10 @@ export class vtkOrientationControllerWidget {
                 }
             }
             else {
+                if (isCubeHovered) {
+                    isCubeHovered = false;
+                    setAmbient(false);
+                }
                 this.clearHighlight();
                 if (callbacks.onFaceHover) {
                     callbacks.onFaceHover(null);
@@ -595,6 +622,10 @@ export class vtkOrientationControllerWidget {
                 evt.stopPropagation();
             }
             isMouseDown = false;
+            if (isCubeHovered) {
+                isCubeHovered = false;
+                setAmbient(false);
+            }
             didDrag = false;
             pendingPickResult = null;
             mouseDownCanvas = null;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.21.8";
+export declare const version = "4.22.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.21.8';
+export const version = '4.22.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.21.8",
+  "version": "4.22.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -105,11 +105,11 @@
     "lodash.get": "4.4.2"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "4.21.8",
+    "@cornerstonejs/core": "4.22.0",
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.21.8",
+    "@cornerstonejs/core": "4.22.0",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -128,5 +128,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "65b9f66a24ac61dfa72640089ffde095dfff9d90"
+  "gitHead": "e38264452c2d9a0498a90fdbf1268e5ab1a26b2b"
 }