Fix contour annotations RTSS saving (#5545)

* [WIP] Fix contour annotations RTSS saving

* fix: Export image sop image reference provider

* Fixes for download with filename

* Updates to fix metadata issues with CS3D

* Updates to save menu

* Fixing some additional re-save metadata

* Add support for saving with predecessor image sequence

* PR comment fixes

* fix: Load RTSS after save

* fix segmentation save

* fix load of mixed seg/rt studies

* Use frame module to get information on the frame shown

* Fix study browser to use instances.length when numImageFrames not present

* fix: Load of display set split from multiple non-FOR referenes

* Fix RT and SEG applying to wrong series because of using
referenced series sequence without checkout sop instances

* Fix save seg

* Update to released CS3D versions

* test: Add revokeObjectURL to test download blob

* Add hard dependency on mode-basic to fix build order issues

* fix: build

* Try to fix build segmentation

* PR comments

* PR comment update

modes/basic/package.json

@@ -5,6 +5,7 @@
   "author": "OHIF Contributors",
   "license": "MIT",
   "main": "dist/ohif-mode-basic.js",
+  "module": "src/index.tsx",
   "files": [
     "dist/**",
     "public/**",
@@ -14,7 +15,6 @@
   "keywords": [
     "ohif-mode"
   ],
-  "module": "src/index.tsx",
   "engines": {
     "node": ">=14",
     "npm": ">=6",

modes/basic/src/index.tsx

@@ -21,12 +21,17 @@ export const ohif = {
   layout: '@ohif/extension-default.layoutTemplateModule.viewerLayout',
   sopClassHandler: '@ohif/extension-default.sopClassHandlerModule.stack',
   thumbnailList: '@ohif/extension-default.panelModule.seriesList',
+  hangingProtocol: '@ohif/extension-default.hangingProtocolModule.default',
   wsiSopClassHandler:
     '@ohif/extension-cornerstone.sopClassHandlerModule.DicomMicroscopySopClassHandler',
 };
 
 export const cornerstone = {
   measurements: '@ohif/extension-cornerstone.panelModule.panelMeasurement',
+  labelMapSegmentationPanel:
+    '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsLabelMap',
+  contourSegmentationPanel:
+    '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsContour',
   segmentation: '@ohif/extension-cornerstone.panelModule.panelSegmentation',
   viewport: '@ohif/extension-cornerstone.viewportModule.cornerstone',
 };
@@ -62,6 +67,11 @@ export const dicomRT = {
   sopClassHandler: '@ohif/extension-cornerstone-dicom-rt.sopClassHandlerModule.dicom-rt',
 };
 
+export const segmentation = {
+  sopClassHandler: '@ohif/extension-cornerstone-dicom-seg.sopClassHandlerModule.dicom-seg',
+  viewport: '@ohif/extension-cornerstone-dicom-seg.viewportModule.dicom-seg',
+};
+
 export const extensionDependencies = {
   // Can derive the versions at least process.env.from npm_package_version
   '@ohif/extension-default': '^3.0.0',

modes/longitudinal/package.json

@@ -42,7 +42,8 @@
     "@ohif/extension-default": "3.12.0-beta.90",
     "@ohif/extension-dicom-pdf": "3.12.0-beta.90",
     "@ohif/extension-dicom-video": "3.12.0-beta.90",
-    "@ohif/extension-measurement-tracking": "3.12.0-beta.90"
+    "@ohif/extension-measurement-tracking": "3.12.0-beta.90",
+    "@ohif/mode-basic": "3.12.0-beta.90"
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",

modes/segmentation/.webpack/webpack.prod.js

@@ -33,6 +33,12 @@ const config = {
         amd: '@ohif/core',
         root: '@ohif/core',
       },
+      '@ohif/mode-basic': {
+        commonjs2: '@ohif/mode-basic',
+        commonjs: '@ohif/mode-basic',
+        amd: '@ohif/mode-basic',
+        root: '@ohif/mode-basic',
+      },
       '@ohif/ui': {
         commonjs2: '@ohif/ui',
         commonjs: '@ohif/ui',

modes/segmentation/package.json

@@ -35,6 +35,7 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
+    "@ohif/mode-basic": "3.12.0-beta.90",
     "@ohif/core": "3.12.0-beta.90",
     "@ohif/extension-cornerstone": "3.12.0-beta.90",
     "@ohif/extension-cornerstone-dicom-rt": "3.12.0-beta.90",

modes/segmentation/src/index.tsx

@@ -2,42 +2,8 @@ import { id } from './id';
 import toolbarButtons from './toolbarButtons';
 import initToolGroups from './initToolGroups';
 import setUpAutoTabSwitchHandler from './utils/setUpAutoTabSwitchHandler';
-
-const ohif = {
-  layout: '@ohif/extension-default.layoutTemplateModule.viewerLayout',
-  sopClassHandler: '@ohif/extension-default.sopClassHandlerModule.stack',
-  hangingProtocol: '@ohif/extension-default.hangingProtocolModule.default',
-  leftPanel: '@ohif/extension-default.panelModule.seriesList',
-};
-
-const cornerstone = {
-  viewport: '@ohif/extension-cornerstone.viewportModule.cornerstone',
-  labelMapSegmentationPanel:
-    '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsLabelMap',
-  contourSegmentationPanel:
-    '@ohif/extension-cornerstone.panelModule.panelSegmentationWithToolsContour',
-  measurements: '@ohif/extension-cornerstone.panelModule.panelMeasurement',
-};
-
-const segmentation = {
-  sopClassHandler: '@ohif/extension-cornerstone-dicom-seg.sopClassHandlerModule.dicom-seg',
-  viewport: '@ohif/extension-cornerstone-dicom-seg.viewportModule.dicom-seg',
-};
-
-const dicomRT = {
-  viewport: '@ohif/extension-cornerstone-dicom-rt.viewportModule.dicom-rt',
-  sopClassHandler: '@ohif/extension-cornerstone-dicom-rt.sopClassHandlerModule.dicom-rt',
-};
-/**
- * Just two dependencies to be able to render a viewport with panels in order
- * to make sure that the mode is working.
- */
-const extensionDependencies = {
-  '@ohif/extension-default': '^3.0.0',
-  '@ohif/extension-cornerstone': '^3.0.0',
-  '@ohif/extension-cornerstone-dicom-seg': '^3.0.0',
-  '@ohif/extension-cornerstone-dicom-rt': '^3.0.0',
-};
+import { ohif, cornerstone, extensionDependencies, dicomRT, segmentation } from '@ohif/mode-basic';
+export * from './toolbarButtons';
 
 function modeFactory({ modeConfiguration }) {
   const _unsubscriptions = [];
@@ -236,7 +202,7 @@ function modeFactory({ modeConfiguration }) {
           return {
             id: ohif.layout,
             props: {
-              leftPanels: [ohif.leftPanel],
+              leftPanels: [ohif.thumbnailList],
               leftPanelResizable: true,
               rightPanels: [
                 cornerstone.labelMapSegmentationPanel,

modes/segmentation/src/toolbarButtons.ts

@@ -20,7 +20,7 @@ const callbacks = (toolName: string) => [
   },
 ];
 
-const toolbarButtons: Button[] = [
+export const toolbarButtons: Button[] = [
   {
     id: 'AdvancedRenderingControls',
     uiType: 'ohif.advancedRenderingControls',

modes/usAnnotation/package.json

@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.28.2",
-    "@cornerstonejs/core": "4.11.2",
-    "@cornerstonejs/tools": "4.11.2",
+    "@cornerstonejs/core": "4.11.3",
+    "@cornerstonejs/tools": "4.11.3",
     "@ohif/core": "3.12.0-beta.90",
     "@ohif/extension-cornerstone-dicom-sr": "3.12.0-beta.90",
     "@ohif/extension-ultrasound-pleura-bline": "3.12.0-beta.90",