@ohif/app 3.8.0-beta.73 → 3.8.0-beta.74

package/dist/{425.bundle.f796ed1020fbed0f1e71.js → 335.bundle.ec53cc58116ef1dc5fa3.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[425,481],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[335],{
 
-/***/ 42048:
+/***/ 27335:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -723,10 +723,10 @@ var react = __webpack_require__(41766);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(11374);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 542 modules
-var src = __webpack_require__(48804);
-// EXTERNAL MODULE: ../../core/src/index.ts + 68 modules
-var core_src = __webpack_require__(85073);
+// 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: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(80619);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelPetSUV.tsx
@@ -970,318 +970,22 @@ PanelPetSUV.propTypes = {
     }).isRequired
   }).isRequired
 };
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 78 modules
-var default_src = __webpack_require__(54090);
-;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/segmentationEditHandler.tsx
-
-
-function segmentationItemEditHandler({
-  id,
-  servicesManager
-}) {
-  const {
-    segmentationService,
-    uiDialogService
-  } = servicesManager.services;
-  const segmentation = segmentationService.getSegmentation(id);
-  const onSubmitHandler = ({
-    action,
-    value
-  }) => {
-    switch (action.id) {
-      case 'save':
-        {
-          segmentationService.addOrUpdateSegmentation({
-            ...segmentation,
-            ...value
-          }, false,
-          // don't suppress event
-          true // it should update cornerstone
-          );
-        }
-    }
-    uiDialogService.dismiss({
-      id: 'enter-annotation'
-    });
-  };
-  uiDialogService.create({
-    id: 'enter-annotation',
-    centralize: true,
-    isDraggable: false,
-    showOverlay: true,
-    content: src/* Dialog */.lG,
-    contentProps: {
-      title: 'Enter your Segmentation',
-      noCloseButton: true,
-      value: {
-        label: segmentation.label || ''
-      },
-      body: ({
-        value,
-        setValue
-      }) => {
-        const onChangeHandler = event => {
-          event.persist();
-          setValue(value => ({
-            ...value,
-            label: event.target.value
-          }));
-        };
-        const onKeyPressHandler = event => {
-          if (event.key === 'Enter') {
-            onSubmitHandler({
-              value,
-              action: {
-                id: 'save'
-              }
-            });
-          }
-        };
-        return /*#__PURE__*/react.createElement(src/* Input */.pd, {
-          autoFocus: true,
-          className: "border-primary-main bg-black",
-          type: "text",
-          containerClassName: "mr-2",
-          value: value.label,
-          onChange: onChangeHandler,
-          onKeyPress: onKeyPressHandler
-        });
-      },
-      actions: [{
-        id: 'cancel',
-        text: 'Cancel',
-        type: src/* ButtonEnums.type */.Ny.NW.secondary
-      }, {
-        id: 'save',
-        text: 'Save',
-        type: src/* ButtonEnums.type */.Ny.NW.primary
-      }],
-      onSubmit: onSubmitHandler
-    }
-  });
-}
-/* harmony default export */ const segmentationEditHandler = (segmentationItemEditHandler);
-;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/ExportReports.tsx
-
-
-
-function ExportReports({
-  segmentations,
-  tmtvValue,
-  config,
-  commandsManager
-}) {
-  const {
-    t
-  } = (0,es/* useTranslation */.Bd)('PanelSUVExport');
-  return /*#__PURE__*/react.createElement(react.Fragment, null, segmentations?.length ? /*#__PURE__*/react.createElement("div", {
-    className: "mt-4 flex justify-center space-x-2"
-  }, /*#__PURE__*/react.createElement(src/* LegacyButtonGroup */.xA, {
-    color: "black",
-    size: "inherit"
-  }, /*#__PURE__*/react.createElement(src/* LegacyButton */._H, {
-    className: "px-2 py-2 text-base",
-    disabled: tmtvValue === null,
-    onClick: () => {
-      commandsManager.runCommand('exportTMTVReportCSV', {
-        segmentations,
-        tmtv: tmtvValue,
-        config
-      });
-    }
-  }, t('Export CSV'))), /*#__PURE__*/react.createElement(src/* LegacyButtonGroup */.xA, {
-    color: "black",
-    size: "inherit"
-  }, /*#__PURE__*/react.createElement(src/* LegacyButton */._H, {
-    className: "px-2 py-2 text-base",
-    onClick: () => {
-      commandsManager.runCommand('createTMTVRTReport');
-    },
-    disabled: tmtvValue === null
-  }, t('Create RT Report')))) : null);
-}
-/* harmony default export */ const PanelROIThresholdSegmentation_ExportReports = (ExportReports);
-;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/callInputDialog.tsx
-
-
-function callInputDialog(uiDialogService, label, callback) {
-  const dialogId = 'enter-segment-label';
-  const onSubmitHandler = ({
-    action,
-    value
-  }) => {
-    switch (action.id) {
-      case 'save':
-        callback(value.label, action.id);
-        break;
-      case 'cancel':
-        callback('', action.id);
-        break;
-    }
-    uiDialogService.dismiss({
-      id: dialogId
-    });
-  };
-  if (uiDialogService) {
-    uiDialogService.create({
-      id: dialogId,
-      centralize: true,
-      isDraggable: false,
-      showOverlay: true,
-      content: src/* Dialog */.lG,
-      contentProps: {
-        title: 'Segment',
-        value: {
-          label
-        },
-        noCloseButton: true,
-        onClose: () => uiDialogService.dismiss({
-          id: dialogId
-        }),
-        actions: [{
-          id: 'cancel',
-          text: 'Cancel',
-          type: src/* ButtonEnums.type */.Ny.NW.secondary
-        }, {
-          id: 'save',
-          text: 'Confirm',
-          type: src/* ButtonEnums.type */.Ny.NW.primary
-        }],
-        onSubmit: onSubmitHandler,
-        body: ({
-          value,
-          setValue
-        }) => {
-          return /*#__PURE__*/react.createElement(src/* Input */.pd, {
-            label: "Enter the segment label",
-            labelClassName: "text-white text-[14px] leading-[1.2]",
-            autoFocus: true,
-            className: "border-primary-main bg-black",
-            type: "text",
-            value: value.label,
-            onChange: event => {
-              event.persist();
-              setValue(value => ({
-                ...value,
-                label: event.target.value
-              }));
-            },
-            onKeyPress: event => {
-              if (event.key === 'Enter') {
-                onSubmitHandler({
-                  value,
-                  action: {
-                    id: 'save'
-                  }
-                });
-              }
-            }
-          });
-        }
-      }
-    });
-  }
-}
-/* harmony default export */ const PanelROIThresholdSegmentation_callInputDialog = (callInputDialog);
-// EXTERNAL MODULE: ../../../node_modules/react-color/es/index.js + 219 modules
-var react_color_es = __webpack_require__(13726);
-;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/colorPickerDialog.css
-// extracted by mini-css-extract-plugin
-
-;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/colorPickerDialog.tsx
-
-
-
-
-function callColorPickerDialog(uiDialogService, rgbaColor, callback) {
-  const dialogId = 'pick-color';
-  const onSubmitHandler = ({
-    action,
-    value
-  }) => {
-    switch (action.id) {
-      case 'save':
-        callback(value.rgbaColor, action.id);
-        break;
-      case 'cancel':
-        callback('', action.id);
-        break;
-    }
-    uiDialogService.dismiss({
-      id: dialogId
-    });
-  };
-  if (uiDialogService) {
-    uiDialogService.create({
-      id: dialogId,
-      centralize: true,
-      isDraggable: false,
-      showOverlay: true,
-      content: src/* Dialog */.lG,
-      contentProps: {
-        title: 'Segment Color',
-        value: {
-          rgbaColor
-        },
-        noCloseButton: true,
-        onClose: () => uiDialogService.dismiss({
-          id: dialogId
-        }),
-        actions: [{
-          id: 'cancel',
-          text: 'Cancel',
-          type: 'primary'
-        }, {
-          id: 'save',
-          text: 'Save',
-          type: 'secondary'
-        }],
-        onSubmit: onSubmitHandler,
-        body: ({
-          value,
-          setValue
-        }) => {
-          const handleChange = color => {
-            setValue({
-              rgbaColor: color.rgb
-            });
-          };
-          return /*#__PURE__*/react.createElement(react_color_es/* ChromePicker */.xk, {
-            color: value.rgbaColor,
-            onChange: handleChange,
-            presetColors: [],
-            width: 300
-          });
-        }
-      }
-    });
-  }
-}
-/* harmony default export */ const colorPickerDialog = (callColorPickerDialog);
-;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdSegmentation.tsx
-
-
-
-
+;// CONCATENATED MODULE: ../../../extensions/tmtv/src/Panels/PanelROIThresholdSegmentation/PanelROIThresholdExport.tsx
 
 
 
 
 function PanelRoiThresholdSegmentation({
   servicesManager,
-  commandsManager,
-  extensionManager
+  commandsManager
 }) {
   const {
-    segmentationService,
-    viewportGridService,
-    uiDialogService
+    segmentationService
   } = servicesManager.services;
-  const [selectedSegmentationId, setSelectedSegmentationId] = (0,react.useState)(null);
+  const {
+    t
+  } = (0,es/* useTranslation */.Bd)('PanelSUVExport');
   const [segmentations, setSegmentations] = (0,react.useState)(() => segmentationService.getSegmentations());
-  const runCommand = (0,react.useCallback)((commandName, commandOptions = {}) => {
-    return commandsManager.runCommand(commandName, commandOptions);
-  }, [commandsManager]);
 
   /**
    * Update UI based on segmentation changes (added, removed, updated)
@@ -1307,178 +1011,41 @@ function PanelRoiThresholdSegmentation({
       });
     };
   }, []);
-  const onSegmentationClick = segmentationId => {
-    segmentationService.setActiveSegmentationForToolGroup(segmentationId);
-    setSelectedSegmentationId(segmentationId);
-  };
-  const onSegmentationAdd = async () => {
-    runCommand('createNewLabelmapFromPT').then(segmentationId => {
-      setSelectedSegmentationId(segmentationId);
-    });
-  };
-  const onSegmentAdd = segmentationId => {
-    segmentationService.addSegment(segmentationId);
-  };
-  const getToolGroupIds = segmentationId => {
-    const toolGroupIds = segmentationService.getToolGroupIdsWithSegmentation(segmentationId);
-    return toolGroupIds;
-  };
-  const onSegmentClick = (segmentationId, segmentIndex) => {
-    segmentationService.setActiveSegment(segmentationId, segmentIndex);
-    const toolGroupIds = getToolGroupIds(segmentationId);
-    toolGroupIds.forEach(toolGroupId => {
-      // const toolGroupId =
-      segmentationService.setActiveSegmentationForToolGroup(segmentationId, toolGroupId);
-      segmentationService.jumpToSegmentCenter(segmentationId, segmentIndex, toolGroupId);
-    });
-  };
-  const _setSegmentationConfiguration = (0,react.useCallback)((segmentationId, key, value) => {
-    segmentationService.setConfiguration({
-      segmentationId,
-      [key]: value
-    });
-  }, [segmentationService]);
-  const onToggleSegmentVisibility = (segmentationId, segmentIndex) => {
-    const segmentation = segmentationService.getSegmentation(segmentationId);
-    const segmentInfo = segmentation.segments[segmentIndex];
-    const isVisible = !segmentInfo.isVisible;
-    const toolGroupIds = getToolGroupIds(segmentationId);
-    toolGroupIds.forEach(toolGroupId => {
-      segmentationService.setSegmentVisibility(segmentationId, segmentIndex, isVisible, toolGroupId);
-    });
-  };
-  const onSegmentDelete = (segmentationId, segmentIndex) => {
-    segmentationService.removeSegment(segmentationId, segmentIndex);
-  };
-  const onSegmentEdit = (segmentationId, segmentIndex) => {
-    const segmentation = segmentationService.getSegmentation(segmentationId);
-    const segment = segmentation.segments[segmentIndex];
-    const {
-      label
-    } = segment;
-    PanelROIThresholdSegmentation_callInputDialog(uiDialogService, label, (label, actionId) => {
-      if (label === '') {
-        return;
-      }
-      segmentationService.setSegmentLabel(segmentationId, segmentIndex, label);
-    });
-  };
-  const onToggleSegmentLock = (segmentationId, segmentIndex) => {
-    segmentationService.toggleSegmentLocked(segmentationId, segmentIndex);
-  };
-  const onSegmentColorClick = (segmentationId, segmentIndex) => {
-    const segmentation = segmentationService.getSegmentation(segmentationId);
-    const segment = segmentation.segments[segmentIndex];
-    const {
-      color,
-      opacity
-    } = segment;
-    const rgbaColor = {
-      r: color[0],
-      g: color[1],
-      b: color[2],
-      a: opacity / 255.0
-    };
-    colorPickerDialog(uiDialogService, rgbaColor, (newRgbaColor, actionId) => {
-      if (actionId === 'cancel') {
-        return;
-      }
-      segmentationService.setSegmentRGBAColor(segmentationId, segmentIndex, [newRgbaColor.r, newRgbaColor.g, newRgbaColor.b, newRgbaColor.a * 255.0]);
-    });
-  };
-  const storeSegmentation = async segmentationId => {
-    const datasources = extensionManager.getActiveDataSource();
-    const displaySetInstanceUIDs = await (0,default_src.createReportAsync)({
-      servicesManager,
-      getReport: () => commandsManager.runCommand('storeSegmentation', {
-        segmentationId,
-        dataSource: datasources[0]
-      }),
-      reportType: 'Segmentation'
-    });
-
-    // Show the exported report in the active viewport as read only (similar to SR)
-    if (displaySetInstanceUIDs) {
-      // clear the segmentation that we exported, similar to the storeMeasurement
-      // where we remove the measurements and prompt again the user if they would like
-      // to re-read the measurements in a SR read only viewport
-      segmentationService.remove(segmentationId);
-      viewportGridService.setDisplaySetsForViewport({
-        viewportId: viewportGridService.getActiveViewportId(),
-        displaySetInstanceUIDs
-      });
-    }
-  };
-  const onSegmentationDownloadRTSS = segmentationId => {
-    commandsManager.runCommand('downloadRTSS', {
-      segmentationId
-    });
-  };
-  const onSegmentationDownload = segmentationId => {
-    commandsManager.runCommand('downloadSegmentation', {
-      segmentationId
-    });
-  };
   const tmtvValue = segmentations?.[0]?.cachedStats?.tmtv?.value || null;
   const config = segmentations?.[0]?.cachedStats?.tmtv?.config || {};
-  return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
-    className: "flex flex-col"
-  }, /*#__PURE__*/react.createElement("div", {
-    className: "invisible-scrollbar overflow-y-auto overflow-x-hidden"
-  }, /*#__PURE__*/react.createElement("div", {
-    className: "flex min-h-0 flex-col bg-black text-[13px] font-[300]"
-  }, /*#__PURE__*/react.createElement(src/* SegmentationGroupTableExpanded */.fO, {
-    disableEditing: false,
-    showAddSegmentation: true,
-    showAddSegment: false,
-    showDeleteSegment: true,
-    segmentations: segmentations,
-    onSegmentationAdd: onSegmentationAdd,
-    onSegmentationClick: onSegmentationClick,
-    onToggleSegmentationVisibility: id => {
-      segmentationService.toggleSegmentationVisibility(id);
-    },
-    onToggleSegmentVisibility: onToggleSegmentVisibility,
-    onSegmentationDelete: id => {
-      segmentationService.remove(id);
-    },
-    onSegmentationEdit: id => {
-      segmentationEditHandler({
-        id,
-        servicesManager
+  const actions = [{
+    label: 'Export CSV',
+    onClick: () => {
+      commandsManager.runCommand('exportTMTVReportCSV', {
+        segmentations,
+        tmtv: tmtvValue,
+        config
       });
     },
-    segmentationConfig: {
-      initialConfig: segmentationService.getConfiguration()
+    disabled: tmtvValue === null
+  }, {
+    label: 'Create RT Report',
+    onClick: () => {
+      commandsManager.runCommand('createTMTVRTReport');
     },
-    onSegmentAdd: onSegmentAdd,
-    onSegmentClick: onSegmentClick,
-    onSegmentDelete: onSegmentDelete,
-    onSegmentEdit: onSegmentEdit,
-    onToggleSegmentLock: onToggleSegmentLock,
-    onSegmentColorClick: onSegmentColorClick,
-    storeSegmentation: storeSegmentation,
-    onSegmentationDownloadRTSS: onSegmentationDownloadRTSS,
-    onSegmentationDownload: onSegmentationDownload,
-    setRenderOutline: value => _setSegmentationConfiguration(selectedSegmentationId, 'renderOutline', value),
-    setOutlineOpacityActive: value => _setSegmentationConfiguration(selectedSegmentationId, 'outlineOpacity', value),
-    setRenderFill: value => _setSegmentationConfiguration(selectedSegmentationId, 'renderFill', value),
-    setRenderInactiveSegmentations: value => _setSegmentationConfiguration(selectedSegmentationId, 'renderInactiveSegmentations', value),
-    setOutlineWidthActive: value => _setSegmentationConfiguration(selectedSegmentationId, 'outlineWidthActive', value),
-    setFillAlpha: value => _setSegmentationConfiguration(selectedSegmentationId, 'fillAlpha', value),
-    setFillAlphaInactive: value => _setSegmentationConfiguration(selectedSegmentationId, 'fillAlphaInactive', value)
-  })), tmtvValue !== null ? /*#__PURE__*/react.createElement("div", {
+    disabled: tmtvValue === null
+  }];
+  return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
+    className: "mt-1 flex flex-col"
+  }, /*#__PURE__*/react.createElement("div", {
+    className: "invisible-scrollbar overflow-y-auto overflow-x-hidden"
+  }, tmtvValue !== null ? /*#__PURE__*/react.createElement("div", {
     className: "bg-secondary-dark mt-1 flex items-baseline justify-between px-2 py-1"
   }, /*#__PURE__*/react.createElement("span", {
     className: "text-base font-bold uppercase tracking-widest text-white"
   }, 'TMTV:'), /*#__PURE__*/react.createElement("div", {
     className: "text-white"
-  }, `${tmtvValue} mL`)) : null, /*#__PURE__*/react.createElement(PanelROIThresholdSegmentation_ExportReports, {
-    segmentations: segmentations,
-    tmtvValue: tmtvValue,
-    config: config,
-    commandsManager: commandsManager
-  }))), /*#__PURE__*/react.createElement("div", {
+  }, `${tmtvValue} mL`)) : null, /*#__PURE__*/react.createElement("div", {
+    className: "mt-1 flex justify-center"
+  }, /*#__PURE__*/react.createElement(src/* ActionButtons */.wr, {
+    actions: actions,
+    t: t
+  })))), /*#__PURE__*/react.createElement("div", {
     className: "absolute bottom-1 flex cursor-pointer items-center justify-center text-blue-400 opacity-50 hover:opacity-80",
     onClick: () => {
       // navigate to a url in a new tab
@@ -1535,17 +1102,19 @@ function getPanelModule({
       servicesManager: servicesManager
     });
   };
-  const wrappedROIThresholdSeg = () => {
+  const wrappedROIThresholdToolbox = () => {
     return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(src/* Toolbox */.OO, {
       commandsManager: commandsManager,
       servicesManager: servicesManager,
       extensionManager: extensionManager,
-      buttonSectionId: "tmtvToolbox",
+      buttonSectionId: "ROIThresholdToolbox",
       title: "Threshold Tools"
-    }), /*#__PURE__*/react.createElement(PanelROIThresholdSegmentation, {
+    }));
+  };
+  const wrappedROIThresholdExport = () => {
+    return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(PanelROIThresholdSegmentation, {
       commandsManager: commandsManager,
-      servicesManager: servicesManager,
-      extensionManager: extensionManager
+      servicesManager: servicesManager
     }));
   };
   return [{
@@ -1555,20 +1124,26 @@ function getPanelModule({
     label: 'Patient Info',
     component: wrappedPanelPetSuv
   }, {
-    name: 'ROIThresholdSeg',
+    name: 'tmtvBox',
+    iconName: 'tab-segmentation',
+    iconLabel: 'Segmentation',
+    label: 'Segmentation Toolbox',
+    component: wrappedROIThresholdToolbox
+  }, {
+    name: 'tmtvExport',
     iconName: 'tab-segmentation',
     iconLabel: 'Segmentation',
-    label: 'Segmentation',
-    component: wrappedROIThresholdSeg
+    label: 'Segmentation Export',
+    component: wrappedROIThresholdExport
   }];
 }
 /* harmony default export */ const src_getPanelModule = (getPanelModule);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 16 modules
-var esm = __webpack_require__(20767);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 18 modules
+var esm = __webpack_require__(24542);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/constants/supportedTools.js
 /* harmony default export */ const supportedTools = (['RectangleROIStartEndThreshold']);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 383 modules
-var dist_esm = __webpack_require__(50719);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 327 modules
+var dist_esm = __webpack_require__(44656);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/utils/getSOPInstanceAttributes.js
 
 function getSOPInstanceAttributes(imageId) {
@@ -1687,8 +1262,8 @@ function init({
   const csTools3DVer1MeasurementSource = measurementService.getSource(CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION);
   measurementService.addMapping(csTools3DVer1MeasurementSource, 'RectangleROIStartEndThreshold', RectangleROIStartEndThreshold.matchingCriteria, RectangleROIStartEndThreshold.toAnnotation, RectangleROIStartEndThreshold.toMeasurement);
 }
-// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
-var gl_matrix_esm = __webpack_require__(83636);
+// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
+var gl_matrix_esm = __webpack_require__(44753);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/getThresholdValue.ts
 
 function getRoiStats(referencedVolume, annotations) {
@@ -1770,21 +1345,21 @@ function calculateSuvPeak(labelmap, referenceVolume, annotations, segmentIndex =
   if (referenceVolume.metadata.Modality !== 'PT') {
     return;
   }
-  if (labelmap.scalarData.length !== referenceVolume.scalarData.length) {
+  const labelmapData = labelmap.getScalarData();
+  const referenceVolumeData = referenceVolume.getScalarData();
+  if (labelmapData.length !== referenceVolumeData.length) {
     throw new Error('labelmap and referenceVolume must have the same number of pixels');
   }
   const {
-    scalarData: labelmapData,
     dimensions,
     imageData: labelmapImageData
   } = labelmap;
   const {
-    scalarData: referenceVolumeData,
     imageData: referenceVolumeImageData
   } = referenceVolume;
   let boundsIJK;
   // Todo: using the first annotation for now
-  if (annotations && annotations[0].data?.cachedStats) {
+  if (annotations?.length && annotations[0].data?.cachedStats) {
     const {
       projectionPoints
     } = annotations[0].data.cachedStats;
@@ -1889,7 +1464,7 @@ function calculateTMTV(labelmaps, segmentIndex = 1) {
 }
 /* harmony default export */ const utils_calculateTMTV = (calculateTMTV);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/createAndDownloadTMTVReport.js
-function createAndDownloadTMTVReport(segReport, additionalReportRows) {
+function createAndDownloadTMTVReport(segReport, additionalReportRows, options = {}) {
   const firstReport = segReport[Object.keys(segReport)[0]];
   const columns = Object.keys(firstReport);
   const csv = [columns.join(',')];
@@ -1925,7 +1500,7 @@ function createAndDownloadTMTVReport(segReport, additionalReportRows) {
   const url = URL.createObjectURL(blob);
   const a = document.createElement('a');
   a.href = url;
-  a.download = `${firstReport.PatientID}_tmtv.csv`;
+  a.download = options.filename ?? `${firstReport.PatientID}_tmtv.csv`;
   a.click();
 }
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
@@ -1963,7 +1538,7 @@ function dicomRTAnnotationExport(annotations) {
 
 
 const commandsModule_metadataProvider = core_src.classes.MetadataProvider;
-const RECTANGLE_ROI_THRESHOLD_MANUAL = 'RectangleROIStartEndThreshold';
+const RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS = ['RectangleROIStartEndThreshold', 'RectangleROIThreshold'];
 const LABELMAP = esm.Enums.SegmentationRepresentations.Labelmap;
 const commandsModule = ({
   servicesManager,
@@ -2011,6 +1586,12 @@ const commandsModule = ({
     });
     return toolGroupIds;
   }
+  function _getAnnotationsSelectedByToolNames(toolNames) {
+    return toolNames.reduce((allAnnotationUIDs, toolName) => {
+      const annotationUIDs = esm.annotation.selection.getAnnotationsSelectedByToolName(toolName);
+      return allAnnotationUIDs.concat(annotationUIDs);
+    }, []);
+  }
   const actions = {
     getMatchingPTDisplaySet: ({
       viewportMatchDetails
@@ -2062,7 +1643,9 @@ const commandsModule = ({
       };
       return metadata;
     },
-    createNewLabelmapFromPT: async () => {
+    createNewLabelmapFromPT: async ({
+      label
+    }) => {
       // Create a segmentation of the same resolution as the source data
       // using volumeLoader.createAndCacheDerivedVolume.
       const {
@@ -2127,23 +1710,52 @@ const commandsModule = ({
       const {
         referencedVolumeId
       } = dist_esm.cache.getVolume(segVolumeId);
+      const annotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
+      if (annotationUIDs.length === 0) {
+        uiNotificationService.show({
+          title: 'Commands Module',
+          message: 'No ROIThreshold Tool is Selected',
+          type: 'error'
+        });
+        return;
+      }
       const labelmapVolume = dist_esm.cache.getVolume(segmentationId);
-      const referencedVolume = dist_esm.cache.getVolume(referencedVolumeId);
+      let referencedVolume = dist_esm.cache.getVolume(referencedVolumeId);
       const ctReferencedVolume = dist_esm.cache.getVolume(ctVolumeId);
+
+      // check if viewport is
+
       if (!referencedVolume) {
         throw new Error('No Reference volume found');
       }
       if (!labelmapVolume) {
         throw new Error('No Reference labelmap found');
       }
-      const annotationUIDs = esm.annotation.selection.getAnnotationsSelectedByToolName(RECTANGLE_ROI_THRESHOLD_MANUAL);
-      if (annotationUIDs.length === 0) {
-        uiNotificationService.show({
-          title: 'Commands Module',
-          message: 'No ROIThreshold Tool is Selected',
-          type: 'error'
+      const annotation = esm.annotation.state.getAnnotation(annotationUIDs[0]);
+      const {
+        metadata: {
+          enabledElement: {
+            viewport
+          }
+        }
+      } = annotation;
+      const showingReferenceVolume = viewport.hasVolumeId(referencedVolumeId);
+      if (!showingReferenceVolume) {
+        // if the reference volume is not being displayed, we can't
+        // rely on it for thresholding, we have couple of options here
+        // 1. We choose whatever volume is being displayed
+        // 2. We check if it is a fusion viewport, we pick the volume
+        // that matches the size and dimensions of the labelmap. This might
+        // happen if the 4D PT is converted to a computed volume and displayed
+        // and wants to threshold the labelmap
+        // 3. We throw an error
+        const displaySetInstanceUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewport.id);
+        displaySetInstanceUIDs.forEach(displaySetInstanceUID => {
+          const volume = dist_esm.cache.getVolumes().find(volume => volume.volumeId.includes(displaySetInstanceUID));
+          if (dist_esm.utilities.isEqual(volume.dimensions, labelmapVolume.dimensions) && dist_esm.utilities.isEqual(volume.spacing, labelmapVolume.spacing)) {
+            referencedVolume = volume;
+          }
         });
-        return;
       }
       const {
         ptLower,
@@ -2172,7 +1784,7 @@ const commandsModule = ({
         referencedVolumeId
       } = labelmap;
       const referencedVolume = dist_esm.cache.getVolume(referencedVolumeId);
-      const annotationUIDs = esm.annotation.selection.getAnnotationsSelectedByToolName(RECTANGLE_ROI_THRESHOLD_MANUAL);
+      const annotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
       const annotations = annotationUIDs.map(annotationUID => esm.annotation.state.getAnnotation(annotationUID));
       const suvPeak = calculateSUVPeak(labelmap, referencedVolume, annotations, segmentIndex);
       return {
@@ -2190,9 +1802,7 @@ const commandsModule = ({
         scalarData,
         spacing
       } = labelmap;
-      const {
-        scalarData: referencedScalarData
-      } = dist_esm.cache.getVolume(labelmap.referencedVolumeId);
+      const referencedScalarData = dist_esm.cache.getVolume(labelmap.referencedVolumeId).getScalarData();
       let segmentationMax = -Infinity;
       let segmentationMin = Infinity;
       let segmentationValues = [];
@@ -2242,7 +1852,8 @@ const commandsModule = ({
     exportTMTVReportCSV: ({
       segmentations,
       tmtv,
-      config
+      config,
+      options
     }) => {
       const segReport = commandsManager.runCommand('getSegmentationCSVReport', {
         segmentations
@@ -2251,11 +1862,6 @@ const commandsModule = ({
         segmentations
       });
       const additionalReportRows = [{
-        key: 'Total Metabolic Tumor Volume',
-        value: {
-          tmtv
-        }
-      }, {
         key: 'Total Lesion Glycolysis',
         value: {
           tlg: tlg.toFixed(4)
@@ -2266,7 +1872,15 @@ const commandsModule = ({
           ...config
         }
       }];
-      createAndDownloadTMTVReport(segReport, additionalReportRows);
+      if (tmtv !== undefined) {
+        additionalReportRows.unshift({
+          key: 'Total Metabolic Tumor Volume',
+          value: {
+            tmtv
+          }
+        });
+      }
+      createAndDownloadTMTVReport(segReport, additionalReportRows, options);
     },
     getTotalLesionGlycolysis: ({
       segmentations
@@ -2291,8 +1905,8 @@ const commandsModule = ({
         console.error('commandsModule::getTotalLesionGlycolysis:No referencedVolumeId found');
       }
       const ptVolume = dist_esm.cache.getVolume(referencedVolumeId);
-      const mergedLabelData = mergedLabelmap.scalarData;
-      if (mergedLabelData.length !== ptVolume.scalarData.length) {
+      const mergedLabelData = mergedLabelmap.getScalarData();
+      if (mergedLabelData.length !== ptVolume.getScalarData().length) {
         console.error('commandsModule::getTotalLesionGlycolysis:Labelmap and ptVolume are not the same size');
       }
       let suv = 0;
@@ -2300,7 +1914,7 @@ const commandsModule = ({
       for (let i = 0; i < mergedLabelData.length; i++) {
         // if not background
         if (mergedLabelData[i] !== 0) {
-          suv += ptVolume.scalarData[i];
+          suv += ptVolume.getScalarData()[i];
           totalLesionVoxelCount += 1;
         }
       }
@@ -2319,7 +1933,7 @@ const commandsModule = ({
         focalPoint,
         viewPlaneNormal
       } = viewport.getCamera();
-      const selectedAnnotationUIDs = esm.annotation.selection.getAnnotationsSelectedByToolName(RECTANGLE_ROI_THRESHOLD_MANUAL);
+      const selectedAnnotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
       const annotationUID = selectedAnnotationUIDs[0];
       const annotation = esm.annotation.state.getAnnotation(annotationUID);
       const {
@@ -2355,7 +1969,7 @@ const commandsModule = ({
       const {
         viewport
       } = _getActiveViewportsEnabledElement();
-      const selectedAnnotationUIDs = esm.annotation.selection.getAnnotationsSelectedByToolName(RECTANGLE_ROI_THRESHOLD_MANUAL);
+      const selectedAnnotationUIDs = _getAnnotationsSelectedByToolNames(RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS);
       const annotationUID = selectedAnnotationUIDs[0];
       const annotation = esm.annotation.state.getAnnotation(annotationUID);
 
@@ -2374,7 +1988,7 @@ const commandsModule = ({
       const annotations = [];
       Object.keys(stateManager.annotations).forEach(frameOfReferenceUID => {
         const forAnnotations = stateManager.annotations[frameOfReferenceUID];
-        const ROIAnnotations = forAnnotations[RECTANGLE_ROI_THRESHOLD_MANUAL];
+        const ROIAnnotations = RECTANGLE_ROI_THRESHOLD_MANUAL_TOOL_IDS.reduce((annotations, toolName) => [...annotations, ...(forAnnotations[toolName] ?? [])], []);
         annotations.push(...ROIAnnotations);
       });
       commandsManager.runCommand('exportRTReportForAnnotations', {
@@ -2436,7 +2050,7 @@ const commandsModule = ({
         }
         report[id] = {
           ...segReport,
-          PatientID: instance.PatientID,
+          PatientID: instance.PatientID ?? '000000',
           PatientName: instance.PatientName.Alphabetic,
           StudyInstanceUID: instance.StudyInstanceUID,
           SeriesInstanceUID: instance.SeriesInstanceUID,