@ohif/app 3.8.0-beta.79 → 3.8.0-beta.80

package/dist/{606.bundle.97b10da82b21f72df781.js → 41.bundle.7c943bb857ed37831905.js}

@@ -1,5 +1,5 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[606],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[41],{
 
 /***/ 76255:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -141,7 +141,7 @@ const useViewportActionCornersContext = () => (0,react__WEBPACK_IMPORTED_MODULE_
 
 /***/ }),
 
-/***/ 39606:
+/***/ 77422:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -914,7 +914,7 @@ const toolNames = {
 };
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/constants/supportedTools.js
-/* harmony default export */ const supportedTools = (['Length', 'EllipticalROI', 'CircleROI', 'Bidirectional', 'ArrowAnnotate', 'Angle', 'CobbAngle', 'Probe', 'RectangleROI', 'PlanarFreehandROI', 'SplineROI', 'LivewireContour']);
+/* harmony default export */ const supportedTools = (['Length', 'EllipticalROI', 'CircleROI', 'Bidirectional', 'ArrowAnnotate', 'Angle', 'CobbAngle', 'Probe', 'RectangleROI', 'PlanarFreehandROI', 'SplineROI', 'LivewireContour', 'Probe', 'UltrasoundDirectionalTool']);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js
 var getSOPInstanceAttributes = __webpack_require__(1663);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/Length.ts
@@ -3043,6 +3043,387 @@ function LivewireContour_getDisplayText(annotation, displaySet, customizationSer
   return displayText;
 }
 /* harmony default export */ const measurementServiceMappings_LivewireContour = (LivewireContour);
