@ohif/app 3.9.0-beta.61 → 3.9.0-beta.63

package/dist/{281.bundle.4891dfda2fdb24578002.js → 281.bundle.7c7901a50253c44b7442.js}

@@ -2844,8 +2844,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.9.0-beta.61";
-  const commitHash = "aefa6d94dff82d34fa8358933fb1d5dec3f8246d";
+  const versionNumber = "3.9.0-beta.63";
+  const commitHash = "0968b3abb1d38c6f0a66d2a75bbc52b7d8f6be17";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',

package/dist/{372.bundle.0a9307b8380627f2ebdc.js → 913.bundle.92c848a924160e13ea85.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[372],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[913],{
 
-/***/ 94372:
+/***/ 47913:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -1330,8 +1330,76 @@ const RectangleROIStartEndThreshold = {
   }
 };
 /* harmony default export */ const measurementServiceMappings_RectangleROIStartEndThreshold = (RectangleROIStartEndThreshold);
+;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/CircleROIStartEndThreshold.js
+
+
+const CircleROIStartEndThreshold = {
+  toAnnotation: (measurement, definition) => {},
+  /**
+   * Maps cornerstone annotation event data to measurement service format.
+   *
+   * @param {Object} cornerstone Cornerstone event data
+   * @return {Measurement} Measurement instance
+   */
+  toMeasurement: (csToolsEventDetail, displaySetService, cornerstoneViewportService) => {
+    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
+    } = getSOPInstanceAttributes(referencedImageId, cornerstoneViewportService, viewportId);
+    let displaySet;
+    if (SOPInstanceUID) {
+      displaySet = displaySetService.getDisplaySetForSOPInstanceUID(SOPInstanceUID, SeriesInstanceUID);
+    } else {
+      displaySet = displaySetService.getDisplaySetsForSeries(SeriesInstanceUID);
+    }
+    const {
+      cachedStats
+    } = data;
+    return {
+      uid: annotationUID,
+      SOPInstanceUID,
+      FrameOfReferenceUID,
+      // points,
+      metadata,
+      referenceSeriesUID: SeriesInstanceUID,
+      referenceStudyUID: StudyInstanceUID,
+      toolName: metadata.toolName,
+      displaySetInstanceUID: displaySet.displaySetInstanceUID,
+      label: metadata.label,
+      // displayText: displayText,
+      data: data.cachedStats,
+      type: 'CircleROIStartEndThreshold'
+      // getReport,
+    };
+  }
+};
+/* harmony default export */ const measurementServiceMappings_CircleROIStartEndThreshold = (CircleROIStartEndThreshold);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/measurementServiceMappingsFactory.js
 
