@cornerstonejs/adapters 1.56.1 → 1.57.0

package/dist/adapters.es.js

@@ -5072,6 +5072,7 @@ var Events$2;
   Events["CAMERA_MODIFIED"] = "CORNERSTONE_CAMERA_MODIFIED";
   Events["CAMERA_RESET"] = "CORNERSTONE_CAMERA_RESET";
   Events["VOI_MODIFIED"] = "CORNERSTONE_VOI_MODIFIED";
+  Events["PRESET_MODIFIED"] = "CORNERSTONE_VIEWPORT_RENDERING_PRESET_MODIFIED";
   Events["DISPLAY_AREA_MODIFIED"] = "CORNERSTONE_DISPLAY_AREA_MODIFIED";
   Events["ELEMENT_DISABLED"] = "CORNERSTONE_ELEMENT_DISABLED";
   Events["ELEMENT_ENABLED"] = "CORNERSTONE_ELEMENT_ENABLED";
@@ -38139,24 +38140,26 @@ function applyPreset(actor, preset) {
     normPoints.push([value, opacity]);
   }
   applyPointsToPiecewiseFunction(normPoints, shiftRange, ofun);
-  actor.getProperty().setScalarOpacity(0, ofun);
+  const property = actor.getProperty();
+  property.setScalarOpacity(0, ofun);
   const [gradientMinValue, gradientMinOpacity, gradientMaxValue, gradientMaxOpacity] = preset.gradientOpacity.split(' ').splice(1).map(parseFloat);
-  actor.getProperty().setUseGradientOpacity(0, true);
-  actor.getProperty().setGradientOpacityMinimumValue(0, gradientMinValue);
-  actor.getProperty().setGradientOpacityMinimumOpacity(0, gradientMinOpacity);
-  actor.getProperty().setGradientOpacityMaximumValue(0, gradientMaxValue);
-  actor.getProperty().setGradientOpacityMaximumOpacity(0, gradientMaxOpacity);
+  property.setUseGradientOpacity(0, true);
+  property.setGradientOpacityMinimumValue(0, gradientMinValue);
+  property.setGradientOpacityMinimumOpacity(0, gradientMinOpacity);
+  property.setGradientOpacityMaximumValue(0, gradientMaxValue);
+  property.setGradientOpacityMaximumOpacity(0, gradientMaxOpacity);
   if (preset.interpolation === '1') {
-    actor.getProperty().setInterpolationTypeToFastLinear();
+    property.setInterpolationTypeToFastLinear();
   }
+  property.setShade(preset.shade === '1');
   const ambient = parseFloat(preset.ambient);
   const diffuse = parseFloat(preset.diffuse);
   const specular = parseFloat(preset.specular);
   const specularPower = parseFloat(preset.specularPower);
-  actor.getProperty().setAmbient(ambient);
-  actor.getProperty().setDiffuse(diffuse);
-  actor.getProperty().setSpecular(specular);
-  actor.getProperty().setSpecularPower(specularPower);
+  property.setAmbient(ambient);
+  property.setDiffuse(diffuse);
+  property.setSpecular(specular);
+  property.setSpecularPower(specularPower);
 }
 function getShiftRange(colorTransferArray) {
   let min = Infinity;
@@ -41786,7 +41789,7 @@ class BaseVolumeViewport extends Viewport$1 {
     }
     this.render();
   }
-  setPreset(presetName, volumeId, suppressEvents) {
+  setPreset(presetNameOrObj, volumeId, suppressEvents) {
     const applicableVolumeActorInfo = this._getApplicableVolumeActor(volumeId);
     if (!applicableVolumeActorInfo) {
       return;
@@ -41794,14 +41797,24 @@ class BaseVolumeViewport extends Viewport$1 {
     const {
       volumeActor
     } = applicableVolumeActorInfo;
-    const preset = VIEWPORT_PRESETS.find(preset => {
-      return preset.name === presetName;
-    });
+    let preset = presetNameOrObj;
+    if (typeof preset === 'string') {
+      preset = VIEWPORT_PRESETS.find(preset => {
+        return preset.name === presetNameOrObj;
+      });
+    }
     if (!preset) {
       return;
     }
     applyPreset(volumeActor, preset);
-    this.viewportProperties.preset = presetName;
+    if (!suppressEvents) {
+      triggerEvent(this.element, EVENTS.PRESET_MODIFIED, {
+        viewportId: this.id,
+        volumeId: applicableVolumeActorInfo.volumeId,
+        actor: volumeActor,
+        presetName: preset.name
+      });
+    }
   }
   async setVolumes(volumeInputArray, immediate = false, suppressEvents = false) {
     const firstImageVolume = cache$1.getVolume(volumeInputArray[0].volumeId);
@@ -48250,11 +48263,11 @@ let state = {
 const {
   isEqual: isEqual$1
 } = utilities;
-function getViewportForAnnotation(annotation) {
+function getViewportsForAnnotation(annotation) {
   const {
     metadata
   } = annotation;
-  const enabledElement = getEnabledElements().find(enabledElement => {
+  return getEnabledElements().filter(enabledElement => {
     if (enabledElement.FrameOfReferenceUID === metadata.FrameOfReferenceUID) {
       const viewport = enabledElement.viewport;
       const {
@@ -48264,8 +48277,12 @@ function getViewportForAnnotation(annotation) {
       return isEqual$1(viewPlaneNormal, metadata.viewPlaneNormal) && (!metadata.viewUp || isEqual$1(viewUp, metadata.viewUp));
     }
     return;
-  });
-  return enabledElement?.viewport;
+  }).map(enabledElement => enabledElement.viewport);
+}
+
+function getViewportForAnnotation(annotation) {
+  const viewports = getViewportsForAnnotation(annotation);
+  return viewports.length ? viewports[0] : undefined;
 }
 
 function areCoplanarContours(firstAnnotation, secondAnnotation) {