@ohif/app 3.12.0-beta.90 → 3.12.0-beta.92

package/dist/{9548.bundle.7be4f24aeadd0ad4f16c.js → 9195.bundle.70afccd0f802b78c279a.js}

@@ -1,5 +1,5 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[9548],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[9195],{
 
 /***/ 52675:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -564,7 +564,7 @@ function _mapDisplaySets(displaySets, displaySetLoadingState, thumbnailImageSrcM
       seriesNumber: ds.SeriesNumber,
       modality: ds.Modality,
       seriesDate: formatDate(ds.SeriesDate),
-      numInstances: ds.numImageFrames,
+      numInstances: ds.numImageFrames ?? ds.instances?.length,
       loadingProgress,
       countIcon: ds.countIcon,
       messages: ds.messages,
@@ -749,7 +749,7 @@ function Toolbar({
 
 /***/ }),
 
-/***/ 39548:
+/***/ 39195:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -4662,8 +4662,35 @@ function _createGetImageSrcFromImageIdFn(extensionManager) {
 var PROMPT_RESPONSES = __webpack_require__(96357);
 ;// ../../../extensions/default/src/Panels/createReportDialogPrompt.tsx
 
+
+/**
+ * Creates and shows a report dialog prompt.
+ * The input for this is:
+ *   - `title` shown in the dialog
+ *   - `modality` being stored, used to query existing series
+ *   - `minSeriesNumber` is the start of new series of this modality type.
+ *     Will get set to 4000 if not determined by the modality
+ *   - predecessorImageId is the image id that this series was currently loaded
+ *     from.  That allows defaulting the dialog to show the specified series instead
+ *     of always creating a new series.
+ *
+ * The response is:
+ *   - `value`, the default name of the object/series being created
+ *   - `dataSourceName`, where to store the object to
+ *   - `series`, is the series to store do, as referenced by a predecessorImageId value.
+ *   - `priorSeriesNumber` is the previously lowest series number at least minSeriesNumber
+ *     of all the seris of the given modality type.
+ *
+ * This should be provided to the DICOM encoder, which will get the predecessor
+ * sequence from the metaData provider so that the saved series will replace
+ * the existing instance in the same series.
+ * This will be falsy for a new series.
+ */
 function CreateReportDialogPrompt({
   title = 'Create Report',
+  modality = 'SR',
+  minSeriesNumber = 0,
+  predecessorImageId,
   extensionManager,
   servicesManager
 }) {
@@ -4674,22 +4701,28 @@ function CreateReportDialogPrompt({
   const dataSources = extensionManager.getDataSourcesForUI();
   const ReportDialog = customizationService.getCustomization('ohif.createReportDialog');
   const allowMultipleDataSources = window.config.allowMultiSelectExport;
-  return new Promise(function (resolve, reject) {
+  minSeriesNumber ||= modality === 'SR' && 3000 || modality === 'SEG' && 3100 || modality === 'RTSTRUCT' && 3200 || 4000;
+  return new Promise(function (resolve) {
     uiDialogService.show({
       id: 'report-dialog',
       title,
       content: ReportDialog,
       contentProps: {
         dataSources: allowMultipleDataSources ? dataSources : undefined,
+        predecessorImageId,
+        minSeriesNumber,
+        modality,
         onSave: async ({
           reportName,
           dataSource: selectedDataSource,
-          series
+          series,
+          priorSeriesNumber
         }) => {
           resolve({
             value: reportName,
             dataSourceName: selectedDataSource,
             series,
+            priorSeriesNumber,
             action: PROMPT_RESPONSES/* default */.A.CREATE_REPORT
           });
         },
@@ -5047,7 +5080,8 @@ function getDisplaySetsFromUnsupportedSeries(instances) {
     SOPClassUID: instance.SOPClassUID,
     SeriesDescription: instance.SeriesDescription || '',
     Modality: instance.Modality,
-    numImageFrames: instances.length,
+    instances,
+    instance: instances[instance.length - 1],
     unsupported: true,
     SOPClassHandlerId: 'unsupported',
     isReconstructable: false,
@@ -7539,84 +7573,11 @@ async function createReportAsync({
   }
 }
 /* harmony default export */ const Actions_createReportAsync = (createReportAsync);
-;// ../../../extensions/default/src/utils/getSRSeriesAndInstanceNumber.js
-const MIN_SR_SERIES_NUMBER = 4700;
-function getNextSeriesNumber({
-  displaySetService,
-  modality,
-  minSeriesNumber
-}) {
-  const activeDisplaySets = displaySetService.getActiveDisplaySets();
-  const modalityDisplaySets = activeDisplaySets.filter(ds => ds.Modality === modality);
-  const modalitySeriesNumbers = modalityDisplaySets.map(ds => ds.SeriesNumber);
-  const maxSeriesNumber = Math.max(...modalitySeriesNumbers, minSeriesNumber);
-  const allSeriesNumbers = activeDisplaySets.map(ds => ds.SeriesNumber);
-  let finalSeriesNumber = maxSeriesNumber + 1;
-  while (allSeriesNumbers.includes(finalSeriesNumber)) {
-    finalSeriesNumber++;
-  }
-  return {
-    SeriesNumber: finalSeriesNumber,
-    InstanceNumber: 1
-  };
-}
-function getSRSeriesAndInstanceNumber({
-  displaySetService,
-  SeriesInstanceUid
-}) {
-  if (!SeriesInstanceUid) {
-    return getNextSeriesNumber({
-      displaySetService,
-      modality: 'SR',
-      minSeriesNumber: MIN_SR_SERIES_NUMBER
-    });
-  }
-  const displaySetsMap = displaySetService.getDisplaySetCache();
-  const displaySets = Array.from(displaySetsMap.values());
-  const srDisplaySet = displaySets.find(ds => ds.Modality === 'SR' && ds.SeriesInstanceUID === SeriesInstanceUid);
-  const InstanceNumber = srDisplaySet.instances?.length + 1;
-  if (!srDisplaySet?.SeriesNumber || !InstanceNumber) {
-    return getNextSeriesNumber({
-      displaySetService,
-      modality: 'SR',
-      minSeriesNumber: MIN_SR_SERIES_NUMBER
-    });
-  }
-  return {
-    SeriesNumber: srDisplaySet.SeriesNumber,
-    InstanceNumber,
-    referenceDisplaySet: srDisplaySet
-  };
-}
-;// ../../../extensions/default/src/utils/getCurrentDicomDateTime.ts
-const getSeriesDateTime = (jsDate = new Date()) => {
-  const dicomDateTime = getDicomDateTime(jsDate);
-  return {
-    SeriesDate: dicomDateTime.date,
-    SeriesTime: dicomDateTime.time
-  };
-};
-const getDicomDateTime = (jsDate = new Date()) => {
-  const month = String(jsDate.getUTCMonth() + 1).padStart(2, '0');
-  const day = String(jsDate.getUTCDate()).padStart(2, '0');
-  const year = String(jsDate.getUTCFullYear()).padStart(4, '0');
-  const date = `${year}${month}${day}`;
-  const hours = String(jsDate.getUTCHours()).padStart(2, '0');
-  const minutes = String(jsDate.getUTCMinutes()).padStart(2, '0');
-  const seconds = String(jsDate.getUTCSeconds()).padStart(2, '0');
-  const time = `${hours}${minutes}${seconds}`;
-  return {
-    date,
-    time
-  };
-};
 ;// ../../../extensions/default/src/utils/promptSaveReport.tsx
 
 
 
 
-
-
 const {
   filterAnd,
   filterMeasurementsByStudyUID,
@@ -7644,29 +7605,25 @@ async function promptSaveReport({
     defaultSaveTitle = 'Create Report'
   } = ctx;
   let displaySetInstanceUIDs;
+  const measurementData = measurementService.getMeasurements(measurementFilter);
+  const predecessorImageId = findPredecessorImageId(measurementData);
   try {
     const promptResult = await CreateReportDialogPrompt({
       title: defaultSaveTitle,
+      predecessorImageId,
+      minSeriesNumber: 3000,
       extensionManager,
       servicesManager
     });
     if (promptResult.action === PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
       const dataSources = extensionManager.getDataSources(promptResult.dataSourceName);
       const dataSource = dataSources[0];
-      const measurementData = measurementService.getMeasurements(measurementFilter);
-      const SeriesDescription = promptResult.value || defaultSaveTitle;
       const {
-        SeriesNumber,
-        InstanceNumber,
-        referenceDisplaySet
-      } = getSRSeriesAndInstanceNumber({
-        displaySetService,
-        SeriesInstanceUid: promptResult.series
-      });
-      const {
-        SeriesDate,
-        SeriesTime
-      } = referenceDisplaySet ?? getSeriesDateTime();
+        series,
+        priorSeriesNumber,
+        value: reportName
+      } = promptResult;
+      const SeriesDescription = reportName || defaultSaveTitle;
       const getReport = async () => {
         return commandsManager.runCommand('storeMeasurements', {
           measurementData,
@@ -7674,11 +7631,8 @@ async function promptSaveReport({
           additionalFindingTypes: ['ArrowAnnotate'],
           options: {
             SeriesDescription,
-            SeriesNumber,
-            InstanceNumber,
-            SeriesInstanceUID: promptResult.series,
-            SeriesDate,
-            SeriesTime
+            SeriesNumber: 1 + priorSeriesNumber,
+            predecessorImageId: series
           }
         }, 'CORNERSTONE_STRUCTURED_REPORT');
       };
@@ -7703,6 +7657,17 @@ async function promptSaveReport({
     return null;
   }
 }
+function findPredecessorImageId(annotations) {
+  let predecessorImageId;
+  for (const annotation of annotations) {
+    if (predecessorImageId && annotation.predecessorImageId && annotation.predecessorImageId !== predecessorImageId) {
+      console.warn('Found multiple source predecessors, not defaulting to same series');
+      return;
+    }
+    predecessorImageId ||= annotation.predecessorImageId;
+  }
+  return predecessorImageId;
+}
 /* harmony default export */ const utils_promptSaveReport = (promptSaveReport);
 ;// ../../../extensions/default/src/commandsModule.ts
 
@@ -10435,8 +10400,8 @@ function AboutModalDefault() {
     name
   } = (0,browser_detect_es5/* default */.A)();
   const browser = `${name[0].toUpperCase()}${name.substr(1)} ${version}`;
-  const versionNumber = "3.12.0-beta.90";
-  const commitHash = "62d6bf437b167ac3e60a0f134869c9f96d199d0f";
+  const versionNumber = "3.12.0-beta.92";
+  const commitHash = "29cfb2c29999c08b52bf1ed46531e21ae85ea667";
   const [main, beta] = versionNumber.split('-');
   return /*#__PURE__*/react.createElement(ui_next_src/* AboutModal */.VTU, {
     className: "w-[400px]"
@@ -10561,6 +10526,9 @@ function UserPreferencesModalDefault({
 
 function ReportDialog({
   dataSources,
+  modality = 'SR',
+  predecessorImageId,
+  minSeriesNumber = 3000,
   hide,
   onSave,
   onCancel
@@ -10569,25 +10537,27 @@ function ReportDialog({
     servicesManager
   } = (0,src/* useSystem */.Jg)();
   const [selectedDataSource, setSelectedDataSource] = (0,react.useState)(dataSources?.[0]?.value ?? null);
-  const [selectedSeries, setSelectedSeries] = (0,react.useState)(null);
-  const [reportName, setReportName] = (0,react.useState)('');
   const {
     displaySetService
   } = servicesManager.services;
+  const [selectedSeries, setSelectedSeries] = (0,react.useState)(predecessorImageId || null);
+  const [reportName, setReportName] = (0,react.useState)('');
   const seriesOptions = (0,react.useMemo)(() => {
     const displaySetsMap = displaySetService.getDisplaySetCache();
     const displaySets = Array.from(displaySetsMap.values());
-    const options = displaySets.filter(ds => ds.Modality === 'SR').map(ds => ({
-      value: ds.SeriesInstanceUID,
+    const options = displaySets.filter(ds => ds.Modality === modality).map(ds => ({
+      value: ds.predecessorImageId || ds.SeriesInstanceUID,
+      seriesNumber: isFinite(ds.SeriesNumber) ? ds.SeriesNumber : minSeriesNumber,
       description: ds.SeriesDescription,
       label: `${ds.SeriesDescription} ${ds.SeriesDate}/${ds.SeriesTime} ${ds.SeriesNumber}`
     }));
     return [{
       value: null,
       description: null,
+      seriesNumber: minSeriesNumber,
       label: 'Create new series'
     }, ...options];
-  }, [displaySetService]);
+  }, [displaySetService, modality]);
   (0,react.useEffect)(() => {
     const seriesOption = seriesOptions.find(s => s.value === selectedSeries);
     const newReportName = selectedSeries && seriesOption?.description ? seriesOption.description : '';
@@ -10597,6 +10567,7 @@ function ReportDialog({
     onSave({
       reportName,
       dataSource: selectedDataSource,
+      priorSeriesNumber: Math.max(...seriesOptions.map(it => it.seriesNumber)),
       series: selectedSeries
     });
     hide();

package/dist/{9845.bundle.7e4db5e31b28d73fdac2.js → 9845.bundle.0d22f2210c1d5ac18882.js}

@@ -179,7 +179,7 @@ function OHIFCornerstoneSEGViewport(props) {
     const {
       unsubscribe
     } = segmentationService.subscribe(segmentationService.EVENTS.SEGMENTATION_LOADING_COMPLETE, evt => {
-      if (evt.segDisplaySet.displaySetInstanceUID === segDisplaySet.displaySetInstanceUID) {
+      if (evt.segDisplaySet?.displaySetInstanceUID === segDisplaySet?.displaySetInstanceUID) {
         setSegIsLoading(false);
       }
       if (segDisplaySet?.firstSegmentedSliceImageId && viewportOptions?.presentationIds) {