@cornerstonejs/core 1.70.5 → 1.70.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.70.5",
+  "version": "1.70.7",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -30,7 +30,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@kitware/vtk.js": "30.3.1",
+    "@kitware/vtk.js": "30.3.3",
     "comlink": "^4.4.1",
     "detect-gpu": "^5.0.22",
     "gl-matrix": "^3.4.3",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "bf3d33986d1cdad6ab4abf9e4004dcb16a1a83c9"
+  "gitHead": "4b6774d20ea66e2fa2815edc042b57565b816959"
 }

package/src/RenderingEngine/BaseVolumeViewport.ts

@@ -257,9 +257,6 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
 
     const { volumeActor } = applicableVolumeActorInfo;
 
-    const mapper = volumeActor.getMapper();
-    mapper.setSampleDistance(1.0);
-
     const cfun = vtkColorTransferFunction.newInstance();
     let colormapObj = colormapUtils.getColormap(colormap.name);
 
@@ -328,6 +325,10 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
     }
     volumeActor.getProperty().setScalarOpacity(0, ofun);
 
+    if (!this.viewportProperties.colormap) {
+      this.viewportProperties.colormap = {};
+    }
+
     this.viewportProperties.colormap.opacity = colormap.opacity;
   }
 
@@ -771,6 +772,9 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
 
     applyPreset(volumeActor, preset);
 
+    this.viewportProperties.preset = preset;
+    this.render();
+
     if (!suppressEvents) {
       triggerEvent(this.element, Events.PRESET_MODIFIED, {
         viewportId: this.id,
@@ -822,6 +826,7 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
       invert,
       slabThickness,
       rotation,
+      preset,
     } = this.viewportProperties;
 
     const voiRanges = this.getActors()
@@ -841,16 +846,14 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
       })
       .filter(Boolean);
 
-    const voiRange = voiRanges.length ? voiRanges[0].voiRange : null;
+    const voiRange = volumeId
+      ? voiRanges.find((range) => range.volumeId === volumeId)?.voiRange
+      : voiRanges[0]?.voiRange;
 
     const volumeColormap = this.getColormap(applicableVolumeActorInfo);
 
-    let colormap;
-    if (volumeId && volumeColormap) {
-      colormap = volumeColormap;
-    } else {
-      colormap = latestColormap;
-    }
+    const colormap =
+      volumeId && volumeColormap ? volumeColormap : latestColormap;
 
     return {
       colormap: colormap,
@@ -860,6 +863,7 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
       invert: invert,
       slabThickness: slabThickness,
       rotation: rotation,
+      preset,
     };
   };
 

package/src/RenderingEngine/RenderingEngine.ts

@@ -1295,6 +1295,8 @@ class RenderingEngine implements IRenderingEngine {
       renderingEngineId,
     };
 
+    viewport.removeWidgets();
+
     // Trigger first before removing the data attributes, as we need the enabled
     // element to remove tools associated with the viewport
     triggerEvent(eventTarget, Events.ELEMENT_DISABLED, eventDetail);

package/src/RenderingEngine/StackViewport.ts

@@ -190,6 +190,11 @@ class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
   // Camera properties
   private initialViewUp: Point3;
 
+  // this flag is used to check
+  // if the viewport used the same actor/mapper to render the image
+  // or because of the new image inconsistency, a new actor/mapper was created
+  public stackActorReInitialized: boolean;
+
   /**
    * Constructor for the StackViewport class
    * @param props - ViewportInput
@@ -2012,8 +2017,8 @@ class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
       renderingEngineId: this.renderingEngineId,
     };
 
-    triggerEvent(this.element, Events.STACK_NEW_IMAGE, eventDetail);
     this._updateActorToDisplayImageId(image);
+    triggerEvent(this.element, Events.STACK_NEW_IMAGE, eventDetail);
 
     // Trigger the image to be drawn on the next animation frame
     this.render();
@@ -2299,6 +2304,7 @@ class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
       );
 
       this._setPropertiesFromCache();
+      this.stackActorReInitialized = false;
 
       return;
     }
@@ -2378,6 +2384,8 @@ class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
     this.cameraFocalPointOnRender = this.getCamera().focalPoint;
     this.stackInvalidated = false;
 
+    this.stackActorReInitialized = true;
+
     if (this._publishCalibratedEvent) {
       this.triggerCalibrationEvent();
     }

package/src/RenderingEngine/Viewport.ts

@@ -175,6 +175,36 @@ class Viewport implements IViewport {
     return false;
   }
 
+  private viewportWidgets = new Map() as Map<string, any>;
+
+  public addWidget = (widgetId, widget) => {
+    this.viewportWidgets.set(widgetId, widget);
+  };
+
+  public getWidget = (id) => {
+    return this.viewportWidgets.get(id);
+  };
+
+  public getWidgets = () => {
+    return Array.from(this.viewportWidgets.values());
+  };
+
+  public removeWidgets = () => {
+    const widgets = this.getWidgets();
+    widgets.forEach((widget) => {
+      if (widget.getEnabled()) {
+        widget.setEnabled(false);
+      }
+      if (widget.getActor && widget.getRenderer) {
+        const actor = widget.getActor();
+        const renderer = widget.getRenderer();
+        if (renderer && actor) {
+          renderer.removeActor(actor);
+        }
+      }
+    });
+  };
+
   /**
    * Indicate that the image has been rendered.
    * This will set the viewportStatus to RENDERED if there is image data

package/src/RenderingEngine/helpers/setDefaultVolumeVOI.ts

@@ -186,7 +186,10 @@ async function getVOIFromMinMax(
   let image = cache.getImage(imageId);
 
   if (!imageVolume.referencedImageIds?.length) {
-    image = await loadAndCacheImage(imageId, options);
+    // we should ignore the cache here,
+    // since we want to load the image from with the most
+    // recent prescale settings
+    image = await loadAndCacheImage(imageId, { ...options, ignoreCache: true });
   }
 
   const imageScalarData = image

package/src/enums/Events.ts

@@ -5,6 +5,7 @@ enum Events {
   /**
    * ERROR CODES
    */