+
 const measurementServiceMappingsFactory = (measurementService, displaySetService, cornerstoneViewportService) => {
   return {
     RectangleROIStartEndThreshold: {
@@ -1340,6 +1408,13 @@ const measurementServiceMappingsFactory = (measurementService, displaySetService
       matchingCriteria: [{
         valueType: measurementService.VALUE_TYPES.ROI_THRESHOLD_MANUAL
       }]
+    },
+    CircleROIStartEndThreshold: {
+      toAnnotation: measurementServiceMappings_CircleROIStartEndThreshold.toAnnotation,
+      toMeasurement: csToolsAnnotation => measurementServiceMappings_CircleROIStartEndThreshold.toMeasurement(csToolsAnnotation, displaySetService, cornerstoneViewportService),
+      matchingCriteria: [{
+        valueType: measurementService.VALUE_TYPES.ROI_THRESHOLD_MANUAL
+      }]
     }
   };
 };
@@ -1364,14 +1439,15 @@ function init({
     cornerstoneViewportService
   } = servicesManager.services;
   (0,dist_esm.addTool)(dist_esm.RectangleROIStartEndThresholdTool);
+  (0,dist_esm.addTool)(dist_esm.CircleROIStartEndThresholdTool);
   const {
-    RectangleROIStartEndThreshold
+    RectangleROIStartEndThreshold,
+    CircleROIStartEndThreshold
   } = measurementServiceMappings_measurementServiceMappingsFactory(measurementService, displaySetService, cornerstoneViewportService);
   const csTools3DVer1MeasurementSource = measurementService.getSource(CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'RectangleROIStartEndThreshold', RectangleROIStartEndThreshold.matchingCriteria, RectangleROIStartEndThreshold.toAnnotation, RectangleROIStartEndThreshold.toMeasurement);
+  measurementService.addMapping(csTools3DVer1MeasurementSource, 'CircleROIStartEndThreshold', CircleROIStartEndThreshold.matchingCriteria, CircleROIStartEndThreshold.toAnnotation, CircleROIStartEndThreshold.toMeasurement);
 }
-// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
-var gl_matrix_esm = __webpack_require__(72076);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/getThresholdValue.ts
 
 function getRoiStats(referencedVolume, annotations) {
@@ -1540,9 +1616,8 @@ function dicomRTAnnotationExport(annotations) {
 
 
 
-
 const commandsModule_metadataProvider = core_src.classes.MetadataProvider;
-const RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS = ['RectangleROIStartEndThreshold', 'RectangleROIThreshold'];
+const ROI_THRESHOLD_MANUAL_TOOL_IDS = ['RectangleROIStartEndThreshold', 'RectangleROIThreshold', 'CircleROIStartEndThreshold'];
 const LABELMAP = dist_esm.Enums.SegmentationRepresentations.Labelmap;
 const workerManager = (0,esm.getWebWorkerManager)();
 const options = {
@@ -1729,7 +1804,7 @@ const commandsModule = ({
       const {
         referencedVolumeId
       } = esm.cache.getVolume(segVolumeId);
-      const annotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
+      const annotationUIDs = _getAnnotationsSelectedByToolNames(ROI_THRESHOLD_MANUAL_TOOL_IDS);
       if (annotationUIDs.length === 0) {
         uiNotificationService.show({
           title: 'Commands Module',
@@ -1805,7 +1880,7 @@ const commandsModule = ({
         referencedVolumeId
       } = labelmap;
       const referencedVolume = esm.cache.getVolume(referencedVolumeId);
-      const annotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
+      const annotationUIDs = _getAnnotationsSelectedByToolNames(ROI_THRESHOLD_MANUAL_TOOL_IDS);
       const annotations = annotationUIDs.map(annotationUID => dist_esm.annotation.state.getAnnotation(annotationUID));
       const labelmapProps = {
         dimensions: labelmap.dimensions,
@@ -1991,36 +2066,14 @@ const commandsModule = ({
         viewport
       } = _getActiveViewportsEnabledElement();
       const {
-        focalPoint,
-        viewPlaneNormal
+        focalPoint
       } = viewport.getCamera();
-      const selectedAnnotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
+      const selectedAnnotationUIDs = _getAnnotationsSelectedByToolNames(ROI_THRESHOLD_MANUAL_TOOL_IDS);
       const annotationUID = selectedAnnotationUIDs[0];
       const annotation = dist_esm.annotation.state.getAnnotation(annotationUID);
-      const {
-        handles
-      } = annotation.data;
-      const {
-        points
-      } = handles;
-
-      // get the current slice Index
-      const sliceIndex = viewport.getCurrentImageIdIndex();
-      annotation.data.startSlice = sliceIndex;
-
-      // distance between camera focal point and each point on the rectangle
-      const newPoints = points.map(point => {
-        const distance = gl_matrix_esm/* vec3.create */.R3.create();
-        gl_matrix_esm/* vec3.subtract */.R3.subtract(distance, focalPoint, point);
-        // distance in the direction of the viewPlaneNormal
-        const distanceInViewPlane = gl_matrix_esm/* vec3.dot */.R3.dot(distance, viewPlaneNormal);
-        // new point is current point minus distanceInViewPlane
-        const newPoint = gl_matrix_esm/* vec3.create */.R3.create();
-        gl_matrix_esm/* vec3.scaleAndAdd */.R3.scaleAndAdd(newPoint, point, viewPlaneNormal, distanceInViewPlane);
-        return newPoint;
-        //
-      });
-      handles.points = newPoints;
+
+      // set the current focalpoint
+      annotation.data.startCoordinate = focalPoint;
       // IMPORTANT: invalidate the toolData for the cached stat to get updated
       // and re-calculate the projection points
       annotation.invalidated = true;
@@ -2030,13 +2083,13 @@ const commandsModule = ({
       const {
         viewport
       } = _getActiveViewportsEnabledElement();
-      const selectedAnnotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
+      const selectedAnnotationUIDs = _getAnnotationsSelectedByToolNames(ROI_THRESHOLD_MANUAL_TOOL_IDS);
       const annotationUID = selectedAnnotationUIDs[0];
       const annotation = dist_esm.annotation.state.getAnnotation(annotationUID);
 
-      // get the current slice Index
-      const sliceIndex = viewport.getCurrentImageIdIndex();
-      annotation.data.endSlice = sliceIndex;
+      // get the current focalpoint
+      const focalPointToEnd = viewport.getCamera().focalPoint;
+      annotation.data.endCoordinate = focalPointToEnd;
 
       // IMPORTANT: invalidate the toolData for the cached stat to get updated
       // and re-calculate the projection points
@@ -2049,7 +2102,7 @@ const commandsModule = ({
       const annotations = [];
       Object.keys(stateManager.annotations).forEach(frameOfReferenceUID => {
         const forAnnotations = stateManager.annotations[frameOfReferenceUID];
-        const ROIAnnotations = RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS.reduce((annotations, toolName) => [...annotations, ...(forAnnotations[toolName] ?? [])], []);
+        const ROIAnnotations = ROI_THRESHOLD_MANUAL_TOOL_IDS.reduce((annotations, toolName) => [...annotations, ...(forAnnotations[toolName] ?? [])], []);
         annotations.push(...ROIAnnotations);
       });
       commandsManager.runCommand('exportRTReportForAnnotations', {