@ohif/app 3.9.0-beta.15 → 3.9.0-beta.17

package/dist/{117.bundle.58f96ac1d52fd08db5c2.js → 117.bundle.772ce244eee25d9b7316.js}

@@ -4526,6 +4526,7 @@ __webpack_require__.d(__webpack_exports__, {
   getCalibratedAspect: () => (/* reexport */ getCalibratedUnits/* getCalibratedAspect */.CQ),
   getCalibratedLengthUnitsAndScale: () => (/* reexport */ getCalibratedUnits/* getCalibratedLengthUnitsAndScale */.Op),
   getCalibratedProbeUnitsAndValue: () => (/* reexport */ getCalibratedUnits/* getCalibratedProbeUnitsAndValue */.Xw),
+  getClosestImageIdForStackViewport: () => (/* reexport */ annotationHydration/* getClosestImageIdForStackViewport */.x),
   getSphereBoundsInfo: () => (/* reexport */ getSphereBoundsInfo/* getSphereBoundsInfo */.R),
   getViewportForAnnotation: () => (/* reexport */ getViewportForAnnotation/* default */.A),
   isObject: () => (/* reexport */ isObject/* default */.A),

package/dist/{164.bundle.db5eee347be4e24f6fdd.js → 164.bundle.3221590f5e6855086889.js}

@@ -3335,6 +3335,9 @@ class AnnotationFrameRange {
 /***/ 25781:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   x: () => (/* binding */ getClosestImageIdForStackViewport)
+/* harmony export */ });
 /* unused harmony export annotationHydration */
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(92136);
 /* harmony import */ var _stateManagement__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(95778);
@@ -3407,7 +3410,7 @@ function getClosestImageIdForStackViewport(viewport, worldPos, viewPlaneNormal)
         return;
     }
     const distanceImagePairs = imageIds.map((imageId) => {
-        const { imagePositionPatient } = metaData.get('imagePlaneModule', imageId);
+        const { imagePositionPatient } = _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__.metaData.get('imagePlaneModule', imageId);
         const distance = calculateDistanceToImage(worldPos, imagePositionPatient, viewPlaneNormal);
         return { imageId, distance };
     });
@@ -3415,9 +3418,9 @@ function getClosestImageIdForStackViewport(viewport, worldPos, viewPlaneNormal)
     return distanceImagePairs[0].imageId;
 }
 function calculateDistanceToImage(worldPos, ImagePositionPatient, viewPlaneNormal) {
-    const dir = vec3.create();
-    vec3.sub(dir, worldPos, ImagePositionPatient);
-    const dot = vec3.dot(dir, viewPlaneNormal);
+    const dir = gl_matrix__WEBPACK_IMPORTED_MODULE_2__/* .vec3.create */ .eR.create();
+    gl_matrix__WEBPACK_IMPORTED_MODULE_2__/* .vec3.sub */ .eR.sub(dir, worldPos, ImagePositionPatient);
+    const dot = gl_matrix__WEBPACK_IMPORTED_MODULE_2__/* .vec3.dot */ .eR.dot(dir, viewPlaneNormal);
     return Math.abs(dot);
 }
 
@@ -5286,7 +5289,7 @@ __webpack_require__.d(__webpack_exports__, {
   triggerAnnotationRenderForViewportIds: () => (/* reexport */ triggerAnnotationRenderForViewportIds/* default */.A)
 });
 
-// UNUSED EXPORTS: annotationFrameRange, annotationHydration, boundingBox, calibrateImageSpacing, cine, contourSegmentation, contours, drawing, dynamicVolume, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, getCalibratedAspect, getCalibratedProbeUnitsAndValue, getSphereBoundsInfo, getViewportForAnnotation, isObject, jumpToSlice, orientation, planar, planarFreehandROITool, pointInSurroundingSphereCallback, rectangleROITool, segmentation, stackContextPrefetch, stackPrefetch, touch, triggerAnnotationRender, triggerEvent, viewport, viewportFilters, voi
+// UNUSED EXPORTS: annotationFrameRange, annotationHydration, boundingBox, calibrateImageSpacing, cine, contourSegmentation, contours, drawing, dynamicVolume, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, getCalibratedAspect, getCalibratedProbeUnitsAndValue, getClosestImageIdForStackViewport, getSphereBoundsInfo, getViewportForAnnotation, isObject, jumpToSlice, orientation, planar, planarFreehandROITool, pointInSurroundingSphereCallback, rectangleROITool, segmentation, stackContextPrefetch, stackPrefetch, touch, triggerAnnotationRender, triggerEvent, viewport, viewportFilters, voi
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 28 modules
 var esm = __webpack_require__(92136);