+;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/Probe.ts
+
+
+
+
+const Probe = {
+  toAnnotation: measurement => {},
+  /**
+   * Maps cornerstone annotation event data to measurement service format.
+   *
+   * @param {Object} cornerstone Cornerstone event data
+   * @return {Measurement} Measurement instance
+   */
+  toMeasurement: (csToolsEventDetail, displaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
+    const {
+      annotation,
+      viewportId
+    } = csToolsEventDetail;
+    const {
+      metadata,
+      data,
+      annotationUID
+    } = annotation;
+    if (!metadata || !data) {
+      console.warn('Length tool: Missing metadata or data');
+      return null;
+    }
+    const {
+      toolName,
+      referencedImageId,
+      FrameOfReferenceUID
+    } = metadata;
+    const validToolType = supportedTools.includes(toolName);
+    if (!validToolType) {
+      throw new Error('Tool not supported');
+    }
+    const {
+      SOPInstanceUID,
+      SeriesInstanceUID,
+      StudyInstanceUID
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
+    let displaySet;
+    if (SOPInstanceUID) {
+      displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
+    } else {
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+    }
+    const {
+      points
+    } = data.handles;
+    const mappedAnnotations = Probe_getMappedAnnotations(annotation, displaySetService);
+    const displayText = Probe_getDisplayText(mappedAnnotations, displaySet, customizationService);
+    const getReport = () => Probe_getReport(mappedAnnotations, points, FrameOfReferenceUID, customizationService);
+    return {
+      uid: annotationUID,
+      SOPInstanceUID,
+      FrameOfReferenceUID,
+      points,
+      metadata,
+      referenceSeriesUID: SeriesInstanceUID,
+      referenceStudyUID: StudyInstanceUID,
+      frameNumber: mappedAnnotations?.[0]?.frameNumber || 1,
+      toolName: metadata.toolName,
+      displaySetInstanceUID: displaySet.displaySetInstanceUID,
+      label: data.label,
+      displayText: displayText,
+      data: data.cachedStats,
+      type: getValueTypeFromToolType(toolName),
+      getReport
+    };
+  }
+};
+function Probe_getMappedAnnotations(annotation, DisplaySetService) {
+  const {
+    metadata,
+    data
+  } = annotation;
+  const {
+    cachedStats
+  } = data;
+  const {
+    referencedImageId
+  } = metadata;
+  const targets = Object.keys(cachedStats);
+  if (!targets.length) {
+    return;
+  }
+  const annotations = [];
+  Object.keys(cachedStats).forEach(targetId => {
+    const targetStats = cachedStats[targetId];
+    if (!referencedImageId) {
+      throw new Error('Non-acquisition plane measurement mapping not supported');
+    }
+    const {
+      SOPInstanceUID,
+      SeriesInstanceUID,
+      frameNumber
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
+    const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    const {
+      SeriesNumber
+    } = displaySet;
+    const {
+      value
+    } = targetStats;
+    const unit = 'HU';
+    annotations.push({
+      SeriesInstanceUID,
+      SOPInstanceUID,
+      SeriesNumber,
+      frameNumber,
+      unit,
+      value
+    });
+  });
+  return annotations;
+}
+
+/*
+This function is used to convert the measurement data to a format that is
+suitable for the report generation (e.g. for the csv report). The report
+returns a list of columns and corresponding values.
+*/
+function Probe_getReport(mappedAnnotations, points, FrameOfReferenceUID, customizationService) {
+  const columns = [];
+  const values = [];
+
+  // Add Type
+  columns.push('AnnotationType');
+  values.push('Cornerstone:Probe');
+  mappedAnnotations.forEach(annotation => {
+    const {
+      value,
+      unit
+    } = annotation;
+    columns.push(`Probe (${unit})`);
+    values.push(value);
+  });
+  if (FrameOfReferenceUID) {
+    columns.push('FrameOfReferenceUID');
+    values.push(FrameOfReferenceUID);
+  }
+  if (points) {
+    columns.push('points');
+    values.push(points.map(p => p.join(' ')).join(';'));
+  }
+  return {
+    columns,
+    values
+  };
+}
+function Probe_getDisplayText(mappedAnnotations, displaySet, customizationService) {
+  if (!mappedAnnotations || !mappedAnnotations.length) {
+    return '';
+  }
+  const displayText = [];
+  const {
+    value,
+    unit,
+    SeriesNumber,
+    SOPInstanceUID,
+    frameNumber
+  } = mappedAnnotations[0];
+  const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
+  let InstanceNumber;
+  if (instance) {
+    InstanceNumber = instance.InstanceNumber;
+  }
+  const instanceText = InstanceNumber ? ` I: ${InstanceNumber}` : '';
+  const frameText = displaySet.isMultiFrame ? ` F: ${frameNumber}` : '';
+  if (value === undefined) {
+    return displayText;
+  }
+  const roundedValue = src.utils.roundNumber(value, 2);
+  displayText.push(`${roundedValue} ${utils_getDisplayUnit(unit)} (S: ${SeriesNumber}${instanceText}${frameText})`);
+  return displayText;
+}
+/* harmony default export */ const measurementServiceMappings_Probe = (Probe);
+;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/UltrasoundDirectional.ts
+
+
+
+const UltrasoundDirectional = {
+  toAnnotation: measurement => {},
+  /**
+   * Maps cornerstone annotation event data to measurement service format.
+   *
+   * @param {Object} cornerstone Cornerstone event data
+   * @return {Measurement} Measurement instance
+   */
+  toMeasurement: (csToolsEventDetail, displaySetService, CornerstoneViewportService, getValueTypeFromToolType, customizationService) => {
+    const {
+      annotation,
+      viewportId
+    } = csToolsEventDetail;
+    const {
+      metadata,
+      data,
+      annotationUID
+    } = annotation;
+    if (!metadata || !data) {
+      console.warn('Length tool: Missing metadata or data');
+      return null;
+    }
+    const {
+      toolName,
+      referencedImageId,
+      FrameOfReferenceUID
+    } = metadata;
+    const validToolType = supportedTools.includes(toolName);
+    if (!validToolType) {
+      throw new Error('Tool not supported');
+    }
+    const {
+      SOPInstanceUID,
+      SeriesInstanceUID,
+      StudyInstanceUID
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
+    let displaySet;
+    if (SOPInstanceUID) {
+      displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
+    } else {
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+    }
+    const {
+      points
+    } = data.handles;
+    const mappedAnnotations = UltrasoundDirectional_getMappedAnnotations(annotation, displaySetService);
+    const displayText = UltrasoundDirectional_getDisplayText(mappedAnnotations, displaySet, customizationService);
+    const getReport = () => UltrasoundDirectional_getReport(mappedAnnotations, points, FrameOfReferenceUID, customizationService);
+    return {
+      uid: annotationUID,
+      SOPInstanceUID,
+      FrameOfReferenceUID,
+      points,
+      metadata,
+      referenceSeriesUID: SeriesInstanceUID,
+      referenceStudyUID: StudyInstanceUID,
+      frameNumber: mappedAnnotations?.[0]?.frameNumber || 1,
+      toolName: metadata.toolName,
+      displaySetInstanceUID: displaySet.displaySetInstanceUID,
+      label: data.label,
+      displayText: displayText,
+      data: data.cachedStats,
+      type: getValueTypeFromToolType(toolName),
+      getReport
+    };
+  }
+};
+function UltrasoundDirectional_getMappedAnnotations(annotation, DisplaySetService) {
+  const {
+    metadata,
+    data
+  } = annotation;
+  const {
+    cachedStats
+  } = data;
+  const {
+    referencedImageId
+  } = metadata;
+  const targets = Object.keys(cachedStats);
+  if (!targets.length) {
+    return;
+  }
+  const annotations = [];
+  Object.keys(cachedStats).forEach(targetId => {
+    const targetStats = cachedStats[targetId];
+    if (!referencedImageId) {
+      throw new Error('Non-acquisition plane measurement mapping not supported');
+    }
+    const {
+      SOPInstanceUID,
+      SeriesInstanceUID,
+      frameNumber
+    } = (0,getSOPInstanceAttributes/* default */.A)(referencedImageId);
+    const displaySet = DisplaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID, frameNumber);
+    const {
+      SeriesNumber
+    } = displaySet;
+    const {
+      xValues,
+      yValues,
+      units,
+      isUnitless,
+      isHorizontal
+    } = targetStats;
+    annotations.push({
+      SeriesInstanceUID,
+      SOPInstanceUID,
+      SeriesNumber,
+      frameNumber,
+      xValues,
+      yValues,
+      units,
+      isUnitless,
+      isHorizontal
+    });
+  });
+  return annotations;
+}
+
+/*
+This function is used to convert the measurement data to a format that is
+suitable for the report generation (e.g. for the csv report). The report
+returns a list of columns and corresponding values.
+*/
+function UltrasoundDirectional_getReport(mappedAnnotations, points, FrameOfReferenceUID, customizationService) {
+  const columns = [];
+  const values = [];
+
+  // Add Type
+  columns.push('AnnotationType');
+  values.push('Cornerstone:UltrasoundDirectional');
+  mappedAnnotations.forEach(annotation => {
+    const {
+      xValues,
+      yValues,
+      units,
+      isUnitless
+    } = annotation;
+    if (isUnitless) {
+      columns.push('Length' + units[0]);
+      values.push(src.utils.roundNumber(xValues[0], 2));
+    } else {
+      const dist1 = Math.abs(xValues[1] - xValues[0]);
+      const dist2 = Math.abs(yValues[1] - yValues[0]);
+      columns.push('Time' + units[0]);
+      values.push(src.utils.roundNumber(dist1, 2));
+      columns.push('Length' + units[1]);
+      values.push(src.utils.roundNumber(dist2, 2));
+    }
+  });
+  if (FrameOfReferenceUID) {
+    columns.push('FrameOfReferenceUID');
+    values.push(FrameOfReferenceUID);
+  }
+  if (points) {
+    columns.push('points');
+    values.push(points.map(p => p.join(' ')).join(';'));
+  }
+  return {
+    columns,
+    values
+  };
+}
+function UltrasoundDirectional_getDisplayText(mappedAnnotations, displaySet, customizationService) {
+  if (!mappedAnnotations || !mappedAnnotations.length) {
+    return '';
+  }
+  const displayText = [];
+  const {
+    xValues,
+    yValues,
+    units,
+    isUnitless,
+    SeriesNumber,
+    SOPInstanceUID,
+    frameNumber
+  } = mappedAnnotations[0];
+  const instance = displaySet.images.find(image => image.SOPInstanceUID === SOPInstanceUID);
+  let InstanceNumber;
+  if (instance) {
+    InstanceNumber = instance.InstanceNumber;
+  }
+  const instanceText = InstanceNumber ? ` I: ${InstanceNumber}` : '';
+  const frameText = displaySet.isMultiFrame ? ` F: ${frameNumber}` : '';
+  const seriesText = `(S: ${SeriesNumber}${instanceText}${frameText})`;
+  if (xValues === undefined || yValues === undefined) {
+    return displayText;
+  }
+  if (isUnitless) {
+    displayText.push(`${src.utils.roundNumber(xValues[0], 2)} ${units[0]} ${seriesText}`);
+  } else {
+    const dist1 = Math.abs(xValues[1] - xValues[0]);
+    const dist2 = Math.abs(yValues[1] - yValues[0]);
+    displayText.push(`${src.utils.roundNumber(dist1)} ${units[0]} ${seriesText}`);
+    displayText.push(`${src.utils.roundNumber(dist2)} ${units[1]} ${seriesText}`);
+  }
+  return displayText;
+}
+/* harmony default export */ const measurementServiceMappings_UltrasoundDirectional = (UltrasoundDirectional);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.ts
 
 
@@ -3056,6 +3437,8 @@ function LivewireContour_getDisplayText(annotation, displaySet, customizationSer
 
 
 
+
+
 const measurementServiceMappingsFactory = (measurementService, displaySetService, cornerstoneViewportService, customizationService) => {
   /**
    * Maps measurement service format object to cornerstone annotation object.
@@ -3090,7 +3473,9 @@ const measurementServiceMappingsFactory = (measurementService, displaySetService
       CobbAngle: ANGLE,
       Angle: ANGLE,
       SplineROI: POLYLINE,
-      LivewireContour: POLYLINE
+      LivewireContour: POLYLINE,
+      Probe: POINT,
+      UltrasoundDirectional: POLYLINE
     };
     return TOOL_TYPE_TO_VALUE_TYPE[toolType];
   };
@@ -3167,6 +3552,14 @@ const measurementServiceMappingsFactory = (measurementService, displaySetService
         points: 1
       }]
     },
+    Probe: {
+      toAnnotation: measurementServiceMappings_Probe.toAnnotation,
+      toMeasurement: csToolsAnnotation => measurementServiceMappings_Probe.toMeasurement(csToolsAnnotation, displaySetService, cornerstoneViewportService, _getValueTypeFromToolType, customizationService),
+      matchingCriteria: [{
+        valueType: src.MeasurementService.VALUE_TYPES.POINT,
+        points: 1
+      }]
+    },
     CobbAngle: {
       toAnnotation: measurementServiceMappings_CobbAngle.toAnnotation,
       toMeasurement: csToolsAnnotation => measurementServiceMappings_CobbAngle.toMeasurement(csToolsAnnotation, displaySetService, cornerstoneViewportService, _getValueTypeFromToolType, customizationService),
@@ -3180,6 +3573,14 @@ const measurementServiceMappingsFactory = (measurementService, displaySetService
       matchingCriteria: [{
         valueType: src.MeasurementService.VALUE_TYPES.ANGLE
       }]
+    },
+    UltrasoundDirectional: {
+      toAnnotation: measurementServiceMappings_UltrasoundDirectional.toAnnotation,
+      toMeasurement: csToolsAnnotation => measurementServiceMappings_UltrasoundDirectional.toMeasurement(csToolsAnnotation, displaySetService, cornerstoneViewportService, _getValueTypeFromToolType, customizationService),
+      matchingCriteria: [{
+        valueType: src.MeasurementService.VALUE_TYPES.POLYLINE,
+        points: 2
+      }]
     }
   };
   return factories;
@@ -3212,7 +3613,9 @@ const initMeasurementService = (measurementService, displaySetService, cornersto
     RectangleROI,
     PlanarFreehandROI,
     SplineROI,
-    LivewireContour
+    LivewireContour,
+    Probe,
+    UltrasoundDirectional
   } = measurementServiceMappings_measurementServiceMappingsFactory(measurementService, displaySetService, cornerstoneViewportService, customizationService);
   const csTools3DVer1MeasurementSource = measurementService.createSource(CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
 
@@ -3239,6 +3642,8 @@ const initMeasurementService = (measurementService, displaySetService, cornersto
   // Length tool
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'CalibrationLine', Length.matchingCriteria, Length.toAnnotation, Length.toMeasurement);
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'LivewireContour', LivewireContour.matchingCriteria, LivewireContour.toAnnotation, LivewireContour.toMeasurement);
+  measurementService.addMapping(csTools3DVer1MeasurementSource, 'Probe', Probe.matchingCriteria, Probe.toAnnotation, Probe.toMeasurement);
+  measurementService.addMapping(csTools3DVer1MeasurementSource, 'UltrasoundDirectionalTool', UltrasoundDirectional.matchingCriteria, UltrasoundDirectional.toAnnotation, UltrasoundDirectional.toMeasurement);
   return csTools3DVer1MeasurementSource;
 };
 const connectToolsToMeasurementService = servicesManager => {
@@ -4326,6 +4731,20 @@ function imageRenderedListener(evt) {
 }
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/colormaps.js
 const colormaps = [{
+  ColorSpace: 'RGB',
+  Name: 'Grayscale',
+  name: 'Grayscale',
+  NanColor: [1, 0, 0],
+  RGBPoints: [0, 0, 0, 0, 1, 1, 1, 1],
+  description: 'Grayscale'
+}, {
+  ColorSpace: 'RGB',
+  Name: 'X Ray',
+  name: 'X Ray',
+  NanColor: [1, 0, 0],
+  RGBPoints: [0, 1, 1, 1, 1, 0, 0, 0],
+  description: 'X Ray'
+}, {
   ColorSpace: 'RGB',
   Name: 'hsv',
   name: 'hsv',
@@ -4385,20 +4804,6 @@ const colormaps = [{
   name: 'siemens',
   RGBPoints: [0.0, 0.0078431373, 0.0039215686, 0.1254901961, 0.00392156862745098, 0.0078431373, 0.0039215686, 0.1254901961, 0.00784313725490196, 0.0078431373, 0.0039215686, 0.1882352941, 0.011764705882352941, 0.0117647059, 0.0039215686, 0.2509803922, 0.01568627450980392, 0.0117647059, 0.0039215686, 0.3098039216, 0.0196078431372549, 0.0156862745, 0.0039215686, 0.3725490196, 0.023529411764705882, 0.0156862745, 0.0039215686, 0.3725490196, 0.027450980392156862, 0.0156862745, 0.0039215686, 0.3725490196, 0.03137254901960784, 0.0156862745, 0.0039215686, 0.3725490196, 0.03529411764705882, 0.0156862745, 0.0039215686, 0.3725490196, 0.0392156862745098, 0.0156862745, 0.0039215686, 0.3725490196, 0.043137254901960784, 0.0156862745, 0.0039215686, 0.3725490196, 0.047058823529411764, 0.0156862745, 0.0039215686, 0.3725490196, 0.050980392156862744, 0.0156862745, 0.0039215686, 0.3725490196, 0.054901960784313725, 0.0156862745, 0.0039215686, 0.3725490196, 0.05882352941176471, 0.0156862745, 0.0039215686, 0.3725490196, 0.06274509803921569, 0.0156862745, 0.0039215686, 0.3882352941, 0.06666666666666667, 0.0156862745, 0.0039215686, 0.4078431373, 0.07058823529411765, 0.0156862745, 0.0039215686, 0.4235294118, 0.07450980392156863, 0.0156862745, 0.0039215686, 0.4431372549, 0.0784313725490196, 0.0156862745, 0.0039215686, 0.462745098, 0.08235294117647059, 0.0156862745, 0.0039215686, 0.4784313725, 0.08627450980392157, 0.0156862745, 0.0039215686, 0.4980392157, 0.09019607843137255, 0.0196078431, 0.0039215686, 0.5137254902, 0.09411764705882353, 0.0196078431, 0.0039215686, 0.5333333333, 0.09803921568627451, 0.0196078431, 0.0039215686, 0.5529411765, 0.10196078431372549, 0.0196078431, 0.0039215686, 0.568627451, 0.10588235294117647, 0.0196078431, 0.0039215686, 0.5882352941, 0.10980392156862745, 0.0196078431, 0.0039215686, 0.6039215686, 0.11372549019607843, 0.0196078431, 0.0039215686, 0.6235294118, 0.11764705882352942, 0.0196078431, 0.0039215686, 0.6431372549, 0.12156862745098039, 0.0235294118, 0.0039215686, 0.6588235294, 0.12549019607843137, 0.0235294118, 0.0039215686, 0.6784313725, 0.12941176470588237, 0.0235294118, 0.0039215686, 0.6980392157, 0.13333333333333333, 0.0235294118, 0.0039215686, 0.7137254902, 0.13725490196078433, 0.0235294118, 0.0039215686, 0.7333333333, 0.1411764705882353, 0.0235294118, 0.0039215686, 0.7490196078, 0.1450980392156863, 0.0235294118, 0.0039215686, 0.7647058824, 0.14901960784313725, 0.0235294118, 0.0039215686, 0.7843137255, 0.15294117647058825, 0.0274509804, 0.0039215686, 0.8, 0.1568627450980392, 0.0274509804, 0.0039215686, 0.8196078431, 0.1607843137254902, 0.0274509804, 0.0039215686, 0.8352941176, 0.16470588235294117, 0.0274509804, 0.0039215686, 0.8549019608, 0.16862745098039217, 0.0274509804, 0.0039215686, 0.8745098039, 0.17254901960784313, 0.0274509804, 0.0039215686, 0.8901960784, 0.17647058823529413, 0.0274509804, 0.0039215686, 0.9098039216, 0.1803921568627451, 0.031372549, 0.0039215686, 0.9294117647, 0.1843137254901961, 0.031372549, 0.0039215686, 0.9254901961, 0.18823529411764706, 0.0509803922, 0.0039215686, 0.9098039216, 0.19215686274509805, 0.0705882353, 0.0039215686, 0.8901960784, 0.19607843137254902, 0.0901960784, 0.0039215686, 0.8705882353, 0.2, 0.1137254902, 0.0039215686, 0.8509803922, 0.20392156862745098, 0.1333333333, 0.0039215686, 0.831372549, 0.20784313725490197, 0.1529411765, 0.0039215686, 0.8117647059, 0.21176470588235294, 0.1725490196, 0.0039215686, 0.7921568627, 0.21568627450980393, 0.1960784314, 0.0039215686, 0.7725490196, 0.2196078431372549, 0.2156862745, 0.0039215686, 0.7529411765, 0.2235294117647059, 0.2352941176, 0.0039215686, 0.737254902, 0.22745098039215686, 0.2509803922, 0.0039215686, 0.7176470588, 0.23137254901960785, 0.2745098039, 0.0039215686, 0.6980392157, 0.23529411764705885, 0.2941176471, 0.0039215686, 0.6784313725, 0.23921568627450984, 0.3137254902, 0.0039215686, 0.6588235294, 0.24313725490196078, 0.3333333333, 0.0039215686, 0.6392156863, 0.24705882352941178, 0.3568627451, 0.0039215686, 0.6196078431, 0.25098039215686274, 0.3764705882, 0.0039215686, 0.6, 0.2549019607843137, 0.3960784314, 0.0039215686, 0.5803921569, 0.25882352941176473, 0.4156862745, 0.0039215686, 0.5607843137, 0.2627450980392157, 0.4392156863, 0.0039215686, 0.5411764706, 0.26666666666666666, 0.4588235294, 0.0039215686, 0.5215686275, 0.27058823529411763, 0.4784313725, 0.0039215686, 0.5019607843, 0.27450980392156865, 0.4980392157, 0.0039215686, 0.4823529412, 0.2784313725490196, 0.5215686275, 0.0039215686, 0.4666666667, 0.2823529411764706, 0.5411764706, 0.0039215686, 0.4470588235, 0.28627450980392155, 0.5607843137, 0.0039215686, 0.4274509804, 0.2901960784313726, 0.5803921569, 0.0039215686, 0.4078431373, 0.29411764705882354, 0.6039215686, 0.0039215686, 0.3882352941, 0.2980392156862745, 0.6235294118, 0.0039215686, 0.368627451, 0.30196078431372547, 0.6431372549, 0.0039215686, 0.3490196078, 0.3058823529411765, 0.662745098, 0.0039215686, 0.3294117647, 0.30980392156862746, 0.6862745098, 0.0039215686, 0.3098039216, 0.3137254901960784, 0.7058823529, 0.0039215686, 0.2901960784, 0.3176470588235294, 0.7254901961, 0.0039215686, 0.2705882353, 0.3215686274509804, 0.7450980392, 0.0039215686, 0.2509803922, 0.3254901960784314, 0.7647058824, 0.0039215686, 0.2352941176, 0.32941176470588235, 0.7843137255, 0.0039215686, 0.2156862745, 0.3333333333333333, 0.8039215686, 0.0039215686, 0.1960784314, 0.33725490196078434, 0.8235294118, 0.0039215686, 0.1764705882, 0.3411764705882353, 0.8470588235, 0.0039215686, 0.1568627451, 0.34509803921568627, 0.8666666667, 0.0039215686, 0.137254902, 0.34901960784313724, 0.8862745098, 0.0039215686, 0.1176470588, 0.35294117647058826, 0.9058823529, 0.0039215686, 0.0980392157, 0.3568627450980392, 0.9294117647, 0.0039215686, 0.0784313725, 0.3607843137254902, 0.9490196078, 0.0039215686, 0.0588235294, 0.36470588235294116, 0.968627451, 0.0039215686, 0.0392156863, 0.3686274509803922, 0.9921568627, 0.0039215686, 0.0235294118, 0.37254901960784315, 0.9529411765, 0.0039215686, 0.0588235294, 0.3764705882352941, 0.9529411765, 0.0078431373, 0.0549019608, 0.3803921568627451, 0.9529411765, 0.0156862745, 0.0549019608, 0.3843137254901961, 0.9529411765, 0.0235294118, 0.0549019608, 0.38823529411764707, 0.9529411765, 0.031372549, 0.0549019608, 0.39215686274509803, 0.9529411765, 0.0352941176, 0.0549019608, 0.396078431372549, 0.9529411765, 0.0431372549, 0.0549019608, 0.4, 0.9529411765, 0.0509803922, 0.0549019608, 0.403921568627451, 0.9529411765, 0.0588235294, 0.0549019608, 0.40784313725490196, 0.9529411765, 0.062745098, 0.0549019608, 0.4117647058823529, 0.9529411765, 0.0705882353, 0.0549019608, 0.41568627450980394, 0.9529411765, 0.0784313725, 0.0509803922, 0.4196078431372549, 0.9529411765, 0.0862745098, 0.0509803922, 0.4235294117647059, 0.9568627451, 0.0941176471, 0.0509803922, 0.42745098039215684, 0.9568627451, 0.0980392157, 0.0509803922, 0.43137254901960786, 0.9568627451, 0.1058823529, 0.0509803922, 0.43529411764705883, 0.9568627451, 0.1137254902, 0.0509803922, 0.4392156862745098, 0.9568627451, 0.1215686275, 0.0509803922, 0.44313725490196076, 0.9568627451, 0.1254901961, 0.0509803922, 0.4470588235294118, 0.9568627451, 0.1333333333, 0.0509803922, 0.45098039215686275, 0.9568627451, 0.1411764706, 0.0509803922, 0.4549019607843137, 0.9568627451, 0.1490196078, 0.0470588235, 0.4588235294117647, 0.9568627451, 0.1568627451, 0.0470588235, 0.4627450980392157, 0.9568627451, 0.1607843137, 0.0470588235, 0.4666666666666667, 0.9568627451, 0.168627451, 0.0470588235, 0.4705882352941177, 0.9607843137, 0.1764705882, 0.0470588235, 0.4745098039215686, 0.9607843137, 0.1843137255, 0.0470588235, 0.4784313725490197, 0.9607843137, 0.1882352941, 0.0470588235, 0.48235294117647065, 0.9607843137, 0.1960784314, 0.0470588235, 0.48627450980392156, 0.9607843137, 0.2039215686, 0.0470588235, 0.49019607843137253, 0.9607843137, 0.2117647059, 0.0470588235, 0.49411764705882355, 0.9607843137, 0.2196078431, 0.0431372549, 0.4980392156862745, 0.9607843137, 0.2235294118, 0.0431372549, 0.5019607843137255, 0.9607843137, 0.231372549, 0.0431372549, 0.5058823529411764, 0.9607843137, 0.2392156863, 0.0431372549, 0.5098039215686274, 0.9607843137, 0.2470588235, 0.0431372549, 0.5137254901960784, 0.9607843137, 0.2509803922, 0.0431372549, 0.5176470588235295, 0.9647058824, 0.2549019608, 0.0431372549, 0.5215686274509804, 0.9647058824, 0.262745098, 0.0431372549, 0.5254901960784314, 0.9647058824, 0.2705882353, 0.0431372549, 0.5294117647058824, 0.9647058824, 0.2745098039, 0.0431372549, 0.5333333333333333, 0.9647058824, 0.2823529412, 0.0392156863, 0.5372549019607843, 0.9647058824, 0.2901960784, 0.0392156863, 0.5411764705882353, 0.9647058824, 0.2980392157, 0.0392156863, 0.5450980392156862, 0.9647058824, 0.3058823529, 0.0392156863, 0.5490196078431373, 0.9647058824, 0.3098039216, 0.0392156863, 0.5529411764705883, 0.9647058824, 0.3176470588, 0.0392156863, 0.5568627450980392, 0.9647058824, 0.3254901961, 0.0392156863, 0.5607843137254902, 0.9647058824, 0.3333333333, 0.0392156863, 0.5647058823529412, 0.9647058824, 0.337254902, 0.0392156863, 0.5686274509803921, 0.968627451, 0.3450980392, 0.0392156863, 0.5725490196078431, 0.968627451, 0.3529411765, 0.0352941176, 0.5764705882352941, 0.968627451, 0.3607843137, 0.0352941176, 0.5803921568627451, 0.968627451, 0.368627451, 0.0352941176, 0.5843137254901961, 0.968627451, 0.3725490196, 0.0352941176, 0.5882352941176471, 0.968627451, 0.3803921569, 0.0352941176, 0.592156862745098, 0.968627451, 0.3882352941, 0.0352941176, 0.596078431372549, 0.968627451, 0.3960784314, 0.0352941176, 0.6, 0.968627451, 0.4, 0.0352941176, 0.6039215686274509, 0.968627451, 0.4078431373, 0.0352941176, 0.6078431372549019, 0.968627451, 0.4156862745, 0.0352941176, 0.611764705882353, 0.968627451, 0.4235294118, 0.031372549, 0.615686274509804, 0.9725490196, 0.431372549, 0.031372549, 0.6196078431372549, 0.9725490196, 0.4352941176, 0.031372549, 0.6235294117647059, 0.9725490196, 0.4431372549, 0.031372549, 0.6274509803921569, 0.9725490196, 0.4509803922, 0.031372549, 0.6313725490196078, 0.9725490196, 0.4588235294, 0.031372549, 0.6352941176470588, 0.9725490196, 0.462745098, 0.031372549, 0.6392156862745098, 0.9725490196, 0.4705882353, 0.031372549, 0.6431372549019608, 0.9725490196, 0.4784313725, 0.031372549, 0.6470588235294118, 0.9725490196, 0.4862745098, 0.031372549, 0.6509803921568628, 0.9725490196, 0.4941176471, 0.0274509804, 0.6549019607843137, 0.9725490196, 0.4980392157, 0.0274509804, 0.6588235294117647, 0.9725490196, 0.5058823529, 0.0274509804, 0.6627450980392157, 0.9764705882, 0.5137254902, 0.0274509804, 0.6666666666666666, 0.9764705882, 0.5215686275, 0.0274509804, 0.6705882352941176, 0.9764705882, 0.5254901961, 0.0274509804, 0.6745098039215687, 0.9764705882, 0.5333333333, 0.0274509804, 0.6784313725490196, 0.9764705882, 0.5411764706, 0.0274509804, 0.6823529411764706, 0.9764705882, 0.5490196078, 0.0274509804, 0.6862745098039216, 0.9764705882, 0.5529411765, 0.0274509804, 0.6901960784313725, 0.9764705882, 0.5607843137, 0.0235294118, 0.6941176470588235, 0.9764705882, 0.568627451, 0.0235294118, 0.6980392156862745, 0.9764705882, 0.5764705882, 0.0235294118, 0.7019607843137254, 0.9764705882, 0.5843137255, 0.0235294118, 0.7058823529411765, 0.9764705882, 0.5882352941, 0.0235294118, 0.7098039215686275, 0.9764705882, 0.5960784314, 0.0235294118, 0.7137254901960784, 0.9803921569, 0.6039215686, 0.0235294118, 0.7176470588235294, 0.9803921569, 0.6117647059, 0.0235294118, 0.7215686274509804, 0.9803921569, 0.6156862745, 0.0235294118, 0.7254901960784313, 0.9803921569, 0.6235294118, 0.0235294118, 0.7294117647058823, 0.9803921569, 0.631372549, 0.0196078431, 0.7333333333333333, 0.9803921569, 0.6392156863, 0.0196078431, 0.7372549019607844, 0.9803921569, 0.6470588235, 0.0196078431, 0.7411764705882353, 0.9803921569, 0.6509803922, 0.0196078431, 0.7450980392156863, 0.9803921569, 0.6588235294, 0.0196078431, 0.7490196078431373, 0.9803921569, 0.6666666667, 0.0196078431, 0.7529411764705882, 0.9803921569, 0.6745098039, 0.0196078431, 0.7568627450980392, 0.9803921569, 0.6784313725, 0.0196078431, 0.7607843137254902, 0.9843137255, 0.6862745098, 0.0196078431, 0.7647058823529411, 0.9843137255, 0.6941176471, 0.0196078431, 0.7686274509803922, 0.9843137255, 0.7019607843, 0.0156862745, 0.7725490196078432, 0.9843137255, 0.7098039216, 0.0156862745, 0.7764705882352941, 0.9843137255, 0.7137254902, 0.0156862745, 0.7803921568627451, 0.9843137255, 0.7215686275, 0.0156862745, 0.7843137254901961, 0.9843137255, 0.7294117647, 0.0156862745, 0.788235294117647, 0.9843137255, 0.737254902, 0.0156862745, 0.792156862745098, 0.9843137255, 0.7411764706, 0.0156862745, 0.796078431372549, 0.9843137255, 0.7490196078, 0.0156862745, 0.8, 0.9843137255, 0.7529411765, 0.0156862745, 0.803921568627451, 0.9843137255, 0.7607843137, 0.0156862745, 0.807843137254902, 0.9882352941, 0.768627451, 0.0156862745, 0.8117647058823529, 0.9882352941, 0.768627451, 0.0156862745, 0.8156862745098039, 0.9843137255, 0.7843137255, 0.0117647059, 0.8196078431372549, 0.9843137255, 0.8, 0.0117647059, 0.8235294117647058, 0.9843137255, 0.8156862745, 0.0117647059, 0.8274509803921568, 0.9803921569, 0.831372549, 0.0117647059, 0.8313725490196079, 0.9803921569, 0.8431372549, 0.0117647059, 0.8352941176470589, 0.9803921569, 0.8588235294, 0.0078431373, 0.8392156862745098, 0.9803921569, 0.8745098039, 0.0078431373, 0.8431372549019608, 0.9764705882, 0.8901960784, 0.0078431373, 0.8470588235294118, 0.9764705882, 0.9058823529, 0.0078431373, 0.8509803921568627, 0.9764705882, 0.9176470588, 0.0078431373, 0.8549019607843137, 0.9764705882, 0.9333333333, 0.0039215686, 0.8588235294117647, 0.9725490196, 0.9490196078, 0.0039215686, 0.8627450980392157, 0.9725490196, 0.9647058824, 0.0039215686, 0.8666666666666667, 0.9725490196, 0.9803921569, 0.0039215686, 0.8705882352941177, 0.9725490196, 0.9960784314, 0.0039215686, 0.8745098039215686, 0.9725490196, 0.9960784314, 0.0039215686, 0.8784313725490196, 0.9725490196, 0.9960784314, 0.0352941176, 0.8823529411764706, 0.9725490196, 0.9960784314, 0.0666666667, 0.8862745098039215, 0.9725490196, 0.9960784314, 0.0980392157, 0.8901960784313725, 0.9725490196, 0.9960784314, 0.1294117647, 0.8941176470588236, 0.9725490196, 0.9960784314, 0.1647058824, 0.8980392156862745, 0.9764705882, 0.9960784314, 0.1960784314, 0.9019607843137255, 0.9764705882, 0.9960784314, 0.2274509804, 0.9058823529411765, 0.9764705882, 0.9960784314, 0.2549019608, 0.9098039215686274, 0.9764705882, 0.9960784314, 0.2901960784, 0.9137254901960784, 0.9764705882, 0.9960784314, 0.3215686275, 0.9176470588235294, 0.9803921569, 0.9960784314, 0.3529411765, 0.9215686274509803, 0.9803921569, 0.9960784314, 0.3843137255, 0.9254901960784314, 0.9803921569, 0.9960784314, 0.4156862745, 0.9294117647058824, 0.9803921569, 0.9960784314, 0.4509803922, 0.9333333333333333, 0.9803921569, 0.9960784314, 0.4823529412, 0.9372549019607843, 0.9843137255, 0.9960784314, 0.5137254902, 0.9411764705882354, 0.9843137255, 0.9960784314, 0.5450980392, 0.9450980392156864, 0.9843137255, 0.9960784314, 0.5803921569, 0.9490196078431372, 0.9843137255, 0.9960784314, 0.6117647059, 0.9529411764705882, 0.9843137255, 0.9960784314, 0.6431372549, 0.9568627450980394, 0.9882352941, 0.9960784314, 0.6745098039, 0.9607843137254903, 0.9882352941, 0.9960784314, 0.7058823529, 0.9647058823529413, 0.9882352941, 0.9960784314, 0.7411764706, 0.9686274509803922, 0.9882352941, 0.9960784314, 0.768627451, 0.9725490196078431, 0.9882352941, 0.9960784314, 0.8, 0.9764705882352941, 0.9921568627, 0.9960784314, 0.831372549, 0.9803921568627451, 0.9921568627, 0.9960784314, 0.8666666667, 0.984313725490196, 0.9921568627, 0.9960784314, 0.8980392157, 0.9882352941176471, 0.9921568627, 0.9960784314, 0.9294117647, 0.9921568627450981, 0.9921568627, 0.9960784314, 0.9607843137, 0.996078431372549, 0.9960784314, 0.9960784314, 0.9607843137, 1.0, 0.9960784314, 0.9960784314, 0.9607843137],
   description: 'Siemens'
-}, {
-  ColorSpace: 'RGB',
-  Name: 'X Ray',
-  name: 'X Ray',
-  NanColor: [1, 0, 0],
-  RGBPoints: [0, 1, 1, 1, 1, 0, 0, 0],
-  description: 'X Ray'
-}, {
-  ColorSpace: 'RGB',
-  Name: 'Grayscale',
-  name: 'Grayscale',
-  NanColor: [1, 0, 0],
-  RGBPoints: [0, 0, 0, 0, 1, 1, 1, 1],
-  description: 'Grayscale'
 }];
 
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/init.tsx
@@ -4526,7 +4931,7 @@ async function init({
   });
   const labelmapRepresentation = dist_esm.Enums.SegmentationRepresentations.Labelmap;
   dist_esm.segmentation.config.setGlobalRepresentationConfig(labelmapRepresentation, {
-    fillAlpha: 0.3,
+    fillAlpha: 0.5,
     fillAlphaInactive: 0.2,
     outlineOpacity: 1,
     outlineOpacityInactive: 0.65
@@ -7068,8 +7473,11 @@ const fourUp = {
       displaySets: [{
         id: 'mprDisplaySet',
         options: {
-          // ToDo: choose appropriate preset
-          displayPreset: 'CT-Bone'
+          displayPreset: {
+            CT: 'CT-Bone',
+            MR: 'MR-Default',
+            default: 'CT-Bone'
+          }
         }
       }]
     }, {
@@ -7187,8 +7595,11 @@ const main3D = {
       displaySets: [{
         id: 'mprDisplaySet',
         options: {
-          // ToDo: choose appropriate preset
-          displayPreset: 'CT-Bone'
+          displayPreset: {
+            CT: 'CT-Bone',
+            MR: 'MR-Default',
+            default: 'CT-Bone'
+          }
         }
       }]
     }, {
@@ -7467,7 +7878,11 @@ const mprAnd3DVolumeViewport = {
       displaySets: [{
         id: 'mprDisplaySet',
         options: {
-          displayPreset: 'CT-Bone'
+          displayPreset: {
+            CT: 'CT-Bone',
+            MR: 'MR-Default',
+            default: 'CT-Bone'
+          }
         }
       }]
     }, {
@@ -7564,8 +7979,11 @@ const only3D = {
       displaySets: [{
         id: 'mprDisplaySet',
         options: {
-          // ToDo: choose appropriate preset
-          displayPreset: 'CT-Bone'
+          displayPreset: {
+            CT: 'CT-Bone',
+            MR: 'MR-Default',
+            default: 'CT-Bone'
+          }
         }
       }]
     }]
@@ -7641,8 +8059,11 @@ const primary3D = {
       displaySets: [{
         id: 'mprDisplaySet',
         options: {
-          // ToDo: choose appropriate preset
-          displayPreset: 'CT-Bone'
+          displayPreset: {
+            CT: 'CT-Bone',
+            MR: 'MR-Default',
+            default: 'CT-Bone'
+          }
         }
       }]
     }, {
@@ -7905,7 +8326,7 @@ function getToolbarModule({
       const isPrimaryActive = toolGroup.getActivePrimaryMouseButtonTool() === toolName;
       return {
         disabled: false,
-        className: isPrimaryActive ? '!text-black bg-primary-light' : '!text-common-bright hover:!bg-primary-dark hover:!text-primary-light',
+        className: isPrimaryActive ? '!text-black bg-primary-light rounded' : '!text-common-bright hover:!bg-primary-dark hover:!text-primary-light rounded',
         // Todo: isActive right now is used for nested buttons where the primary
         // button needs to be fully rounded (vs partial rounded) when active
         // otherwise it does not have any other use
@@ -11289,10 +11710,14 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
   async setVolumesForViewport(viewport, volumeInputArray, presentations) {
     const {
       displaySetService,
-      toolGroupService
+      toolGroupService,
+      viewportGridService
     } = this.servicesManager.services;
     const viewportInfo = this.getViewportInfo(viewport.id);
     const displaySetOptions = viewportInfo.getDisplaySetOptions();
+    const displaySetUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewport.id);
+    const displaySet = displaySetService.getDisplaySetByUID(displaySetUIDs[0]);
+    const displaySetModality = displaySet?.Modality;
 
     // Todo: use presentations states
     const volumesProperties = volumeInputArray.map((volumeInput, index) => {
@@ -11324,7 +11749,7 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
         properties.colormap = colormap;
       }
       if (displayPreset !== undefined) {
-        properties.preset = displayPreset;
+        properties.preset = displayPreset[displaySetModality] || displayPreset.default;
       }
       return {
         properties,

package/dist/{41.bundle.b720bbff6d0a8847b77a.js → 422.bundle.bd6529c536f59807fbee.js}

@@ -1,5 +1,5 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[41],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[422],{
 
 /***/ 97041:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

package/dist/{487.bundle.0910e5f0cf0c9e255ab4.js → 487.bundle.7890ca42826941ebcd60.js}

@@ -679,7 +679,7 @@ const Header = ({
   content: /*#__PURE__*/react.createElement("div", {
     className: "text-white"
   }, tooltip),
-  position: "bottom",
+  position: "bottom-left",
   tight: true,
   tooltipBoxClassName: "max-w-xs"
 }, /*#__PURE__*/react.createElement(ui_src/* Icon */.In, {