@ohif/app 3.8.0 → 3.8.2

package/dist/{94.bundle.33ca3bc10aa42716dbbb.js → 94.bundle.ae3ca435b134c95aea2e.js}

@@ -18,8 +18,8 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/mode-precl
 
 const id = package_namespaceObject.UU;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 70 modules
-var src = __webpack_require__(55411);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(8633);
 ;// CONCATENATED MODULE: ../../../modes/preclinical-4d/src/getWorkflowSettings.ts
 const dynamicVolume = {
   sopClassHandler: '@ohif/extension-cornerstone-dynamic-volume.sopClassHandlerModule.dynamic-volume',
@@ -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
@@ -538,7 +567,7 @@ const segmentationButtons_toolbarButtons = [{
         min: 0,
         max: 100,
         step: 0.5,
-        values: [2, 50],
+        value: [2, 50],
         commands: {
           commandName: 'setThresholdRange',
           commandOptions: {
@@ -639,7 +668,8 @@ function modeFactory({
         toolNames,
         Enums,
         toolGroupService,
-        commandsManager
+        commandsManager,
+        servicesManager
       });
       toolbarService.addButtons([...src_toolbarButtons, ...segmentationButtons]);
       toolbarService.createButtonSection('secondary', ['ProgressDropdown']);

package/dist/{961.bundle.2c4663737c970764a41e.js → 961.bundle.d1b25d8f354bde3be17c.js}

@@ -21,8 +21,8 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/extension-
 const id = package_namespaceObject.UU;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-video`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 70 modules
-var src = __webpack_require__(55411);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(8633);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-video/src/getSopClassHandlerModule.js
 
 

package/dist/{7.bundle.94692aed50fe4ba2e2f5.js → 981.bundle.808058a6555d322675e1.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[7],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[981],{
 
-/***/ 89007:
+/***/ 93981:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -128,7 +128,7 @@ const ptAXIAL = {
       source: true,
       target: false,
       options: {
-        syncInvertState: false
+        syncColormap: false
       }
     }]
   },
@@ -168,7 +168,7 @@ const ptSAGITTAL = {
       source: true,
       target: false,
       options: {
-        syncInvertState: false
+        syncColormap: false
       }
     }]
   },
@@ -208,7 +208,7 @@ const ptCORONAL = {
       source: true,
       target: false,
       options: {
-        syncInvertState: false
+        syncColormap: false
       }
     }]
   },
@@ -256,7 +256,7 @@ const fusionAXIAL = {
       source: false,
       target: true,
       options: {
-        syncInvertState: false
+        syncColormap: false
       }
     }]
   },
@@ -318,7 +318,7 @@ const fusionSAGITTAL = {
       source: false,
       target: true,
       options: {
-        syncInvertState: false
+        syncColormap: false
       }
     }]
   },
@@ -380,7 +380,7 @@ const fusionCORONAL = {
       source: false,
       target: true,
       options: {
-        syncInvertState: false
+        syncColormap: false
       }
     }]
   },
@@ -429,7 +429,7 @@ const mipSAGITTAL = {
       source: true,
       target: false,
       options: {
-        syncInvertState: false
+        syncColormap: false
       }
     }],
     // Custom props can be used to set custom properties which extensions
@@ -725,8 +725,8 @@ var prop_types = __webpack_require__(11374);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../ui/src/index.js + 785 modules
 var src = __webpack_require__(5085);
-// EXTERNAL MODULE: ../../core/src/index.ts + 70 modules
-var core_src = __webpack_require__(55411);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var core_src = __webpack_require__(8633);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(80619);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelPetSUV.tsx
@@ -1529,7 +1529,7 @@ function dicomRTAnnotationExport(annotations) {
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/dicomRTAnnotationExport/RTStructureSet/index.js
 
 /* harmony default export */ const RTStructureSet = (dicomRTAnnotationExport);
-;// CONCATENATED MODULE: ../../../extensions/tmtv/src/commandsModule.js
+;// CONCATENATED MODULE: ../../../extensions/tmtv/src/commandsModule.ts
 
 
 
@@ -1864,7 +1864,7 @@ const commandsModule = ({
       const referencedScalarData = esm.cache.getVolume(labelmap.referencedVolumeId).getScalarData();
       let segmentationMax = -Infinity;
       let segmentationMin = Infinity;
-      let segmentationValues = [];
+      const segmentationValues = [];
       let voxelCount = 0;
       for (let i = 0; i < scalarData.length; i++) {
         if (scalarData[i] === segmentIndex) {
@@ -2060,7 +2060,7 @@ const commandsModule = ({
       if (!segmentations || !segmentations.length) {
         segmentations = segmentationService.getSegmentations();
       }
-      let report = {};
+      const report = {};
       for (const segmentation of segmentations) {
         const {
           id,
@@ -2138,7 +2138,7 @@ const commandsModule = ({
         return;
       }
       const fusionViewportIds = toolGroup.getViewportIds();
-      let viewports = [];
+      const viewports = [];
       fusionViewportIds.forEach(viewportId => {
         commandsManager.runCommand('setViewportColormap', {
           viewportId,

package/dist/{594.bundle.c292423defd9581bfbe3.js → 989.bundle.b929ddc23c16980560de.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[594],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[989],{
 
-/***/ 26594:
+/***/ 50989:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -14,8 +14,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../ui/src/index.js + 785 modules
 var src = __webpack_require__(5085);
-// EXTERNAL MODULE: ../../core/src/index.ts + 70 modules
-var core_src = __webpack_require__(55411);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var core_src = __webpack_require__(8633);
 ;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js
 
 
@@ -235,7 +235,7 @@ const id = package_namespaceObject.UU;
 
 // EXTERNAL MODULE: ../../../node_modules/i18next/dist/esm/i18next.js
 var i18next = __webpack_require__(92344);
-;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/index.js
+;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/index.ts
 
 
 

package/dist/{633.bundle.e258ba4843985e67336a.js → 998.bundle.df083f740270855652bd.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[633,481],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[998,481],{
 
-/***/ 27400:
+/***/ 32009:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -22,8 +22,8 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(41766);
-// EXTERNAL MODULE: ../../core/src/index.ts + 70 modules
-var src = __webpack_require__(55411);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(8633);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 28 modules
 var esm = __webpack_require__(92136);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
@@ -45,7 +45,7 @@ function dicomlabToRGB(cielab) {
   return rgb;
 }
 
-;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.js
+;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.ts
 
 
 
@@ -53,7 +53,7 @@ function dicomlabToRGB(cielab) {
 
 
 const sopClassUids = ['1.2.840.10008.5.1.4.1.1.66.4'];
-let loadPromises = {};
+const loadPromises = {};
 function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager) {
   const instance = instances[0];
   const {
@@ -317,8 +317,8 @@ function getHangingProtocolModule() {
 var state = __webpack_require__(15575);
 // EXTERNAL MODULE: ../../ui/src/index.js + 785 modules
 var ui_src = __webpack_require__(5085);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 85 modules
-var default_src = __webpack_require__(7206);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 84 modules
+var default_src = __webpack_require__(42545);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(11374);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
@@ -880,7 +880,7 @@ var ImageData = __webpack_require__(51250);
  * @param params.viewportId - ID of the viewport to be updated.
  * @param params.loadFn - Function to load the segmentation data.
  * @param params.servicesManager - The services manager.
- * @param params.referencedDisplaySetInstanceUID - Optional UID for the referenced display set instance.
+ * @param params.displaySet -  the display set.
  *
  * @returns Returns true upon successful update of viewports for segmentation rendering.
  */
@@ -888,7 +888,7 @@ async function updateViewportsForSegmentationRendering({
   viewportId,
   loadFn,
   servicesManager,
-  referencedDisplaySetInstanceUID
+  displaySet
 }) {
   const {
     cornerstoneViewportService,
@@ -900,11 +900,11 @@ async function updateViewportsForSegmentationRendering({
     viewportGridService
   });
   const targetViewportId = viewport.viewportOptions.viewportId;
-  referencedDisplaySetInstanceUID = referencedDisplaySetInstanceUID || viewport?.displaySetInstanceUIDs[0];
+  const referencedDisplaySetInstanceUID = displaySet?.referencedDisplaySetInstanceUID || viewport?.displaySetInstanceUIDs[0];
   const updatedViewports = getUpdatedViewportsForSegmentation({
-    servicesManager,
     viewportId,
-    referencedDisplaySetInstanceUID
+    servicesManager,
+    displaySet
   });
 
   // create Segmentation callback which needs to be waited until
@@ -920,7 +920,7 @@ async function updateViewportsForSegmentationRendering({
   updatedViewports.forEach(async viewport => {
     viewport.viewportOptions = {
       ...viewport.viewportOptions,
-      viewportType: 'volume',
+      viewportType: displaySet?.Modality === 'RTSTRUCT' ? 'stack' : 'volume',
       needsRerendering: true
     };
     const viewportId = viewport.viewportId;
@@ -929,7 +929,7 @@ async function updateViewportsForSegmentationRendering({
 
     // only run the createSegmentationForVolume for the targetViewportId
     // since the rest will get handled by cornerstoneViewportService
-    if (volumeExists && viewportId === targetViewportId) {
+    if ((volumeExists || displaySet.Modality === 'RTSTRUCT') && viewportId === targetViewportId) {
       await createSegmentationForVolume();
       return;
     }
@@ -978,14 +978,14 @@ const getTargetViewport = ({
  * @param {Object} params - Parameters for the function.
  * @param params.viewportId - the ID of the viewport to be updated.
  * @param params.servicesManager - The services manager
- * @param params.referencedDisplaySetInstanceUID - Optional UID for the referenced display set instance.
+ * @param params.displaySet -  the display set.
  *
  * @returns {Array} Returns an array of viewports that require updates for segmentation rendering.
  */
 function getUpdatedViewportsForSegmentation({
   viewportId,
   servicesManager,
-  referencedDisplaySetInstanceUID
+  displaySet
 }) {
   const {
     hangingProtocolService,
@@ -1003,7 +1003,7 @@ function getUpdatedViewportsForSegmentation({
   });
   const targetViewportId = viewport.viewportOptions.viewportId;
   const displaySetInstanceUIDs = viewports.get(targetViewportId).displaySetInstanceUIDs;
-  const referenceDisplaySetInstanceUID = referencedDisplaySetInstanceUID || displaySetInstanceUIDs[0];
+  const referenceDisplaySetInstanceUID = displaySet?.referencedDisplaySetInstanceUID || displaySetInstanceUIDs[0];
   const referencedDisplaySet = displaySetService.getDisplaySetByUID(referenceDisplaySetInstanceUID);
   const segmentationFrameOfReferenceUID = referencedDisplaySet.instances[0].FrameOfReferenceUID;
   const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(targetViewportId, referenceDisplaySetInstanceUID, isHangingProtocolLayout);
@@ -1017,7 +1017,7 @@ function getUpdatedViewportsForSegmentation({
         viewportId,
         displaySetInstanceUIDs: viewport.displaySetInstanceUIDs,
         viewportOptions: {
-          viewportType: 'volume',
+          viewportType: displaySet?.Modality === 'RTSTRUCT' ? 'stack' : 'volume',
           needsRerendering: true
         }
       });
@@ -1119,6 +1119,7 @@ const commandsModule = ({
       updateViewportsForSegmentationRendering({
         viewportId,
         servicesManager,
+        displaySet,
         loadFn: async () => {
           const currentSegmentations = segmentationService.getSegmentations();
           const segmentationId = await segmentationService.createSegmentationForDisplaySet(displaySetInstanceUID, {
@@ -1225,7 +1226,7 @@ const commandsModule = ({
       updateViewportsForSegmentationRendering({
         viewportId,
         servicesManager,
-        referencedDisplaySetInstanceUID: displaySet.referencedDisplaySetInstanceUID,
+        displaySet,
         loadFn: async () => {
           const segDisplaySet = displaySet;
           const suppressEvents = false;

package/dist/app-config.js

@@ -1,4 +1,6 @@
-window.config = {
+/** @type {AppTypes.Config} */
+
+const config = {
   routerBasename: '/',
   // whiteLabeling: {},
   extensions: [],
@@ -232,3 +234,5 @@ window.config = {
     },
   ],
 };
+
+window.config = config;