package/dist/{236.bundle.d93b7e3b3edcae50a4e6.js → 236.bundle.d3a631d79ee8952e3c60.js}

@@ -8220,6 +8220,11 @@ class CrosshairsTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationToo
         configuration: {
             shadow: true,
             viewportIndicators: true,
+            viewportIndicatorsConfig: {
+                radius: 5,
+                x: null,
+                y: null,
+            },
             autoPan: {
                 enabled: false,
                 panSize: 10,
@@ -8819,11 +8824,14 @@ class CrosshairsTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationToo
             data.handles.rotationPoints = newRtpoints;
             data.handles.slabThicknessPoints = newStpoints;
             if (this.configuration.viewportIndicators) {
+                const { viewportIndicatorsConfig } = this.configuration;
+                const xOffset = viewportIndicatorsConfig?.xOffset || 0.95;
+                const yOffset = viewportIndicatorsConfig?.yOffset || 0.05;
                 const referenceColorCoordinates = [
-                    clientWidth * 0.95,
-                    clientHeight * 0.05,
+                    clientWidth * xOffset,
+                    clientHeight * yOffset,
                 ];
-                const circleRadius = canvasDiagonalLength * 0.01;
+                const circleRadius = viewportIndicatorsConfig?.circleRadius || canvasDiagonalLength * 0.01;
                 const circleUID = '0';
                 (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_7__.drawCircle)(svgDrawingHelper, annotationUID, circleUID, referenceColorCoordinates, circleRadius, { color, fill: color });
             }
@@ -24250,6 +24258,7 @@ __webpack_require__.d(__webpack_exports__, {
   getCalibratedAspect: () => (/* reexport */ getCalibratedUnits/* getCalibratedAspect */.CQ),
   getCalibratedLengthUnitsAndScale: () => (/* reexport */ getCalibratedUnits/* getCalibratedLengthUnitsAndScale */.Op),
   getCalibratedProbeUnitsAndValue: () => (/* reexport */ getCalibratedUnits/* getCalibratedProbeUnitsAndValue */.Xw),
+  getClosestImageIdForStackViewport: () => (/* reexport */ annotationHydration/* getClosestImageIdForStackViewport */.x),
   getSphereBoundsInfo: () => (/* reexport */ getSphereBoundsInfo/* getSphereBoundsInfo */.R),
   getViewportForAnnotation: () => (/* reexport */ getViewportForAnnotation/* default */.A),
   isObject: () => (/* reexport */ isObject/* default */.A),

package/dist/{367.bundle.da5db5b510b537e43888.js → 367.bundle.6a0746aeca702ae6eba6.js}

@@ -299,7 +299,8 @@ class AnnotationFrameRange {
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   i: () => (/* binding */ annotationHydration)
+/* harmony export */   i: () => (/* binding */ annotationHydration),
+/* harmony export */   x: () => (/* binding */ getClosestImageIdForStackViewport)
 /* harmony export */ });
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(92136);
 /* harmony import */ var _stateManagement__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(95778);

package/dist/{370.bundle.d6c1741f388bb129bcd3.js → 370.bundle.baa389d217c390b0e92b.js}

@@ -5215,6 +5215,8 @@ function deleteConfigCache(segmentationRepresentationUID) {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/stateManagement/segmentation/index.js + 31 modules
 var stateManagement_segmentation = __webpack_require__(63421);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/utilities/annotationHydration.js
+var annotationHydration = __webpack_require__(25781);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/CellArray.js
 var CellArray = __webpack_require__(24768);
 // EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/Points.js
@@ -5284,6 +5286,7 @@ var contourSegmentation = __webpack_require__(7259);
 
 
 
+
 function handleContourSegmentation(viewport, geometryIds, annotationUIDsMap, contourRepresentation, contourRepresentationConfig) {
     const addOrUpdateFn = annotationUIDsMap.size
         ? updateContourSets
@@ -5372,7 +5375,7 @@ function addContourSetsToElement(viewport, geometryIds, contourRepresentation, c
                 isLocked: true,
                 isVisible: true,
                 metadata: {
-                    referencedImageId: viewport.getCurrentImageId(),
+                    referencedImageId: (0,annotationHydration/* getClosestImageIdForStackViewport */.x)(viewport, points[0], viewport.getCamera().viewPlaneNormal),
                     toolName: 'PlanarFreehandContourSegmentationTool',
                     FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
                     viewPlaneNormal: viewport.getCamera().viewPlaneNormal,

package/dist/{390.bundle.19dc1ebc9a6cfc3fbfc9.js → 390.bundle.8f12eb01e3aca2e5e1a7.js}

@@ -2757,8 +2757,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.9.0-beta.15";
-  const commitHash = "4fcee5d449b24a01f072b2db7d702fa0ddd036c1";
+  const versionNumber = "3.9.0-beta.17";
+  const commitHash = "73d9e99d5d6f38ab6c36f4471d54f18798feacb4";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -4863,6 +4863,7 @@ function LayoutSelector({
   ...rest
 }) {
   const [isOpen, setIsOpen] = (0,react.useState)(false);
+  const dropdownRef = (0,react.useRef)(null);
   const {
     customizationService
   } = servicesManager.services;
@@ -4870,15 +4871,21 @@ function LayoutSelector({
   const advancedPresets = customizationService.get('advancedPresets') || generateAdvancedPresets({
     servicesManager
   });
-  const closeOnOutsideClick = () => {
-    if (isOpen) {
+  const closeOnOutsideClick = event => {
+    if (isOpen && dropdownRef.current) {
       setIsOpen(false);
     }
   };
   (0,react.useEffect)(() => {
-    window.addEventListener('click', closeOnOutsideClick);
+    if (!isOpen) {
+      return;
+    }
+    setTimeout(() => {
+      window.addEventListener('click', closeOnOutsideClick);
+    }, 0);
     return () => {
       window.removeEventListener('click', closeOnOutsideClick);
+      dropdownRef.current = null;
     };
   }, [isOpen]);
   const onInteractionHandler = () => {
@@ -4894,7 +4901,8 @@ function LayoutSelector({
     rounded: rest.rounded,
     disableToolTip: tooltipDisabled,
     dropdownContent: DropdownContent !== null && /*#__PURE__*/react.createElement("div", {
-      className: "flex "
+      className: "flex",
+      ref: dropdownRef
     }, /*#__PURE__*/react.createElement("div", {
       className: "bg-secondary-dark flex flex-col gap-2.5 p-2"
     }, /*#__PURE__*/react.createElement("div", {

package/dist/{501.bundle.d5262ba2d61a134e80f9.js → 501.bundle.7d5003758fa3ffbb344b.js}

@@ -36057,6 +36057,11 @@ class CrosshairsTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationToo
         configuration: {
             shadow: true,
             viewportIndicators: true,
+            viewportIndicatorsConfig: {
+                radius: 5,
+                x: null,
+                y: null,
+            },
             autoPan: {
                 enabled: false,
                 panSize: 10,
@@ -36656,11 +36661,14 @@ class CrosshairsTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationToo
             data.handles.rotationPoints = newRtpoints;
             data.handles.slabThicknessPoints = newStpoints;
             if (this.configuration.viewportIndicators) {
+                const { viewportIndicatorsConfig } = this.configuration;
+                const xOffset = viewportIndicatorsConfig?.xOffset || 0.95;
+                const yOffset = viewportIndicatorsConfig?.yOffset || 0.05;
                 const referenceColorCoordinates = [
-                    clientWidth * 0.95,
-                    clientHeight * 0.05,
+                    clientWidth * xOffset,
+                    clientHeight * yOffset,
                 ];
-                const circleRadius = canvasDiagonalLength * 0.01;
+                const circleRadius = viewportIndicatorsConfig?.circleRadius || canvasDiagonalLength * 0.01;
                 const circleUID = '0';
                 (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_7__.drawCircle)(svgDrawingHelper, annotationUID, circleUID, referenceColorCoordinates, circleRadius, { color, fill: color });
             }

package/dist/{682.bundle.7c011d50d7288912a1c4.js → 682.bundle.a790945450764c120a60.js}

@@ -284,7 +284,12 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m
     disabled: [{
       toolName: toolNames.Crosshairs,
       configuration: {
-        viewportIndicators: false,
+        viewportIndicators: true,
+        viewportIndicatorsConfig: {
+          circleRadius: 5,
+          xOffset: 0.95,
+          yOffset: 0.05
+        },
         disableOnPassive: true,
         autoPan: {
           enabled: false,

package/dist/{699.bundle.e1cd2e58926dcf5dabb4.js → 699.bundle.fed4662fb1e2b7993e2f.js}

@@ -446,6 +446,16 @@ const segmentationButtons_toolbarButtons = [{
 }];
 /* harmony default export */ const segmentationButtons = (segmentationButtons_toolbarButtons);
 ;// CONCATENATED MODULE: ../../../modes/segmentation/src/initToolGroups.ts
+const colours = {
+  'viewport-0': 'rgb(200, 0, 0)',
+  'viewport-1': 'rgb(200, 200, 0)',
+  'viewport-2': 'rgb(0, 200, 0)'
+};
+const colorsByOrientation = {
+  axial: 'rgb(200, 0, 0)',
+  sagittal: 'rgb(200, 200, 0)',
+  coronal: 'rgb(0, 200, 0)'
+};
 function createTools(utilityModule) {
   const {
     toolNames,
@@ -554,15 +564,34 @@ function initDefaultToolGroup(extensionManager, toolGroupService, commandsManage
 }
 function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
   const utilityModule = extensionManager.getModuleEntry('@ohif/extension-cornerstone.utilityModule.tools');
+  const servicesManager = extensionManager._servicesManager;
+  const {
+    cornerstoneViewportService
+  } = servicesManager.services;
   const tools = createTools(utilityModule);
   tools.disabled.push({
     toolName: utilityModule.exports.toolNames.Crosshairs,
     configuration: {
-      viewportIndicators: false,
+      viewportIndicators: true,
+      viewportIndicatorsConfig: {
+        circleRadius: 5,
+        xOffset: 0.95,
+        yOffset: 0.05
+      },
       disableOnPassive: true,
       autoPan: {
         enabled: false,
         panSize: 10
+      },
+      getReferenceLineColor: viewportId => {
+        const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
+        const viewportOptions = viewportInfo?.viewportOptions;
+        if (viewportOptions) {
+          return colours[viewportOptions.id] || colorsByOrientation[viewportOptions.orientation] || '#0c0';
+        } else {
+          console.warn('missing viewport?', viewportId);
+          return '#0c0';
+        }
       }
     }
   }, {

package/dist/{776.bundle.73c4061d25da8a38f094.js → 776.bundle.2a001f4a814223e38f6c.js}

@@ -22,7 +22,7 @@ const toolGroupIds = {
   MIP: 'mipToolGroup',
   default: 'default'
 };
-function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig) {
+function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig, servicesManager) {
   const tools = {
     active: [{
       toolName: toolNames.WindowLevel,
@@ -147,7 +147,12 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, mo
     disabled: [{
       toolName: toolNames.Crosshairs,
       configuration: {
-        viewportIndicators: false,
+        viewportIndicators: true,
+        viewportIndicatorsConfig: {
+          circleRadius: 5,
+          xOffset: 0.95,
+          yOffset: 0.05
+        },
         disableOnPassive: true,
         autoPan: {
           enabled: false,
@@ -195,8 +200,8 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, mo
   };
   toolGroupService.createToolGroupAndAddTools(toolGroupIds.MIP, mipTools);
 }
-function initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig) {
-  _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig);
+function initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig, servicesManager) {
+  _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, modeLabelConfig, servicesManager);
 }
 /* harmony default export */ const src_initToolGroups = (initToolGroups);
 ;// CONCATENATED MODULE: ../../../modes/tmtv/src/toolbarButtons.js
@@ -595,7 +600,7 @@ function modeFactory({
       } = utilityModule.exports;
 
       // Init Default and SR ToolGroups
-      src_initToolGroups(toolNames, Enums, toolGroupService, commandsManager);
+      src_initToolGroups(toolNames, Enums, toolGroupService, commandsManager, null, servicesManager);
       const {
         unsubscribe
       } = toolGroupService.subscribe(toolGroupService.EVENTS.VIEWPORT_ADDED, () => {

package/dist/{94.bundle.db1489df1601db91673a.js → 94.bundle.3bdd767681a55c11efff.js}

@@ -133,7 +133,20 @@ const toolGroupIds = {
   Fusion: 'dynamic4D-fusion',
   CT: 'dynamic4D-ct'
 };
-function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
+const colours = {
+  'viewport-0': 'rgb(200, 0, 0)',
+  'viewport-1': 'rgb(200, 200, 0)',
+  'viewport-2': 'rgb(0, 200, 0)'
+};
+const colorsByOrientation = {
+  axial: 'rgb(200, 0, 0)',
+  sagittal: 'rgb(200, 200, 0)',
+  coronal: 'rgb(0, 200, 0)'
+};
+function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, servicesManager) {
+  const {
+    cornerstoneViewportService
+  } = servicesManager.services;
   const tools = {
     active: [{
       toolName: toolNames.WindowLevel,
@@ -237,11 +250,26 @@ function _initToolGroups(toolNames, Enums, toolGroupService, commandsManager) {
     disabled: [{
       toolName: toolNames.Crosshairs,
       configuration: {
-        viewportIndicators: false,
+        viewportIndicators: true,
+        viewportIndicatorsConfig: {
+          circleRadius: 5,
+          xOffset: 0.95,
+          yOffset: 0.05
+        },
         disableOnPassive: true,
         autoPan: {
           enabled: false,
           panSize: 10
+        },
+        getReferenceLineColor: viewportId => {
+          const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
+          const viewportOptions = viewportInfo?.viewportOptions;
+          if (viewportOptions) {
+            return colours[viewportOptions.id] || colorsByOrientation[viewportOptions.orientation] || '#0c0';
+          } else {
+            console.warn('missing viewport?', viewportId);
+            return '#0c0';
+          }
         }
       }
     }]
@@ -270,9 +298,10 @@ function initToolGroups({
   toolNames,
   Enums,
   toolGroupService,
-  commandsManager
+  commandsManager,
+  servicesManager
 }) {
-  _initToolGroups(toolNames, Enums, toolGroupService, commandsManager);
+  _initToolGroups(toolNames, Enums, toolGroupService, commandsManager, servicesManager);
 }
 
 ;// CONCATENATED MODULE: ../../../modes/preclinical-4d/src/toolbarButtons.tsx
@@ -639,7 +668,8 @@ function modeFactory({
         toolNames,
         Enums,
         toolGroupService,
-        commandsManager
+        commandsManager,
+        servicesManager
       });
       toolbarService.addButtons([...src_toolbarButtons, ...segmentationButtons]);
       toolbarService.createButtonSection('secondary', ['ProgressDropdown']);

package/dist/app-config.js

@@ -1,4 +1,5 @@
-window.config = {
+/** @type {import('@ohif/core').OHIFConfig} */
+const config = {
   routerBasename: '/',
   // whiteLabeling: {},
   extensions: [],
@@ -232,3 +233,5 @@ window.config = {
     },
   ],
 };
+
+window.config = config;