+  ERROR_EVENT = 'CORNERSTONE_ERROR',
 
   /**
    * Error that is thrown when the ImageCache exceeds its max cache size.
@@ -243,7 +244,7 @@ enum Events {
    * Make use of {@link EventTypes.ColormapModifiedEvent | ColormapModified Event Type } for typing your event listeners for COLORMAP_MODIFIED event,
    * and see what event detail is included in {@link EventTypes.ColormapModifiedEventDetail | ColormapModified Event Detail }
    */
-  COLORMAP_MODIFIED = "CORNERSTONE_COLORMAP_MODIFIED"
+  COLORMAP_MODIFIED = 'CORNERSTONE_COLORMAP_MODIFIED',
 }
 
 export default Events;

package/src/loaders/imageLoader.ts

@@ -26,6 +26,7 @@ export interface ImageLoaderOptions {
   priority: number;
   requestType: string;
   additionalDetails?: Record<string, unknown>;
+  ignoreCache?: boolean;
 }
 
 interface DerivedImages {
@@ -126,6 +127,10 @@ function loadImageFromCacheOrVolume(
   imageId: string,
   options: ImageLoaderOptions
 ): IImageLoadObject {
+  if (options.ignoreCache) {
+    return loadImageFromImageLoader(imageId, options);
+  }
+
   // 1. Check inside the image cache for imageId
   let imageLoadObject = cache.getImageLoadObject(imageId);
   if (imageLoadObject !== undefined) {

package/src/types/IImage.ts

@@ -20,6 +20,7 @@ interface IImage {
   isPreScaled?: boolean;
   /** preScale object */
   preScale?: {
+    enabled: boolean;
     /** boolean flag to indicate whether the image has been scaled */
     scaled?: boolean;
     /** scaling parameters */

package/src/types/IStackViewport.ts

@@ -15,6 +15,8 @@ export default interface IStackViewport extends IViewport {
   modality: string;
   /** Scaling parameters */
   scaling: Scaling;
+
+  stackActorReInitialized: boolean;
   /**
    * Resizes the viewport - only used in CPU fallback for StackViewport. The
    * GPU resizing happens inside the RenderingEngine.

package/src/types/IViewport.ts

@@ -191,6 +191,15 @@ export type ViewPresentationSelector = {
 interface IViewport {
   /** unique identifier of the viewport */
   id: string;
+
+  getWidget: (id: string) => any;
+
+  addWidget: (id: string, widget: any) => void;
+
+  getWidgets: () => any;
+
+  removeWidgets: () => void;
+
   /** renderingEngineId the viewport belongs to */
   renderingEngineId: string;
   /** viewport type, can be ORTHOGRAPHIC or STACK for now */

package/src/utilities/getViewportImageCornersInWorld.ts

@@ -21,10 +21,17 @@ export default function getViewportImageCornersInWorld(
   const { imageData, dimensions } = viewport.getImageData() as IImageData;
   const { canvas } = viewport;
 
+  // we should consider the device pixel ratio since we are
+  // working with canvas coordinates
+  const ratio = window.devicePixelRatio;
+
   const topLeftCanvas: Point2 = [0, 0];
-  const topRightCanvas: Point2 = [canvas.width, 0];
-  const bottomRightCanvas: Point2 = [canvas.width, canvas.height];
-  const bottomLeftCanvas: Point2 = [0, canvas.height];
+  const topRightCanvas: Point2 = [canvas.width / ratio, 0];
+  const bottomRightCanvas: Point2 = [
+    canvas.width / ratio,
+    canvas.height / ratio,
+  ];
+  const bottomLeftCanvas: Point2 = [0, canvas.height / ratio];
 
   const topLeftWorld = viewport.canvasToWorld(topLeftCanvas);
   const topRightWorld = viewport.canvasToWorld(topRightCanvas);