@ohif/app 3.7.0-beta.98 → 3.7.0

package/dist/{221.bundle.772f38088c3079c8035b.js → 221.bundle.a331e2a9a29f9599fd40.js}

@@ -642,8 +642,13 @@ function PanelSegmentation(_ref) {
       });
     }
   };
+  const onSegmentationDownloadRTSS = segmentationId => {
+    commandsManager.runCommand('downloadRTSS', {
+      segmentationId
+    });
+  };
   return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
-    className: "flex min-h-0 flex-auto select-none flex-col justify-between"
+    className: "ohif-scrollbar flex min-h-0 flex-auto select-none flex-col justify-between overflow-auto"
   }, /*#__PURE__*/react.createElement(ui_src/* SegmentationGroupTable */.cX, {
     title: t('Segmentations'),
     segmentations: segmentations,
@@ -653,6 +658,7 @@ function PanelSegmentation(_ref) {
     onSegmentationClick: onSegmentationClick,
     onSegmentationDelete: onSegmentationDelete,
     onSegmentationDownload: onSegmentationDownload,
+    onSegmentationDownloadRTSS: onSegmentationDownloadRTSS,
     storeSegmentation: storeSegmentation,
     onSegmentationEdit: onSegmentationEdit,
     onSegmentClick: onSegmentClick,
@@ -706,9 +712,9 @@ const TOOL_TYPES = {
   SPHERE_BRUSH: 'SphereBrush',
   CIRCULAR_ERASER: 'CircularEraser',
   SPHERE_ERASER: 'SphereEraser',
-  CIRCLE_SCISSOR: 'CircleScissor',
-  RECTANGLE_SCISSOR: 'RectangleScissor',
-  SPHERE_SCISSOR: 'SphereScissor',
+  CIRCLE_SHAPE: 'CircleScissor',
+  RECTANGLE_SHAPE: 'RectangleScissor',
+  SPHERE_SHAPE: 'SphereScissor',
   THRESHOLD_CIRCULAR_BRUSH: 'ThresholdCircularBrush',
   THRESHOLD_SPHERE_BRUSH: 'ThresholdSphereBrush'
 };
@@ -727,7 +733,7 @@ const initialState = {
     mode: 'CircularEraser' // Can be 'CircularEraser' or 'SphereEraser'
   },
 
-  Scissors: {
+  Shapes: {
     brushSize: 15,
     mode: 'CircleScissor' // E.g., 'CircleScissor', 'RectangleScissor', or 'SphereScissor'
   },
@@ -966,24 +972,24 @@ function SegmentationToolbox(_ref) {
         onChange: value => setToolActive(value)
       }]
     }, {
-      name: 'Scissor',
-      icon: 'icon-tool-scissor',
+      name: 'Shapes',
+      icon: 'icon-tool-shape',
       disabled: !toolsEnabled,
-      active: state.activeTool === TOOL_TYPES.CIRCLE_SCISSOR || state.activeTool === TOOL_TYPES.RECTANGLE_SCISSOR || state.activeTool === TOOL_TYPES.SPHERE_SCISSOR,
-      onClick: () => setToolActive(TOOL_TYPES.CIRCLE_SCISSOR),
+      active: state.activeTool === TOOL_TYPES.CIRCLE_SHAPE || state.activeTool === TOOL_TYPES.RECTANGLE_SHAPE || state.activeTool === TOOL_TYPES.SPHERE_SHAPE,
+      onClick: () => setToolActive(TOOL_TYPES.CIRCLE_SHAPE),
       options: [{
         name: 'Mode',
         type: 'radio',
-        value: state.Scissors.mode,
-        id: 'scissor-mode',
+        value: state.Shapes.mode,
+        id: 'shape-mode',
         values: [{
-          value: TOOL_TYPES.CIRCLE_SCISSOR,
+          value: TOOL_TYPES.CIRCLE_SHAPE,
           label: 'Circle'
         }, {
-          value: TOOL_TYPES.RECTANGLE_SCISSOR,
+          value: TOOL_TYPES.RECTANGLE_SHAPE,
           label: 'Rectangle'
         }, {
-          value: TOOL_TYPES.SPHERE_SCISSOR,
+          value: TOOL_TYPES.SPHERE_SHAPE,
           label: 'Sphere'
         }],
         onChange: value => setToolActive(value)
@@ -1118,6 +1124,12 @@ const getPanelModule = _ref => {
   }];
 };
 /* harmony default export */ const src_getPanelModule = (getPanelModule);
+// EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Filters/General/ImageMarchingSquares.js + 2 modules
+var ImageMarchingSquares = __webpack_require__(49399);
+// EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/Core/DataArray.js
+var DataArray = __webpack_require__(54131);
+// EXTERNAL MODULE: ../../../node_modules/@kitware/vtk.js/Common/DataModel/ImageData.js + 2 modules
+var ImageData = __webpack_require__(96372);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/hydrationUtils.ts
 
 
@@ -1287,6 +1299,12 @@ function getUpdatedViewportsForSegmentation(_ref3) {
 
 
 
+
+
+
+const {
+  datasetToBlob
+} = dcmjs_es["default"].data;
 const {
   Cornerstone3D: {
     Segmentation: {
@@ -1295,6 +1313,13 @@ const {
     }
   }
 } = adapters_es.adaptersSEG;
+const {
+  Cornerstone3D: {
+    RTSS: {
+      generateRTSSFromSegmentations
+    }
+  }
+} = adapters_es.adaptersRT;
 const {
   downloadDICOMData
 } = adapters_es.helpers;
@@ -1608,6 +1633,34 @@ const commandsModule = _ref => {
       naturalizedReport.wadoRoot = dataSource.getConfig().wadoRoot;
       src.DicomMetadataStore.addInstances([naturalizedReport], true);
       return naturalizedReport;
+    },
+    /**
+     * Converts segmentations into RTSS for download.
+     * This sample function retrieves all segentations and passes to
+     * cornerstone tool adapter to convert to DICOM RTSS format. It then
+     * converts dataset to downloadable blob.
+     *
+     */
+    downloadRTSS: _ref8 => {
+      let {
+        segmentationId
+      } = _ref8;
+      const segmentations = segmentationService.getSegmentation(segmentationId);
+      const vtkUtils = {
+        vtkImageMarchingSquares: ImageMarchingSquares/* default */.ZP,
+        vtkDataArray: DataArray/* default */.ZP,
+        vtkImageData: ImageData/* default */.ZP
+      };
+      const RTSS = generateRTSSFromSegmentations(segmentations, src.classes.MetadataProvider, src.DicomMetadataStore, esm.cache, dist_esm.Enums, vtkUtils);
+      try {
+        const reportBlob = datasetToBlob(RTSS);
+
+        //Create a URL for the binary.
+        const objectUrl = URL.createObjectURL(reportBlob);
+        window.location.assign(objectUrl);
+      } catch (e) {
+        console.warn(e);
+      }
     }
   };
   const definitions = {
@@ -1631,6 +1684,9 @@ const commandsModule = _ref => {
     },
     storeSegmentation: {
       commandFn: actions.storeSegmentation
+    },
+    downloadRTSS: {
+      commandFn: actions.downloadRTSS
     }
   };
   return {

package/dist/{236.bundle.197bab4e86815ec4ca4a.js → 236.bundle.b09ef6a3c16be7ad1d05.js}

@@ -1738,8 +1738,8 @@ function MicroscopyPanel(props) {
     displaySetService
   } = servicesManager.services;
   (0,react.useEffect)(() => {
-    const viewport = props.viewports[props.activeViewportId];
-    if (viewport.displaySetInstanceUIDs[0]) {
+    const viewport = props.viewports.get(props.activeViewportId);
+    if (viewport?.displaySetInstanceUIDs[0]) {
       const displaySet = displaySetService.getDisplaySetByUID(viewport.displaySetInstanceUIDs[0]);
       if (displaySet) {
         setStudyInstanceUID(displaySet.StudyInstanceUID);

package/dist/{342.bundle.1d55f37e9c918e0825ec.js → 342.bundle.3f9ebc45fdc6d6879adc.js}

@@ -12,7 +12,7 @@ __webpack_require__.d(__webpack_exports__, {
   ContextMenuController: () => (/* reexport */ ContextMenuController),
   CustomizableContextMenuTypes: () => (/* reexport */ types_namespaceObject),
   createReportAsync: () => (/* reexport */ Actions_createReportAsync),
-  createReportDialogPrompt: () => (/* reexport */ createReportDialogPrompt),
+  createReportDialogPrompt: () => (/* reexport */ CreateReportDialogPrompt),
   "default": () => (/* binding */ default_src),
   dicomWebUtils: () => (/* reexport */ utils_namespaceObject),
   getStudiesForPatientByMRN: () => (/* reexport */ Panels_getStudiesForPatientByMRN)
@@ -831,7 +831,7 @@ class StaticWadoClient extends dicomweb_client_es.api.DICOMwebClient {
     if (!valueElem) {
       return false;
     }
-    if (valueElem.vr == 'DA') {
+    if (valueElem.vr === 'DA' && valueElem.Value?.[0]) {
       return this.compareDateRange(testValue, valueElem.Value[0]);
     }
     const value = valueElem.Value;
@@ -2166,8 +2166,8 @@ function ViewerHeader(_ref) {
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.7.0-beta.98";
-  const commitHash = "ebe8f71da22c1d24b58f889c5d803951e19817b6";
+  const versionNumber = "3.7.0";
+  const commitHash = "5ddf8a16027255d28dc01c1740099cf85bbcf458";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -2508,7 +2508,6 @@ function PanelStudyBrowser(_ref) {
   const [studyDisplayList, setStudyDisplayList] = (0,react.useState)([]);
   const [displaySets, setDisplaySets] = (0,react.useState)([]);
   const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = (0,react.useState)({});
-  const isMounted = (0,react.useRef)(true);
   const onDoubleClickThumbnailHandler = displaySetInstanceUID => {
     let updatedViewports = [];
     const viewportId = activeViewportId;
@@ -2585,9 +2584,6 @@ function PanelStudyBrowser(_ref) {
       }
       // When the image arrives, render it and store the result in the thumbnailImgSrcMap
       newImageSrcEntry[dSet.displaySetInstanceUID] = await getImageSrc(imageId);
-      if (!isMounted.current) {
-        return;
-      }
       setThumbnailImageSrcMap(prevState => {
         return {
           ...prevState,
@@ -2595,9 +2591,6 @@ function PanelStudyBrowser(_ref) {
         };
       });
     });
-    return () => {
-      isMounted.current = false;
-    };
   }, [StudyInstanceUIDs, dataSource, displaySetService, getImageSrc]);
 
   // ~~ displaySets
@@ -2944,14 +2937,13 @@ ActionButtons.defaultProps = {
 var lodash_debounce = __webpack_require__(8324);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
 ;// CONCATENATED MODULE: ../../../extensions/default/src/Panels/createReportDialogPrompt.tsx
-/* eslint-disable react/display-name */
 
 
 const CREATE_REPORT_DIALOG_RESPONSE = {
   CANCEL: 0,
   CREATE_REPORT: 1
 };
-function createReportDialogPrompt(uiDialogService, _ref) {
+function CreateReportDialogPrompt(uiDialogService, _ref) {
   let {
     extensionManager
   } = _ref;
@@ -3059,9 +3051,11 @@ function createReportDialogPrompt(uiDialogService, _ref) {
               });
             }
           };
-          return /*#__PURE__*/react.createElement(react.Fragment, null, dataSourcesOpts.length > 1 && /*#__PURE__*/react.createElement(ui_src/* Select */.Ph, {
+          return /*#__PURE__*/react.createElement(react.Fragment, null, dataSourcesOpts.length > 1 && window.config?.allowMultiSelectExport && /*#__PURE__*/react.createElement("div", null, /*#__PURE__*/react.createElement("label", {
+            className: "text-[14px] leading-[1.2] text-white"
+          }, "Data Source"), /*#__PURE__*/react.createElement(ui_src/* Select */.Ph, {
             closeMenuOnSelect: true,
-            className: "border-primary-main mr-2 bg-black",
+            className: "border-primary-main  mt-2 bg-black",
             options: dataSourcesOpts,
             placeholder: dataSourcesOpts.find(option => option.value === value.dataSourceName).placeHolder,
             value: value.dataSourceName,
@@ -3072,7 +3066,9 @@ function createReportDialogPrompt(uiDialogService, _ref) {
               }));
             },
             isClearable: false
-          }), /*#__PURE__*/react.createElement(ui_src/* Input */.II, {
+          })), /*#__PURE__*/react.createElement("div", {
+            className: "mt-3"
+          }, /*#__PURE__*/react.createElement(ui_src/* Input */.II, {
             autoFocus: true,
             label: "Enter the report name",
             labelClassName: "text-white text-[14px] leading-[1.2]",
@@ -3082,7 +3078,7 @@ function createReportDialogPrompt(uiDialogService, _ref) {
             onChange: onChangeHandler,
             onKeyPress: onKeyPressHandler,
             required: true
-          }));
+          })));
         }
       }
     });
@@ -3279,7 +3275,7 @@ function PanelMeasurementTable(_ref) {
       });
       return;
     }
-    const promptResult = await createReportDialogPrompt(uiDialogService, {
+    const promptResult = await CreateReportDialogPrompt(uiDialogService, {
       extensionManager
     });
     if (promptResult.action === CREATE_REPORT_DIALOG_RESPONSE.CREATE_REPORT) {
@@ -3801,11 +3797,11 @@ function checkSingleFrames(instances, messages) {
  */
 function getDisplaySetMessages(instances, isReconstructable) {
   const messages = new src/* DisplaySetMessageList */.iK();
-  const firstInstance = instances[0];
-  if (!instances.length || firstInstance) {
+  if (!instances.length) {
     messages.addMessage(src/* DisplaySetMessage */.Lt.CODES.NO_VALID_INSTANCES);
     return;
   }
+  const firstInstance = instances[0];
   const {
     Modality,
     ImageType,
@@ -5570,6 +5566,7 @@ const commandsModule = _ref => {
         stageIndex,
         reset = false
       } = _ref3;
+      const primaryToolBeforeHPChange = toolbarService.getActivePrimaryTool();
       try {
         // Stores in the state the display set selector id to displaySetUID mapping
         // Pass in viewportId for the active viewport.  This item will get set as
@@ -5632,7 +5629,27 @@ const commandsModule = _ref => {
         const {
           protocol
         } = hangingProtocolService.getActiveProtocol();
-        actions.toggleHpTools(protocol);
+        actions.toggleHpTools();
+
+        // try to use the same tool in the new hanging protocol stage
+        const primaryButton = toolbarService.getButton(primaryToolBeforeHPChange);
+        if (primaryButton) {
+          // is there any type of interaction on this button, if not it might be in the
+          // items. This is a bit of a hack, but it works for now.
+
+          let interactionType = primaryButton.props?.interactionType;
+          if (!interactionType && primaryButton.props?.items) {
+            const firstItem = primaryButton.props.items[0];
+            interactionType = firstItem.props?.interactionType || firstItem.props?.type;
+          }
+          if (interactionType) {
+            toolbarService.recordInteraction({
+              interactionType,
+              ...primaryButton.props
+            });
+          }
+        }
+
         // Send the notification about updating the state
         if (protocolId !== hpInfo.protocolId) {
           // The old protocol callbacks are used for turning off things
@@ -5645,7 +5662,8 @@ const commandsModule = _ref => {
         commandsManager.run(protocol.callbacks?.onProtocolEnter);
         return true;
       } catch (e) {
-        actions.toggleHpTools(hangingProtocolService.getActiveProtocol());
+        console.error(e);
+        actions.toggleHpTools();
         uiNotificationService.show({
           title: 'Apply Hanging Protocol',
           message: 'The hanging protocol could not be applied.',

package/dist/{359.bundle.fed8617ddfa6afa1328a.js → 359.bundle.aa2adce78c3935aa19c1.js}

@@ -236,9 +236,7 @@ const toolbarButtons = [
     // toolGroupIds.MPR,
     ])], 'Arrow Annotate'), _createToolButton('EllipticalROI', 'tool-elipse', 'Ellipse', [..._createCommands('setToolActive', 'EllipticalROI', [toolGroupIds.CT, toolGroupIds.PT, toolGroupIds.Fusion
     // toolGroupIds.MPR,
-    ])], 'Ellipse Tool'), _createToolButton('CircleROI', 'tool-circle', 'Circle', [..._createCommands('setToolActive', 'CircleROI', [toolGroupIds.CT, toolGroupIds.PT, toolGroupIds.Fusion
-    // toolGroupIds.MPR,
-    ])], 'Circle Tool')]
+    ])], 'Ellipse Tool')]
   }
 },
 // Zoom..

package/dist/{370.bundle.1a6cbcbde7c8207d2864.js → 370.bundle.31f3d861d96bdd540dc7.js}

@@ -709,7 +709,7 @@ const dicomSeg = {
   viewport: '@ohif/extension-cornerstone-dicom-seg.viewportModule.dicom-seg',
   panel: '@ohif/extension-cornerstone-dicom-seg.panelModule.panelSegmentation'
 };
-const dicomRt = {
+const dicomRT = {
   viewport: '@ohif/extension-cornerstone-dicom-rt.viewportModule.dicom-rt',
   sopClassHandler: '@ohif/extension-cornerstone-dicom-rt.sopClassHandlerModule.dicom-rt'
 };
@@ -869,8 +869,8 @@ function modeFactory(_ref) {
               namespace: dicomSeg.viewport,
               displaySetsToDisplay: [dicomSeg.sopClassHandler]
             }, {
-              namespace: dicomRt.viewport,
-              displaySetsToDisplay: [dicomRt.sopClassHandler]
+              namespace: dicomRT.viewport,
+              displaySetsToDisplay: [dicomRT.sopClassHandler]
             }]
           }
         };
@@ -883,7 +883,7 @@ function modeFactory(_ref) {
     // the same sop class under different situations.  In that case, the more
     // general handler needs to come last.  For this case, the dicomvideo must
     // come first to remove video transfer syntax before ohif uses images
-    sopClassHandlers: [dicomvideo.sopClassHandler, dicomSeg.sopClassHandler, ohif.sopClassHandler, dicompdf.sopClassHandler, dicomsr.sopClassHandler, dicomRt.sopClassHandler],
+    sopClassHandlers: [dicomvideo.sopClassHandler, dicomSeg.sopClassHandler, ohif.sopClassHandler, dicompdf.sopClassHandler, dicomsr.sopClassHandler, dicomRT.sopClassHandler],
     hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings],
     ...modeConfiguration
   };

package/dist/{743.bundle.4bfe6e562ffb2c22708f.js → 743.bundle.489f7df3a089d4d374e1.js}

@@ -45257,6 +45257,19 @@ class VolumeViewport extends RenderingEngine_BaseVolumeViewport {
             throw new Error(`imageVolume with id: ${volumeActor.uid} does not exist in cache`);
         }
         helpers_setDefaultVolumeVOI(volumeActor.actor, imageVolume, false);
+        const range = volumeActor.actor
+            .getProperty()
+            .getRGBTransferFunction(0)
+            .getMappingRange();
+        const eventDetails = {
+            viewportId: volumeActor.uid,
+            range: {
+                lower: range[0],
+                upper: range[1],
+            },
+            volumeId: volumeActor.uid,
+        };
+        triggerEvent(this.element, enums_Events.VOI_MODIFIED, eventDetails);
     }
 }
 /* harmony default export */ const RenderingEngine_VolumeViewport = (VolumeViewport);