chore(version): Update package versions to 3.13.0-beta.78 [skip ci]

* Add (better) assertions for area calculation fixes.
* Add SVG and measurement side panel area for freehand ROI test.
* Add Playwright viewport screenshot scope migration guide.
* Update cornerstonjs dependencies to 4.22.8. Ensure all versions of @babel/preset-env are 7.29.5.

---------

Co-authored-by: Ghadeer Albattarni <165973963+GhadeerAlbattarni@users.noreply.github.com>

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 
 defaults: &defaults
   docker:
-    - image: cimg/node:20.18.1
+    - image: cimg/node:20.19.0
       environment:
         TERM: xterm
         QUICK_BUILD: true
@@ -15,22 +15,13 @@ defaults: &defaults
 commands:
   install_bun:
     steps:
-      - restore_cache:
-          keys:
-            - bun-cache-v2-{{ arch }}-latest
       - run:
           name: Install Bun
           command: |
-            if [ ! -d "$HOME/.bun" ]; then
-              curl -fsSL https://bun.sh/install | bash
-            fi
+            curl -fsSL https://bun.sh/install | bash -s "bun-v1.2.23"
             echo 'export BUN_INSTALL="$HOME/.bun"' >> $BASH_ENV
             echo 'export PATH="$BUN_INSTALL/bin:$PATH"' >> $BASH_ENV
             source $BASH_ENV
-      - save_cache:
-          key: bun-cache-v2-{{ arch }}-latest
-          paths:
-            - ~/.bun
 
 jobs:
   UNIT_TESTS:
@@ -353,12 +344,74 @@ jobs:
           name: Export Display Variable
           command: export DISPLAY=:99
       - cypress/install:
-          install-command: bun install --no-save
-          package-manager: yarn
+          install-command: yarn install --frozen-lockfile --no-save
       - cypress/run-tests:
           cypress-command: |
             npx wait-on@latest http://localhost:3000 && cd platform/app && npx cypress run --record --parallel
-          start-command: bun run test:data && bun run test:e2e:serve
+          start-command: yarn run test:data && yarn run test:e2e:serve
+
+  SECURITY_AUDIT:
+    <<: *defaults
+    resource_class: large
+    steps:
+      - install_bun
+      - checkout
+      - run:
+          name: 'Security Audit - High Risk Vulnerabilities'
+          command: |
+            git fetch origin master 2>/dev/null || true
+            BASE_REF=$(git merge-base HEAD origin/master 2>/dev/null)
+            if [[ -z "$BASE_REF" ]]; then
+              echo "Could not determine base ref (e.g. shallow clone or no origin/master), skipping security audit."
+              exit 0
+            fi
+            CHANGED_FILES=$(git diff --name-only origin/master...HEAD 2>/dev/null || echo "")
+            if ! echo "$CHANGED_FILES" | grep -qx 'bun.lock'; then
+              echo "⏭️ bun.lock unchanged - skipping security audit."
+              exit 0
+            fi
+            echo "🔍 bun.lock changed - running bun audit for security vulnerabilities..."
+            echo "Checking for HIGH-RISK vulnerabilities..."
+
+            # Define ignored vulnerabilities with comments
+            IGNORED_VULNS=(
+              "GHSA-3ppc-4f35-3m26"  # CVE-2026-26996 - minimatch via itk-wasm and glob is safe because it does NOT use the CLI
+                                     # CVE-2026-26996 - minimatch via other packages are strictly for building and CI/CD purposes; no user supplied expressions are passed to minimatch
+              "GHSA-7r86-cg39-jmmj"  # CVE-2026-27903 - minimatch same as above
+              "GHSA-23c5-xmqv-rm74"  # CVE-2026-27904 - minimatch same as above
+              "GHSA-c2c7-rcm5-vvqj"  # CVE-2026-33671 - picomatch is generally used for development and CI/CD purposes
+            )
+
+            # Build ignore flags
+            IGNORE_FLAGS=""
+            for vuln in "${IGNORED_VULNS[@]}"; do
+              IGNORE_FLAGS="$IGNORE_FLAGS --ignore=$vuln"
+            done
+
+            if bun audit $IGNORE_FLAGS --audit-level high; then
+              echo "✅ No high-risk vulnerabilities found"
+              echo "🎉 Security audit passed!"
+              exit 0
+            else
+              echo ""
+              echo "❌ HIGH-RISK VULNERABILITIES DETECTED!"
+              echo "======================================"
+              echo ""
+              echo "🔧 To fix these issues:"
+              echo "  1. Run: bun audit"
+              echo "  2. Review the vulnerability details"
+              echo "  3. Update affected packages to secure versions"
+              echo "  4. Test your changes"
+              echo "  5. Re-run: bun audit --audit-level high"
+              echo ""
+              echo "📋 Full audit report:"
+
+              bun audit $IGNORE_FLAGS --audit-level low || true
+
+              echo ""
+              echo "❌ This build cannot proceed until high-risk vulnerabilities are resolved."
+              exit 1
+            fi
 
   DOCKER_MULTIARCH_MANIFEST:
     <<: *defaults
@@ -449,6 +502,10 @@ workflows:
       - CYPRESS:
           name: 'Cypress Tests'
           context: cypress
+      - SECURITY_AUDIT:
+          filters:
+            branches:
+              ignore: master
 
   # viewer-dev.ohif.org
   DEPLOY_MASTER:
@@ -457,8 +514,13 @@ workflows:
           filters:
             branches:
               only: master
+      # - HOLD_FOR_APPROVAL:
+      #     type: approval
+      #     requires:
+      #       - BUILD
       - NPM_PUBLISH:
           requires:
+            # - HOLD_FOR_APPROVAL
             - BUILD
       - DOCKER_BETA_PUBLISH:
           requires:

.github/.dependabot.yaml

@@ -2,6 +2,8 @@ version: 2
 enable-beta-ecosystems: true
 updates:
   - package-ecosystem: 'bun'
+    # Disable all pull requests for bun version updates.
+    open-pull-requests-limit: 0
     directory: '/'
     schedule:
       interval: 'daily'
@@ -10,6 +12,8 @@ updates:
       prefix: 'chore'
       include: 'scope'
   - package-ecosystem: 'npm'
+    # Disable all pull requests for npm version updates.
+    open-pull-requests-limit: 0
     directory: '/'
     schedule:
       interval: 'daily'

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -51,28 +51,29 @@ body:
     validations:
       required: true
 
-  - type: input
-    id: os
+  - type: textarea
+    id: system_info
     attributes:
-      label: 'OS'
-      description: 'Your operating system.'
-      placeholder: 'e.g., Windows 10, macOS 10.15.4'
-    validations:
-      required: true
-  - type: input
-    id: node-version
-    attributes:
-      label: 'Node version'
-      description: 'Your Node.js version.'
-      placeholder: 'e.g., 20.18.1'
-    validations:
-      required: true
-  - type: input
-    id: browser
-    attributes:
-      label: 'Browser'
-      description: 'Your browser.'
-      placeholder: 'e.g., Chrome 83.0.4103.116, Firefox 77.0.1, Safari 13.1.1'
+      label: 'System Information'
+      description: 'Please run the following command in your terminal and paste the output:'
+      placeholder: |
+        Run: npx envinfo --system --binaries --browsers
+        
+        Then paste the output here. It should look something like:
+        
+        System:
+          OS: Windows 10 10.0.19042
+          CPU: (8) x64 Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz
+          Memory: 15.89 GB / 31.74 GB
+          Shell: 1.0.0 - C:\WINDOWS\System32\WindowsPowerShell\v1.0\powershell.exe
+        Binaries:
+          Node: 20.18.1 - C:\Program Files\nodejs\node.EXE
+          Yarn: 1.22.22 - C:\Users\user\AppData\Roaming\npm\yarn.CMD
+          npm: 10.8.2 - C:\Program Files\nodejs\npm.CMD
+        Browsers:
+          Chrome: 83.0.4103.116
+          Edge: Spartan (44.19041.1266.0), Chromium (83.0.478.58)
+          Firefox: 77.0.1
     validations:
       required: true
 

.github/workflows/build-docs.yml

@@ -23,6 +23,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: 1.2.23
       - uses: actions/setup-node@v4
         with:
           node-version: 20 # Or your desired Node version

.github/workflows/playwright.yml

@@ -1,7 +1,20 @@
 name: Playwright Tests
 on:
   pull_request:
-    branches: [master]
+    branches: [master, release/*]
+  workflow_dispatch:
+    inputs:
+      cs3d_ref:
+        description: >-
+          CS3D branch (e.g. main, origin:feat/foo) or version (e.g. 4.18.2, 4.19+, 4.x). Only used
+          when ohif-integration label is present or via workflow_dispatch.
+        required: false
+        default: '4.19+'
+
+permissions:
+  contents: read
+  pull-requests: read
+  issues: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -9,7 +22,7 @@ concurrency:
 
 jobs:
   playwright-tests:
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: self-hosted
     strategy:
       fail-fast: false
@@ -18,17 +31,105 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: 1.2.23
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Install Yarn
+        run: npm install -g yarn@1.22.22
+
+      # ── CS3D integration: detect label and ref type ──────────────────────
+      - name: Check for CS3D integration label
+        id: cs3d-check
+        run: bash .scripts/ci/cs3d-check-integration.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+          EVENT_NAME: ${{ github.event_name }}
+          CS3D_REF_INPUT: ${{ github.event.inputs.cs3d_ref || '4.19+' }}
+          REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+
+      - name: Detect CS3D ref type
+        id: cs3d-ref
+        if: steps.cs3d-check.outputs.enabled == 'true'
+        run: |
+          REF="${CS3D_REF}"
+          if [[ "$REF" =~ ^[0-9]+\.[0-9x]+\+?(\.[0-9x]+)?(-[a-zA-Z0-9._]+)?$ ]]; then
+            echo "type=version" >> "$GITHUB_OUTPUT"
+            RESOLVED=$(node .scripts/cs3d-resolve-version.mjs "$REF")
+            echo "version=$RESOLVED" >> "$GITHUB_OUTPUT"
+            echo "::notice::CS3D version: $REF -> $RESOLVED"
+          else
+            echo "type=branch" >> "$GITHUB_OUTPUT"
+            echo "::notice::CS3D branch: $REF"
+          fi
+        env:
+          CS3D_REF: ${{ steps.cs3d-check.outputs.cs3d_ref }}
+
+      # ── CS3D branch path: clone and build before OHIF install ───────────
+      - name: Clone CS3D
+        if: steps.cs3d-check.outputs.enabled == 'true' && steps.cs3d-ref.outputs.type == 'branch'
+        run: |
+          REF="${CS3D_REF}"
+          if [[ "$REF" == *:* ]]; then
+            REPO="https://github.com/${REF%%:*}/cornerstone3D.git"
+            BRANCH="${REF#*:}"
+          else
+            REPO="https://github.com/cornerstonejs/cornerstone3D.git"
+            BRANCH="$REF"
+          fi
+          echo "::notice::Cloning CS3D from $REPO branch $BRANCH"
+          git clone --depth 1 --branch "$BRANCH" "$REPO" libs/@cornerstonejs
+        env:
+          CS3D_REF: ${{ steps.cs3d-check.outputs.cs3d_ref }}
+
+      - name: Install & Build CS3D
+        if: steps.cs3d-check.outputs.enabled == 'true' && steps.cs3d-ref.outputs.type == 'branch'
+        working-directory: libs/@cornerstonejs
+        run: bun install --frozen-lockfile && bun run build:esm
+
+      # ── Common: install OHIF dependencies ───────────────────────────────
       - name: Install dependencies
         run: bun install --frozen-lockfile
-      # - name: Install Playwright browsers
-      #   run: bun x playwright install-deps chromium
+
+      # ── CS3D branch path: link packages after OHIF install ──────────────
+      - name: Link CS3D packages
+        if: steps.cs3d-check.outputs.enabled == 'true' && steps.cs3d-ref.outputs.type == 'branch'
+        working-directory: libs/@cornerstonejs
+        run: node scripts/link-ohif-cornerstone-node-modules.mjs "$GITHUB_WORKSPACE"
+
+      # ── CS3D version path: update versions after OHIF install ───────────
+      - name: Set CS3D version
+        if: steps.cs3d-check.outputs.enabled == 'true' && steps.cs3d-ref.outputs.type == 'version'
+        run: |
+          node .scripts/cs3d-set-version.mjs "${CS3D_VERSION}"
+          bun install --config=./bunfig.update-lockfile.toml
+        env:
+          CS3D_VERSION: ${{ steps.cs3d-ref.outputs.version }}
+
+      # ── Common: run tests ───────────────────────────────────────────────
+      - name: Install Playwright browsers
+        run: npx playwright install
       - name: Run Playwright tests
         run: |
           export NODE_OPTIONS="--max_old_space_size=10192"
           bun run test:e2e:coverage
+
+      # ── Common: collect test results and coverage ───────────────────────
+      - name: Create directory of test results
+        if: ${{ !cancelled() }}
+        run: |
+          mkdir -p packaged-test-results
+          cp -r ./tests/test-results packaged-test-results/ || true
+          cp ./tests/playwright-report.json packaged-test-results/ || true
+      - name: Upload directory of test results artifact
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-results
+          path: packaged-test-results/
+          retention-days: 5
       - name: create the coverage report
         run: |
           bun nyc report --reporter=lcov --reporter=text
@@ -39,3 +140,70 @@ jobs:
           name: coverage-report-pr
           path: coverage
           retention-days: 3
+
+      # ── CS3D: build and deploy preview to Netlify ───────────────────────
+      - name: Log build context (OHIF/CS3D branch and version for build diagnosis)
+        if: steps.cs3d-check.outputs.enabled == 'true'
+        run: |
+          if [[ "$CS3D_REF_TYPE" == "branch" ]]; then
+            echo "::notice::Build type: ohif-downstream | OHIF: ${{ github.repository }}@${{ github.ref }} (${{ github.sha }}) | CS3D: branch ${{ steps.cs3d-check.outputs.cs3d_ref }}"
+          else
+            echo "::notice::Build type: ohif-upstream | OHIF: ${{ github.repository }}@${{ github.ref }} (${{ github.sha }}) | CS3D: version ${{ steps.cs3d-ref.outputs.version }}"
+          fi
+          node .scripts/log-build-context.mjs
+        env:
+          BUILD_TYPE: ${{ steps.cs3d-ref.outputs.type == 'branch' && 'ohif-downstream' || 'ohif-upstream' }}
+          CS3D_REF_TYPE: ${{ steps.cs3d-ref.outputs.type }}
+
+      - name: Build OHIF viewer (CS3D preview)
+        if: steps.cs3d-check.outputs.enabled == 'true'
+        run: bun run build:ci
+
+      - name: Deploy CS3D preview to Netlify
+        if: steps.cs3d-check.outputs.enabled == 'true'
+        run: |
+          RESULT=$(npx netlify-cli deploy --dir=platform/app/dist --alias="cs3d-pr-${PR_NUM}" --json --filter=@ohif/app) || {
+            echo "::error::Netlify deploy command failed"
+            exit 1
+          }
+          URL=$(echo "$RESULT" | jq -r '.deploy_url')
+          if [[ -z "$URL" || "$URL" == "null" ]]; then
+            echo "::error::Netlify deploy did not return a valid URL"
+            echo "$RESULT"
+            exit 1
+          fi
+          echo "::notice::CS3D preview deployed: $URL"
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+          PR_NUM: ${{ github.event.pull_request.number || 'manual' }}
+
+      # ── CS3D: log results ───────────────────────────────────────────────
+      - name: Log CS3D build used
+        if: steps.cs3d-check.outputs.enabled == 'true'
+        run: |
+          if [[ "$CS3D_REF_TYPE" == "branch" ]]; then
+            echo "::notice::CS3D integration PASSED with branch ${CS3D_REF} (linked from libs/@cornerstonejs)"
+          else
+            echo "::notice::CS3D integration PASSED with @cornerstonejs/*@${CS3D_VERSION}"
+          fi
+        env:
+          CS3D_REF_TYPE: ${{ steps.cs3d-ref.outputs.type }}
+          CS3D_REF: ${{ steps.cs3d-check.outputs.cs3d_ref }}
+          CS3D_VERSION: ${{ steps.cs3d-ref.outputs.version }}
+
+  # ── Separate job: block merge when using a CS3D branch ─────────────
+  cs3d-branch-merge-guard:
+    name: "CS3D Branch Merge Guard"
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check for CS3D branch usage
+        run: bash .scripts/ci/cs3d-branch-merge-guard.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+          EVENT_NAME: ${{ github.event_name }}
+          CS3D_REF_INPUT: ${{ github.event.inputs.cs3d_ref || '4.19+' }}
+          REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}

.gitignore

@@ -44,6 +44,7 @@ videos/
 
 # autogenerated files
 platform/app/src/pluginImports.js
+CLAUDE.md
 /Viewers.iml
 platform/app/.recipes/Nginx-Dcm4Chee/logs/*
 platform/app/.recipes/OpenResty-Orthanc/logs/*
@@ -58,3 +59,17 @@ tests/test-results/
 tests/playwright-report/
 /blob-report/
 /playwright/.cache/
+
+**/.claude/settings.local.json
+
+# cornerstone3D local linking
+libs/
+
+# Backup files
+*~
+
+# cornerstone3D local linking
+libs/
+link-cs3d.js
+unlink-cs3d.js
+auth.json

.netlify/build-deploy-preview.sh

@@ -19,7 +19,7 @@ echo 'Web application built and copied'
 
 # Build && Move Docusaurus Output (for the docs themselves)
 cd platform/docs
-yarn install
+yarn install --frozen-lockfile
 yarn run build
 cd ../..
 mkdir -p ./.netlify/www/docs

.netlify/package.json

@@ -10,6 +10,6 @@
     "deploy": "netlify deploy --prod --dir ./../platform/app/dist"
   },
   "devDependencies": {
-    "netlify-cli": "^2.21.0"
+    "netlify-cli": "2.21.0"
   }
 }

.scripts/ci/cs3d-branch-merge-guard.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# CS3D branch merge guard: blocks merge when tests ran against a CS3D branch (not a version).
+# Exits 0 when merge is allowed or guard is skipped; exits 1 when merge must be blocked.
+#
+# Required env: GH_TOKEN, EVENT_NAME, REPO, PR_NUMBER
+# Optional env: CS3D_REF_INPUT (for workflow_dispatch, default 4.19+)
+
+set -e
+
+if [[ "$EVENT_NAME" == "workflow_dispatch" ]]; then
+  echo "::notice::workflow_dispatch — no merge to block, skipping guard."
+  exit 0
+elif [[ "$EVENT_NAME" == "pull_request" ]]; then
+  LABELS=$(gh api "repos/${REPO}/issues/${PR_NUMBER}/labels" --jq '.[].name')
+  if echo "$LABELS" | grep -q "ohif-integration"; then
+    ENABLED=true
+    CS3D_REF=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}" --jq '.body' \
+      | sed -n 's/^[[:space:]]*CS3D_REF:[[:space:]]*\([^[:space:]]*\).*/\1/p' | head -1)
+    if [[ -z "$CS3D_REF" ]]; then
+      CS3D_REF="4.19+"
+    fi
+  else
+    ENABLED=false
+  fi
+else
+  ENABLED=false
+fi
+
+if [[ "$ENABLED" != "true" ]]; then
+  echo "::notice::No ohif-integration label — skipping merge guard."
+  exit 0
+fi
+
+# Check if the ref is a branch (not a version)
+if [[ "$CS3D_REF" =~ ^[0-9]+\.[0-9x]+\+?(\.[0-9x]+)?(-[a-zA-Z0-9._]+)?$ ]]; then
+  echo "::notice::CS3D ref '$CS3D_REF' is a version — merge allowed."
+  exit 0
+fi
+
+echo "::error::Tests ran against CS3D branch '${CS3D_REF}' — this build cannot be merged."
+echo "::error::Re-run with a published CS3D version (e.g. 4.19+) before merging."
+exit 1

.scripts/ci/cs3d-check-integration.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# CS3D integration check: detects ohif-integration label and parses CS3D_REF.
+# Writes to GITHUB_OUTPUT: enabled (true|false), cs3d_ref (when enabled).
+#
+# Required env: GH_TOKEN, EVENT_NAME, REPO, PR_NUMBER, GITHUB_OUTPUT
+# Optional env: CS3D_REF_INPUT (for workflow_dispatch, default 4.19+)
+
+set -e
+
+if [[ "$EVENT_NAME" == "workflow_dispatch" ]]; then
+  echo "enabled=true" >> "$GITHUB_OUTPUT"
+  echo "cs3d_ref=${CS3D_REF_INPUT:-4.19+}" >> "$GITHUB_OUTPUT"
+elif [[ "$EVENT_NAME" == "pull_request" ]]; then
+  LABELS=$(gh api "repos/${REPO}/issues/${PR_NUMBER}/labels" --jq '.[].name')
+  if echo "$LABELS" | grep -q "ohif-integration"; then
+    echo "enabled=true" >> "$GITHUB_OUTPUT"
+    REF=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}" --jq '.body' \
+      | sed -n 's/^[[:space:]]*CS3D_REF:[[:space:]]*\([^[:space:]]*\).*/\1/p' | head -1)
+    if [[ -z "$REF" ]]; then
+      REF="4.19+"
+    fi
+    echo "cs3d_ref=${REF}" >> "$GITHUB_OUTPUT"
+    echo "::notice::CS3D ref from PR body: ${REF}"
+  else
+    echo "enabled=false" >> "$GITHUB_OUTPUT"
+  fi
+else
+  echo "enabled=false" >> "$GITHUB_OUTPUT"
+fi

.scripts/cs3d-check.mjs

@@ -0,0 +1,55 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { execSync } from 'node:child_process';
+
+const workflowPath = path.resolve(
+  process.cwd(),
+  'libs',
+  '@cornerstonejs',
+  '.github',
+  'workflows',
+  'ohif-downstream.yml'
+);
+
+if (!fs.existsSync(workflowPath)) {
+  console.error(`[cs3d:check] Workflow file not found: ${workflowPath}`);
+  process.exit(1);
+}
+
+const workflowText = fs.readFileSync(workflowPath, 'utf8');
+const ohifRefMatch = workflowText.match(/^\s*OHIF_REF:\s*["']?([^"'\r\n]+)["']?\s*$/m);
+
+if (!ohifRefMatch) {
+  console.error('[cs3d:check] Could not find OHIF_REF in ohif-downstream workflow.');
+  process.exit(1);
+}
+
+const expectedBranch = ohifRefMatch[1].trim();
+let currentBranch = '';
+
+try {
+  currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {
+    cwd: process.cwd(),
+    encoding: 'utf8',
+  }).trim();
+} catch (error) {
+  console.error('[cs3d:check] Failed to determine current git branch.');
+  process.exit(1);
+}
+
+if (currentBranch !== expectedBranch) {
+  console.error(
+    `[cs3d:check] Branch mismatch: current='${currentBranch}', expected='${expectedBranch}' from ${path.relative(
+      process.cwd(),
+      workflowPath
+    )}`
+  );
+  process.exit(1);
+}
+
+console.log(
+  `[cs3d:check] OK: current branch '${currentBranch}' matches OHIF_REF in ${path.relative(
+    process.cwd(),
+    workflowPath
+  )}`
+);

.scripts/cs3d-resolve-version.mjs

@@ -0,0 +1,63 @@
+#!/usr/bin/env node
+
+/**
+ * Resolves a version pattern to a concrete npm version of @cornerstonejs/core.
+ *
+ * Patterns:
+ * 4.18.2         -> 4.18.2 (exact, returned as-is)
+ * 4.18.2-beta.3  -> 4.18.2-beta.3 (exact prerelease)
+ * 4.x            -> latest 4.* from npm
+ * 4.17.x         -> latest 4.17.* from npm
+ * 4.19+          -> latest >=4.19.0 <5.0.0-0 from npm (4.19 and later, same major)
+ *
+ * Prints the resolved version to stdout.
+ */
+
+import { execSync } from 'child_process';
+
+const pattern = process.argv[2];
+if (!pattern) {
+  console.error('Usage: cs3d-resolve-version.mjs <pattern>');
+  console.error(' e.g. 4.x, 4.17.x, 4.19+, 4.18.2, 4.18.2-beta.3');
+  process.exit(1);
+}
+
+// Exact version (no wildcard or range) — pass through unchanged
+if (!pattern.includes('x') && !pattern.endsWith('+')) {
+  console.log(pattern);
+  process.exit(0);
+}
+
+// Convert "M.m+" to npm semver range ">=M.m.0 <(M+1).0.0-0"
+let npmRange = pattern;
+const plusMatch = pattern.match(/^(\d+)\.(\d+)\+$/);
+if (plusMatch) {
+  const major = Number(plusMatch[1]);
+  const minor = Number(plusMatch[2]);
+  npmRange = `>=${major}.${minor}.0 <${major + 1}.0.0-0`;
+}
+
+try {
+  // Let npm resolve the range: @package@<range> → concrete version
+  const raw = execSync(`npm view @cornerstonejs/core@"${npmRange}" version --json`, {
+    encoding: 'utf8',
+    timeout: 30_000,
+  });
+
+  const resolved = JSON.parse(raw);
+  if (!resolved) {
+    console.error(`npm returned no version when resolving @cornerstonejs/core@${npmRange}`);
+    process.exit(1);
+  }
+
+  // npm may return an array of versions for ranges; pick the latest (last) one
+  const version = Array.isArray(resolved) ? resolved[resolved.length - 1] : resolved;
+  console.log(version);
+} catch (err) {
+  const message =
+    (err && (err.stderr?.toString() || err.message || String(err))) ||
+    `Unknown error resolving @cornerstonejs/core@${pattern}`;
+  console.error(`Failed to resolve @cornerstonejs/core version for pattern "${pattern}":`);
+  console.error(message);
+  process.exit(1);
+}

.scripts/cs3d-set-version.mjs

@@ -0,0 +1,131 @@
+#!/usr/bin/env node
+
+/**
+ * Updates all @cornerstonejs/* package versions across the OHIF workspace.
+ *
+ * Usage: node .scripts/cs3d-set-version.mjs <version>
+ *
+ * Only updates the 8 main CS3D packages (not codec packages):
+ *   adapters, ai, core, dicom-image-loader, labelmap-interpolation,
+ *   nifti-volume-loader, polymorphic-segmentation, tools
+ */
+
+import { readFileSync, writeFileSync, existsSync, readdirSync } from 'fs';
+import { resolve, dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const rootDir = resolve(__dirname, '..');
+
+const version = process.argv[2];
+if (!version) {
+  console.error('Usage: cs3d-set-version.mjs <version>');
+  console.error('  e.g. 4.18.2, 4.19.0-beta.1');
+  process.exit(1);
+}
+
+// The 8 CS3D packages that are built from source (not codecs)
+const CS3D_PACKAGES = [
+  '@cornerstonejs/adapters',
+  '@cornerstonejs/ai',
+  '@cornerstonejs/core',
+  '@cornerstonejs/dicom-image-loader',
+  '@cornerstonejs/labelmap-interpolation',
+  '@cornerstonejs/nifti-volume-loader',
+  '@cornerstonejs/polymorphic-segmentation',
+  '@cornerstonejs/tools',
+];
+
+// Read root package.json to get workspace globs
+const rootPkgPath = resolve(rootDir, 'package.json');
+const rootPkg = JSON.parse(readFileSync(rootPkgPath, 'utf8'));
+const workspaceGlobs = rootPkg.workspaces?.packages || rootPkg.workspaces || [];
+
+// Collect all package.json paths from workspace globs
+function findWorkspacePackageJsons() {
+  const paths = [rootPkgPath]; // include root
+
+  for (const pattern of workspaceGlobs) {
+    const parts = pattern.split('/');
+    let searchDir = rootDir;
+    let hasWildcard = false;
+
+    for (const part of parts) {
+      if (part === '*') {
+        hasWildcard = true;
+        break;
+      }
+      searchDir = join(searchDir, part);
+    }
+
+    if (hasWildcard) {
+      try {
+        const entries = readdirSync(searchDir, { withFileTypes: true });
+        for (const entry of entries) {
+          if (entry.isDirectory()) {
+            const pkgJson = join(searchDir, entry.name, 'package.json');
+            if (existsSync(pkgJson)) {
+              paths.push(pkgJson);
+            }
+          }
+        }
+      } catch {
+        // directory doesn't exist, skip
+      }
+    } else {
+      const pkgJson = join(rootDir, pattern, 'package.json');
+      if (existsSync(pkgJson)) {
+        paths.push(pkgJson);
+      }
+    }
+  }
+
+  return paths;
+}
+
+// Update a dependencies object, returning count of changes
+function updateDeps(deps, targetVersion) {
+  let count = 0;
+  if (!deps) return count;
+  for (const pkg of CS3D_PACKAGES) {
+    if (pkg in deps && deps[pkg] !== targetVersion) {
+      deps[pkg] = targetVersion;
+      count++;
+    }
+  }
+  return count;
+}
+
+const pkgPaths = findWorkspacePackageJsons();
+let totalChanges = 0;
+
+for (const pkgPath of pkgPaths) {
+  const content = readFileSync(pkgPath, 'utf8');
+  const pkg = JSON.parse(content);
+  let changes = 0;
+
+  changes += updateDeps(pkg.dependencies, version);
+  changes += updateDeps(pkg.devDependencies, version);
+  changes += updateDeps(pkg.peerDependencies, version);
+  changes += updateDeps(pkg.resolutions, version);
+
+  if (changes > 0) {
+    // Preserve original formatting (detect indent — restrict to spaces/tabs so
+    // we don't accidentally capture a CRLF newline as part of the indent string)
+    const indent = content.match(/^([ \t]+)/m)?.[1] || '  ';
+    writeFileSync(pkgPath, JSON.stringify(pkg, null, indent) + '\n');
+    const rel = pkgPath.replace(rootDir + '/', '').replace(rootDir + '\\', '');
+    console.log(`  Updated ${rel} (${changes} packages)`);
+    totalChanges += changes;
+  }
+}
+
+console.log(
+  `\nDone: ${totalChanges} version(s) updated to ${version} across ${pkgPaths.length} package files.`
+);
+console.log(
+  'This step changes package.json; the following install must not use a frozen Bun lockfile ' +
+    '(OHIF+CS3D combined “version” CI does: `bun install --config=./bunfig.update-lockfile.toml`). ' +
+    'Other installs stay frozen. Locally after this script, use that bun command and/or ' +
+    '`bun run install:update-lockfile` when you intend to commit lockfile updates.\n'
+);

.scripts/log-build-context.mjs

@@ -0,0 +1,108 @@
+#!/usr/bin/env node
+/**
+ * Logs build context (OHIF branch/version, CS3D source) for diagnosing build issues on GitHub.
+ * Run from repo root. Used by version.mjs and can be invoked from CI workflows.
+ */
+import { execa } from 'execa';
+import fs from 'fs/promises';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const REPO_ROOT = path.resolve(__dirname, '..');
+
+function log(msg) {
+  console.log(`[build-context] ${msg}`);
+}
+
+async function detectCs3dSource() {
+  const libsCs3d = path.join(REPO_ROOT, 'libs/@cornerstonejs');
+  const coreInNodeModules = path.join(REPO_ROOT, 'node_modules/@cornerstonejs/core');
+
+  try {
+    const libsExists = await fs.access(libsCs3d).then(() => true).catch(() => false);
+    if (!libsExists) {
+      return { source: 'npm', detail: 'published @cornerstonejs packages (no libs/@cornerstonejs)' };
+    }
+
+    const coreStat = await fs.lstat(coreInNodeModules).catch(() => null);
+    const isSymlink = coreStat?.isSymbolicLink();
+    if (isSymlink) {
+      const target = await fs.readlink(coreInNodeModules);
+      return { source: 'integrated', detail: `linked from libs/@cornerstonejs (→ ${target})` };
+    }
+
+    return { source: 'npm', detail: 'published @cornerstonejs packages (libs exists but not linked)' };
+  } catch {
+    return { source: 'unknown', detail: 'could not detect' };
+  }
+}
+
+async function getCs3dVersion() {
+  try {
+    const corePkg = path.join(REPO_ROOT, 'node_modules/@cornerstonejs/core/package.json');
+    const pkg = JSON.parse(await fs.readFile(corePkg, 'utf-8'));
+    return pkg.version || 'unknown';
+  } catch {
+    return 'unknown';
+  }
+}
+
+async function getCs3dBranchFromLibs() {
+  try {
+    const libsCs3d = path.join(REPO_ROOT, 'libs/@cornerstonejs');
+    const { stdout } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+      cwd: libsCs3d,
+    });
+    return stdout;
+  } catch {
+    return null;
+  }
+}
+
+async function run() {
+  const inCI = process.env.GITHUB_ACTIONS === 'true';
+  const buildType = inCI ? (process.env.BUILD_TYPE || 'ohif-upstream') : 'local';
+
+  log('═══════════════════════════════════════════════════════════════');
+  log('Build context (for diagnosing GitHub build issues)');
+  log('═══════════════════════════════════════════════════════════════');
+
+  if (inCI) {
+    log(`Build type: ${process.env.BUILD_TYPE || 'ohif-upstream'}`);
+    log(`GitHub repo: ${process.env.GITHUB_REPOSITORY || 'unknown'}`);
+    log(`GitHub ref: ${process.env.GITHUB_REF || 'unknown'}`);
+    log(`GitHub SHA: ${process.env.GITHUB_SHA || 'unknown'}`);
+    log(`Workflow: ${process.env.GITHUB_WORKFLOW || 'unknown'}`);
+  }
+
+  try {
+    const { stdout: branch } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+      cwd: REPO_ROOT,
+    });
+    const { stdout: sha } = await execa('git', ['rev-parse', '--short', 'HEAD'], {
+      cwd: REPO_ROOT,
+    });
+    log(`OHIF branch: ${branch} (${sha})`);
+  } catch {
+    log('OHIF branch: (not a git repo or error)');
+  }
+
+  const cs3d = await detectCs3dSource();
+  log(`CS3D source: ${cs3d.source} — ${cs3d.detail}`);
+
+  if (cs3d.source === 'integrated') {
+    const branch = await getCs3dBranchFromLibs();
+    if (branch) log(`CS3D branch (libs/@cornerstonejs): ${branch}`);
+  } else {
+    const ver = await getCs3dVersion();
+    log(`CS3D version (@cornerstonejs/core): ${ver}`);
+  }
+
+  log('═══════════════════════════════════════════════════════════════');
+}
+
+run().catch((err) => {
+  console.error('[build-context] Error:', err.message);
+  process.exitCode = 1;
+});

.vscode/settings.json

@@ -82,6 +82,7 @@
     "Reslices",
     "roadmap",
     "ROADMAPS",
+    "rtstruct",
     "Segmentations",
     "semibold",
     "sitk",
@@ -109,6 +110,8 @@
     "wado",
     "wadors",
     "wadouri",
-    "workerpool"
+    "workerpool",
+    "Colorbar",
+    "Colorbars"
   ]
 }

.webpack/webpack.base.js

@@ -201,8 +201,6 @@ module.exports = (env, argv, { SRC_DIR, ENTRY }) => {
         '@hooks': path.resolve(__dirname, '../platform/app/src/hooks'),
         '@routes': path.resolve(__dirname, '../platform/app/src/routes'),
         '@state': path.resolve(__dirname, '../platform/app/src/state'),
-        'dicom-microscopy-viewer':
-          'dicom-microscopy-viewer/dist/dynamic-import/dicomMicroscopyViewer.min.js',
       },
       // Which directories to search when resolving modules
       modules: [

AGENTS.md

@@ -0,0 +1,201 @@
+# AGENTS.md
+
+This file provides guidance to AI coding agents (Claude, Codex, and other LLM tools) when working with code in this repository.
+
+## Project Overview
+
+This is **OHIF** v3  (Open Health Imaging Foundation) - a medical imaging viewer. It's an extensible web imaging platform.
+## Development Commands
+
+### Main Development
+```bash
+# Start development server for all packages
+yarn dev
+```
+
+### Building
+```bash
+# Build all packages for production
+yarn build
+
+# Build specific packages
+cd platform/app && yarn build    # Main viewer app
+```
+
+## Architecture Overview
+
+### Monorepo Structure
+- **`platform/`** - Core OHIF infrastructure
+  - `app/` - Main viewer application (`@ohif/viewer`)
+  - `core/` - Core services and utilities
+  - `ui-next/` - Modern UI component library
+- **`extensions/`** - Modular functionality plugins
+- **`modes/`** - Application workflow configurations
+
+### Key Extension Architecture
+
+**Extension System**: Each extension exports modules (viewports, tools, panels, commands) that the app dynamically loads. Extensions are self-contained with their own webpack builds.
+
+
+**Core Extensions:**
+- `cornerstone/` - Medical image rendering engine
+- `cornerstone-dicom-pmp/` - DICOM PMP support
+- `cornerstone-dicom-seg/` - DICOM Segmentation support
+- `cornerstone-dicom-sr/` - DICOM SR support
+- `dicom-pdf/` - DICOM PDF support
+- `dicom-video/` - DICOM Video support
+- `measurement-tracking/` - Measurement tracking support
+- `default/` - Standard OHIF functionality
+
+### Service-Oriented Design (PUB-SUB)
+
+The app uses a Services Manager pattern with these core services:
+- **Display Set Service**: Manages image series organization
+- **Measurement Service**: Handles annotations and measurements
+- **Hanging Protocol Service**: Controls image layout and display rules
+- **UI Service**: Manages panels, modals, and notifications
+- **Segmentation Service**: AI/ML powered image segmentation, loading segmentations, etc.
+- **Viewport Grid Service**: Manages viewport layout and display rules
+- **Viewport Display Set History Service**: Manages viewport display set history
+- **Viewport Dialog Service**: Manages viewport dialogs
+- **Notification Service**: Manages notifications
+- **Modal Service**: Manages modals
+- **Dialog Service**: Manages dialogs, more general not just viewport dialogs
+- **Customization Service**: Manages customization of the app
+- **Toolbar Service**: Manages the toolbar, viewport action corners, tool states
+- **User Authentication Service**: Manages user authentication, but used only for injecting tokens in dicomweb requests in our context
+- **Panel Service**: Manages side panels
+- **Cornerstone Viewport Service**: Manages the cornerstone viewport, rendering engines, presentation states, more tightly coupled to cornerstone than the other services
+- **Tool Group Service**: Manages tool groups, creating and managing tool groups, etc.
+- **Sync Group Service**: Manages sync groups, syncing zooming, panning, scrolling, etc.
+- **Cornerstone Cache Service**: Manages the cornerstone cache, caching images, etc.
+
+Most of the services utilize a pub sub architecture and extend the pub sub service interace at `pubSubServiceInterface.ts`
+
+### Commands Manager
+
+The Commands Manager tracks named commands (or functions) that are scoped to
+a context. When we attempt to run a command with a given name, we look for it
+in our active contexts, in the order specified.
+If found, we run the command, passing in any application
+or call specific data specified in the command's definition.
+
+You can call `commandsManager.runCommand` to run a command.
+
+### Extension Manager
+
+Aggregates and exposes extension modules throughout the OHIF application, manages data sources, and provides a centralized registry for accessing extension functionality.
+
+### Build System
+
+**Yarn Workspaces**: Optimized monorepo builds with dependency caching
+**Webpack 5**: Module federation for dynamic extension loading
+**Plugin Import System**: Extensions auto-register via `writePluginImportsFile.js`
+
+### Key Technologies
+
+- **React 18 + TypeScript**: UI framework
+- **Cornerstone.js**: Medical image rendering
+- **DICOM**: Medical imaging standard support
+- **ONNX Runtime**: AI model inference (SAM segmentation models)
+- **Zustand**: State management
+- **TailwindCSS**: Styling system
+
+## Development Patterns
+
+### Adding New Tools
+1. Create tool class in `extensions/cornerstone/src/tools/`
+2. Register in tool module's `toolNames.ts`
+3. Add to toolbar via `getToolbarModule.tsx`
+4. Add measurement mapping if needed in `measurementServiceMappings/`
+
+### Creating Extensions
+Extensions must export:
+- `id.js` - Unique extension identifier
+- `index.tsx` - Extension registration
+- Module functions (`getToolbarModule`, `getViewportModule`, etc.)
+
+### Viewport Customization
+Custom viewports extend base Cornerstone viewport:
+- Override render methods for custom overlays
+- Implement measurement tracking
+- Add viewport-specific tools and interactions
+
+### Service Integration
+Register services in extension's `servicesManager.registerService` and access via:
+```javascript
+const { MeasurementService } = servicesManager.services;
+```
+
+### Creating stores
+To create a store, you can make one in your extension's `stores/` directory, and you can follow the example of an existing store such as `useLutPresentationStore.ts` or `useSynchronizersStore.ts`.
+
+### Creating hooks
+To create a hook, you can make one in your extension's `hooks/` directory, and you can follow the example of an existing hook such as `usePatientInfo.tsx`.
+
+### Creating providers
+To create a provider, you can make one in your extension's `providers/` or `contexts/` directory, and you can follow the example of an existing provider such as `ViewportGridProvider.tsx`.
+
+### Adding new icons
+To add a new icon, you can add it to the `icons/` directory, then register the icon using `import { addIcon } from '@ohif/extension-default/src/utils'`
+
+### Creating synchronizers
+You can create custom synchronizers and place them in the `synchronizers/` directory, you can follow the example of `frameViewSynchronizer.ts`
+
+### Utilites
+Any new utilites should be placed in the `utils/` directory, and you can follow the example of `formatPN.ts`
+
+### Commands
+Commands are created in the commandsModule of the extension, for example the cornerstone extension has `commandsModule.tsx`, sometimes its also named `getCommandsModule.tsx.`
+
+### Overriding OHIF Components
+
+To override an OHIF component, you can create a new component in your extension's `components/` directory, then import it instead of the original ui-next component.
+
+### Mode layout
+
+The layoutTemplate is a function that returns a layout object, you can follow the example of `longitudinal/src/index.ts`. This would be helpful when you need to override a component as you can know where to look for the original component.
+
+### Pub Sub
+Always prioritrize pub sub, by calling a services subscribe over useEffects as it's more reliable, for example
+
+```ts
+  useEffect(() => {
+    const subscriptions = [
+      cornerstoneViewportService.subscribe(EVENTS.VIEWPORT_DATA_CHANGED, handleViewportDataChanged),
+      syncGroupService.subscribe(EVENTS.VIEWPORT_REMOVED, onHotKeyRemoval),
+      syncGroupService.subscribe(EVENTS.VIEWPORT_ADDED, onHotKeyAddition),
+    ];
+
+    return () => {
+      subscriptions.forEach(({ unsubscribe }) => unsubscribe());
+    };
+  }, []);
+```
+
+### Never modify core architecture
+Do not modify the core and always find a way to implement the solution via the extensions and modes, only modify core as a last resort if all other fail or there's an architectural constraint.
+
+## Configuration
+
+### Plugin Configuration
+Extensions are auto-discovered via `pluginConfig.json` and dynamically imported during build.
+
+## Medical Imaging Specifics
+
+### DICOM Support
+- Multi-format: CT, MRI, X-Ray, Mammography, Ultrasound
+- SOP Class handlers for specialized DICOM types (RT, SEG, SR)
+- DICOMweb protocol for web-based image retrieval
+
+### Hanging Protocols
+Define how images are arranged and displayed:
+- Located in `hps/` directories
+- JSON configuration with viewport rules
+- Support for priors comparison and multi-monitor layouts
+
+### Measurement Tools
+- Cornerstone Tools integration for annotations
+- Bidirectional measurements, polylines, annotations
+- Export capabilities (DICOM SR, CSV reports)
+- AI-assisted measurements via ONNX models

Dockerfile

@@ -49,8 +49,8 @@ RUN apt-get update && apt-get install -y build-essential python3
 
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
-RUN npm install -g bun
-# RUN npm install -g lerna@7.4.2
+RUN npm install -g bun@1.2.23
+RUN npm install -g lerna@7.4.2
 ENV PATH=/usr/src/app/node_modules/.bin:$PATH
 
 # Do an initial install and then a final install
@@ -60,6 +60,7 @@ COPY --parents ./addOns/package.json ./addOns/*/*/package.json ./extensions/*/pa
 
 RUN bun pm cache rm
 RUN bun install
+RUN bun add ajv@8.12.0
 # Copy the local directory
 COPY --link --exclude=yarn.lock --exclude=package.json --exclude=Dockerfile . .
 
@@ -98,7 +99,7 @@ COPY --from=builder /usr/src/app/platform/app/dist/dicom-microscopy-viewer /usr/
 # In entrypoint.sh, app-config.js might be overwritten, so chmod it to be writeable.
 # The nginx user cannot chmod it, so change to root.
 USER root
-RUN chown -R nginx:nginx /usr/share/nginx/html
+RUN chown -R nginx:nginx /usr/share/nginx/html && chmod -R 777 /usr/share/nginx/html
 USER nginx
 ENTRYPOINT ["/usr/src/entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -49,11 +49,12 @@ provided by the <a href="https://ohif.org/">Open Health Imaging Foundation (OHIF
 | <img src="https://github.com/OHIF/Viewers/blob/master/platform/docs/docs/assets/img/demo-4d.webp?raw=true" alt="4D" width="350"/> | 4D  | [Demo](https://viewer.ohif.org/dynamic-volume?StudyInstanceUIDs=2.25.232704420736447710317909004159492840763) |
 | <img src="https://github.com/OHIF/Viewers/blob/master/platform/docs/docs/assets/img/demo-video.webp?raw=true" alt="VIDEO" width="350"/> | Video  | [Demo](https://viewer.ohif.org/viewer?StudyInstanceUIDs=2.25.96975534054447904995905761963464388233) |
 | <img src="https://github.com/OHIF/Viewers/blob/master/platform/docs/docs/assets/img/microscopy.webp?raw=true" alt="microscopy" width="350"/> | Slide Microscopy  | [Demo](https://viewer.ohif.org/microscopy?StudyInstanceUIDs=2.25.141277760791347900862109212450152067508) |
+| <img src="https://github.com/OHIF/Viewers/blob/master/platform/docs/docs/assets/img/demo-ecg.webp?raw=true" alt="ECG" width="350"/> | ECG Waveform  | [Demo](https://viewer-dev.ohif.org/viewer?StudyInstanceUIDs=2.25.209974489360710696739324151261716440238) |
 
 ## About
 
 The OHIF Viewer can retrieve
-and load images from most sources and formats; render sets in 2D, 3D, and
+and load images from most sources and formats, render sets in 2D, 3D, and
 reconstructed representations; allows for the manipulation, annotation, and
 serialization of observations; supports internationalization, OpenID Connect,
 offline use, hotkeys, and many more features.
@@ -76,7 +77,7 @@ contributions of individuals, research groups, and commercial organizations.
 After more than 8-years of integrating with many companies and organizations,
 The OHIF Viewer has been rebuilt from the ground up to better address the
 varying workflow and configuration needs of its many users. All of the Viewer's
-core features are built using it's own extension system. The same extensibility
+core features are built using its own extension system. The same extensibility
 that allows us to offer:
 
 - 2D and 3D medical image viewing
@@ -104,7 +105,6 @@ For commercial support, academic collaborations, and answers to common
 questions; please use [Get Support](https://ohif.org/get-support/) to contact
 us.
 
-
 ## Developing
 
 ### Branches
@@ -147,7 +147,14 @@ Here is a schematic representation of our development workflow:
 3. Navigate to the cloned project's directory
 4. Add this repo as a `remote` named `upstream`
    - `git remote add upstream https://github.com/OHIF/Viewers.git`
-5. `yarn install` to restore dependencies and link projects
+5. `yarn install --frozen-lockfile` to restore dependencies and link projects
+
+:::danger
+In general run `yarn install` with the `--frozen-lockfile` flag to help avoid
+supply chain attacks by enforcing reproducible dependencies. That is, if the
+`yarn.lock` file is clean and does NOT reference compromised packages, then
+no compromised packages should land on your machine by using this flag.
+:::
 
 #### To Develop
 
@@ -158,9 +165,67 @@ _From this repository's root directory:_
 yarn config set workspaces-experimental true
 
 # Restore dependencies
-yarn install
+yarn install --frozen-lockfile
 ```
 
+### Cornerstone3D Integration Testing
+
+OHIF's Playwright end-to-end tests can run against a **CS3D branch** or a
+**published CS3D version**, allowing changes that span both repositories to be
+validated together before merging.
+
+#### Setting up an integration build
+
+1. Add the **`ohif-integration`** label to your OHIF pull request.
+2. In the PR body, add a line specifying the CS3D ref:
+   ```
+   CS3D_REF: feat/my-feature
+   ```
+   - **Version ref** (e.g. `4.19+`, `4.18.2`) — the workflow resolves it to an
+     exact published version and swaps the CS3D dependency via npm.
+   - **Branch ref** (e.g. `main`, `cornerstonejs:feat/foo`) — the workflow
+     clones the branch, builds CS3D from source with `bun run build:esm`, and
+     symlinks the built packages into OHIF's `node_modules`.
+   - For forks, use the `<owner>:<branch>` format
+     (e.g. `myGithubUser:feat/foo`).
+   - If no `CS3D_REF` is specified, the default is `4.19+`.
+3. The workflow can also be triggered manually via **workflow_dispatch** with a
+   `cs3d_ref` input.
+
+#### What happens in CI
+
+The [Playwright workflow](.github/workflows/playwright.yml) runs two jobs:
+
+| Job | Purpose |
+|-----|---------|
+| **Playwright Tests** | Builds OHIF (with CS3D linked or version-swapped), runs the full Playwright suite, uploads test results and coverage, and deploys a Netlify preview when `ohif-integration` is active. |
+| **CS3D Branch Merge Guard** | A lightweight check that **fails** when the `ohif-integration` label is present and `CS3D_REF` points to a branch (not a version). This prevents merging while still letting the Playwright tests show green so you can see whether the code actually works. |
+
+#### Testing changes that span both repos
+
+If a feature requires changes in both Cornerstone3D and OHIF:
+
+1. Create your feature branch in CS3D and push it.
+2. Create a matching branch in OHIF.
+3. Add the `ohif-integration` label to the OHIF pull request.
+4. In the PR body, add: `CS3D_REF: <your-cs3d-branch>`.
+5. Playwright tests will build CS3D from source, link it, and run the full
+   suite. The merge guard will block merge until you switch to a published
+   version — but you can see the test results and the preview deploy while
+   iterating.
+6. Once the CS3D side is merged and published, update the PR body to reference
+   the published version (e.g. `CS3D_REF: 4.19+`). The tests will run against
+   the registry version and the merge guard will pass.
+
+#### Preview deploys
+
+When `ohif-integration` is active, the Playwright workflow also builds the OHIF
+viewer and deploys it to Netlify as a preview. This gives you a live URL to
+manually test the combined CS3D + OHIF changes without running anything locally.
+
+For details on linking CS3D locally for development, see the
+[Cornerstone3D README](libs/@cornerstonejs/README.md#local-development-linking--unlinking).
+
 ## Commands
 
 These commands are available from the root directory. Each project directory

addOns/externals/devDependencies/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@externals/devDependencies",
   "description": "External dev dependencies - put dev build dependencies here",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "license": "MIT",
   "private": true,
   "engines": {
@@ -9,87 +9,81 @@
     "yarn": ">=1.19.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.13",
-    "@kitware/vtk.js": "32.12.0",
-    "clsx": "^2.1.1",
-    "core-js": "^3.2.1",
-    "moment": "^2.30.1"
+    "@babel/runtime": "7.28.2",
+    "@kitware/vtk.js": "34.15.1",
+    "clsx": "2.1.1",
+    "core-js": "3.45.1",
+    "moment": "2.30.1"
   },
   "peerDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@rsbuild/core": "^1.1.13",
-    "@rsbuild/plugin-node-polyfill": "1.2.0",
-    "@rsbuild/plugin-react": "^1.1.0",
-    "@svgr/webpack": "^8.1.0",
-    "@swc/helpers": "^0.5.15",
-    "@types/jest": "^27.5.0",
-    "@typescript-eslint/eslint-plugin": "^6.3.0",
-    "@typescript-eslint/parser": "^6.3.0",
-    "autoprefixer": "^10.4.4",
-    "babel-eslint": "9.x",
-    "babel-loader": "^8.2.4",
-    "babel-plugin-module-resolver": "^5.0.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^9.0.1",
-    "cross-env": "^5.2.0",
-    "css-loader": "^6.8.1",
-    "dotenv": "^8.1.0",
-    "eslint": "^8.39.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-config-react-app": "^6.0.0",
-    "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-flowtype": "^7.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-promise": "^5.2.0",
-    "eslint-plugin-react": "^7.29.4",
-    "eslint-plugin-react-hooks": "^4.4.0",
-    "eslint-plugin-tsdoc": "^0.2.11",
-    "eslint-webpack-plugin": "^2.5.3",
-    "execa": "^8.0.1",
-    "extract-css-chunks-webpack-plugin": "^4.5.4",
-    "html-webpack-plugin": "^5.3.2",
-    "husky": "^3.0.0",
-    "jest": "^29.5.0",
-    "jest-canvas-mock": "^2.1.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "jest-junit": "^6.4.0",
-    "lerna": "^7.2.0",
-    "lint-staged": "^9.0.2",
-    "mini-css-extract-plugin": "^2.1.0",
-    "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "postcss": "^8.3.5",
-    "postcss-import": "^14.0.2",
-    "postcss-loader": "^6.1.1",
-    "postcss-preset-env": "^7.4.3",
-    "prettier": "^3.0.3",
-    "prettier-plugin-tailwindcss": "^0.5.4",
-    "react-refresh": "^0.14.2",
-    "semver": "^7.5.1",
-    "serve": "^14.2.4",
-    "shader-loader": "^1.3.1",
-    "shx": "^0.3.3",
-    "source-map-loader": "^4.0.1",
-    "style-loader": "^1.0.0",
-    "stylus": "^0.59.0",
-    "stylus-loader": "^7.1.3",
-    "terser-webpack-plugin": "^5.1.4",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.17",
+    "@rsbuild/core": "1.5.1",
+    "@rsbuild/plugin-node-polyfill": "1.4.2",
+    "@rsbuild/plugin-react": "1.4.0",
+    "@svgr/webpack": "8.1.0",
+    "@swc/helpers": "0.5.17",
+    "@types/jest": "27.5.2",
+    "@typescript-eslint/eslint-plugin": "8.56.0",
+    "@typescript-eslint/parser": "8.56.0",
+    "autoprefixer": "10.4.21",
+    "babel-loader": "8.4.1",
+    "clean-webpack-plugin": "3.0.0",
+    "copy-webpack-plugin": "9.1.0",
+    "cross-env": "7.0.3",
+    "css-loader": "6.11.0",
+    "dotenv": "8.6.0",
+    "eslint": "9.39.3",
+    "eslint-config-prettier": "7.2.0",
+    "eslint-config-react-app": "7.0.1",
+    "eslint-plugin-cypress": "2.15.2",
+    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-jsx-a11y": "6.10.2",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-prettier": "5.5.1",
+    "eslint-plugin-promise": "7.2.1",
+    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react-hooks": "7.0.1",
+    "eslint-plugin-tsdoc": "0.2.17",
+    "execa": "8.0.1",
+    "extract-css-chunks-webpack-plugin": "4.10.0",
+    "html-webpack-plugin": "5.6.3",
+    "husky": "3.1.0",
+    "jest": "29.7.0",
+    "jest-canvas-mock": "2.5.2",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-junit": "6.4.0",
+    "lerna": "9.0.4",
+    "lint-staged": "9.5.0",
+    "mini-css-extract-plugin": "2.9.2",
+    "optimize-css-assets-webpack-plugin": "6.0.1",
+    "postcss": "8.5.6",
+    "postcss-import": "14.1.0",
+    "postcss-loader": "6.2.1",
+    "postcss-preset-env": "7.8.3",
+    "prettier": "3.6.2",
+    "prettier-plugin-tailwindcss": "0.6.9",
+    "react-refresh": "0.14.2",
+    "semver": "7.7.2",
+    "serve": "14.2.5",
+    "shader-loader": "1.3.1",
+    "shx": "0.3.4",
+    "source-map-loader": "4.0.2",
+    "style-loader": "1.3.0",
+    "terser-webpack-plugin": "5.3.14",
     "typescript": "5.5.4",
     "unused-webpack-plugin": "2.4.0",
-    "webpack": "5.94.0",
-    "webpack-bundle-analyzer": "^4.8.0",
-    "webpack-cli": "^4.7.2",
-    "webpack-dev-server": "4.7.3",
-    "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^5.7.3",
-    "workbox-webpack-plugin": "^6.1.5",
-    "worker-loader": "^3.0.8"
+    "webpack": "5.105.0",
+    "webpack-bundle-analyzer": "4.10.2",
+    "webpack-cli": "5.1.4",
+    "webpack-dev-server": "5.2.2",
+    "webpack-hot-middleware": "2.26.1",
+    "webpack-merge": "5.10.0",
+    "workbox-webpack-plugin": "6.6.1",
+    "worker-loader": "3.0.8"
   },
   "scripts": {
     "build": "Included as direct dependency"

addOns/externals/dicom-microscopy-viewer/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@externals/dicom-microscopy-viewer",
   "description": "External reference to dicom-microscopy-viewer",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "license": "MIT",
   "dependencies": {
-    "dicom-microscopy-viewer": "^0.46.1"
+    "dicom-microscopy-viewer": "0.48.17"
   }
 }

addOns/package.json

@@ -21,31 +21,30 @@
     "preinstall": "cd .. && node preinstall.js"
   },
   "devDependencies": {
-    "@babel/core": "7.24.7",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-object-rest-spread": "^7.17.3",
-    "@babel/plugin-proposal-private-methods": "^7.18.6",
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-arrow-functions": "^7.16.7",
-    "@babel/plugin-transform-regenerator": "^7.16.7",
-    "@babel/plugin-transform-runtime": "7.24.7",
-    "@babel/plugin-transform-typescript": "^7.13.0",
-    "@babel/preset-env": "7.24.7",
-    "@babel/preset-react": "^7.16.7",
-    "@babel/preset-typescript": "^7.13.0"
+    "@babel/core": "7.28.0",
+    "@babel/plugin-transform-class-properties": "7.27.1",
+    "@babel/plugin-transform-object-rest-spread": "7.28.0",
+    "@babel/plugin-transform-private-methods": "7.27.1",
+    "@babel/plugin-transform-private-property-in-object": "7.27.1",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-transform-arrow-functions": "7.27.1",
+    "@babel/plugin-transform-regenerator": "7.28.1",
+    "@babel/plugin-transform-runtime": "7.28.0",
+    "@babel/plugin-transform-typescript": "7.28.0",
+    "@babel/preset-env": "7.29.5",
+    "@babel/preset-react": "7.27.1",
+    "@babel/preset-typescript": "7.27.1"
   },
   "resolutions": {
-    "**/@babel/runtime": "^7.20.13",
+    "**/@babel/runtime": "7.28.2",
     "commander": "8.3.0",
-    "dcmjs": "0.38.0",
-    "dicomweb-client": ">=0.10.4",
-    "nth-check": "^2.1.1",
-    "trim-newlines": "^5.0.0",
-    "glob-parent": "^6.0.2",
-    "trim": "^1.0.0",
-    "package-json": "^8.1.0",
-    "typescript": "5.5.4",
-    "sharp": "^0.32.6"
+    "dcmjs": "0.49.4",
+    "dicomweb-client": "0.10.4",
+    "nth-check": "2.1.1",
+    "trim-newlines": "5.0.0",
+    "glob-parent": "6.0.2",
+    "trim": "1.0.1",
+    "package-json": "8.1.1",
+    "typescript": "5.5.4"
   }
 }

babel.config.js

@@ -3,10 +3,10 @@ module.exports = {
   babelrcRoots: ['./platform/*', './extensions/*', './modes/*'],
   presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'],
   plugins: [
-    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    ['@babel/plugin-transform-class-properties', { loose: true }],
     '@babel/plugin-transform-typescript',
-    ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
-    ['@babel/plugin-proposal-private-methods', { loose: true }],
+    ['@babel/plugin-transform-private-property-in-object', { loose: true }],
+    ['@babel/plugin-transform-private-methods', { loose: true }],
     '@babel/plugin-transform-class-static-block',
   ],
   env: {
@@ -18,6 +18,8 @@ module.exports = {
           {
             modules: 'commonjs',
             debug: false,
+            targets: { node: 'current' },
+            bugfixes: true,
           },
         ],
         '@babel/preset-react',
@@ -25,13 +27,15 @@ module.exports = {
       ],
       plugins: [
         'babel-plugin-istanbul',
-        '@babel/plugin-proposal-object-rest-spread',
+        '@babel/plugin-transform-object-rest-spread',
         '@babel/plugin-syntax-dynamic-import',
         '@babel/plugin-transform-regenerator',
         '@babel/transform-destructuring',
         '@babel/plugin-transform-runtime',
         '@babel/plugin-transform-typescript',
         '@babel/plugin-transform-class-static-block',
+        '@babel/plugin-transform-for-of',
+        ['babel-plugin-transform-import-meta', { module: 'ES6' }],
       ],
     },
     production: {

bunfig.toml

@@ -0,0 +1,2 @@
+[install]
+frozenLockfile = true

bunfig.update-lockfile.toml

@@ -0,0 +1,2 @@
+[install]
+frozenLockfile = false

commit.txt

@@ -1 +1 @@
-09ac43f297fa81101d3a3eaa9b5cfef8e01ea214
+27af6821b56f2c5be3a5d4ce38d05be6fbce68f4

extensions/cornerstone-dicom-pmap/babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  plugins: ['@babel/plugin-proposal-class-properties'],
+  plugins: ['@babel/plugin-transform-class-properties'],
   env: {
     test: {
       presets: [
@@ -15,7 +15,7 @@ module.exports = {
         '@babel/preset-react',
       ],
       plugins: [
-        '@babel/plugin-proposal-object-rest-spread',
+        '@babel/plugin-transform-object-rest-spread',
         '@babel/plugin-syntax-dynamic-import',
         '@babel/plugin-transform-regenerator',
         '@babel/plugin-transform-runtime',

extensions/cornerstone-dicom-pmap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-pmap",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "description": "DICOM Parametric Map read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,22 +33,21 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.11.0-beta.15",
-    "@ohif/extension-cornerstone": "3.11.0-beta.15",
-    "@ohif/extension-default": "3.11.0-beta.15",
-    "@ohif/i18n": "3.11.0-beta.15",
-    "prop-types": "^15.6.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-i18next": "^12.2.2",
-    "react-router": "^6.8.1",
-    "react-router-dom": "^6.8.1"
+    "@ohif/core": "3.13.0-beta.78",
+    "@ohif/extension-cornerstone": "3.13.0-beta.78",
+    "@ohif/extension-default": "3.13.0-beta.78",
+    "@ohif/i18n": "3.13.0-beta.78",
+    "prop-types": "15.8.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-i18next": "12.3.1",
+    "react-router": "6.30.3",
+    "react-router-dom": "6.30.3"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.9.5",
-    "@cornerstonejs/core": "^3.9.5",
-    "@kitware/vtk.js": "32.12.0",
-    "react-color": "^2.19.3"
+    "@babel/runtime": "7.28.2",
+    "@cornerstonejs/adapters": "4.22.8",
+    "@cornerstonejs/core": "4.22.8",
+    "@kitware/vtk.js": "34.15.1"
   }
 }

extensions/cornerstone-dicom-pmap/src/getSopClassHandlerModule.ts

@@ -1,10 +1,9 @@
-import { utils } from '@ohif/core';
+import { utils, Types as OhifTypes } from '@ohif/core';
+import i18n from '@ohif/i18n';
 import { metaData, cache, utilities as csUtils, volumeLoader } from '@cornerstonejs/core';
 import { adaptersPMAP } from '@cornerstonejs/adapters';
 import { SOPClassHandlerId } from './id';
-import { dicomLoaderService } from '@ohif/extension-cornerstone';
-
-const VOLUME_LOADER_SCHEME = 'cornerstoneStreamingImageVolume';
+import { dicomLoaderService, VOLUME_LOADER_SCHEME } from '@ohif/extension-cornerstone';
 const sopClassUids = ['1.2.840.10008.5.1.4.1.1.30'];
 
 function _getDisplaySetsFromSeries(
@@ -57,7 +56,8 @@ function _getDisplaySetsFromSeries(
     wadoRoot,
     wadoUriRoot,
     wadoUri,
-    isOverlayDisplaySet: true,
+    supportsWindowLevel: true,
+    label: SeriesDescription || `${i18n.t('Series')} ${SeriesNumber} - ${i18n.t('PMAP')}`,
   };
 
   const referencedSeriesSequence = instance.ReferencedSeriesSequence;
@@ -227,7 +227,8 @@ async function _loadParametricMap({ displaySet, headers }: withAppTypes) {
   return derivedVolume;
 }
 
-function getSopClassHandlerModule({ servicesManager, extensionManager }) {
+function getSopClassHandlerModule(params: OhifTypes.Extensions.ExtensionParams) {
+  const { servicesManager, extensionManager } = params;
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };

extensions/cornerstone-dicom-pmap/src/viewports/OHIFCornerstonePMAPViewport.tsx

@@ -1,16 +1,10 @@
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useViewportGrid } from '@ohif/ui-next';
+import { OHIFCornerstoneViewport } from '@ohif/extension-cornerstone';
 
 function OHIFCornerstonePMAPViewport(props: withAppTypes) {
-  const {
-    displaySets,
-    children,
-    viewportOptions,
-    displaySetOptions,
-    servicesManager,
-    extensionManager,
-  } = props;
+  const { displaySets, children, viewportOptions, displaySetOptions, servicesManager } = props;
   const viewportId = viewportOptions.viewportId;
   const { displaySetService, segmentationService, uiNotificationService, customizationService } =
     servicesManager.services;
@@ -59,9 +53,6 @@ function OHIFCornerstonePMAPViewport(props: withAppTypes) {
 
   const getCornerstoneViewport = useCallback(() => {
     const { displaySet: referencedDisplaySet } = referencedDisplaySetRef.current;
-    const { component: Component } = extensionManager.getModuleEntry(
-      '@ohif/extension-cornerstone.viewportModule.cornerstone'
-    );
 
     displaySetOptions.unshift({});
     const [pmapDisplaySetOptions] = displaySetOptions;
@@ -93,7 +84,7 @@ function OHIFCornerstonePMAPViewport(props: withAppTypes) {
     });
 
     return (
-      <Component
+      <OHIFCornerstoneViewport
         {...props}
         // Referenced + PMAP displaySets must be passed as parameter in this order
         displaySets={[referencedDisplaySet, pmapDisplaySet]}
@@ -104,15 +95,16 @@ function OHIFCornerstonePMAPViewport(props: withAppTypes) {
           presentationIds: viewportOptions.presentationIds,
         }}
         displaySetOptions={[{}, pmapDisplaySetOptions]}
-      ></Component>
+      />
     );
   }, [
-    extensionManager,
     displaySetOptions,
     props,
     pmapDisplaySet,
     viewportOptions.orientation,
     viewportOptions.viewportId,
+    viewportOptions.presentationIds,
+    uiNotificationService,
   ]);
 
   // Cleanup the PMAP viewport when the viewport is destroyed

extensions/cornerstone-dicom-rt/babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  plugins: ['@babel/plugin-proposal-class-properties'],
+  plugins: ['@babel/plugin-transform-class-properties'],
   env: {
     test: {
       presets: [
@@ -15,7 +15,7 @@ module.exports = {
         '@babel/preset-react',
       ],
       plugins: [
-        '@babel/plugin-proposal-object-rest-spread',
+        '@babel/plugin-transform-object-rest-spread',
         '@babel/plugin-syntax-dynamic-import',
         '@babel/plugin-transform-regenerator',
         '@babel/plugin-transform-runtime',

extensions/cornerstone-dicom-rt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-rt",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,19 +33,18 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.11.0-beta.15",
-    "@ohif/extension-cornerstone": "3.11.0-beta.15",
-    "@ohif/extension-default": "3.11.0-beta.15",
-    "@ohif/i18n": "3.11.0-beta.15",
-    "prop-types": "^15.6.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-i18next": "^10.11.0",
-    "react-router": "^6.23.1",
-    "react-router-dom": "^6.23.1"
+    "@ohif/core": "3.13.0-beta.78",
+    "@ohif/extension-cornerstone": "3.13.0-beta.78",
+    "@ohif/extension-default": "3.13.0-beta.78",
+    "@ohif/i18n": "3.13.0-beta.78",
+    "prop-types": "15.8.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-i18next": "12.3.1",
+    "react-router": "6.30.3",
+    "react-router-dom": "6.30.3"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.13",
-    "react-color": "^2.19.3"
+    "@babel/runtime": "7.28.2"
   }
 }

extensions/cornerstone-dicom-rt/src/getCommandsModule.ts

@@ -27,7 +27,7 @@ const commandsModule = ({ commandsManager, servicesManager }: withAppTypes) => {
       // it will be in the correct position zoom and pan
       commandsManager.runCommand('updateStoredPositionPresentation', {
         viewportId,
-        displaySetInstanceUID: referencedDisplaySet.displaySetInstanceUID,
+        displaySetInstanceUIDs: [referencedDisplaySet.displaySetInstanceUID],
       });
 
       viewportGridService.setDisplaySetsForViewport({

extensions/cornerstone-dicom-rt/src/getSopClassHandlerModule.ts

@@ -1,9 +1,13 @@
-import { utils } from '@ohif/core';
+import { utils, Types as OhifTypes } from '@ohif/core';
+import i18n from '@ohif/i18n';
+import { segmentation as cstSegmentation } from '@cornerstonejs/tools';
 
 import { SOPClassHandlerId } from './id';
 import loadRTStruct from './loadRTStruct';
 
-const sopClassUids = ['1.2.840.10008.5.1.4.1.1.481.3'];
+const { sopClassDictionary } = utils;
+
+const sopClassUids = [sopClassDictionary.RTStructureSetStorage];
 
 const loadPromises = {};
 
@@ -12,34 +16,47 @@ function _getDisplaySetsFromSeries(
   servicesManager: AppTypes.ServicesManager,
   extensionManager
 ) {
-  const instance = instances[0];
+  utils.sortStudyInstances(instances);
+  // Choose the LAST instance in the list as the most recently created one.
+  const instance = instances[instances.length - 1];
 
   const {
     StudyInstanceUID,
     SeriesInstanceUID,
     SOPInstanceUID,
-    SeriesDescription,
+    SeriesDescription = '',
     SeriesNumber,
     SeriesDate,
+    SeriesTime,
+    StructureSetDate,
+    StructureSetTime,
     SOPClassUID,
     wadoRoot,
     wadoUri,
     wadoUriRoot,
+    imageId: predecessorImageId,
   } = instance;
 
   const displaySet = {
     Modality: 'RTSTRUCT',
     loading: false,
-    isReconstructable: false, // by default for now since it is a volumetric SEG currently
+    isReconstructable: false,
     displaySetInstanceUID: utils.guid(),
     SeriesDescription,
     SeriesNumber,
-    SeriesDate,
+    /**
+     * The "SeriesDate" for a display set is really the display set date, which
+     * should be the date of the instance being used, which will be the structure
+     * set date in this case.
+     */
+    SeriesDate: StructureSetDate || SeriesDate,
+    SeriesTime: StructureSetTime || SeriesTime,
     SOPInstanceUID,
     SeriesInstanceUID,
     StudyInstanceUID,
     SOPClassHandlerId,
     SOPClassUID,
+    FrameOfReferenceUID: null,
     referencedImages: null,
     referencedSeriesInstanceUID: null,
     referencedDisplaySetInstanceUID: null,
@@ -49,14 +66,20 @@ function _getDisplaySetsFromSeries(
     structureSet: null,
     sopClassUids,
     instance,
+    instances,
+    predecessorImageId,
     wadoRoot,
     wadoUriRoot,
     wadoUri,
     isOverlayDisplaySet: true,
+    label: SeriesDescription || `${i18n.t('Series')} ${SeriesNumber} - ${i18n.t('RTSTRUCT')}`,
   };
 
   let referencedSeriesSequence = instance.ReferencedSeriesSequence;
-  if (instance.ReferencedFrameOfReferenceSequence && !instance.ReferencedSeriesSequence) {
+  if (
+    instance.ReferencedFrameOfReferenceSequence?.RTReferencedStudySequence &&
+    !instance.ReferencedSeriesSequence
+  ) {
     instance.ReferencedSeriesSequence = _deriveReferencedSeriesSequenceFromFrameOfReferenceSequence(
       instance.ReferencedFrameOfReferenceSequence
     );
@@ -64,7 +87,8 @@ function _getDisplaySetsFromSeries(
   }
 
   if (!referencedSeriesSequence) {
-    throw new Error('ReferencedSeriesSequence is missing for the RTSTRUCT');
+    console.error('ReferencedSeriesSequence is missing for the RTSTRUCT');
+    return;
   }
 
   const referencedSeries = referencedSeriesSequence[0];
@@ -72,10 +96,17 @@ function _getDisplaySetsFromSeries(
   displaySet.referencedImages = instance.ReferencedSeriesSequence.ReferencedInstanceSequence;
   displaySet.referencedSeriesInstanceUID = referencedSeries.SeriesInstanceUID;
 
+  displaySet.FrameOfReferenceUID =
+    instance.ReferencedFrameOfReferenceSequence?.[0]?.FrameOfReferenceUID;
+
   const { displaySetService } = servicesManager.services;
-  const referencedDisplaySets = displaySetService.getDisplaySetsForSeries(
-    displaySet.referencedSeriesInstanceUID
-  );
+  const referencedDisplaySets =
+    displaySetService.getDisplaySetsForReferences(referencedSeriesSequence);
+  if (referencedDisplaySets?.length > 1) {
+    console.warn(
+      'Reference applies to more than 1 display set for Contours, applying only to first display set'
+    );
+  }
 
   if (!referencedDisplaySets || referencedDisplaySets.length === 0) {
     // Instead of throwing error, subscribe to display sets added
@@ -85,27 +116,39 @@ function _getDisplaySetsFromSeries(
         const addedDisplaySet = displaySetsAdded[0];
         if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) {
           displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID;
+          displaySet.isReconstructable = addedDisplaySet.isReconstructable;
+          displaySet.FrameOfReferenceUID = addedDisplaySet.FrameOfReferenceUID;
           unsubscribe();
         }
       }
     );
   } else {
-    const referencedDisplaySet = referencedDisplaySets[0];
+    const [referencedDisplaySet] = referencedDisplaySets;
     displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID;
+    displaySet.isReconstructable = referencedDisplaySet.isReconstructable;
+    displaySet.FrameOfReferenceUID = referencedDisplaySet.FrameOfReferenceUID;
   }
 
-  displaySet.load = ({ headers }) => _load(displaySet, servicesManager, extensionManager, headers);
+  displaySet.load = ({ headers, createSegmentation = true }) =>
+    _load(displaySet, servicesManager, extensionManager, headers, createSegmentation);
 
   return [displaySet];
 }
 
-function _load(rtDisplaySet, servicesManager: AppTypes.ServicesManager, extensionManager, headers) {
+function _load(
+  rtDisplaySet,
+  servicesManager: AppTypes.ServicesManager,
+  extensionManager,
+  headers,
+  createSegmentation = true
+) {
   const { SOPInstanceUID } = rtDisplaySet;
   const { segmentationService } = servicesManager.services;
+
   if (
     (rtDisplaySet.loading || rtDisplaySet.isLoaded) &&
     loadPromises[SOPInstanceUID] &&
-    _segmentationExistsInCache(rtDisplaySet, segmentationService)
+    _segmentationExists(rtDisplaySet)
   ) {
     return loadPromises[SOPInstanceUID];
   }
@@ -114,23 +157,23 @@ function _load(rtDisplaySet, servicesManager: AppTypes.ServicesManager, extensio
 
   // We don't want to fire multiple loads, so we'll wait for the first to finish
   // and also return the same promise to any other callers.
-  loadPromises[SOPInstanceUID] = new Promise(async (resolve, reject) => {
-    if (!rtDisplaySet.structureSet) {
-      const structureSet = await loadRTStruct(extensionManager, rtDisplaySet, headers);
+  loadPromises[SOPInstanceUID] = new Promise<void>(async (resolve, reject) => {
+    try {
+      if (!rtDisplaySet.structureSet) {
+        const structureSet = await loadRTStruct(extensionManager, rtDisplaySet, headers);
+        rtDisplaySet.structureSet = structureSet;
+      }
 
-      rtDisplaySet.structureSet = structureSet;
+      if (createSegmentation) {
+        await segmentationService.createSegmentationForRTDisplaySet(rtDisplaySet);
+      }
+
+      resolve();
+    } catch (error) {
+      reject(error);
+    } finally {
+      rtDisplaySet.loading = false;
     }
-
-    segmentationService
-      .createSegmentationForRTDisplaySet(rtDisplaySet)
-      .then(() => {
-        rtDisplaySet.loading = false;
-        resolve();
-      })
-      .catch(error => {
-        rtDisplaySet.loading = false;
-        reject(error);
-      });
   });
 
   return loadPromises[SOPInstanceUID];
@@ -171,20 +214,13 @@ function _deriveReferencedSeriesSequenceFromFrameOfReferenceSequence(
   return ReferencedSeriesSequence;
 }
 
-function _segmentationExistsInCache(
-  rtDisplaySet,
-  segmentationService: AppTypes.SegmentationService
-) {
-  // Todo: fix this
-  return false;
-  // This should be abstracted with the CornerstoneCacheService
-  const rtContourId = rtDisplaySet.displaySetInstanceUID;
-  const contour = segmentationService.getContour(rtContourId);
-
-  return contour !== undefined;
+function _segmentationExists(segDisplaySet) {
+  return !!cstSegmentation.state.getSegmentation(segDisplaySet.displaySetInstanceUID);
 }
 
-function getSopClassHandlerModule({ servicesManager, extensionManager }) {
+function getSopClassHandlerModule(params: OhifTypes.Extensions.ExtensionParams) {
+  const { servicesManager, extensionManager } = params;
+
   return [
     {
       name: 'dicom-rt',

extensions/cornerstone-dicom-rt/src/loadRTStruct.js

@@ -2,9 +2,34 @@ import dcmjs from 'dcmjs';
 const { DicomMessage, DicomMetaDictionary } = dcmjs.data;
 const dicomlab2RGB = dcmjs.data.Colors.dicomlab2RGB;
 
-async function checkAndLoadContourData(instance, datasource) {
+/**
+ * Checks and loads contour data for RT Structure Set, handling both inline and bulk data URIs.
+ * Processes ROIContourSequence to extract contour data and resolve any bulk data references.
+ *
+ * @async
+ * @function checkAndLoadContourData
+ * @param {Object} params - Parameters object
+ * @param {Object} params.instance - Initial RT Structure instance
+ * @param {Object} params.dataSource - Data source for retrieving bulk data
+ * @param {Object} params.extensionManager - OHIF extension manager
+ * @param {Object} params.rtStructDisplaySet - RT Structure display set
+ * @param {Object} params.headers - HTTP headers for requests
+ * @returns {Promise<Object>} Promise that resolves to the processed RT Structure instance with loaded contour data
+ * @throws {Promise<string>} Rejects with error message if instance is invalid or data retrieval fails
+ */
+async function checkAndLoadContourData({
+  instance: initialInstance,
+  dataSource,
+  extensionManager,
+  rtStructDisplaySet,
+  headers,
+}) {
+  let instance = initialInstance;
   if (!instance || !instance.ROIContourSequence) {
-    return Promise.reject('Invalid instance object or ROIContourSequence');
+    instance = await getRTStructInstance({ extensionManager, rtStructDisplaySet, headers });
+    if (!instance || !instance.ROIContourSequence) {
+      return Promise.reject('Invalid instance object or ROIContourSequence');
+    }
   }
 
   const promisesMap = new Map();
@@ -30,11 +55,11 @@ async function checkAndLoadContourData(instance, datasource) {
       } else if (contourData && contourData.BulkDataURI) {
         const bulkDataURI = contourData.BulkDataURI;
 
-        if (!datasource || !datasource.retrieve || !datasource.retrieve.bulkDataURI) {
-          return Promise.reject('Invalid datasource object or retrieve function');
+        if (!dataSource || !dataSource.retrieve || !dataSource.retrieve.bulkDataURI) {
+          return Promise.reject('Invalid dataSource object or retrieve function');
         }
 
-        const bulkDataPromise = datasource.retrieve.bulkDataURI({
+        const bulkDataPromise = dataSource.retrieve.bulkDataURI({
           BulkDataURI: bulkDataURI,
           StudyInstanceUID: instance.StudyInstanceUID,
           SeriesInstanceUID: instance.SeriesInstanceUID,
@@ -44,6 +69,40 @@ async function checkAndLoadContourData(instance, datasource) {
         promisesMap.has(referencedROINumber)
           ? promisesMap.get(referencedROINumber).push(bulkDataPromise)
           : promisesMap.set(referencedROINumber, [bulkDataPromise]);
+      } else if (contourData && contourData.InlineBinary) {
+        // Contour data is still in binary format, conversion needed
+        const base64String = contourData.InlineBinary;
+        const decodedText = atob(base64String);
+
+        const rawValues = decodedText.split('\\');
+
+        const result = [];
+
+        // Ensure strictly that we have a full set of 3 coordinates
+        if (rawValues.length % 3 !== 0) {
+          return Promise.reject('ContourData raw values not divisible by 3');
+        }
+
+        for (let i = 0; i < rawValues.length; i += 3) {
+          if (i + 2 < rawValues.length) {
+            const x = parseFloat(rawValues[i]);
+            const y = parseFloat(rawValues[i + 1]);
+            const z = parseFloat(rawValues[i + 2]);
+
+            // Only push if all three are valid numbers (filters out trailing empty splits)
+            if (!isNaN(x) && !isNaN(y) && !isNaN(z)) {
+              result.push(x);
+              result.push(y);
+              result.push(z);
+            } else {
+              return Promise.reject('Error parsing contourData from InlineBinary format');
+            }
+          }
+        }
+
+        promisesMap.has(referencedROINumber)
+          ? promisesMap.get(referencedROINumber).push(result)
+          : promisesMap.set(referencedROINumber, [result]);
       } else {
         return Promise.reject(`Invalid ContourData: ${contourData}`);
       }
@@ -64,9 +123,12 @@ async function checkAndLoadContourData(instance, datasource) {
         ROIContour.ContourSequence.forEach((Contour, index) => {
           const promise = resolvedPromises[index];
           if (promise.status === 'fulfilled') {
-            if (Array.isArray(promise.value) && promise.value.every(Number.isFinite)) {
+            if (
+              Array.isArray(promise.value) &&
+              promise.value.every(it => Number.isFinite(Number(it)))
+            ) {
               // If promise.value is already an array of numbers, use it directly
-              Contour.ContourData = promise.value;
+              Contour.ContourData = promise.value.map(Number);
             } else {
               // If the resolved promise value is a byte array (Blob), it needs to be decoded
               const uint8Array = new Uint8Array(promise.value);
@@ -87,35 +149,74 @@ async function checkAndLoadContourData(instance, datasource) {
       console.error(error);
     }
   });
+
+  return instance;
 }
 
-export default async function loadRTStruct(extensionManager, rtStructDisplaySet, headers) {
+/**
+ * Retrieves and parses RT Structure Set instance from DICOM data.
+ * Uses the cornerstone utility module to load DICOM data and converts it to a naturalized dataset.
+ *
+ * @async
+ * @function getRTStructInstance
+ * @param {Object} params - Parameters object
+ * @param {Object} params.extensionManager - OHIF extension manager
+ * @param {Object} params.rtStructDisplaySet - RT Structure display set
+ * @param {Object} params.headers - HTTP headers for requests
+ * @returns {Promise<Object>} Promise that resolves to the parsed RT Structure dataset
+ */
+const getRTStructInstance = async ({ extensionManager, rtStructDisplaySet, headers }) => {
   const utilityModule = extensionManager.getModuleEntry(
     '@ohif/extension-cornerstone.utilityModule.common'
   );
+  const { dicomLoaderService } = utilityModule.exports;
+  const segArrayBuffer = await dicomLoaderService.findDicomDataPromise(
+    rtStructDisplaySet,
+    null,
+    headers
+  );
+  const dicomData = DicomMessage.readFile(segArrayBuffer);
+  const rtStructDataset = DicomMetaDictionary.naturalizeDataset(dicomData.dict);
+  rtStructDataset._meta = DicomMetaDictionary.namifyDataset(dicomData.meta);
+  return rtStructDataset;
+};
+
+/**
+ * Main function to load and process RT Structure Set data.
+ * Creates a structure set object with ROI contours, metadata, and visualization properties.
+ * Handles both bulk data URI and inline contour data scenarios.
+ *
+ * @async
+ * @function loadRTStruct
+ * @param {Object} extensionManager - OHIF extension manager
+ * @param {Object} rtStructDisplaySet - RT Structure display set to process
+ * @param {Object} headers - HTTP headers for data requests
+ * @returns {Promise<Object>} Promise that resolves to a structure set object containing:
+ *   - StructureSetLabel: Label of the structure set
+ *   - SeriesInstanceUID: Series instance UID
+ *   - ROIContours: Array of ROI contour data with points and metadata
+ *   - visible: Visibility state
+ *   - ReferencedSOPInstanceUIDsSet: Set of referenced SOP instance UIDs
+ */
+export default async function loadRTStruct(extensionManager, rtStructDisplaySet, headers) {
   const dataSource = extensionManager.getActiveDataSource()[0];
   const { bulkDataURI } = dataSource.getConfig?.() || {};
 
-  const { dicomLoaderService } = utilityModule.exports;
-
   // Set here is loading is asynchronous.
   // If this function throws its set back to false.
   rtStructDisplaySet.isLoaded = true;
   let instance = rtStructDisplaySet.instance;
 
   if (!bulkDataURI || !bulkDataURI.enabled) {
-    const segArrayBuffer = await dicomLoaderService.findDicomDataPromise(
-      rtStructDisplaySet,
-      null,
-      headers
-    );
-
-    const dicomData = DicomMessage.readFile(segArrayBuffer);
-    const rtStructDataset = DicomMetaDictionary.naturalizeDataset(dicomData.dict);
-    rtStructDataset._meta = DicomMetaDictionary.namifyDataset(dicomData.meta);
-    instance = rtStructDataset;
+    instance = await getRTStructInstance({ extensionManager, rtStructDisplaySet, headers });
   } else {
-    await checkAndLoadContourData(instance, dataSource);
+    instance = await checkAndLoadContourData({
+      instance,
+      dataSource,
+      extensionManager,
+      rtStructDisplaySet,
+      headers,
+    });
   }
 
   const { StructureSetROISequence, ROIContourSequence, RTROIObservationsSequence } = instance;
@@ -132,21 +233,16 @@ export default async function loadRTStruct(extensionManager, rtStructDisplaySet,
   for (let i = 0; i < ROIContourSequence.length; i++) {
     const ROIContour = ROIContourSequence[i];
     const { ContourSequence } = ROIContour;
-
     if (!ContourSequence) {
       continue;
     }
 
-    const isSupported = false;
-
     const ContourSequenceArray = _toArray(ContourSequence);
 
     const contourPoints = [];
-    for (let c = 0; c < ContourSequenceArray.length; c++) {
+    for (const ContourSequenceItem of ContourSequenceArray) {
       const { ContourData, NumberOfContourPoints, ContourGeometricType, ContourImageSequence } =
-        ContourSequenceArray[c];
-
-      let isSupported = false;
+        ContourSequenceItem;
 
       const points = [];
       for (let p = 0; p < NumberOfContourPoints * 3; p += 3) {
@@ -157,22 +253,18 @@ export default async function loadRTStruct(extensionManager, rtStructDisplaySet,
         });
       }
 
-      switch (ContourGeometricType) {
-        case 'CLOSED_PLANAR':
-        case 'OPEN_PLANAR':
-        case 'POINT':
-          isSupported = true;
-
-          break;
-        default:
-          continue;
-      }
+      const supportedContourTypesMap = new Map([
+        ['CLOSED_PLANAR', false],
+        ['OPEN_NONPLANAR', false],
+        ['OPEN_PLANAR', false],
+        ['POINT', true],
+      ]);
 
       contourPoints.push({
         numberOfPoints: NumberOfContourPoints,
         points,
         type: ContourGeometricType,
-        isSupported,
+        isSupported: supportedContourTypesMap.get(ContourGeometricType) ?? false,
       });
 
       if (ContourImageSequence?.ReferencedSOPInstanceUID) {
@@ -187,20 +279,30 @@ export default async function loadRTStruct(extensionManager, rtStructDisplaySet,
       StructureSetROISequence,
       RTROIObservationsSequence,
       ROIContour,
-      contourPoints,
-      isSupported
+      contourPoints
     );
   }
   return structureSet;
 }
 
+/**
+ * Sets metadata for ROI contour data and adds it to the structure set.
+ * Extracts ROI information from StructureSetROISequence and RTROIObservationsSequence,
+ * then creates a complete ROI contour data object with visualization properties.
+ *
+ * @function _setROIContourMetadata
+ * @param {Object} structureSet - The structure set object to add ROI contour to
+ * @param {Array} StructureSetROISequence - Array of structure set ROI definitions
+ * @param {Array} RTROIObservationsSequence - Array of RT ROI observations
+ * @param {Object} ROIContour - ROI contour object containing contour data
+ * @param {Array} contourPoints - Array of processed contour points
+ */
 function _setROIContourMetadata(
   structureSet,
   StructureSetROISequence,
   RTROIObservationsSequence,
   ROIContour,
-  contourPoints,
-  isSupported
+  contourPoints
 ) {
   const StructureSetROI = StructureSetROISequence.find(
     structureSetROI => structureSetROI.ROINumber === ROIContour.ReferencedROINumber
@@ -211,9 +313,9 @@ function _setROIContourMetadata(
     ROIName: StructureSetROI.ROIName,
     ROIGenerationAlgorithm: StructureSetROI.ROIGenerationAlgorithm,
     ROIDescription: StructureSetROI.ROIDescription,
-    isSupported,
     contourPoints,
     visible: true,
+    colorArray: [],
   };
 
   _setROIContourDataColor(ROIContour, ROIContourData);
@@ -230,6 +332,14 @@ function _setROIContourMetadata(
   structureSet.ROIContours.push(ROIContourData);
 }
 
+/**
+ * Sets the display color for ROI contour data.
+ * Uses ROIDisplayColor if available, otherwise converts RecommendedDisplayCIELabValue to RGB.
+ *
+ * @function _setROIContourDataColor
+ * @param {Object} ROIContour - ROI contour object containing color information
+ * @param {Object} ROIContourData - ROI contour data object to set color on
+ */
 function _setROIContourDataColor(ROIContour, ROIContourData) {
   let { ROIDisplayColor, RecommendedDisplayCIELabValue } = ROIContour;
 
@@ -243,6 +353,15 @@ function _setROIContourDataColor(ROIContour, ROIContourData) {
   }
 }
 
+/**
+ * Sets RT ROI observations metadata for ROI contour data.
+ * Finds matching RTROIObservations by ROINumber and adds observation details to contour data.
+ *
+ * @function _setROIContourRTROIObservations
+ * @param {Object} ROIContourData - ROI contour data object to add observations to
+ * @param {Array} RTROIObservationsSequence - Array of RT ROI observations
+ * @param {number} ROINumber - ROI number to match observations
+ */
 function _setROIContourRTROIObservations(ROIContourData, RTROIObservationsSequence, ROINumber) {
   const RTROIObservations = RTROIObservationsSequence.find(
     RTROIObservations => RTROIObservations.ReferencedROINumber === ROINumber
@@ -262,6 +381,14 @@ function _setROIContourRTROIObservations(ROIContourData, RTROIObservationsSequen
   }
 }
 
+/**
+ * Converts a single object or array to an array.
+ * Utility function to ensure consistent array handling for DICOM sequences.
+ *
+ * @function _toArray
+ * @param {*} objOrArray - Object or array to convert
+ * @returns {Array} Array containing the input (if already array) or wrapped in array
+ */
 function _toArray(objOrArray) {
   return Array.isArray(objOrArray) ? objOrArray : [objOrArray];
 }

extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts

@@ -1,8 +1,4 @@
-const RESPONSE = {
-  NO_NEVER: -1,
-  CANCEL: 0,
-  HYDRATE_SEG: 5,
-};
+import { utils, Types } from '@ohif/extension-cornerstone';
 
 function promptHydrateRT({
   servicesManager,
@@ -10,74 +6,20 @@ function promptHydrateRT({
   viewportId,
   preHydrateCallbacks,
   hydrateRTDisplaySet,
-}: withAppTypes) {
-  const { uiViewportDialogService, customizationService } = servicesManager.services;
-  const extensionManager = servicesManager._extensionManager;
-  const appConfig = extensionManager._appConfig;
-  return new Promise(async function (resolve, reject) {
-    const promptResult = appConfig?.disableConfirmationPrompts
-      ? RESPONSE.HYDRATE_SEG
-      : await _askHydrate(uiViewportDialogService, customizationService, viewportId);
-
-    if (promptResult === RESPONSE.HYDRATE_SEG) {
-      preHydrateCallbacks?.forEach(callback => {
-        callback();
-      });
-
-      const isHydrated = await hydrateRTDisplaySet({
-        rtDisplaySet,
-        viewportId,
-        servicesManager,
-      });
-
-      resolve(isHydrated);
-    }
-  });
-}
-
-function _askHydrate(
-  uiViewportDialogService: AppTypes.UIViewportDialogService,
-  customizationService: AppTypes.CustomizationService,
-  viewportId
-) {
-  return new Promise(function (resolve, reject) {
-    const message = customizationService.getCustomization('viewportNotification.hydrateRTMessage');
-    const actions = [
-      {
-        id: 'no-hydrate',
-        type: 'secondary',
-        text: 'No',
-        value: RESPONSE.CANCEL,
-      },
-      {
-        id: 'yes-hydrate',
-        type: 'primary',
-        text: 'Yes',
-        value: RESPONSE.HYDRATE_SEG,
-      },
-    ];
-    const onSubmit = result => {
-      uiViewportDialogService.hide();
-      resolve(result);
-    };
-
-    uiViewportDialogService.show({
-      id: 'promptHydrateRT',
-      viewportId,
-      type: 'info',
-      message,
-      actions,
-      onSubmit,
-      onOutsideClick: () => {
-        uiViewportDialogService.hide();
-        resolve(RESPONSE.CANCEL);
-      },
-      onKeyPress: event => {
-        if (event.key === 'Enter') {
-          onSubmit(RESPONSE.HYDRATE_SEG);
-        }
-      },
-    });
+}: {
+  servicesManager: AppTypes.ServicesManager;
+  rtDisplaySet: AppTypes.DisplaySet;
+  viewportId: string;
+  preHydrateCallbacks?: Types.HydrationCallback[];
+  hydrateRTDisplaySet: Types.HydrationCallback;
+}) {
+  return utils.promptHydrationDialog({
+    servicesManager,
+    viewportId,
+    displaySet: rtDisplaySet,
+    preHydrateCallbacks,
+    hydrateCallback: hydrateRTDisplaySet,
+    type: 'RTSTRUCT',
   });
 }
 

extensions/cornerstone-dicom-rt/src/viewports/OHIFCornerstoneRTViewport.tsx

@@ -1,35 +1,27 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { Component, useCallback, useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { ViewportActionArrows } from '@ohif/ui-next';
 import { useViewportGrid } from '@ohif/ui-next';
-import { utils } from '@ohif/extension-cornerstone';
+import {
+  utils,
+  usePositionPresentationStore,
+  OHIFCornerstoneViewport,
+} from '@ohif/extension-cornerstone';
 
 import promptHydrateRT from '../utils/promptHydrateRT';
-import _getStatusComponent from './_getStatusComponent';
-
 import createRTToolGroupAndAddTools from '../utils/initRTToolGroup';
-import { usePositionPresentationStore } from '@ohif/extension-cornerstone';
-
+import { useSystem } from '@ohif/core/src';
 const RT_TOOLGROUP_BASE_NAME = 'RTToolGroup';
 
 function OHIFCornerstoneRTViewport(props: withAppTypes) {
-  const {
-    children,
-    displaySets,
-    viewportOptions,
-    servicesManager,
-    extensionManager,
-    commandsManager,
-  } = props;
+  const { servicesManager, commandsManager } = useSystem();
+  const { children, displaySets, viewportOptions } = props as {
+    children: React.ReactNode;
+    displaySets: AppTypes.DisplaySet[];
+    viewportOptions: AppTypes.ViewportOptions;
+  };
 
-  const {
-    displaySetService,
-    toolGroupService,
-    segmentationService,
-    uiNotificationService,
-    customizationService,
-    viewportActionCornersService,
-  } = servicesManager.services;
+  const { displaySetService, toolGroupService, segmentationService, customizationService } =
+    servicesManager.services;
 
   const viewportId = viewportOptions.viewportId;
 
@@ -46,31 +38,34 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
 
   const rtDisplaySet = displaySets[0];
 
-  const [viewportGrid, viewportGridService] = useViewportGrid();
+  const [{ viewports, activeViewportId }, viewportGridService] = useViewportGrid();
 
   // States
-  const selectedSegmentObjectIndex: number = 0;
   const { setPositionPresentation } = usePositionPresentationStore();
-
-  // Hydration means that the RT is opened and segments are loaded into the
-  // segmentation panel, and RT is also rendered on any viewport that is in the
-  // same frameOfReferenceUID as the referencedSeriesUID of the RT. However,
-  // loading basically means RT loading over network and bit unpacking of the
-  // RT data.
-  const [isHydrated, setIsHydrated] = useState(rtDisplaySet.isHydrated);
   const [rtIsLoading, setRtIsLoading] = useState(!rtDisplaySet.isLoaded);
-  const [element, setElement] = useState(null);
   const [processingProgress, setProcessingProgress] = useState({
     percentComplete: null,
     totalSegments: null,
   });
 
-  // refs
   const referencedDisplaySetRef = useRef(null);
 
-  const { viewports, activeViewportId } = viewportGrid;
-
   const referencedDisplaySetInstanceUID = rtDisplaySet.referencedDisplaySetInstanceUID;
+  // If the referencedDisplaySetInstanceUID is not found, it means the RTStruct series is being
+  // launched without its corresponding referenced display set (e.g., the RTStruct series is launched using
+  // series launch /mode?StudyInstanceUIDs=&SeriesInstanceUID).
+  // In such cases, we attempt to handle this scenario gracefully by
+  // invoking a custom handler. Ideally, if a user tries to launch a series that isn't viewable,
+  // (eg.: we can prompt them with an explanation and provide a link to the full study).
+  if (!referencedDisplaySetInstanceUID) {
+    const missingReferenceDisplaySetHandler = customizationService.getCustomization(
+      'missingReferenceDisplaySetHandler'
+    );
+    const { handled } = missingReferenceDisplaySetHandler();
+    if (handled) {
+      return;
+    }
+  }
   const referencedDisplaySet = displaySetService.getDisplaySetByUID(
     referencedDisplaySetInstanceUID
   );
@@ -80,104 +75,35 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
     displaySet: referencedDisplaySet,
     metadata: referencedDisplaySetMetadata,
   };
-  /**
-   * OnElementEnabled callback which is called after the cornerstoneExtension
-   * has enabled the element. Note: we delegate all the image rendering to
-   * cornerstoneExtension, so we don't need to do anything here regarding
-   * the image rendering, element enabling etc.
-   */
-  const onElementEnabled = evt => {
-    setElement(evt.detail.element);
-  };
-
-  const onElementDisabled = () => {
-    setElement(null);
-  };
-
-  const storePresentationState = useCallback(() => {
-    viewportGrid?.viewports.forEach(({ viewportId }) => {
-      commandsManager.runCommand('storePresentation', {
-        viewportId,
-      });
-    });
-  }, [viewportGrid]);
-
-  const hydrateRTDisplaySet = useCallback(
-    ({ rtDisplaySet, viewportId }) => {
-      commandsManager.runCommand('hydrateRTSDisplaySet', {
-        displaySet: rtDisplaySet,
-        viewportId,
-      });
-    },
-    [commandsManager]
-  );
-
-  const getCornerstoneViewport = useCallback(() => {
-    const { component: Component } = extensionManager.getModuleEntry(
-      '@ohif/extension-cornerstone.viewportModule.cornerstone'
-    );
-
-    const { displaySet: referencedDisplaySet } = referencedDisplaySetRef.current;
-
-    // Todo: jump to the center of the first segment
-    return (
-      <Component
-        {...props}
-        displaySets={[referencedDisplaySet, rtDisplaySet]}
-        viewportOptions={{
-          viewportType: 'stack',
-          toolGroupId: toolGroupId,
-          orientation: viewportOptions.orientation,
-          viewportId: viewportOptions.viewportId,
-          presentationIds: viewportOptions.presentationIds,
-        }}
-        onElementEnabled={evt => {
-          props.onElementEnabled?.(evt);
-          onElementEnabled(evt);
-        }}
-        onElementDisabled={onElementDisabled}
-      ></Component>
-    );
-  }, [viewportId, rtDisplaySet, toolGroupId]);
-
-  const onSegmentChange = useCallback(
-    direction => {
-      utils.handleSegmentChange({
-        direction,
-        segDisplaySet: rtDisplaySet,
-        viewportId,
-        selectedSegmentObjectIndex,
-        segmentationService,
-      });
-    },
-    [selectedSegmentObjectIndex]
-  );
 
   useEffect(() => {
     if (rtIsLoading) {
       return;
     }
 
+    // if not active viewport, return
+    if (viewportId !== activeViewportId) {
+      return;
+    }
+
     promptHydrateRT({
       servicesManager,
       viewportId,
       rtDisplaySet,
-      preHydrateCallbacks: [storePresentationState],
-      hydrateRTDisplaySet,
-    }).then(isHydrated => {
-      if (isHydrated) {
-        setIsHydrated(true);
-      }
+      hydrateRTDisplaySet: async () => {
+        return commandsManager.runCommand('hydrateSecondaryDisplaySet', {
+          displaySet: rtDisplaySet,
+          viewportId,
+        });
+      },
     });
-  }, [servicesManager, viewportId, rtDisplaySet, rtIsLoading]);
+  }, [servicesManager, viewportId, rtDisplaySet, rtIsLoading, commandsManager, activeViewportId]);
 
   useEffect(() => {
-    // I'm not sure what is this, since in RT we support Overlapping segments
-    // via contours
     const { unsubscribe } = segmentationService.subscribe(
       segmentationService.EVENTS.SEGMENTATION_LOADING_COMPLETE,
       evt => {
-        if (evt.rtDisplaySet.displaySetInstanceUID === rtDisplaySet.displaySetInstanceUID) {
+        if (evt.rtDisplaySet?.displaySetInstanceUID === rtDisplaySet.displaySetInstanceUID) {
           setRtIsLoading(false);
         }
 
@@ -193,14 +119,6 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
             viewPresentation: {},
           });
         }
-
-        if (evt.overlappingSegments) {
-          uiNotificationService.show({
-            title: 'Overlapping Segments',
-            message: 'Overlapping segments detected which is not currently supported',
-            type: 'warning',
-          });
-        }
       }
     );
 
@@ -210,7 +128,7 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
   }, [rtDisplaySet]);
 
   useEffect(() => {
-    const { unsubscribe } = segmentationService.subscribe(
+    const segmentLoadingSubscription = segmentationService.subscribe(
       segmentationService.EVENTS.SEGMENT_LOADING_COMPLETE,
       ({ percentComplete, numSegments }) => {
         setProcessingProgress({
@@ -220,16 +138,7 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
       }
     );
 
-    return () => {
-      unsubscribe();
-    };
-  }, [rtDisplaySet]);
-
-  /**
-   Cleanup the SEG viewport when the viewport is destroyed
-   */
-  useEffect(() => {
-    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(
+    const displaySetsRemovedSubscription = displaySetService.subscribe(
       displaySetService.EVENTS.DISPLAY_SETS_REMOVED,
       ({ displaySetInstanceUIDs }) => {
         const activeViewport = viewports.get(activeViewportId);
@@ -243,9 +152,10 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
     );
 
     return () => {
-      onDisplaySetsRemovedSubscription.unsubscribe();
+      segmentLoadingSubscription.unsubscribe();
+      displaySetsRemovedSubscription.unsubscribe();
     };
-  }, []);
+  }, [rtDisplaySet, displaySetService, viewports, activeViewportId, viewportGridService]);
 
   useEffect(() => {
     let toolGroup = toolGroupService.getToolGroup(toolGroupId);
@@ -258,39 +168,34 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
 
     return () => {
       // remove the segmentation representations if seg displayset changed
-      segmentationService.removeSegmentationRepresentations(viewportId);
-
+      segmentationService.removeRepresentationsFromViewport(viewportId);
+      referencedDisplaySetRef.current = null;
       toolGroupService.destroyToolGroup(toolGroupId);
     };
   }, []);
 
-  useEffect(() => {
-    setIsHydrated(rtDisplaySet.isHydrated);
+  const getCornerstoneViewport = useCallback(() => {
+    const { displaySet: referencedDisplaySet } = referencedDisplaySetRef.current;
 
-    return () => {
-      // remove the segmentation representations if seg displayset changed
-      segmentationService.removeSegmentationRepresentations(viewportId);
-      referencedDisplaySetRef.current = null;
-    };
-  }, [rtDisplaySet]);
+    // Todo: jump to the center of the first segment
+    return (
+      <OHIFCornerstoneViewport
+        {...props}
+        displaySets={[referencedDisplaySet, rtDisplaySet]}
+        viewportOptions={{
+          viewportType: viewportOptions.viewportType,
+          toolGroupId: toolGroupId,
+          orientation: viewportOptions.orientation,
+          viewportId: viewportOptions.viewportId,
+          presentationIds: viewportOptions.presentationIds,
+        }}
+        onElementEnabled={evt => {
+          props.onElementEnabled?.(evt);
+        }}
+      />
+    );
+  }, [viewportId, rtDisplaySet, toolGroupId]);
 
-  const onStatusClick = useCallback(async () => {
-    // Before hydrating a RT and make it added to all viewports in the grid
-    // that share the same frameOfReferenceUID, we need to store the viewport grid
-    // presentation state, so that we can restore it after hydrating the RT. This is
-    // required if the user has changed the viewport (other viewport than RT viewport)
-    // presentation state (w/l and invert) and then opens the RT. If we don't store
-    // the presentation state, the viewport will be reset to the default presentation
-    storePresentationState();
-    const isHydrated = await hydrateRTDisplaySet({
-      rtDisplaySet,
-      viewportId,
-    });
-
-    setIsHydrated(isHydrated);
-  }, [hydrateRTDisplaySet, rtDisplaySet, storePresentationState, viewportId]);
-
-  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   let childrenWithProps = null;
 
   if (
@@ -313,43 +218,6 @@ function OHIFCornerstoneRTViewport(props: withAppTypes) {
     });
   }
 
-  useEffect(() => {
-    viewportActionCornersService.addComponents([
-      {
-        viewportId,
-        id: 'viewportStatusComponent',
-        component: _getStatusComponent({
-          isHydrated,
-          onStatusClick,
-        }),
-        indexPriority: -100,
-        location: viewportActionCornersService.LOCATIONS.topLeft,
-      },
-      {
-        viewportId,
-        id: 'viewportActionArrowsComponent',
-        component: (
-          <ViewportActionArrows
-            key="actionArrows"
-            onArrowsClick={onSegmentChange}
-            className={
-              viewportId === activeViewportId ? 'visible' : 'invisible group-hover/pane:visible'
-            }
-          ></ViewportActionArrows>
-        ),
-        indexPriority: 0,
-        location: viewportActionCornersService.LOCATIONS.topRight,
-      },
-    ]);
-  }, [
-    activeViewportId,
-    isHydrated,
-    onSegmentChange,
-    onStatusClick,
-    viewportActionCornersService,
-    viewportId,
-  ]);
-
   return (
     <>
       <div className="relative flex h-full w-full flex-row overflow-hidden">

extensions/cornerstone-dicom-rt/src/viewports/_getStatusComponent.tsx

@@ -1,59 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { ViewportActionButton } from '@ohif/ui-next';
-import { Icons, Tooltip, TooltipTrigger, TooltipContent } from '@ohif/ui-next';
-
-export default function _getStatusComponent({ isHydrated, onStatusClick }) {
-  let ToolTipMessage = null;
-  let StatusIcon = null;
-
-  switch (isHydrated) {
-    case true:
-      StatusIcon = () => <Icons.ByName name="status-alert" />;
-      ToolTipMessage = () => <div>This Segmentation is loaded in the segmentation panel</div>;
-      break;
-    case false:
-      StatusIcon = () => (
-        <Icons.ByName
-          className="text-muted-foreground h-4 w-4"
-          name="status-untracked"
-        />
-      );
-      ToolTipMessage = () => <div>Click LOAD to load RTSTRUCT.</div>;
-  }
-
-  const StatusArea = () => {
-    const { t } = useTranslation('Common');
-    const loadStr = t('LOAD');
-
-    return (
-      <div className="flex h-6 cursor-default text-sm leading-6 text-white">
-        <div className="bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1">
-          <StatusIcon />
-          <span className="ml-1">RTSTRUCT</span>
-        </div>
-        {!isHydrated && (
-          <ViewportActionButton onInteraction={onStatusClick}>{loadStr}</ViewportActionButton>
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <>
-      {ToolTipMessage && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span>
-              <StatusArea />
-            </span>
-          </TooltipTrigger>
-          <TooltipContent side="bottom">
-            <ToolTipMessage />
-          </TooltipContent>
-        </Tooltip>
-      )}
-      {!ToolTipMessage && <StatusArea />}
-    </>
-  );
-}

extensions/cornerstone-dicom-seg/babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  plugins: ['@babel/plugin-proposal-class-properties'],
+  plugins: ['@babel/plugin-transform-class-properties'],
   env: {
     test: {
       presets: [
@@ -15,7 +15,7 @@ module.exports = {
         '@babel/preset-react',
       ],
       plugins: [
-        '@babel/plugin-proposal-object-rest-spread',
+        '@babel/plugin-transform-object-rest-spread',
         '@babel/plugin-syntax-dynamic-import',
         '@babel/plugin-transform-regenerator',
         '@babel/plugin-transform-runtime',

extensions/cornerstone-dicom-seg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-seg",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,22 +33,21 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.11.0-beta.15",
-    "@ohif/extension-cornerstone": "3.11.0-beta.15",
-    "@ohif/extension-default": "3.11.0-beta.15",
-    "@ohif/i18n": "3.11.0-beta.15",
-    "prop-types": "^15.6.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-i18next": "^12.2.2",
-    "react-router": "^6.23.1",
-    "react-router-dom": "^6.23.1"
+    "@ohif/core": "3.13.0-beta.78",
+    "@ohif/extension-cornerstone": "3.13.0-beta.78",
+    "@ohif/extension-default": "3.13.0-beta.78",
+    "@ohif/i18n": "3.13.0-beta.78",
+    "prop-types": "15.8.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-i18next": "12.3.1",
+    "react-router": "6.30.3",
+    "react-router-dom": "6.30.3"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.9.5",
-    "@cornerstonejs/core": "^3.9.5",
-    "@kitware/vtk.js": "32.12.0",
-    "react-color": "^2.19.3"
+    "@babel/runtime": "7.28.2",
+    "@cornerstonejs/adapters": "4.22.8",
+    "@cornerstonejs/core": "4.22.8",
+    "@kitware/vtk.js": "34.15.1"
   }
 }

extensions/cornerstone-dicom-seg/src/commandsModule.ts

@@ -1,15 +1,12 @@
 import dcmjs from 'dcmjs';
-import { classes, Types } from '@ohif/core';
+import { classes, Types, utils } from '@ohif/core';
 import { cache, metaData } from '@cornerstonejs/core';
 import { segmentation as cornerstoneToolsSegmentation } from '@cornerstonejs/tools';
-import { adaptersRT, helpers, adaptersSEG } from '@cornerstonejs/adapters';
-import { createReportDialogPrompt } from '@ohif/extension-default';
-import { DicomMetadataStore } from '@ohif/core';
+import { adaptersRT, adaptersSEG } from '@cornerstonejs/adapters';
+import { createReportDialogPrompt, useUIStateStore } from '@ohif/extension-default';
 
 import PROMPT_RESPONSES from '../../default/src/utils/_shared/PROMPT_RESPONSES';
 
-const { datasetToBlob } = dcmjs.data;
-
 const getTargetViewport = ({ viewportId, viewportGridService }) => {
   const { viewports, activeViewportId } = viewportGridService.getState();
   const targetViewportId = viewportId || activeViewportId;
@@ -27,17 +24,17 @@ const {
 
 const {
   Cornerstone3D: {
-    RTSS: { generateRTSSFromSegmentations },
+    RTSS: { generateRTSSFromRepresentation },
   },
 } = adaptersRT;
 
-const { downloadDICOMData } = helpers;
 
 const commandsModule = ({
   servicesManager,
   extensionManager,
+  commandsManager,
 }: Types.Extensions.ExtensionParams): Types.Extensions.CommandsModule => {
-  const { segmentationService, displaySetService, viewportGridService, toolGroupService } =
+  const { segmentationService, displaySetService, viewportGridService } =
     servicesManager.services as AppTypes.Services;
 
   const actions = {
@@ -92,6 +89,7 @@ const commandsModule = ({
      */
     generateSegmentation: ({ segmentationId, options = {} }) => {
       const segmentation = cornerstoneToolsSegmentation.state.getSegmentation(segmentationId);
+      const predecessorImageId = options.predecessorImageId ?? segmentation.predecessorImageId;
 
       const { imageIds } = segmentation.representationData.Labelmap;
 
@@ -173,12 +171,10 @@ const commandsModule = ({
         labelmap3D.metadata[segmentIndex] = segmentMetadata;
       });
 
-      const generatedSegmentation = generateSegmentation(
-        referencedImages,
-        labelmap3D,
-        metaData,
-        options
-      );
+      const generatedSegmentation = generateSegmentation(referencedImages, labelmap3D, metaData, {
+        predecessorImageId,
+        ...options,
+      });
 
       return generatedSegmentation;
     },
@@ -197,8 +193,11 @@ const commandsModule = ({
       const generatedSegmentation = actions.generateSegmentation({
         segmentationId,
       });
-
-      downloadDICOMData(generatedSegmentation.dataset, `${segmentationInOHIF.label}`);
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: 'download',
+        defaultFileName: `${segmentationInOHIF.label}.dcm`,
+      });
+      storeFn(generatedSegmentation.dataset);
     },
     /**
      * Stores a segmentation based on the provided segmentationId into a specified data source.
@@ -212,67 +211,84 @@ const commandsModule = ({
      * @returns {Object|void} Returns the naturalized report if successfully stored,
      * otherwise throws an error.
      */
-    storeSegmentation: async ({ segmentationId, dataSource }) => {
+    storeSegmentation: async ({ segmentationId, dataSource, modality = 'SEG' }) => {
       const segmentation = segmentationService.getSegmentation(segmentationId);
 
       if (!segmentation) {
         throw new Error('No segmentation found');
       }
 
-      const { label } = segmentation;
-      const defaultDataSource = dataSource ?? extensionManager.getActiveDataSource();
+      const { label, predecessorImageId } = segmentation;
 
       const {
         value: reportName,
-        dataSourceName: selectedDataSource,
+        dataSourceName,
+        series,
+        priorSeriesNumber,
         action,
       } = await createReportDialogPrompt({
         servicesManager,
         extensionManager,
+        predecessorImageId,
         title: 'Store Segmentation',
+        modality,
+        enableDownload: true,
       });
 
-      if (action === PROMPT_RESPONSES.CREATE_REPORT) {
-        try {
-          const selectedDataSourceConfig = selectedDataSource
-            ? extensionManager.getDataSources(selectedDataSource)[0]
-            : defaultDataSource;
+      if (action !== PROMPT_RESPONSES.CREATE_REPORT) {
+        return;
+      }
 
-          const generatedData = actions.generateSegmentation({
-            segmentationId,
-            options: {
-              SeriesDescription: reportName || label || 'Research Derived Series',
-            },
-          });
+      const defaultFileName =
+        modality === 'RTSTRUCT'
+          ? `rtss-${segmentationId}.dcm`
+          : `${label || 'segmentation'}.dcm`;
 
-          if (!generatedData || !generatedData.dataset) {
-            throw new Error('Error during segmentation generation');
-          }
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: dataSourceName,
+        defaultFileName,
+      });
 
-          const { dataset: naturalizedReport } = generatedData;
+      if (!storeFn) {
+        throw new Error(`No valid store for dataSource: ${dataSourceName}`);
+      }
 
-          await selectedDataSourceConfig.store.dicom(naturalizedReport);
+      try {
+        const args = {
+          segmentationId,
+          options: {
+            SeriesDescription: series ? undefined : reportName || label || 'Contour Series',
+            SeriesNumber: series ? undefined : 1 + priorSeriesNumber,
+            predecessorImageId: series,
+          },
+        };
+        const generatedDataAsync =
+          (modality === 'SEG' && actions.generateSegmentation(args)) ||
+          (modality === 'RTSTRUCT' && actions.generateContour(args));
+        const generatedData = await generatedDataAsync;
 
-          // add the information for where we stored it to the instance as well
-          naturalizedReport.wadoRoot = selectedDataSourceConfig.getConfig().wadoRoot;
-
-          DicomMetadataStore.addInstances([naturalizedReport], true);
-
-          return naturalizedReport;
-        } catch (error) {
-          console.debug('Error storing segmentation:', error);
-          throw error;
+        if (!generatedData?.dataset) {
+          throw new Error('Error during segmentation generation');
         }
+
+        const { dataset: naturalizedReport } = generatedData;
+
+        // DCMJS assigns a dummy study id during creation, and this can cause problems, so clearing it out
+        if (naturalizedReport.StudyID === 'No Study ID') {
+          naturalizedReport.StudyID = '';
+        }
+
+        await storeFn(naturalizedReport, {});
+
+        return naturalizedReport;
+      } catch (error) {
+        console.debug('Error storing segmentation:', error);
+        throw error;
       }
     },
-    /**
-     * 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: async ({ segmentationId }) => {
+
+    generateContour: async args => {
+      const { segmentationId, options } = args;
       const segmentations = segmentationService.getSegmentation(segmentationId);
 
       // inject colors to the segmentIndex
@@ -282,45 +298,51 @@ const commandsModule = ({
         segment.color = segmentationService.getSegmentColor(
           firstRepresentation.viewportId,
           segmentationId,
-          segmentIndex
+          Number(segmentIndex)
         );
       });
+      const predecessorImageId = options?.predecessorImageId ?? segmentations.predecessorImageId;
+      const dataset = await generateRTSSFromRepresentation(segmentations, {
+        predecessorImageId,
+        ...options,
+      });
+      return { dataset };
+    },
 
-      const RTSS = await generateRTSSFromSegmentations(
-        segmentations,
-        classes.MetadataProvider,
-        DicomMetadataStore
-      );
+    /**
+     * Downloads an RTSS instance from a segmentation or contour
+     * representation.
+     */
+    downloadRTSS: async args => {
+      const { dataset } = await actions.generateContour(args);
+      const { InstanceNumber: instanceNumber = 1, SeriesInstanceUID: seriesUID } = dataset;
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: 'download',
+        defaultFileName: `rtss-${seriesUID}-${instanceNumber}.dcm`,
+      });
+      await storeFn(dataset);
+    },
 
-      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);
+    toggleActiveSegmentationUtility: ({ itemId: buttonId }) => {
+      const { uiState, setUIState } = useUIStateStore.getState();
+      const isButtonActive = uiState['activeSegmentationUtility'] === buttonId;
+      console.log('toggleActiveSegmentationUtility', isButtonActive, buttonId);
+      // if the button is active, clear the active segmentation utility
+      if (isButtonActive) {
+        setUIState('activeSegmentationUtility', null);
+      } else {
+        setUIState('activeSegmentationUtility', buttonId);
       }
     },
   };
 
   const definitions = {
-    loadSegmentationsForViewport: {
-      commandFn: actions.loadSegmentationsForViewport,
-    },
-
-    generateSegmentation: {
-      commandFn: actions.generateSegmentation,
-    },
-    downloadSegmentation: {
-      commandFn: actions.downloadSegmentation,
-    },
-    storeSegmentation: {
-      commandFn: actions.storeSegmentation,
-    },
-    downloadRTSS: {
-      commandFn: actions.downloadRTSS,
-    },
+    loadSegmentationsForViewport: actions.loadSegmentationsForViewport,
+    generateSegmentation: actions.generateSegmentation,
+    downloadSegmentation: actions.downloadSegmentation,
+    storeSegmentation: actions.storeSegmentation,
+    downloadRTSS: actions.downloadRTSS,
+    toggleActiveSegmentationUtility: actions.toggleActiveSegmentationUtility,
   };
 
   return {

extensions/cornerstone-dicom-seg/src/components/LogicalContourOperationsOptions.tsx

@@ -0,0 +1,246 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useRunCommand, useSystem } from '@ohif/core';
+import { useActiveViewportSegmentationRepresentations } from '@ohif/extension-cornerstone';
+import {
+  Button,
+  cn,
+  Input,
+  Label,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+  Separator,
+  Switch,
+  Tabs,
+  TabsList,
+  TabsTrigger,
+} from '@ohif/ui-next';
+import { Icons } from '@ohif/ui-next';
+import { contourSegmentation } from '@cornerstonejs/tools/utilities';
+import { useTranslation } from 'react-i18next';
+import { Segment } from '@cornerstonejs/tools/types';
+
+const { LogicalOperation } = contourSegmentation;
+const options = [
+  {
+    value: 'merge',
+    logicalOperation: LogicalOperation.Union,
+    label: 'Merge',
+    icon: 'actions-combine-merge',
+    helperIcon: 'helper-combine-merge',
+  },
+  {
+    value: 'intersect',
+    logicalOperation: LogicalOperation.Intersect,
+    label: 'Intersect',
+    icon: 'actions-combine-intersect',
+    helperIcon: 'helper-combine-intersect',
+  },
+  {
+    value: 'subtract',
+    logicalOperation: LogicalOperation.Subtract,
+    label: 'Subtract',
+    icon: 'actions-combine-subtract',
+    helperIcon: 'helper-combine-subtract',
+  },
+];
+
+// Shared component for segment selection
+function SegmentSelector({
+  label,
+  value,
+  onValueChange,
+  segments,
+  placeholder = 'Select a segment',
+}: {
+  label: string;
+  value: string;
+  onValueChange: (value: string) => void;
+  segments: Segment[];
+  placeholder?: string;
+}) {
+  const { t } = useTranslation('SegmentationPanel');
+  return (
+    <div className="flex justify-between gap-6">
+      <div>{label}</div>
+      <Select
+        key={`select-segment-${label}`}
+        onValueChange={onValueChange}
+        value={value}
+      >
+        <SelectTrigger className="overflow-hidden">
+          <SelectValue placeholder={t(placeholder)} />
+        </SelectTrigger>
+        <SelectContent>
+          {segments.map(segment => (
+            <SelectItem
+              key={segment.segmentIndex}
+              value={segment.segmentIndex.toString()}
+            >
+              {segment.label}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    </div>
+  );
+}
+
+function LogicalContourOperationOptions() {
+  const { servicesManager } = useSystem();
+  const { segmentationService } = servicesManager.services;
+  const { t } = useTranslation('SegmentationPanel');
+  const { segmentationsWithRepresentations } = useActiveViewportSegmentationRepresentations();
+
+  const activeRepresentation = segmentationsWithRepresentations?.find(
+    ({ representation }) => representation?.active
+  );
+
+  const segments = activeRepresentation
+    ? Object.values(activeRepresentation.segmentation.segments)
+    : [];
+
+  // Calculate the next available segment index
+  const nextSegmentIndex = activeRepresentation
+    ? segmentationService.getNextAvailableSegmentIndex(
+        activeRepresentation.segmentation.segmentationId
+      )
+    : 1;
+
+  const activeSegment = segments.find(segment => segment.active);
+
+  const activeSegmentIndex = activeSegment?.segmentIndex || 0;
+
+  const [operation, setOperation] = useState(options[0]);
+  const [segmentA, setSegmentA] = useState<string>(activeSegmentIndex?.toString() || '');
+  const [segmentB, setSegmentB] = useState<string>('');
+  const [createNewSegment, setCreateNewSegment] = useState<boolean>(false);
+  const [newSegmentName, setNewSegmentName] = useState<string>('');
+
+  useEffect(() => {
+    setSegmentA(activeSegmentIndex?.toString() || null);
+  }, [activeSegmentIndex]);
+
+  useEffect(() => {
+    setNewSegmentName(`Segment ${nextSegmentIndex}`);
+  }, [nextSegmentIndex]);
+
+  const runCommand = useRunCommand();
+
+  const applyLogicalContourOperation = useCallback(() => {
+    let resultSegmentIndex = segmentA;
+    if (createNewSegment) {
+      resultSegmentIndex = nextSegmentIndex.toString();
+      runCommand('addSegment', {
+        segmentationId: activeRepresentation.segmentation.segmentationId,
+        config: {
+          label: newSegmentName,
+          segmentIndex: nextSegmentIndex,
+        },
+      });
+    }
+    runCommand('applyLogicalContourOperation', {
+      segmentAInfo: {
+        segmentationId: activeRepresentation.segmentation.segmentationId,
+        segmentIndex: parseInt(segmentA),
+      },
+      segmentBInfo: {
+        segmentationId: activeRepresentation.segmentation.segmentationId,
+        segmentIndex: parseInt(segmentB),
+      },
+      resultSegmentInfo: {
+        segmentationId: activeRepresentation.segmentation.segmentationId,
+        segmentIndex: parseInt(resultSegmentIndex),
+      },
+      logicalOperation: operation.logicalOperation,
+    });
+  }, [
+    activeRepresentation?.segmentation?.segmentationId,
+    createNewSegment,
+    newSegmentName,
+    nextSegmentIndex,
+    operation.logicalOperation,
+    runCommand,
+    segmentA,
+    segmentB,
+  ]);
+
+  return (
+    <div className="flex w-[245px] flex-col gap-4">
+      <div className="flex items-start justify-between">
+        <div className="flex w-auto flex-col items-center gap-2 text-base font-normal leading-none">
+          <Tabs value={operation.value}>
+            <TabsList className="inline-flex space-x-1">
+              {options.map(option => {
+                const { value, icon } = option;
+                return (
+                  <TabsTrigger
+                    value={value}
+                    key={`logical-contour-operation-${value}`}
+                    onClick={() => setOperation(option)}
+                  >
+                    <Icons.ByName name={icon}></Icons.ByName>
+                  </TabsTrigger>
+                );
+              })}
+            </TabsList>
+          </Tabs>
+          <div>{t(operation.label)}</div>
+        </div>
+        <div className="bg-muted flex h-[62px] w-[88px] items-center justify-center rounded-lg">
+          <Icons.ByName name={operation.helperIcon}></Icons.ByName>
+        </div>
+      </div>
+      <SegmentSelector
+        label="A"
+        value={segmentA}
+        onValueChange={setSegmentA}
+        segments={segments}
+      />
+      <SegmentSelector
+        label="B"
+        value={segmentB}
+        onValueChange={setSegmentB}
+        segments={segments}
+      />
+      <div className="flex justify-end pl-[34px]">
+        <Button
+          className="border-primary/60 grow border"
+          variant="ghost"
+          onClick={() => {
+            applyLogicalContourOperation();
+          }}
+        >
+          {t(operation.label)}
+        </Button>
+      </div>
+      <Separator className="bg-input mt-2 h-[1px]" />
+      <div className="flex flex-col gap-2">
+        <div className="flex items-center justify-start gap-2">
+          <Switch
+            id="logical-contour-operations-create-new-segment-switch"
+            onCheckedChange={setCreateNewSegment}
+          ></Switch>
+          <Label htmlFor="logical-contour-operations-create-new-segment-switch">
+            {t('Create a new segment')}
+          </Label>
+        </div>
+        <div className="pl-9">
+          <Input
+            className={cn(createNewSegment ? 'visible' : 'hidden')}
+            disabled={!createNewSegment}
+            id="logical-contour-operations-create-new-segment-input"
+            type="text"
+            placeholder={t('New segment name')}
+            value={newSegmentName}
+            onChange={e => setNewSegmentName(e.target.value)}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default LogicalContourOperationOptions;

extensions/cornerstone-dicom-seg/src/components/SimplifyContourOptions.tsx

@@ -0,0 +1,73 @@
+import React, { useState } from 'react';
+import { Button, Input, Label, Separator } from '@ohif/ui-next';
+import { useRunCommand } from '@ohif/core';
+import { useTranslation } from 'react-i18next';
+
+function SimplifyContourOptions() {
+  const [areaThreshold, setAreaThreshold] = useState(10);
+
+  const runCommand = useRunCommand();
+  const { t } = useTranslation('SegmentationPanel');
+
+  return (
+    <div className="flex w-auto w-[252px] flex-col gap-[8px] text-base font-normal leading-none">
+      <div className="flex w-auto flex-col gap-[10px] text-base font-normal leading-none">
+        <div>{t('Fill contour holes')}</div>
+        <Button
+          className="border-primary/60 border"
+          variant="ghost"
+          onClick={() => {
+            runCommand('removeContourHoles');
+          }}
+        >
+          {t('Fill Holes')}
+        </Button>
+        <Separator className="bg-input mt-[20px] h-[1px]" />
+      </div>
+      <div className="flex w-auto flex-col gap-[10px] text-base font-normal leading-none">
+        <div>{t('Remove Small Contours')}</div>
+        <div className="flex items-center gap-2 self-end">
+          <Label
+            htmlFor="simplify-contour-options"
+            className="text-muted-foreground"
+          >
+            {t('Area Threshold')}
+          </Label>
+          <Input
+            id="simplify-contour-options"
+            className="w-20"
+            type="number"
+            value={areaThreshold}
+            onChange={e => setAreaThreshold(Number(e.target.value))}
+          />
+        </div>
+        <Button
+          className="border-primary/60 border"
+          variant="ghost"
+          onClick={() => {
+            runCommand('removeSmallContours', {
+              areaThreshold,
+            });
+          }}
+        >
+          {t('Remove Small Contours')}
+        </Button>
+        <Separator className="bg-input mt-[20px] h-[1px]" />
+      </div>
+      <div className="flex w-auto flex-col gap-[10px] text-base font-normal leading-none">
+        <div>{t('Create New Segment from Holes')}</div>
+        <Button
+          className="border-primary/60 border"
+          variant="ghost"
+          onClick={() => {
+            runCommand('convertContourHoles');
+          }}
+        >
+          {t('Create New Segment')}
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+export default SimplifyContourOptions;

extensions/cornerstone-dicom-seg/src/components/SmoothContoursOptions.tsx

@@ -0,0 +1,41 @@
+import React from 'react';
+import { Button, Separator } from '@ohif/ui-next';
+import { useRunCommand } from '@ohif/core';
+import { useTranslation } from 'react-i18next';
+
+function SmoothContoursOptions() {
+  const runCommand = useRunCommand();
+  const { t } = useTranslation('SegmentationPanel');
+
+  return (
+    <div className="flex w-auto w-[245px] flex-col gap-[8px] text-base font-normal leading-none">
+      <div className="flex w-auto flex-col gap-[10px] text-base font-normal leading-none">
+        <div>{t('Smooth all edges')}</div>
+        <Button
+          className="border-primary/60 border"
+          variant="ghost"
+          onClick={() => {
+            runCommand('smoothContours');
+          }}
+        >
+          {t('Smooth Edges')}
+        </Button>
+        <Separator className="bg-input mt-[20px] h-[1px]" />
+      </div>
+      <div className="flex w-auto flex-col gap-[10px] text-base font-normal leading-none">
+        <div>{t('Remove extra points')}</div>
+        <Button
+          className="border-primary/60 border"
+          variant="ghost"
+          onClick={() => {
+            runCommand('decimateContours');
+          }}
+        >
+          {t('Remove Points')}
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+export default SmoothContoursOptions;

extensions/cornerstone-dicom-seg/src/getSopClassHandlerModule.ts

@@ -1,12 +1,13 @@
-import { utils } from '@ohif/core';
-import { metaData, triggerEvent, eventTarget } from '@cornerstonejs/core';
+import { utils, Types as OhifTypes } from '@ohif/core';
+import i18n from '@ohif/i18n';
+import { metaData, eventTarget } from '@cornerstonejs/core';
 import { CONSTANTS, segmentation as cstSegmentation } from '@cornerstonejs/tools';
 import { adaptersSEG, Enums } from '@cornerstonejs/adapters';
 
 import { SOPClassHandlerId } from './id';
 import { dicomlabToRGB } from './utils/dicomlabToRGB';
 
-const sopClassUids = ['1.2.840.10008.5.1.4.1.1.66.4'];
+const sopClassUids = ['1.2.840.10008.5.1.4.1.1.66.4', '1.2.840.10008.5.1.4.1.1.66.7'];
 
 const loadPromises = {};
 
@@ -15,34 +16,41 @@ function _getDisplaySetsFromSeries(
   servicesManager: AppTypes.ServicesManager,
   extensionManager
 ) {
-  const instance = instances[0];
+  utils.sortStudyInstances(instances);
+
+  // Choose the LAST instance in the list as the most recently created one.
+  const instance = instances[instances.length - 1];
 
   const {
     StudyInstanceUID,
     SeriesInstanceUID,
     SOPInstanceUID,
-    SeriesDescription,
+    SeriesDescription = '',
     SeriesNumber,
     SeriesDate,
+    StructureSetDate,
     SOPClassUID,
+    FrameOfReferenceUID,
     wadoRoot,
     wadoUri,
     wadoUriRoot,
+    imageId: predecessorImageId,
   } = instance;
 
   const displaySet = {
     Modality: 'SEG',
     loading: false,
-    isReconstructable: true, // by default for now since it is a volumetric SEG currently
+    isReconstructable: false,
     displaySetInstanceUID: utils.guid(),
     SeriesDescription,
     SeriesNumber,
-    SeriesDate,
+    SeriesDate: SeriesDate || StructureSetDate || '',
     SOPInstanceUID,
     SeriesInstanceUID,
     StudyInstanceUID,
     SOPClassHandlerId,
     SOPClassUID,
+    FrameOfReferenceUID,
     referencedImages: null,
     referencedSeriesInstanceUID: null,
     referencedDisplaySetInstanceUID: null,
@@ -52,11 +60,13 @@ function _getDisplaySetsFromSeries(
     segments: {},
     sopClassUids,
     instance,
+    predecessorImageId,
     instances: [instance],
     wadoRoot,
     wadoUriRoot,
     wadoUri,
     isOverlayDisplaySet: true,
+    label: SeriesDescription || `${i18n.t('Series')} ${SeriesNumber} - ${i18n.t('SEG')}`,
   };
 
   const referencedSeriesSequence = instance.ReferencedSeriesSequence;
@@ -71,10 +81,16 @@ function _getDisplaySetsFromSeries(
   displaySet.referencedImages = instance.ReferencedSeriesSequence.ReferencedInstanceSequence;
   displaySet.referencedSeriesInstanceUID = referencedSeries.SeriesInstanceUID;
   const { displaySetService } = servicesManager.services;
-  const referencedDisplaySets = displaySetService.getDisplaySetsForSeries(
-    displaySet.referencedSeriesInstanceUID
+  const referencedDisplaySets = displaySetService.getDisplaySetsForReferences(
+    instance.ReferencedSeriesSequence
   );
 
+  if (referencedDisplaySets?.length > 1) {
+    console.warn(
+      'Segmentation does not currently handle references to multiple series, defaulting to first series'
+    );
+  }
+
   const referencedDisplaySet = referencedDisplaySets[0];
 
   if (!referencedDisplaySet) {
@@ -89,12 +105,16 @@ function _getDisplaySetsFromSeries(
         const addedDisplaySet = displaySetsAdded[0];
         if (addedDisplaySet.SeriesInstanceUID === displaySet.referencedSeriesInstanceUID) {
           displaySet.referencedDisplaySetInstanceUID = addedDisplaySet.displaySetInstanceUID;
+          displaySet.isReconstructable = addedDisplaySet.isReconstructable;
+          displaySet.FrameOfReferenceUID = addedDisplaySet.FrameOfReferenceUID;
           unsubscribe();
         }
       }
     );
   } else {
     displaySet.referencedDisplaySetInstanceUID = referencedDisplaySet.displaySetInstanceUID;
+    displaySet.isReconstructable = referencedDisplaySet.isReconstructable;
+    displaySet.FrameOfReferenceUID = referencedDisplaySet.FrameOfReferenceUID;
   }
 
   displaySet.load = async ({ headers }) =>
@@ -232,7 +252,8 @@ function _segmentationExists(segDisplaySet) {
   return cstSegmentation.state.getSegmentation(segDisplaySet.displaySetInstanceUID);
 }
 
-function getSopClassHandlerModule({ servicesManager, extensionManager }) {
+function getSopClassHandlerModule(params: OhifTypes.Extensions.ExtensionParams) {
+  const { servicesManager, extensionManager } = params;
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };

extensions/cornerstone-dicom-seg/src/getToolbarModule.ts

@@ -1,6 +1,35 @@
+import { utilities as cstUtils } from '@cornerstonejs/tools';
+import i18n from '@ohif/i18n';
+import { useUIStateStore } from '@ohif/extension-default';
+
+import LogicalContourOperationsOptions from './components/LogicalContourOperationsOptions';
+import SimplifyContourOptions from './components/SimplifyContourOptions';
+import SmoothContoursOptions from './components/SmoothContoursOptions';
+
 export function getToolbarModule({ servicesManager }: withAppTypes) {
   const { segmentationService, toolbarService, toolGroupService } = servicesManager.services;
   return [
+    {
+      name: 'cornerstone.SimplifyContourOptions',
+      defaultComponent: SimplifyContourOptions,
+    },
+    {
+      name: 'cornerstone.LogicalContourOperationsOptions',
+      defaultComponent: LogicalContourOperationsOptions,
+    },
+    {
+      name: 'cornerstone.SmoothContoursOptions',
+      defaultComponent: SmoothContoursOptions,
+    },
+    {
+      name: 'cornerstone.isActiveSegmentationUtility',
+      evaluate: ({ button }) => {
+        const { uiState } = useUIStateStore.getState();
+        return {
+          isActive: uiState[`activeSegmentationUtility`] === button.id,
+        };
+      },
+    },
     {
       name: 'evaluate.cornerstone.hasSegmentation',
       evaluate: ({ viewportId }) => {
@@ -10,6 +39,30 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {
         };
       },
     },
+    {
+      name: 'evaluate.cornerstone.hasSegmentationOfType',
+      evaluate: ({ viewportId, segmentationRepresentationType }) => {
+        const segmentations = segmentationService.getSegmentationRepresentations(viewportId);
+
+        if (!segmentations?.length) {
+          return {
+            disabled: true,
+            disabledText: i18n.t('SegmentationPanel:No segmentations available'),
+          };
+        }
+
+        if (
+          !segmentations.some(segmentation =>
+            Boolean(segmentation.type === segmentationRepresentationType)
+          )
+        ) {
+          return {
+            disabled: true,
+            disabledText: `No ${segmentationRepresentationType} segmentations available`,
+          };
+        }
+      },
+    },
     {
       name: 'evaluate.cornerstone.segmentation',
       evaluate: ({ viewportId, button, toolNames, disabledText }) => {
@@ -21,7 +74,7 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {
         if (!segmentations?.length) {
           return {
             disabled: true,
-            disabledText: disabledText ?? 'No segmentations available',
+            disabledText: disabledText ?? i18n.t('SegmentationPanel:No segmentations available'),
           };
         }
 
@@ -29,7 +82,7 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {
         if (!Object.keys(activeSegmentation.segments).length) {
           return {
             disabled: true,
-            disabledText: 'Add segment to enable this tool',
+            disabledText: i18n.t('SegmentationPanel:Add segment to enable this tool'),
           };
         }
 
@@ -38,7 +91,7 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {
         if (!toolGroup) {
           return {
             disabled: true,
-            disabledText: disabledText ?? 'Not available on the current viewport',
+            disabledText: disabledText ?? i18n.t('SegmentationPanel:Not available on the current viewport'),
           };
         }
 
@@ -54,7 +107,7 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {
         if (!toolGroup.hasTool(toolName) && !toolNames) {
           return {
             disabled: true,
-            disabledText: disabledText ?? 'Not available on the current viewport',
+            disabledText: disabledText ?? i18n.t('SegmentationPanel:Not available on the current viewport'),
           };
         }
 
@@ -68,5 +121,23 @@ export function getToolbarModule({ servicesManager }: withAppTypes) {
         };
       },
     },
+    {
+      name: 'evaluate.cornerstone.segmentation.synchronizeDrawingRadius',
+      evaluate: ({ button, radiusOptionId }) => {
+        const toolGroupIds = toolGroupService.getToolGroupIds();
+        if (!toolGroupIds?.length) {
+          return;
+        }
+
+        for (const toolGroupId of toolGroupIds) {
+          const brushSize = cstUtils.segmentation.getBrushSizeForToolGroup(toolGroupId);
+
+          if (brushSize) {
+            const option = toolbarService.getOptionById(button, radiusOptionId);
+            option.value = brushSize;
+          }
+        }
+      },
+    },
   ];
 }

extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts

@@ -1,7 +1,14 @@
-function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
+function createSEGToolGroupAndAddTools({
+  commandsManager,
+  toolGroupService,
+  customizationService,
+  toolGroupId,
+}) {
   const tools = customizationService.getCustomization('cornerstone.overlayViewportTools');
 
-  return ToolGroupService.createToolGroupAndAddTools(toolGroupId, tools);
+  const updatedTools = commandsManager.run('initializeSegmentLabelTool', { tools });
+
+  return toolGroupService.createToolGroupAndAddTools(toolGroupId, updatedTools);
 }
 
 export default createSEGToolGroupAndAddTools;

extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts

@@ -1,8 +1,4 @@
-const RESPONSE = {
-  NO_NEVER: -1,
-  CANCEL: 0,
-  HYDRATE_SEG: 5,
-};
+import { utils, Types } from '@ohif/extension-cornerstone';
 
 function promptHydrateSEG({
   servicesManager,
@@ -10,75 +6,20 @@ function promptHydrateSEG({
   viewportId,
   preHydrateCallbacks,
   hydrateCallback,
-}: withAppTypes) {
-  const { uiViewportDialogService, customizationService } = servicesManager.services;
-  const extensionManager = servicesManager._extensionManager;
-  const appConfig = extensionManager._appConfig;
-
-  return new Promise(async function (resolve, reject) {
-    const promptResult = appConfig?.disableConfirmationPrompts
-      ? RESPONSE.HYDRATE_SEG
-      : await _askHydrate(uiViewportDialogService, customizationService, viewportId);
-
-    if (promptResult === RESPONSE.HYDRATE_SEG) {
-      preHydrateCallbacks?.forEach(callback => {
-        callback();
-      });
-
-      window.setTimeout(async () => {
-        const isHydrated = await hydrateCallback({
-          segDisplaySet,
-          viewportId,
-        });
-
-        resolve(isHydrated);
-      }, 0);
-    }
-  });
-}
-
-function _askHydrate(
-  uiViewportDialogService: AppTypes.UIViewportDialogService,
-  customizationService: AppTypes.CustomizationService,
-  viewportId
-) {
-  return new Promise(function (resolve, reject) {
-    const message = customizationService.getCustomization('viewportNotification.hydrateSEGMessage');
-    const actions = [
-      {
-        id: 'no-hydrate',
-        type: 'secondary',
-        text: 'No',
-        value: RESPONSE.CANCEL,
-      },
-      {
-        id: 'yes-hydrate',
-        type: 'primary',
-        text: 'Yes',
-        value: RESPONSE.HYDRATE_SEG,
-      },
-    ];
-    const onSubmit = result => {
-      uiViewportDialogService.hide();
-      resolve(result);
-    };
-
-    uiViewportDialogService.show({
-      viewportId,
-      type: 'info',
-      message,
-      actions,
-      onSubmit,
-      onOutsideClick: () => {
-        uiViewportDialogService.hide();
-        resolve(RESPONSE.CANCEL);
-      },
-      onKeyPress: event => {
-        if (event.key === 'Enter') {
-          onSubmit(RESPONSE.HYDRATE_SEG);
-        }
-      },
-    });
+}: {
+  servicesManager: AppTypes.ServicesManager;
+  segDisplaySet: AppTypes.DisplaySet;
+  viewportId: string;
+  preHydrateCallbacks?: Types.HydrationCallback[];
+  hydrateCallback: Types.HydrationCallback;
+}) {
+  return utils.promptHydrationDialog({
+    servicesManager,
+    viewportId,
+    displaySet: segDisplaySet as AppTypes.DisplaySet,
+    preHydrateCallbacks,
+    hydrateCallback,
+    type: 'SEG',
   });
 }
 

extensions/cornerstone-dicom-seg/src/viewports/OHIFCornerstoneSEGViewport.tsx

@@ -1,36 +1,24 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ViewportActionArrows } from '@ohif/ui-next';
 import { useViewportGrid } from '@ohif/ui-next';
 import createSEGToolGroupAndAddTools from '../utils/initSEGToolGroup';
 import promptHydrateSEG from '../utils/promptHydrateSEG';
-import _getStatusComponent from './_getStatusComponent';
-import { usePositionPresentationStore } from '@ohif/extension-cornerstone';
+import { usePositionPresentationStore, OHIFCornerstoneViewport } from '@ohif/extension-cornerstone';
 import { SegmentationRepresentations } from '@cornerstonejs/tools/enums';
-import { utils } from '@ohif/extension-cornerstone';
+import { useSystem } from '@ohif/core/src/contextProviders/SystemProvider';
 
 const SEG_TOOLGROUP_BASE_NAME = 'SEGToolGroup';
 
 function OHIFCornerstoneSEGViewport(props: withAppTypes) {
-  const {
-    children,
-    displaySets,
-    viewportOptions,
-    servicesManager,
-    extensionManager,
-    commandsManager,
-  } = props;
-
-  const { t } = useTranslation('SEGViewport');
+  const { servicesManager, commandsManager } = useSystem();
+  const { children, displaySets, viewportOptions } = props as {
+    children: React.ReactNode;
+    displaySets: AppTypes.DisplaySet[];
+    viewportOptions: AppTypes.ViewportOptions;
+  };
   const viewportId = viewportOptions.viewportId;
 
-  const {
-    displaySetService,
-    toolGroupService,
-    segmentationService,
-    customizationService,
-    viewportActionCornersService,
-  } = servicesManager.services;
+  const { displaySetService, toolGroupService, segmentationService, customizationService } =
+    servicesManager.services;
 
   const LoadingIndicatorTotalPercent = customizationService.getCustomization(
     'ui.loadingIndicatorTotalPercent'
@@ -47,7 +35,6 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
   const [viewportGrid, viewportGridService] = useViewportGrid();
 
   // States
-  const selectedSegmentObjectIndex: number = 0;
   const { setPositionPresentation } = usePositionPresentationStore();
 
   // Hydration means that the SEG is opened and segments are loaded into the
@@ -55,9 +42,7 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
   // same frameOfReferenceUID as the referencedSeriesUID of the SEG. However,
   // loading basically means SEG loading over network and bit unpacking of the
   // SEG data.
-  const [isHydrated, setIsHydrated] = useState(segDisplaySet.isHydrated);
   const [segIsLoading, setSegIsLoading] = useState(!segDisplaySet.isLoaded);
-  const [element, setElement] = useState(null);
   const [processingProgress, setProcessingProgress] = useState({
     percentComplete: null,
     totalSegments: null,
@@ -69,6 +54,32 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
   const { viewports, activeViewportId } = viewportGrid;
 
   const referencedDisplaySetInstanceUID = segDisplaySet.referencedDisplaySetInstanceUID;
+  // If the referencedDisplaySetInstanceUID is not found, it means the SEG series is being
+  // launched without its corresponding referenced display set (e.g., the SEG series is launched using
+  // series launch /mode?StudyInstanceUIDs=&SeriesInstanceUID).
+  // In such cases, we attempt to handle this scenario gracefully by
+  // invoking a custom handler. Ideally, if a user tries to launch a series that isn't viewable,
+  // (eg.: we can prompt them with an explanation and provide a link to the full study).
+
+  // Additional guard: If no customization handler is registered for missing
+  // referenced display sets, skip SEG rendering to avoid a viewport crash.
+  if (!referencedDisplaySetInstanceUID) {
+    const missingReferenceDisplaySetHandler = customizationService.getCustomization(
+      'missingReferenceDisplaySetHandler'
+    );
+    if (typeof missingReferenceDisplaySetHandler === 'function') {
+      const { handled } = missingReferenceDisplaySetHandler();
+      if (handled) {
+        return;
+      }
+    } else {
+      console.log(
+        "No customization 'missingReferenceDisplaySetHandler' registered. Skipping SEG rendering."
+      );
+      return;
+    }
+  }
+
   const referencedDisplaySet = displaySetService.getDisplaySetByUID(
     referencedDisplaySetInstanceUID
   );
@@ -82,36 +93,10 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
     displaySet: referencedDisplaySet,
     metadata: referencedDisplaySetMetadata,
   };
-  /**
-   * OnElementEnabled callback which is called after the cornerstoneExtension
-   * has enabled the element. Note: we delegate all the image rendering to
-   * cornerstoneExtension, so we don't need to do anything here regarding
-   * the image rendering, element enabling etc.
-   */
-  const onElementEnabled = evt => {
-    setElement(evt.detail.element);
-  };
-
-  const onElementDisabled = () => {
-    setElement(null);
-  };
-
-  const storePresentationState = useCallback(() => {
-    viewportGrid?.viewports.forEach(({ viewportId }) => {
-      commandsManager.runCommand('storePresentation', {
-        viewportId,
-      });
-    });
-  }, [viewportGrid]);
 
   const getCornerstoneViewport = useCallback(() => {
-    const { component: Component } = extensionManager.getModuleEntry(
-      '@ohif/extension-cornerstone.viewportModule.cornerstone'
-    );
-
-    // Todo: jump to the center of the first segment
     return (
-      <Component
+      <OHIFCornerstoneViewport
         {...props}
         displaySets={[segDisplaySet]}
         viewportOptions={{
@@ -123,66 +108,35 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
         }}
         onElementEnabled={evt => {
           props.onElementEnabled?.(evt);
-          onElementEnabled(evt);
         }}
-        onElementDisabled={onElementDisabled}
-      ></Component>
+      />
     );
-  }, [viewportId, segDisplaySet, toolGroupId]);
-
-  const onSegmentChange = useCallback(
-    direction => {
-      utils.handleSegmentChange({
-        direction,
-        segDisplaySet: segDisplaySet,
-        viewportId,
-        selectedSegmentObjectIndex,
-        segmentationService,
-      });
-    },
-    [selectedSegmentObjectIndex]
-  );
-
-  const hydrateSEG = useCallback(() => {
-    // update the previously stored segmentationPresentation with the new viewportId
-    // presentation so that when we put the referencedDisplaySet back in the viewport
-    // it will have the correct segmentation representation hydrated
-    commandsManager.runCommand('updateStoredSegmentationPresentation', {
-      displaySet: segDisplaySet,
-      type: SegmentationRepresentations.Labelmap,
-    });
-
-    // update the previously stored positionPresentation with the new viewportId
-    // presentation so that when we put the referencedDisplaySet back in the viewport
-    // it will be in the correct position zoom and pan
-    commandsManager.runCommand('updateStoredPositionPresentation', {
-      viewportId,
-      displaySetInstanceUID: referencedDisplaySet.displaySetInstanceUID,
-    });
-
-    commandsManager.runCommand('loadSegmentationDisplaySetsForViewport', {
-      viewportId,
-      displaySetInstanceUIDs: [referencedDisplaySet.displaySetInstanceUID],
-    });
-  }, [commandsManager, viewportId, referencedDisplaySet, segDisplaySet]);
+  }, [viewportId, segDisplaySet, toolGroupId, props, viewportOptions]);
 
   useEffect(() => {
     if (segIsLoading) {
       return;
     }
 
+    // if not active viewport, return
+    if (viewportId !== activeViewportId) {
+      return;
+    }
+
     promptHydrateSEG({
       servicesManager,
       viewportId,
       segDisplaySet,
-      preHydrateCallbacks: [storePresentationState],
-      hydrateCallback: hydrateSEG,
-    }).then(isHydrated => {
-      if (isHydrated) {
-        setIsHydrated(true);
-      }
+      hydrateCallback: async () => {
+        await commandsManager.runCommand('hydrateSecondaryDisplaySet', {
+          displaySet: segDisplaySet,
+          viewportId,
+        });
+
+        return true;
+      },
     });
-  }, [servicesManager, viewportId, segDisplaySet, segIsLoading, hydrateSEG]);
+  }, [servicesManager, viewportId, segDisplaySet, segIsLoading, commandsManager, activeViewportId]);
 
   useEffect(() => {
     // on new seg display set, remove all segmentations from all viewports
@@ -191,7 +145,7 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
     const { unsubscribe } = segmentationService.subscribe(
       segmentationService.EVENTS.SEGMENTATION_LOADING_COMPLETE,
       evt => {
-        if (evt.segDisplaySet.displaySetInstanceUID === segDisplaySet.displaySetInstanceUID) {
+        if (evt.segDisplaySet?.displaySetInstanceUID === segDisplaySet?.displaySetInstanceUID) {
           setSegIsLoading(false);
         }
 
@@ -271,7 +225,12 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
 
     // This creates a custom tool group which has the lifetime of this view
     // only, and does NOT interfere with currently displayed segmentations.
-    toolGroup = createSEGToolGroupAndAddTools(toolGroupService, customizationService, toolGroupId);
+    toolGroup = createSEGToolGroupAndAddTools({
+      commandsManager,
+      toolGroupService,
+      customizationService,
+      toolGroupId,
+    });
 
     return () => {
       // remove the segmentation representations if seg displayset changed
@@ -283,54 +242,6 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
     };
   }, []);
 
-  const onStatusClick = useCallback(async () => {
-    // Before hydrating a SEG and make it added to all viewports in the grid
-    // that share the same frameOfReferenceUID, we need to store the viewport grid
-    // presentation state, so that we can restore it after hydrating the SEG. This is
-    // required if the user has changed the viewport (other viewport than SEG viewport)
-    // presentation state (w/l and invert) and then opens the SEG. If we don't store
-    // the presentation state, the viewport will be reset to the default presentation
-    storePresentationState();
-    hydrateSEG();
-  }, [storePresentationState, hydrateSEG]);
-
-  useEffect(() => {
-    viewportActionCornersService.addComponents([
-      {
-        viewportId,
-        id: 'viewportStatusComponent',
-        component: _getStatusComponent({
-          isHydrated,
-          onStatusClick,
-        }),
-        indexPriority: -100,
-        location: viewportActionCornersService.LOCATIONS.topLeft,
-      },
-      {
-        viewportId,
-        id: 'viewportActionArrowsComponent',
-        component: (
-          <ViewportActionArrows
-            key="actionArrows"
-            onArrowsClick={onSegmentChange}
-            className={
-              viewportId === activeViewportId ? 'visible' : 'invisible group-hover/pane:visible'
-            }
-          ></ViewportActionArrows>
-        ),
-        indexPriority: 0,
-        location: viewportActionCornersService.LOCATIONS.topRight,
-      },
-    ]);
-  }, [
-    activeViewportId,
-    isHydrated,
-    onSegmentChange,
-    onStatusClick,
-    viewportActionCornersService,
-    viewportId,
-  ]);
-
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   let childrenWithProps = null;
 

extensions/cornerstone-dicom-seg/src/viewports/_getStatusComponent.tsx

@@ -1,59 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { ViewportActionButton } from '@ohif/ui-next';
-import { Icons, Tooltip, TooltipTrigger, TooltipContent } from '@ohif/ui-next';
-
-export default function _getStatusComponent({ isHydrated, onStatusClick }) {
-  let ToolTipMessage = null;
-  let StatusIcon = null;
-
-  switch (isHydrated) {
-    case true:
-      StatusIcon = () => <Icons.ByName name="status-alert" />;
-      ToolTipMessage = () => <div>This Segmentation is loaded in the segmentation panel</div>;
-      break;
-    case false:
-      StatusIcon = () => (
-        <Icons.ByName
-          className="text-muted-foreground h-4 w-4"
-          name="status-untracked"
-        />
-      );
-      ToolTipMessage = () => <div>Click LOAD to load segmentation.</div>;
-  }
-
-  const StatusArea = () => {
-    const { t } = useTranslation('Common');
-    const loadStr = t('LOAD');
-
-    return (
-      <div className="flex h-6 cursor-default text-sm leading-6 text-white">
-        <div className="bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1">
-          <StatusIcon />
-          <span className="ml-1">SEG</span>
-        </div>
-        {!isHydrated && (
-          <ViewportActionButton onInteraction={onStatusClick}>{loadStr}</ViewportActionButton>
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <>
-      {ToolTipMessage && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span>
-              <StatusArea />
-            </span>
-          </TooltipTrigger>
-          <TooltipContent side="bottom">
-            <ToolTipMessage />
-          </TooltipContent>
-        </Tooltip>
-      )}
-      {!ToolTipMessage && <StatusArea />}
-    </>
-  );
-}

extensions/cornerstone-dicom-sr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-sr",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "description": "OHIF extension for an SR Cornerstone Viewport",
   "author": "OHIF",
   "license": "MIT",
@@ -34,21 +34,21 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.11.0-beta.15",
-    "@ohif/extension-cornerstone": "3.11.0-beta.15",
-    "@ohif/extension-measurement-tracking": "3.11.0-beta.15",
-    "@ohif/ui": "3.11.0-beta.15",
-    "dcmjs": "*",
-    "dicom-parser": "^1.8.9",
-    "hammerjs": "^2.0.8",
-    "prop-types": "^15.6.2",
-    "react": "^18.3.1"
+    "@ohif/core": "3.13.0-beta.78",
+    "@ohif/extension-cornerstone": "3.13.0-beta.78",
+    "@ohif/extension-measurement-tracking": "3.13.0-beta.78",
+    "@ohif/ui": "3.13.0-beta.78",
+    "dcmjs": "0.49.4",
+    "dicom-parser": "1.8.21",
+    "hammerjs": "2.0.8",
+    "prop-types": "15.8.1",
+    "react": "18.3.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.9.5",
-    "@cornerstonejs/core": "^3.9.5",
-    "@cornerstonejs/tools": "^3.9.5",
-    "classnames": "^2.3.2"
+    "@babel/runtime": "7.28.2",
+    "@cornerstonejs/adapters": "4.22.8",
+    "@cornerstonejs/core": "4.22.8",
+    "@cornerstonejs/tools": "4.22.8",
+    "classnames": "2.5.1"
   }
 }

extensions/cornerstone-dicom-sr/src/commandsModule.ts

@@ -1,7 +1,6 @@
-import { metaData, utilities } from '@cornerstonejs/core';
+import { metaData } from '@cornerstonejs/core';
 
-import OHIF, { DicomMetadataStore } from '@ohif/core';
-import dcmjs from 'dcmjs';
+import OHIF from '@ohif/core';
 import { adaptersSR } from '@cornerstonejs/adapters';
 
 import getFilteredCornerstoneToolState from './utils/getFilteredCornerstoneToolState';
@@ -32,12 +31,7 @@ const _generateReport = (measurementData, additionalFindingTypes, options: Optio
     additionalFindingTypes
   );
 
-  const report = MeasurementReport.generateReport(
-    filteredToolState,
-    metaData,
-    utilities.worldToImageCoords,
-    options
-  );
+  const report = MeasurementReport.generateReport(filteredToolState, metaData, options);
 
   const { dataset } = report;
 
@@ -47,14 +41,12 @@ const _generateReport = (measurementData, additionalFindingTypes, options: Optio
     dataset.SpecificCharacterSet = 'ISO_IR 192';
   }
 
-  dataset.InstanceNumber = options.InstanceNumber ?? 1;
-
   return dataset;
 };
 
 const commandsModule = (props: withAppTypes) => {
   const { servicesManager, extensionManager, commandsManager } = props;
-  const { customizationService, viewportGridService, displaySetService } = servicesManager.services;
+  const { customizationService } = servicesManager.services;
 
   const actions = {
     changeColorMeasurement: ({ uid }) => {
@@ -80,25 +72,8 @@ const commandsModule = (props: withAppTypes) => {
     /**
      *
      * @param measurementData An array of measurements from the measurements service
-     * @param additionalFindingTypes toolTypes that should be stored with labels as Findings
-     * @param options Naturalized DICOM JSON headers to merge into the displaySet.
-     * as opposed to Finding Sites.
      * that you wish to serialize.
-     */
-    downloadReport: ({ measurementData, additionalFindingTypes, options = {} }) => {
-      const srDataset = _generateReport(measurementData, additionalFindingTypes, options);
-      const reportBlob = dcmjs.data.datasetToBlob(srDataset);
-
-      //Create a URL for the binary.
-      const objectUrl = URL.createObjectURL(reportBlob);
-      window.location.assign(objectUrl);
-    },
-
-    /**
-     *
-     * @param measurementData An array of measurements from the measurements service
-     * that you wish to serialize.
-     * @param dataSource The dataSource that you wish to use to persist the data.
+     * @param dataSource The data source name ('download', 'copyToClipboard', or a named data source).
      * @param additionalFindingTypes toolTypes that should be stored with labels as Findings
      * @param options Naturalized DICOM JSON headers to merge into the displaySet.
      * @return The naturalized report
@@ -109,44 +84,44 @@ const commandsModule = (props: withAppTypes) => {
       additionalFindingTypes,
       options = {},
     }) => {
-      // Use the @cornerstonejs adapter for converting to/from DICOM
-      // But it is good enough for now whilst we only have cornerstone as a datasource.
       log.info('[DICOMSR] storeMeasurements');
 
-      if (!dataSource || !dataSource.store || !dataSource.store.dicom) {
-        log.error('[DICOMSR] datasource has no dataSource.store.dicom endpoint!');
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource,
+        defaultFileName: 'dicom-sr.dcm',
+      });
+
+      if (!storeFn) {
+        log.error('[DICOMSR] No valid store for dataSource:', dataSource);
         return Promise.reject({});
       }
 
       try {
-        const naturalizedReport = _generateReport(measurementData, additionalFindingTypes, options);
+        const naturalizedReport = _generateReport(
+          measurementData,
+          additionalFindingTypes,
+          options
+        );
 
-        const { StudyInstanceUID, ContentSequence } = naturalizedReport;
+        const { ContentSequence } = naturalizedReport;
         // The content sequence has 5 or more elements, of which
         // the `[4]` element contains the annotation data, so this is
         // checking that there is some annotation data present.
-        if (!ContentSequence?.[4].ContentSequence?.length) {
+        if (!ContentSequence?.[4]?.ContentSequence?.length) {
           console.log('naturalizedReport missing imaging content', naturalizedReport);
           throw new Error('Invalid report, no content');
         }
+        if (!naturalizedReport.SOPClassUID) {
+          throw new Error('No sop class uid');
+        }
 
         const onBeforeDicomStore = customizationService.getCustomization('onBeforeDicomStore');
-
         let dicomDict;
         if (typeof onBeforeDicomStore === 'function') {
           dicomDict = onBeforeDicomStore({ dicomDict, measurementData, naturalizedReport });
         }
 
-        await dataSource.store.dicom(naturalizedReport, null, dicomDict);
-
-        if (StudyInstanceUID) {
-          dataSource.deleteStudyMetadataPromise(StudyInstanceUID);
-        }
-
-        // The "Mode" route listens for DicomMetadataStore changes
-        // When a new instance is added, it listens and
-        // automatically calls makeDisplaySets
-        DicomMetadataStore.addInstances([naturalizedReport], true);
+        await storeFn(naturalizedReport, { measurementData, dicomDict });
 
         return naturalizedReport;
       } catch (error) {
@@ -160,36 +135,17 @@ const commandsModule = (props: withAppTypes) => {
      * Loads measurements by hydrating and loading the SR for the given display set instance UID
      * and displays it in the active viewport.
      */
-    loadSRMeasurements: ({ displaySetInstanceUID }) => {
-      const { SeriesInstanceUIDs } = hydrateStructuredReport(
+    hydrateStructuredReport: ({ displaySetInstanceUID }) => {
+      return hydrateStructuredReport(
         { servicesManager, extensionManager, commandsManager },
         displaySetInstanceUID
       );
-
-      const displaySets = displaySetService.getDisplaySetsForSeries(SeriesInstanceUIDs[0]);
-      if (displaySets.length) {
-        commandsManager.run('setDisplaySetsForViewports', {
-          viewportsToUpdate: [
-            {
-              viewportId: viewportGridService.getActiveViewportId(),
-              displaySetInstanceUIDs: [displaySets[0].displaySetInstanceUID],
-            },
-          ],
-        });
-      }
     },
   };
 
   const definitions = {
-    downloadReport: {
-      commandFn: actions.downloadReport,
-    },
-    storeMeasurements: {
-      commandFn: actions.storeMeasurements,
-    },
-    loadSRMeasurements: {
-      commandFn: actions.loadSRMeasurements,
-    },
+    storeMeasurements: actions.storeMeasurements,
+    hydrateStructuredReport: actions.hydrateStructuredReport,
   };
 
   return {

extensions/cornerstone-dicom-sr/src/components/OHIFCornerstoneSRMeasurementViewport.tsx

@@ -1,25 +1,24 @@
 import PropTypes from 'prop-types';
-import React, { useCallback, useContext, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ExtensionManager, useToolbar } from '@ohif/core';
-
+import React, { useCallback, useEffect, useState } from 'react';
 import { setTrackingUniqueIdentifiersForElement } from '../tools/modules/dicomSRModule';
 
-import { ViewportActionArrows } from '@ohif/ui-next';
 import createReferencedImageDisplaySet from '../utils/createReferencedImageDisplaySet';
-import { usePositionPresentationStore } from '@ohif/extension-cornerstone';
+import { usePositionPresentationStore, OHIFCornerstoneViewport } from '@ohif/extension-cornerstone';
 import { useViewportGrid } from '@ohif/ui-next';
-import { Icons, Tooltip, TooltipTrigger, TooltipContent } from '@ohif/ui-next';
-
-const MEASUREMENT_TRACKING_EXTENSION_ID = '@ohif/extension-measurement-tracking';
+import { useSystem } from '@ohif/core/src/contextProviders/SystemProvider';
 
 const SR_TOOLGROUP_BASE_NAME = 'SRToolGroup';
 
-function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
-  const { children, dataSource, displaySets, viewportOptions, servicesManager, extensionManager } =
-    props;
+function OHIFCornerstoneSRMeasurementViewport(props) {
+  const { servicesManager } = useSystem();
+  const { children, dataSource, displaySets, viewportOptions } = props as {
+    children: React.ReactNode;
+    dataSource: unknown;
+    displaySets: AppTypes.DisplaySet[];
+    viewportOptions: AppTypes.ViewportOptions;
+  };
 
-  const { displaySetService, viewportActionCornersService } = servicesManager.services;
+  const { displaySetService } = servicesManager.services;
 
   const viewportId = viewportOptions.viewportId;
 
@@ -34,40 +33,11 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
 
   const [viewportGrid, viewportGridService] = useViewportGrid();
   const [measurementSelected, setMeasurementSelected] = useState(0);
-  const [measurementCount, setMeasurementCount] = useState(1);
   const [activeImageDisplaySetData, setActiveImageDisplaySetData] = useState(null);
   const [referencedDisplaySetMetadata, setReferencedDisplaySetMetadata] = useState(null);
   const [element, setElement] = useState(null);
   const { viewports, activeViewportId } = viewportGrid;
 
-  const { t } = useTranslation('Common');
-
-  // Optional hook into tracking extension, if present.
-  let trackedMeasurements;
-
-  const hasMeasurementTrackingExtension = extensionManager.registeredExtensionIds.includes(
-    MEASUREMENT_TRACKING_EXTENSION_ID
-  );
-
-  if (hasMeasurementTrackingExtension) {
-    const contextModule = extensionManager.getModuleEntry(
-      '@ohif/extension-measurement-tracking.contextModule.TrackedMeasurementsContext'
-    );
-
-    const tracked = useContext(contextModule.context);
-    trackedMeasurements = tracked?.[0];
-  }
-
-  /**
-   * Todo: what is this, not sure what it does regarding the react aspect,
-   * it is updating a local variable? which is not state.
-   */
-  const [isLocked, setIsLocked] = useState(trackedMeasurements?.context?.trackedSeries?.length > 0);
-  /**
-   * Store the tracking identifiers per viewport in order to be able to
-   * show the SR measurements on the referenced image on the correct viewport,
-   * when multiple viewports are used.
-   */
   const setTrackingIdentifiers = useCallback(
     measurementSelected => {
       const { measurements } = srDisplaySet;
@@ -93,22 +63,12 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
 
   const updateViewport = useCallback(
     newMeasurementSelected => {
-      const { StudyInstanceUID, displaySetInstanceUID, sopClassUids } = srDisplaySet;
+      const { StudyInstanceUID, displaySetInstanceUID } = srDisplaySet;
 
       if (!StudyInstanceUID || !displaySetInstanceUID) {
         return;
       }
 
-      if (sopClassUids && sopClassUids.length > 1) {
-        // Todo: what happens if there are multiple SOP Classes? Why we are
-        // not throwing an error?
-        console.warn('More than one SOPClassUID in the same series is not yet supported.');
-      }
-
-      // if (!srDisplaySet.measurements || !srDisplaySet.measurements.length) {
-      //   return;
-      // }
-
       _getViewportReferencedDisplaySetData(
         srDisplaySet,
         newMeasurementSelected,
@@ -126,7 +86,7 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
         const { presentationIds } = viewportOptions;
         const measurement = srDisplaySet.measurements[newMeasurementSelected];
         setPositionPresentation(presentationIds.positionPresentationId, {
-          viewReference: {
+          viewReference: measurement.viewReference || {
             referencedImageId: measurement.imageId,
           },
         });
@@ -140,10 +100,6 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
       return null;
     }
 
-    const { component: Component } = extensionManager.getModuleEntry(
-      '@ohif/extension-cornerstone.viewportModule.cornerstone'
-    );
-
     const { measurements } = srDisplaySet;
     const measurement = measurements[measurementSelected];
 
@@ -152,7 +108,7 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
     }
 
     return (
-      <Component
+      <OHIFCornerstoneViewport
         {...props}
         // should be passed second since we don't want SR displaySet to
         // override the activeImageDisplaySetData
@@ -176,27 +132,10 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
           onElementEnabled(evt);
         }}
         isJumpToMeasurementDisabled={true}
-      ></Component>
+      />
     );
   }, [activeImageDisplaySetData, viewportId, measurementSelected]);
 
-  const onMeasurementChange = useCallback(
-    direction => {
-      let newMeasurementSelected = measurementSelected;
-
-      newMeasurementSelected += direction;
-      if (newMeasurementSelected >= measurementCount) {
-        newMeasurementSelected = 0;
-      } else if (newMeasurementSelected < 0) {
-        newMeasurementSelected = measurementCount - 1;
-      }
-
-      setTrackingIdentifiers(newMeasurementSelected);
-      updateViewport(newMeasurementSelected);
-    },
-    [measurementSelected, measurementCount, updateViewport, setTrackingIdentifiers]
-  );
-
   /**
    Cleanup the SR viewport when the viewport is destroyed
    */
@@ -231,8 +170,6 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
       if (!srDisplaySet.isLoaded) {
         await srDisplaySet.load();
       }
-      const numMeasurements = srDisplaySet.measurements.length;
-      setMeasurementCount(numMeasurements);
       updateViewport(measurementSelected);
     };
     loadSR();
@@ -255,42 +192,6 @@ function OHIFCornerstoneSRMeasurementViewport(props: withAppTypes) {
     updateSR();
   }, [measurementSelected, element, setTrackingIdentifiers, srDisplaySet]);
 
-  useEffect(() => {
-    setIsLocked(trackedMeasurements?.context?.trackedSeries?.length > 0);
-  }, [trackedMeasurements]);
-
-  useEffect(() => {
-    viewportActionCornersService.addComponents([
-      {
-        viewportId,
-        id: 'viewportStatusComponent',
-        component: _getStatusComponent({
-          srDisplaySet,
-          viewportId,
-          isRehydratable: srDisplaySet.isRehydratable,
-          isLocked,
-          t,
-          servicesManager,
-        }),
-        indexPriority: -100,
-        location: viewportActionCornersService.LOCATIONS.topLeft,
-      },
-      {
-        viewportId,
-        id: 'viewportActionArrowsComponent',
-        index: 0,
-        component: (
-          <ViewportActionArrows
-            key="actionArrows"
-            onArrowsClick={onMeasurementChange}
-          ></ViewportActionArrows>
-        ),
-        indexPriority: 0,
-        location: viewportActionCornersService.LOCATIONS.topRight,
-      },
-    ]);
-  }, [isLocked, onMeasurementChange, srDisplaySet, t, viewportActionCornersService, viewportId]);
-
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   let childrenWithProps = null;
 
@@ -327,8 +228,6 @@ OHIFCornerstoneSRMeasurementViewport.propTypes = {
   children: PropTypes.node,
   viewportLabel: PropTypes.string,
   viewportOptions: PropTypes.object,
-  servicesManager: PropTypes.object.isRequired,
-  extensionManager: PropTypes.instanceOf(ExtensionManager).isRequired,
 };
 
 async function _getViewportReferencedDisplaySetData(
@@ -353,6 +252,9 @@ async function _getViewportReferencedDisplaySetData(
   }
 
   const referencedDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
+  if (!referencedDisplaySet?.images) {
+    return { referencedDisplaySetMetadata: null, referencedDisplaySet: null };
+  }
 
   const image0 = referencedDisplaySet.images[0];
   const referencedDisplaySetMetadata = {
@@ -372,130 +274,4 @@ async function _getViewportReferencedDisplaySetData(
   return { referencedDisplaySetMetadata, referencedDisplaySet };
 }
 
-function _getStatusComponent({
-  srDisplaySet,
-  viewportId,
-  isRehydratable,
-  isLocked,
-  t,
-  servicesManager,
-}) {
-  const loadStr = t('LOAD');
-
-  // 1 - Incompatible
-  // 2 - Locked
-  // 3 - Rehydratable / Open
-  const state = isRehydratable && !isLocked ? 3 : isRehydratable && isLocked ? 2 : 1;
-  let ToolTipMessage = null;
-  let StatusIcon = null;
-
-  switch (state) {
-    case 1:
-      StatusIcon = () => (
-        <Icons.ByName
-          name="status-alert"
-          className="h-4 w-4"
-        />
-      );
-
-      ToolTipMessage = () => (
-        <div>
-          This structured report is not compatible
-          <br />
-          with this application.
-        </div>
-      );
-      break;
-    case 2:
-      StatusIcon = () => (
-        <Icons.ByName
-          name="status-locked"
-          className="h-4 w-4"
-        />
-      );
-
-      ToolTipMessage = () => (
-        <div>
-          This structured report is currently read-only
-          <br />
-          because you are tracking measurements in
-          <br />
-          another viewport.
-        </div>
-      );
-      break;
-    case 3:
-      StatusIcon = () => (
-        <Icons.ByName
-          className="text-muted-foreground h-4 w-4"
-          name="status-untracked"
-        />
-      );
-
-      ToolTipMessage = () => <div>{`Click ${loadStr} to restore measurements.`}</div>;
-  }
-
-  const StatusArea = () => {
-    const { toolbarButtons: loadSRMeasurementsButtons, onInteraction } = useToolbar({
-      servicesManager,
-      buttonSection: 'loadSRMeasurements',
-    });
-
-    const commandOptions = {
-      displaySetInstanceUID: srDisplaySet.displaySetInstanceUID,
-      viewportId,
-    };
-
-    return (
-      <div className="flex h-6 cursor-default text-sm leading-6 text-white">
-        <div className="bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1">
-          <StatusIcon className="h-4 w-4" />
-          <span className="ml-1">SR</span>
-        </div>
-        {state === 3 && (
-          <>
-            {loadSRMeasurementsButtons.map(toolDef => {
-              if (!toolDef) {
-                return null;
-              }
-              const { id, Component, componentProps } = toolDef;
-              const tool = (
-                <Component
-                  key={id}
-                  id={id}
-                  onInteraction={args => onInteraction({ ...args, ...commandOptions })}
-                  {...componentProps}
-                />
-              );
-
-              return <div key={id}>{tool}</div>;
-            })}
-          </>
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <>
-      {ToolTipMessage && (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span>
-              <StatusArea />
-            </span>
-          </TooltipTrigger>
-          <TooltipContent
-            side="bottom"
-            align="start"
-          >
-            <ToolTipMessage />
-          </TooltipContent>
-        </Tooltip>
-      )}
-      {!ToolTipMessage && <StatusArea />}
-    </>
-  );
-}
-
 export default OHIFCornerstoneSRMeasurementViewport;

extensions/cornerstone-dicom-sr/src/components/OHIFCornerstoneSRTextViewport.tsx

@@ -9,7 +9,7 @@ function OHIFCornerstoneSRTextViewport(props: withAppTypes) {
   const instance = displaySet.instances[0];
 
   return (
-    <div className="relative flex h-full w-full flex-col overflow-auto p-4 text-white">
+    <div className="text-foreground relative flex h-full w-full flex-col overflow-auto p-4">
       <div>
         {/* The root level is always a container */}
         <OHIFCornerstoneSRContainer container={instance} />

extensions/cornerstone-dicom-sr/src/getSopClassHandlerModule.ts

@@ -1,4 +1,5 @@
-import { utils, classes, DisplaySetService, Types } from '@ohif/core';
+import { utils, classes, DisplaySetService, Types as OhifTypes } from '@ohif/core';
+import i18n from '@ohif/i18n';
 import { Enums as CSExtensionEnums } from '@ohif/extension-cornerstone';
 import { adaptersSR } from '@cornerstonejs/adapters';
 
@@ -14,10 +15,14 @@ import { CodeNameCodeSequenceValues, CodingSchemeDesignators } from './enums';
 
 const { sopClassDictionary } = utils;
 const { CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION } = CSExtensionEnums;
-const { ImageSet, MetadataProvider: metadataProvider } = classes;
-const { CodeScheme: Cornerstone3DCodeScheme } = adaptersSR.Cornerstone3D;
+const { MetadataProvider: metadataProvider } = classes;
+const {
+  TEXT_ANNOTATION_POSITION,
+  COMMENT_CODE,
+  CodeScheme: Cornerstone3DCodeScheme,
+} = adaptersSR.Cornerstone3D;
 
-type InstanceMetadata = Types.InstanceMetadata;
+type InstanceMetadata = OhifTypes.InstanceMetadata;
 
 /**
  * TODO
@@ -30,6 +35,7 @@ const sopClassUids = [
   sopClassDictionary.BasicTextSR,
   sopClassDictionary.EnhancedSR,
   sopClassDictionary.ComprehensiveSR,
+  sopClassDictionary.Comprehensive3DSR,
 ];
 
 const validateSameStudyUID = (uid: string, instances): void => {
@@ -48,7 +54,7 @@ const validateSameStudyUID = (uid: string, instances): void => {
  * @param instances is a list of instances from THIS series that are not
  *     in this DICOM SR Display Set already.
  */
-function addInstances(instances: InstanceMetadata[], displaySetService: DisplaySetService) {
+function addInstances(instances: InstanceMetadata[], _displaySetService: DisplaySetService) {
   this.instances.push(...instances);
   utils.sortStudyInstances(this.instances);
   // The last instance is the newest one, so is the one most interesting.
@@ -63,9 +69,10 @@ function addInstances(instances: InstanceMetadata[], displaySetService: DisplayS
  * DICOM SR SOP Class Handler
  * For all referenced images in the TID 1500/300 sections, add an image to the
  * display.
- * @param instances is a set of instances all from the same series
- * @param servicesManager is the services that can be used for creating
- * @returns The list of display sets created for the given instances object
+ * @param {InstanceMetadata[]} instances - A set of instances all from the same series
+ * @param {AppTypes.ServicesManager} servicesManager - The services that can be used for creating
+ * @param {AppTypes.ExtensionManager} extensionManager - The extension manager
+ * @returns {Types.DisplaySet[]} The list of display sets created for the given instances object
  */
 function _getDisplaySetsFromSeries(
   instances,
@@ -93,6 +100,7 @@ function _getDisplaySetsFromSeries(
     SeriesTime,
     ConceptNameCodeSequence,
     SOPClassUID,
+    imageId: predecessorImageId,
   } = instance;
   validateSameStudyUID(instance.StudyInstanceUID, instances);
 
@@ -121,7 +129,9 @@ function _getDisplaySetsFromSeries(
     isImagingMeasurementReport,
     sopClassUids,
     instance,
+    predecessorImageId,
     addInstances,
+    label: SeriesDescription || `${i18n.t('Series')} ${SeriesNumber} - ${i18n.t('SR')}`,
   };
 
   displaySet.load = () => _load(displaySet, servicesManager, extensionManager);
@@ -136,7 +146,7 @@ function _getDisplaySetsFromSeries(
  * @param extensionManager - The extension manager containing data sources.
  */
 async function _load(
-  srDisplaySet: Types.DisplaySet,
+  srDisplaySet: OhifTypes.DisplaySet,
   servicesManager: AppTypes.ServicesManager,
   extensionManager: AppTypes.ExtensionManager
 ) {
@@ -176,6 +186,10 @@ async function _load(
     srDisplaySet.referencedImages = [];
     srDisplaySet.measurements = [];
   }
+  const { predecessorImageId } = srDisplaySet;
+  for (const measurement of srDisplaySet.measurements) {
+    measurement.predecessorImageId = predecessorImageId;
+  }
 
   const mappings = measurementService.getSourceMappings(
     CORNERSTONE_3D_TOOLS_SOURCE_NAME,
@@ -186,8 +200,13 @@ async function _load(
   srDisplaySet.isRehydratable = isRehydratable(srDisplaySet, mappings);
   srDisplaySet.isLoaded = true;
 
-  /** Check currently added displaySets and add measurements if the sources exist */
-  displaySetService.activeDisplaySets.forEach(activeDisplaySet => {
+  /** Check currently added displaySets and add measurements if the sources exist.
+   *  Walk the SR's study first in default series order (not load order) so SCOORD3D
+   *  FrameOfReference matching picks a stable series when several share FOR. */
+  const displaySetsForSRPass = utils.sortDisplaySetsCopy(displaySetService.activeDisplaySets, {
+    studyInstanceUIDFirst: srDisplaySet.StudyInstanceUID,
+  });
+  displaySetsForSRPass.forEach(activeDisplaySet => {
     _checkIfCanAddMeasurementsToDisplaySet(
       srDisplaySet,
       activeDisplaySet,
@@ -214,17 +233,15 @@ async function _load(
   });
 }
 
-/**
- * Checks if measurements can be added to a display set.
- *
- * @param srDisplaySet - The source display set containing measurements.
- * @param newDisplaySet - The new display set to check if measurements can be added.
- * @param dataSource - The data source used to retrieve image IDs.
- * @param servicesManager - The services manager.
- */
+function _measurementBelongsToDisplaySet({ measurement, displaySet }) {
+  return (
+    measurement.coords[0].ReferencedFrameOfReferenceSequence === displaySet.FrameOfReferenceUID
+  );
+}
+
 function _checkIfCanAddMeasurementsToDisplaySet(
-  srDisplaySet,
-  newDisplaySet,
+  srDisplaySet: OhifTypes.DisplaySet,
+  newDisplaySet: OhifTypes.DisplaySet,
   dataSource,
   servicesManager: AppTypes.ServicesManager
 ) {
@@ -234,18 +251,10 @@ function _checkIfCanAddMeasurementsToDisplaySet(
     measurement => measurement.loaded === false
   );
 
-  if (
-    unloadedMeasurements.length === 0 ||
-    !(newDisplaySet instanceof ImageSet) ||
-    newDisplaySet.unsupported
-  ) {
+  if (!unloadedMeasurements.length || newDisplaySet.unsupported) {
     return;
   }
 
-  // const { sopClassUids } = newDisplaySet;
-  // Create a Set for faster lookups
-  // const sopClassUidSet = new Set(sopClassUids);
-
   // Create a Map to efficiently look up ImageIds by SOPInstanceUID and frame number
   const imageIdMap = new Map<string, string>();
   const imageIds = dataSource.getImageIdsForDisplaySet(newDisplaySet);
@@ -264,6 +273,7 @@ function _checkIfCanAddMeasurementsToDisplaySet(
 
   for (let j = unloadedMeasurements.length - 1; j >= 0; j--) {
     let measurement = unloadedMeasurements[j];
+    const is3DMeasurement = measurement.coords?.[0]?.ValueType === 'SCOORD3D';
 
     const onBeforeSRAddMeasurement = customizationService.getCustomization(
       'onBeforeSRAddMeasurement'
@@ -278,9 +288,15 @@ function _checkIfCanAddMeasurementsToDisplaySet(
     }
 
     // if it is 3d SR we can just add the SR annotation
-    if (is3DSR) {
-      addSRAnnotation(measurement, null, null);
+    if (
+      is3DSR &&
+      is3DMeasurement &&
+      _measurementBelongsToDisplaySet({ measurement, displaySet: newDisplaySet })
+    ) {
+      addSRAnnotation({ measurement, displaySet: newDisplaySet });
       measurement.loaded = true;
+      measurement.displaySetInstanceUID = newDisplaySet.displaySetInstanceUID;
+      unloadedMeasurements.splice(j, 1);
       continue;
     }
 
@@ -298,15 +314,12 @@ function _checkIfCanAddMeasurementsToDisplaySet(
       imageId &&
       _measurementReferencesSOPInstanceUID(measurement, ReferencedSOPInstanceUID, frame)
     ) {
-      addSRAnnotation(measurement, imageId, frame);
-
-      // Update measurement properties
+      addSRAnnotation({ measurement, imageId, frameNumber: frame, displaySet: newDisplaySet });
       measurement.loaded = true;
       measurement.imageId = imageId;
       measurement.displaySetInstanceUID = newDisplaySet.displaySetInstanceUID;
       measurement.ReferencedSOPInstanceUID = ReferencedSOPInstanceUID;
       measurement.frameNumber = frame;
-
       unloadedMeasurements.splice(j, 1);
     }
   }
@@ -314,10 +327,10 @@ function _checkIfCanAddMeasurementsToDisplaySet(
 
 /**
  * Checks if a measurement references a specific SOP Instance UID.
- * @param measurement - The measurement object.
- * @param SOPInstanceUID - The SOP Instance UID to check against.
- * @param frameNumber - The frame number to check against (optional).
- * @returns True if the measurement references the specified SOP Instance UID, false otherwise.
+ * @param {any} measurement - The measurement object.
+ * @param {string} sopInstanceUID - The SOP Instance UID to check against.
+ * @param {number} frameNumber - The frame number to check against (optional).
+ * @returns {boolean} True if the measurement references the specified SOP Instance UID, false otherwise.
  */
 function _measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frameNumber) {
   const { coords } = measurement;
@@ -349,12 +362,11 @@ function _measurementReferencesSOPInstanceUID(measurement, SOPInstanceUID, frame
 /**
  * Retrieves the SOP class handler module.
  *
- * @param {Object} options - The options for retrieving the SOP class handler module.
- * @param {Object} options.servicesManager - The services manager.
- * @param {Object} options.extensionManager - The extension manager.
- * @returns {Array} An array containing the SOP class handler module.
+ * @param {OhifTypes.Extensions.ExtensionParams} params - The extension parameters.
+ * @returns {Array} An array containing the SOP class handler modules.
  */
-function getSopClassHandlerModule({ servicesManager, extensionManager }) {
+function getSopClassHandlerModule(params: OhifTypes.Extensions.ExtensionParams) {
+  const { servicesManager, extensionManager } = params;
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };
@@ -375,8 +387,8 @@ function getSopClassHandlerModule({ servicesManager, extensionManager }) {
 /**
  * Retrieves the measurements from the ImagingMeasurementReportContentSequence.
  *
- * @param {Array} ImagingMeasurementReportContentSequence - The ImagingMeasurementReportContentSequence array.
- * @returns {Array} - The array of measurements.
+ * @param {any[]} imagingMeasurementReportContentSequence - The ImagingMeasurementReportContentSequence array.
+ * @returns {any[]} The array of measurements.
  */
 function _getMeasurements(ImagingMeasurementReportContentSequence) {
   const ImagingMeasurements = ImagingMeasurementReportContentSequence.find(
@@ -414,8 +426,8 @@ function _getMeasurements(ImagingMeasurementReportContentSequence) {
 /**
  * Retrieves merged content sequences by tracking unique identifiers.
  *
- * @param {Array} MeasurementGroups - The measurement groups.
- * @returns {Object} - The merged content sequences by tracking unique identifiers.
+ * @param {any[]} measurementGroups - The measurement groups.
+ * @returns {Object} The merged content sequences by tracking unique identifiers.
  */
 function _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups) {
   const mergedContentSequencesByTrackingUniqueIdentifiers = {};
@@ -462,15 +474,11 @@ function _getMergedContentSequencesByTrackingUniqueIdentifiers(MeasurementGroups
  * it calls the _processTID1410Measurement function.
  * Otherwise, it calls the _processNonGeometricallyDefinedMeasurement function.
  *
- * @param {Array<Object>} mergedContentSequence - The merged content sequence to process.
- * @returns {any} - The processed measurement result.
+ * @param {any[]} mergedContentSequence - The merged content sequence to process.
+ * @returns {any} The processed measurement result.
  */
 function _processMeasurement(mergedContentSequence) {
-  if (
-    mergedContentSequence.some(
-      group => group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D'
-    )
-  ) {
+  if (mergedContentSequence.some(group => isScoordOr3d(group) && !isTextPosition(group))) {
     return _processTID1410Measurement(mergedContentSequence);
   }
 
@@ -482,8 +490,8 @@ function _processMeasurement(mergedContentSequence) {
  * TID 1410 style measurements have a SCOORD or SCOORD3D at the top level,
  * and non-geometric representations where each NUM has "INFERRED FROM" SCOORD/SCOORD3D.
  *
- * @param mergedContentSequence - The merged content sequence containing the measurements.
- * @returns The measurement object containing the loaded status, labels, coordinates, tracking unique identifier, and tracking identifier.
+ * @param {any[]} mergedContentSequence - The merged content sequence containing the measurements.
+ * @returns {any} The measurement object containing the loaded status, labels, coordinates, tracking unique identifier, and tracking identifier.
  */
 function _processTID1410Measurement(mergedContentSequence) {
   // Need to deal with TID 1410 style measurements, which will have a SCOORD or SCOORD3D at the top level,
@@ -508,12 +516,25 @@ function _processTID1410Measurement(mergedContentSequence) {
 
   const NUMContentItems = mergedContentSequence.filter(group => group.ValueType === 'NUM');
 
+  const { ConceptNameCodeSequence: conceptNameItem } = graphicItem;
+  const { CodeValue: graphicValue, CodingSchemeDesignator: graphicDesignator } = conceptNameItem;
+  const graphicCode = `${graphicDesignator}:${graphicValue}`;
+
+  const pointDataItem = _getCoordsFromSCOORDOrSCOORD3D(graphicItem);
+  const is3DMeasurement = pointDataItem.ValueType === 'SCOORD3D';
+  const pointLength = is3DMeasurement ? 3 : 2;
+  const pointsLength = pointDataItem.GraphicData.length / pointLength;
+
   const measurement = {
     loaded: false,
     labels: [],
-    coords: [_getCoordsFromSCOORDOrSCOORD3D(graphicItem)],
+    coords: [pointDataItem],
     TrackingUniqueIdentifier: UIDREFContentItem.UID,
     TrackingIdentifier: TrackingIdentifierContentItem.TextValue,
+    graphicCode,
+    is3DMeasurement,
+    pointsLength,
+    graphicType: pointDataItem.GraphicType,
   };
 
   NUMContentItems.forEach(item => {
@@ -543,8 +564,8 @@ function _processTID1410Measurement(mergedContentSequence) {
 /**
  * Processes the non-geometrically defined measurement from the merged content sequence.
  *
- * @param mergedContentSequence The merged content sequence containing the measurement data.
- * @returns The processed measurement object.
+ * @param {any[]} mergedContentSequence The merged content sequence containing the measurement data.
+ * @returns {any} The processed measurement object.
  */
 function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
   const NUMContentItems = mergedContentSequence.filter(group => group.ValueType === 'NUM');
@@ -564,6 +585,12 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
       item.ConceptNameCodeSequence.CodeValue === CodeNameCodeSequenceValues.FindingSite
   );
 
+  const commentSites = mergedContentSequence.filter(
+    item =>
+      item.ConceptNameCodeSequence.CodingSchemeDesignator === COMMENT_CODE.schemeDesignator &&
+      item.ConceptNameCodeSequence.CodeValue === COMMENT_CODE.value
+  );
+
   const measurement = {
     loaded: false,
     labels: [],
@@ -572,6 +599,14 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
     TrackingIdentifier: TrackingIdentifierContentItem.TextValue,
   };
 
+  if (commentSites) {
+    for (const group of commentSites) {
+      if (group.TextValue) {
+        measurement.labels.push({ label: group.TextValue, value: '' });
+      }
+    }
+  }
+
   if (
     finding &&
     CodingSchemeDesignators.CornerstoneCodeSchemes.includes(
@@ -607,15 +642,39 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
   NUMContentItems.forEach(item => {
     const { ConceptNameCodeSequence, ContentSequence, MeasuredValueSequence } = item;
 
-    const { ValueType } = ContentSequence;
-    if (!ValueType === 'SCOORD') {
-      console.warn(`Graphic ${ValueType} not currently supported, skipping annotation.`);
-      return;
-    }
+    // Handle spatial reference ONLY if ContentSequence exists.
+    // ContentSequence may be a scalar SCOORD or an array when additional named
+    // SCOORDs (e.g. control points) are nested alongside the primary geometry.
+    // Pick the primary geometry entry: prefer the SCOORD without a
+    // ConceptNameCodeSequence (plain polyline), falling back to the first SCOORD.
+    if (ContentSequence) {
+      const scoordItem = Array.isArray(ContentSequence)
+        ? (ContentSequence.find(
+            cs =>
+              (cs.ValueType === 'SCOORD' || cs.ValueType === 'SCOORD3D') &&
+              !cs.ConceptNameCodeSequence
+          ) ?? ContentSequence.find(cs => cs.ValueType === 'SCOORD' || cs.ValueType === 'SCOORD3D'))
+        : ContentSequence;
 
-    const coords = _getCoordsFromSCOORDOrSCOORD3D(ContentSequence);
-    if (coords) {
-      measurement.coords.push(coords);
+      if (!scoordItem) {
+        console.warn(
+          'ContentSequence array contains no SCOORD or SCOORD3D entry, skipping annotation.'
+        );
+        return;
+      }
+
+      const { ValueType } = scoordItem;
+
+      if (ValueType !== 'SCOORD' && ValueType !== 'SCOORD3D') {
+        console.warn(`Graphic ${ValueType} not currently supported, skipping annotation.`);
+        return;
+      }
+
+      const coords = _getCoordsFromSCOORDOrSCOORD3D(scoordItem);
+
+      if (coords) {
+        measurement.coords.push(coords);
+      }
     }
 
     if (MeasuredValueSequence) {
@@ -630,8 +689,8 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
 
 /**
  * Extracts coordinates from a graphic item of type SCOORD or SCOORD3D.
- * @param {object} graphicItem - The graphic item containing the coordinates.
- * @returns {object} - The extracted coordinates.
+ * @param {any} graphicItem - The graphic item containing the coordinates.
+ * @returns {any} The extracted coordinates.
  */
 const _getCoordsFromSCOORDOrSCOORD3D = graphicItem => {
   const { ValueType, GraphicType, GraphicData } = graphicItem;
@@ -645,9 +704,9 @@ const _getCoordsFromSCOORDOrSCOORD3D = graphicItem => {
 
 /**
  * Retrieves the label and value from the provided ConceptNameCodeSequence and MeasuredValueSequence.
- * @param {Object} ConceptNameCodeSequence - The ConceptNameCodeSequence object.
- * @param {Object} MeasuredValueSequence - The MeasuredValueSequence object.
- * @returns {Object} - An object containing the label and value.
+ * @param {any} conceptNameCodeSequence - The ConceptNameCodeSequence object.
+ * @param {any} measuredValueSequence - The MeasuredValueSequence object.
+ * @returns {Object} An object containing the label and value.
  *                    The label represents the CodeMeaning from the ConceptNameCodeSequence.
  *                    The value represents the formatted NumericValue and CodeValue from the MeasuredValueSequence.
  *                    Example: { label: 'Long Axis', value: '31.00 mm' }
@@ -666,8 +725,8 @@ function _getLabelFromMeasuredValueSequence(ConceptNameCodeSequence, MeasuredVal
 /**
  * Retrieves a list of referenced images from the Imaging Measurement Report Content Sequence.
  *
- * @param {Array} ImagingMeasurementReportContentSequence - The Imaging Measurement Report Content Sequence.
- * @returns {Array} - The list of referenced images.
+ * @param {any[]} imagingMeasurementReportContentSequence - The Imaging Measurement Report Content Sequence.
+ * @returns {any[]} The list of referenced images.
  */
 function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
   const ImageLibrary = ImagingMeasurementReportContentSequence.find(
@@ -714,7 +773,7 @@ function _getReferencedImagesList(ImagingMeasurementReportContentSequence) {
  * Otherwise, the sequence is wrapped in an array and returned.
  *
  * @param {any} sequence - The DICOM sequence to convert.
- * @returns {any[]} - The converted array.
+ * @returns {any[]} The converted array.
  */
 function _getSequenceAsArray(sequence) {
   if (!sequence) {
@@ -723,4 +782,17 @@ function _getSequenceAsArray(sequence) {
   return Array.isArray(sequence) ? sequence : [sequence];
 }
 
+function isScoordOr3d(group) {
+  return group.ValueType === 'SCOORD' || group.ValueType === 'SCOORD3D';
+}
+
+function isTextPosition(group) {
+  const concept = group.ConceptNameCodeSequence[0];
+  return (
+    concept &&
+    concept.CodeValue === TEXT_ANNOTATION_POSITION.value &&
+    concept.CodingSchemeDesignator === TEXT_ANNOTATION_POSITION.schemeDesignator
+  );
+}
+
 export default getSopClassHandlerModule;

extensions/cornerstone-dicom-sr/src/init.ts

@@ -9,19 +9,13 @@ import {
   LengthTool,
   PlanarFreehandROITool,
   RectangleROITool,
-  utilities as csToolsUtils,
 } from '@cornerstonejs/tools';
-import { Types, MeasurementService } from '@ohif/core';
-import { StackViewport, utilities as csUtils } from '@cornerstonejs/core';
-import { Enums as CSExtensionEnums } from '@ohif/extension-cornerstone';
+import { Types } from '@ohif/core';
+
 import DICOMSRDisplayTool from './tools/DICOMSRDisplayTool';
-import SCOORD3DPointTool from './tools/SCOORD3DPointTool';
-import SRSCOOR3DProbeMapper from './utils/SRSCOOR3DProbeMapper';
 import addToolInstance from './utils/addToolInstance';
 import toolNames from './tools/toolNames';
 
-const { CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION } = CSExtensionEnums;
-
 /**
  * @param {object} configuration
  */
@@ -29,8 +23,6 @@ export default function init({
   configuration = {},
   servicesManager,
 }: Types.Extensions.ExtensionParams): void {
-  const { measurementService, cornerstoneViewportService } = servicesManager.services;
-
   addToolInstance(toolNames.DICOMSRDisplay, DICOMSRDisplayTool);
   addToolInstance(toolNames.SRLength, LengthTool);
   addToolInstance(toolNames.SRBidirectional, BidirectionalTool);
@@ -40,26 +32,10 @@ export default function init({
   addToolInstance(toolNames.SRAngle, AngleTool);
   addToolInstance(toolNames.SRPlanarFreehandROI, PlanarFreehandROITool);
   addToolInstance(toolNames.SRRectangleROI, RectangleROITool);
-  addToolInstance(toolNames.SRSCOORD3DPoint, SCOORD3DPointTool);
 
   // TODO - fix the SR display of Cobb Angle, as it joins the two lines
   addToolInstance(toolNames.SRCobbAngle, CobbAngleTool);
 
-  const csTools3DVer1MeasurementSource = measurementService.getSource(
-    CORNERSTONE_3D_TOOLS_SOURCE_NAME,
-    CORNERSTONE_3D_TOOLS_SOURCE_VERSION
-  );
-
-  const { POINT } = measurementService.VALUE_TYPES;
-
-  measurementService.addMapping(
-    csTools3DVer1MeasurementSource,
-    'SRSCOORD3DPoint',
-    POINT,
-    SRSCOOR3DProbeMapper.toAnnotation,
-    SRSCOOR3DProbeMapper.toMeasurement
-  );
-
   // Modify annotation tools to use dashed lines on SR
   const dashedLine = {
     lineDash: '4,4',

extensions/cornerstone-dicom-sr/src/onModeEnter.tsx

@@ -1,11 +1,7 @@
-import React from 'react';
-
 import { SOPClassHandlerId, SOPClassHandlerId3D } from './id';
-import { ViewportActionButton } from '@ohif/ui-next';
-import i18n from '@ohif/i18n';
 
 export default function onModeEnter({ servicesManager }) {
-  const { displaySetService, toolbarService } = servicesManager.services;
+  const { displaySetService } = servicesManager.services;
   const displaySetCache = displaySetService.getDisplaySetCache();
 
   const srDisplaySets = [...displaySetCache.values()].filter(
@@ -16,24 +12,4 @@ export default function onModeEnter({ servicesManager }) {
     // New mode route, allow SRs to be hydrated again
     ds.isHydrated = false;
   });
-
-  toolbarService.addButtons([
-    {
-      // A base/default button for loading measurements. It is added to the toolbar below.
-      // Customizations to this button can be made in the mode or by another extension.
-      // For example, the button label can be changed and/or the command to clear
-      // the measurements can be dropped.
-      id: 'loadSRMeasurements',
-      component: props => (
-        <ViewportActionButton {...props}>{i18n.t('Common:LOAD')}</ViewportActionButton>
-      ),
-      props: {
-        commands: ['clearMeasurements', 'loadSRMeasurements'],
-      },
-    },
-  ]);
-
-  // The toolbar used in the viewport's status bar. Modes and extensions can further customize
-  // it to optionally add other buttons.
-  toolbarService.createButtonSection('loadSRMeasurements', ['loadSRMeasurements']);
 }

extensions/cornerstone-dicom-sr/src/tools/SCOORD3DPointTool.ts

@@ -1,203 +0,0 @@
-import { Types, metaData, utilities as csUtils } from '@cornerstonejs/core';
-import {
-  annotation,
-  drawing,
-  utilities,
-  Types as cs3DToolsTypes,
-  AnnotationDisplayTool,
-} from '@cornerstonejs/tools';
-import toolNames from './toolNames';
-import { Annotation } from '@cornerstonejs/tools/dist/types/types';
-
-export default class SCOORD3DPointTool extends AnnotationDisplayTool {
-  static toolName = toolNames.SRSCOORD3DPoint;
-
-  constructor(
-    toolProps = {},
-    defaultToolProps = {
-      configuration: {},
-    }
-  ) {
-    super(toolProps, defaultToolProps);
-  }
-
-  _getTextBoxLinesFromLabels(labels) {
-    // TODO -> max 5 for now (label + shortAxis + longAxis), need a generic solution for this!
-
-    const labelLength = Math.min(labels.length, 5);
-    const lines = [];
-
-    return lines;
-  }
-
-  // This tool should not inherit from AnnotationTool and we should not need
-  // to add the following lines.
-  isPointNearTool = () => null;
-  getHandleNearImagePoint = () => null;
-
-  renderAnnotation = (enabledElement: Types.IEnabledElement, svgDrawingHelper: any): void => {
-    const { viewport } = enabledElement;
-    const { element } = viewport;
-
-    const annotations = annotation.state.getAnnotations(this.getToolName(), element);
-
-    // Todo: We don't need this anymore, filtering happens in triggerAnnotationRender
-    if (!annotations?.length) {
-      return;
-    }
-
-    // Filter toolData to only render the data for the active SR.
-    const filteredAnnotations = annotations;
-    if (!viewport._actors?.size) {
-      return;
-    }
-
-    const styleSpecifier: cs3DToolsTypes.AnnotationStyle.StyleSpecifier = {
-      toolGroupId: this.toolGroupId,
-      toolName: this.getToolName(),
-      viewportId: enabledElement.viewport.id,
-    };
-
-    for (let i = 0; i < filteredAnnotations.length; i++) {
-      const annotation = filteredAnnotations[i];
-
-      const annotationUID = annotation.annotationUID;
-      const { renderableData } = annotation.data;
-      const { POINT: points } = renderableData;
-
-      styleSpecifier.annotationUID = annotationUID;
-
-      const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
-      const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
-      const color = this.getStyle('color', styleSpecifier, annotation);
-
-      const options = {
-        color,
-        lineDash,
-        lineWidth,
-      };
-
-      const point = points[0][0];
-
-      // check if viewport can render it
-      const viewable = viewport.isReferenceViewable(
-        { FrameOfReferenceUID: annotation.metadata.FrameOfReferenceUID, cameraFocalPoint: point },
-        { asNearbyProjection: true }
-      );
-
-      if (!viewable) {
-        continue;
-      }
-
-      // render the point
-      const arrowPointCanvas = viewport.worldToCanvas(point);
-      // Todo: configure this
-      const arrowEndCanvas = [arrowPointCanvas[0] + 20, arrowPointCanvas[1] + 20];
-      const canvasCoordinates = [arrowPointCanvas, arrowEndCanvas];
-
-      drawing.drawArrow(
-        svgDrawingHelper,
-        annotationUID,
-        '1',
-        canvasCoordinates[1],
-        canvasCoordinates[0],
-        {
-          color: options.color,
-          width: options.lineWidth,
-        }
-      );
-
-      this.renderTextBox(
-        svgDrawingHelper,
-        viewport,
-        canvasCoordinates,
-        annotation,
-        styleSpecifier,
-        options
-      );
-    }
-  };
-
-  renderTextBox(
-    svgDrawingHelper,
-    viewport,
-    canvasCoordinates,
-    annotation,
-    styleSpecifier,
-    options = {}
-  ) {
-    if (!canvasCoordinates || !annotation) {
-      return;
-    }
-
-    const { annotationUID, data = {} } = annotation;
-    const { labels } = data;
-
-    const textLines = [];
-
-    for (const label of labels) {
-      // make this generic
-      // fix this
-      if (label.label === '363698007') {
-        textLines.push(`Finding Site: ${label.value}`);
-      }
-    }
-
-    const { color } = options;
-
-    const adaptedCanvasCoordinates = canvasCoordinates;
-    // adapt coordinates if there is an adapter
-    const canvasTextBoxCoords = utilities.drawing.getTextBoxCoordsCanvas(adaptedCanvasCoordinates);
-
-    if (!annotation.data?.handles?.textBox?.worldPosition) {
-      annotation.data.handles.textBox.worldPosition = viewport.canvasToWorld(canvasTextBoxCoords);
-    }
-
-    const textBoxPosition = viewport.worldToCanvas(annotation.data.handles.textBox.worldPosition);
-
-    const textBoxUID = '1';
-    const textBoxOptions = this.getLinkedTextBoxStyle(styleSpecifier, annotation);
-
-    const boundingBox = drawing.drawLinkedTextBox(
-      svgDrawingHelper,
-      annotationUID,
-      textBoxUID,
-      textLines,
-      textBoxPosition,
-      canvasCoordinates,
-      {},
-      {
-        ...textBoxOptions,
-        color,
-      }
-    );
-
-    const { x: left, y: top, width, height } = boundingBox;
-
-    annotation.data.handles.textBox.worldBoundingBox = {
-      topLeft: viewport.canvasToWorld([left, top]),
-      topRight: viewport.canvasToWorld([left + width, top]),
-      bottomLeft: viewport.canvasToWorld([left, top + height]),
-      bottomRight: viewport.canvasToWorld([left + width, top + height]),
-    };
-  }
-
-  public getLinkedTextBoxStyle(
-    specifications: cs3DToolsTypes.AnnotationStyle.StyleSpecifier,
-    annotation?: Annotation
-  ): Record<string, unknown> {
-    // Todo: this function can be used to set different styles for different toolMode
-    // for the textBox.
-
-    return {
-      visibility: this.getStyle('textBoxVisibility', specifications, annotation),
-      fontFamily: this.getStyle('textBoxFontFamily', specifications, annotation),
-      fontSize: this.getStyle('textBoxFontSize', specifications, annotation),
-      color: this.getStyle('textBoxColor', specifications, annotation),
-      shadow: this.getStyle('textBoxShadow', specifications, annotation),
-      background: this.getStyle('textBoxBackground', specifications, annotation),
-      lineWidth: this.getStyle('textBoxLinkLineWidth', specifications, annotation),
-      lineDash: this.getStyle('textBoxLinkLineDash', specifications, annotation),
-    };
-  }
-}

extensions/cornerstone-dicom-sr/src/tools/toolNames.ts

@@ -9,7 +9,6 @@ const toolNames = {
   SRCobbAngle: 'SRCobbAngle',
   SRRectangleROI: 'SRRectangleROI',
   SRPlanarFreehandROI: 'SRPlanarFreehandROI',
-  SRSCOORD3DPoint: 'SRSCOORD3DPoint',
 };
 
 export default toolNames;

extensions/cornerstone-dicom-sr/src/utils/SRSCOOR3DProbeMapper.ts

@@ -1,62 +0,0 @@
-const SRSCOOR3DProbe = {
-  toAnnotation: measurement => {},
-
-  /**
-   * Maps cornerstone annotation event data to measurement service format.
-   *
-   * @param {Object} cornerstone Cornerstone event data
-   * @return {Measurement} Measurement instance
-   */
-  toMeasurement: (
-    csToolsEventDetail,
-    displaySetService,
-    CornerstoneViewportService,
-    getValueTypeFromToolType,
-    customizationService
-  ) => {
-    const { annotation } = csToolsEventDetail;
-    const { metadata, data, annotationUID } = annotation;
-
-    if (!metadata || !data) {
-      console.warn('Probe tool: Missing metadata or data');
-      return null;
-    }
-
-    const { toolName } = metadata;
-    const { points } = data.handles;
-
-    const displayText = getDisplayText(annotation);
-    return {
-      uid: annotationUID,
-      points,
-      metadata,
-      toolName: metadata.toolName,
-      label: data.label,
-      displayText: displayText,
-      data: data.cachedStats,
-      type: getValueTypeFromToolType?.(toolName) ?? null,
-    };
-  },
-};
-
-function getDisplayText(annotation) {
-  const { data } = annotation;
-
-  if (!data) {
-    return [''];
-  }
-  const { labels } = data;
-
-  const displayText = [];
-
-  for (const label of labels) {
-    // make this generic
-    if (label.label === '33636980076') {
-      displayText.push(`Finding Site: ${label.value}`);
-    }
-  }
-
-  return displayText;
-}
-
-export default SRSCOOR3DProbe;

extensions/cornerstone-dicom-sr/src/utils/addSRAnnotation.ts

@@ -1,11 +1,59 @@
 import { Types, annotation } from '@cornerstonejs/tools';
 import { metaData } from '@cornerstonejs/core';
+import { adaptersSR } from '@cornerstonejs/adapters';
 
 import getRenderableData from './getRenderableData';
 import toolNames from '../tools/toolNames';
 
-export default function addSRAnnotation(measurement, imageId, frameNumber) {
+const { MeasurementReport } = adaptersSR.Cornerstone3D;
+
+/**
+ * Adds a DICOM SR (Structured Report) annotation to the annotation manager.
+ * This function processes measurement data from DICOM SR and converts it into
+ * a format suitable for display in the Cornerstone3D viewer.
+ *
+ * @param {Object} params - The parameters object
+ * @param {Object} params.measurement - The DICOM SR measurement data containing coordinates, labels, and metadata
+ * @param {Array} params.measurement.coords - Array of coordinate objects with GraphicType, ValueType, and other properties
+ * @param {string} params.measurement.TrackingUniqueIdentifier - Unique identifier for the measurement
+ * @param {string} params.measurement.TrackingIdentifier - Tracking identifier for adapter lookup
+ * @param {Array} [params.measurement.labels] - Optional array of label objects
+ * @param {string} [params.measurement.displayText] - Optional display text for the annotation
+ * @param {Object} [params.measurement.textBox] - Optional text box configuration
+ * @param {string|null} [params.imageId] - Optional image ID for the referenced image (defaults to null)
+ * @param {number|null} [params.frameNumber] - Optional frame number for multi-frame images (defaults to null)
+ * @param {Object} params.displaySet - The display set containing the image
+ * @param {string} params.displaySet.displaySetInstanceUID - Unique identifier for the display set
+ * @returns {void}
+ *
+ * @example
+ * ```typescript
+ * addSRAnnotation({
+ *   measurement: {
+ *     TrackingUniqueIdentifier: '1.2.3.4.5',
+ *     TrackingIdentifier: 'POINT',
+ *     coords: [{
+ *       GraphicType: 'POINT',
+ *       ValueType: 'SCOORD',
+ *       // ... other coordinate properties
+ *     }],
+ *     labels: [{ value: 'Measurement Point' }],
+ *     displayText: 'Point measurement'
+ *   },
+ *   imageId: 'wadouri:file://path/to/image.dcm', // Optional
+ *   frameNumber: 0, // Optional
+ *   displaySet: { displaySetInstanceUID: '1.2.3.4' }
+ * });
+ * ```
+ */
+export default function addSRAnnotation({ measurement, imageId = null, frameNumber = null, displaySet }) {
+  /** @type {string} The tool name to use for the annotation, defaults to DICOMSRDisplay */
   let toolName = toolNames.DICOMSRDisplay;
+  
+  /** 
+   * @type {Object} Renderable data organized by graphic type
+   * Groups coordinate data by GraphicType for efficient rendering
+   */
   const renderableData = measurement.coords.reduce((acc, coordProps) => {
     acc[coordProps.GraphicType] = acc[coordProps.GraphicType] || [];
     acc[coordProps.GraphicType].push(getRenderableData({ ...coordProps, imageId }));
@@ -16,32 +64,58 @@ export default function addSRAnnotation(measurement, imageId, frameNumber) {
   const { ValueType: valueType, GraphicType: graphicType } = measurement.coords[0];
   const graphicTypePoints = renderableData[graphicType];
 
-  /** TODO: Read the tool name from the DICOM SR identification type in the future. */
+  /**
+   * TODO: Read the tool name from the DICOM SR identification type in the future.
+   */
   let frameOfReferenceUID = null;
+  let planeRestriction = null;
 
+  /**
+   * Store the view reference for use in initial navigation
+   */
   if (imageId) {
     const imagePlaneModule = metaData.get('imagePlaneModule', imageId);
     frameOfReferenceUID = imagePlaneModule?.frameOfReferenceUID;
   }
 
+  /**
+   * Store the view reference for use in initial navigation
+   */
   if (valueType === 'SCOORD3D') {
-    toolName = toolNames.SRSCOORD3DPoint;
-
-    // get the ReferencedFrameOfReferenceUID from the measurement
     frameOfReferenceUID = measurement.coords[0].ReferencedFrameOfReferenceSequence;
+    planeRestriction = {
+      FrameOfReferenceUID: frameOfReferenceUID,
+      point: graphicTypePoints[0][0],
+    };
   }
 
+  /**
+   * Store the view reference for use in initial navigation
+   */
+  measurement.viewReference = {
+    planeRestriction,
+    FrameOfReferenceUID: frameOfReferenceUID,
+    referencedImageId: imageId,
+  };
+
+  /**
+   * @type {Types.Annotation} The annotation object to be added to the annotation manager
+   * Contains all necessary metadata and data for rendering the DICOM SR measurement
+   */
   const SRAnnotation: Types.Annotation = {
     annotationUID: TrackingUniqueIdentifier,
     highlighted: false,
     isLocked: false,
+    isPreview: toolName === toolNames.DICOMSRDisplay,
     invalidated: false,
     metadata: {
       toolName,
+      planeRestriction,
       valueType,
       graphicType,
       FrameOfReferenceUID: frameOfReferenceUID,
       referencedImageId: imageId,
+      displaySetInstanceUID: displaySet.displaySetInstanceUID,
     },
     data: {
       label: measurement.labels?.[0]?.value || undefined,
@@ -59,9 +133,11 @@ export default function addSRAnnotation(measurement, imageId, frameNumber) {
   };
 
   /**
-   * const annotationManager = annotation.annotationState.getAnnotationManager();
-   * was not triggering annotation_added events.
+   * Add the annotation to the annotation state manager.
+   * Note: Using annotation.state.addAnnotation() instead of annotationManager.addAnnotation()
+   * because the latter was not triggering annotation_added events properly.
+   * 
+   * @param {Types.Annotation} SRAnnotation - The annotation to add
    */
   annotation.state.addAnnotation(SRAnnotation);
-  console.debug('Adding SR annotation:', SRAnnotation);
 }

extensions/cornerstone-dicom-sr/src/utils/getFilteredCornerstoneToolState.ts

@@ -1,17 +1,11 @@
-import OHIF from '@ohif/core';
 import { annotation } from '@cornerstonejs/tools';
-const { log } = OHIF;
+import { NO_IMAGE_ID } from '@cornerstonejs/adapters';
 
 function getFilteredCornerstoneToolState(measurementData, additionalFindingTypes) {
   const filteredToolState = {};
 
   function addToFilteredToolState(annotation, toolType) {
-    if (!annotation.metadata?.referencedImageId) {
-      log.warn(`[DICOMSR] No referencedImageId found for ${toolType} ${annotation.id}`);
-      return;
-    }
-
-    const imageId = annotation.metadata.referencedImageId;
+    const imageId = annotation.metadata?.referencedImageId ?? NO_IMAGE_ID;
 
     if (!filteredToolState[imageId]) {
       filteredToolState[imageId] = {};

extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js

@@ -11,7 +11,11 @@ const { CodeScheme: Cornerstone3DCodeScheme } = adaptersSR.Cornerstone3D;
  * @returns {string} The extracted label.
  */
 export default function getLabelFromDCMJSImportedToolData(toolData) {
-  const { findingSites = [], finding } = toolData;
+  const { findingSites = [], finding, annotation } = toolData;
+
+  if (annotation.data.label) {
+    return annotation.data.label;
+  }
 
   let freeTextLabel = findingSites.find(
     fs => fs.CodeValue === Cornerstone3DCodeScheme.codeValues.CORNERSTONEFREETEXT

extensions/cornerstone-dicom-sr/src/utils/getRenderableData.ts

@@ -36,6 +36,14 @@ function getRenderableData({ GraphicType, GraphicData, ValueType, imageId }) {
         ValueType,
         imageId,
       });
+
+      if (!imageId) {
+        // without the image id it's not possible to perform the calculations below
+        // these calculations also do not seem to be needed, since everything works
+        // just fine when we skip them. At least for SCOORD3D annotations.
+        return pointsWorld;
+      }
+
       // We do not have an explicit draw circle svg helper in Cornerstone3D at
       // this time, but we can use the ellipse svg helper to draw a circle, so
       // here we reshape the data for that purpose.
@@ -90,6 +98,13 @@ function getRenderableData({ GraphicType, GraphicData, ValueType, imageId }) {
         imageId,
       });
 
+      if (!imageId) {
+        // without the image id it's not possible to perform the calculations below
+        // these calculations also do not seem to be needed, since everything works
+        // just fine when we skip them. At least for SCOORD3D annotations.
+        return pointsWorld;
+      }
+
       const majorAxisStart = vec3.fromValues(...pointsWorld[0]);
       const majorAxisEnd = vec3.fromValues(...pointsWorld[1]);
       const minorAxisStart = vec3.fromValues(...pointsWorld[2]);

extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts

@@ -1,15 +1,16 @@
-import { utilities, metaData } from '@cornerstonejs/core';
+import { utilities, metaData, type Types } from '@cornerstonejs/core';
 import OHIF, { DicomMetadataStore } from '@ohif/core';
+import { vec3 } from 'gl-matrix';
+
 import getLabelFromDCMJSImportedToolData from './getLabelFromDCMJSImportedToolData';
 import { adaptersSR } from '@cornerstonejs/adapters';
-import { annotation as CsAnnotation } from '@cornerstonejs/tools';
+import { annotation as CsAnnotation, type Types as ToolTypes } from '@cornerstonejs/tools';
 import { Enums as CSExtensionEnums } from '@ohif/extension-cornerstone';
 
 const { locking } = CsAnnotation;
 const { guid } = OHIF.utils;
-const { MeasurementReport, CORNERSTONE_3D_TAG } = adaptersSR.Cornerstone3D;
+const { MeasurementReport } = adaptersSR.Cornerstone3D;
 const { CORNERSTONE_3D_TOOLS_SOURCE_NAME, CORNERSTONE_3D_TOOLS_SOURCE_VERSION } = CSExtensionEnums;
-const supportedLegacyCornerstoneTags = ['cornerstoneTools@^4.0.0'];
 
 const convertCode = (codingValues, code) => {
   if (!code || code.CodingSchemeDesignator === 'CORNERSTONEJS') {
@@ -37,8 +38,10 @@ const convertSites = (codingValues, sites) => {
 };
 
 /**
- * Hydrates a structured report, for default viewports.
- *
+ * Hydrates a structured report
+ * Handles 2d and 3d hydration from SCOORD and SCOORD3D points
+ * For 3D hydration, chooses a volume display set to display with
+ * FOr 2D hydration, chooses the (first) display set containing the referenced image.
  */
 export default function hydrateStructuredReport(
   { servicesManager, extensionManager, commandsManager }: withAppTypes,
@@ -51,6 +54,11 @@ export default function hydrateStructuredReport(
   const disableEditing = customizationService.getCustomization('panelMeasurement.disableEditing');
 
   const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
+  const {
+    StudyInstanceUID: studyUID,
+    SeriesInstanceUID: seriesUID,
+    instance: { SOPInstanceUID: sopUID },
+  } = displaySet;
 
   // TODO -> We should define a strict versioning somewhere.
   const mappings = measurementService.getSourceMappings(
@@ -64,31 +72,23 @@ export default function hydrateStructuredReport(
     );
   }
 
-  const instance = DicomMetadataStore.getInstance(
-    displaySet.StudyInstanceUID,
-    displaySet.SeriesInstanceUID,
-    displaySet.SOPInstanceUID
-  );
+  const instance = DicomMetadataStore.getInstance(studyUID, seriesUID, sopUID);
 
   const sopInstanceUIDToImageId = {};
-  const imageIdsForToolState = {};
 
   displaySet.measurements.forEach(measurement => {
-    const { ReferencedSOPInstanceUID, imageId, frameNumber } = measurement;
+    const { ReferencedSOPInstanceUID, imageId, frameNumber = 1 } = measurement;
+    const key = `${ReferencedSOPInstanceUID}:${frameNumber}`;
 
-    if (!sopInstanceUIDToImageId[ReferencedSOPInstanceUID]) {
-      sopInstanceUIDToImageId[ReferencedSOPInstanceUID] = imageId;
-      imageIdsForToolState[ReferencedSOPInstanceUID] = [];
-    }
-    if (!imageIdsForToolState[ReferencedSOPInstanceUID][frameNumber]) {
-      imageIdsForToolState[ReferencedSOPInstanceUID][frameNumber] = imageId;
+    if (imageId && !sopInstanceUIDToImageId[key]) {
+      sopInstanceUIDToImageId[key] = imageId;
     }
   });
 
   // Mapping of legacy datasets is now directly handled by adapters module
   const datasetToUse = instance;
 
-  // Use dcmjs to generate toolState.
+  // Use CS3D adapters to generate toolState.
   let storedMeasurementByAnnotationType = MeasurementReport.generateToolState(
     datasetToUse,
     // NOTE: we need to pass in the imageIds to dcmjs since the we use them
@@ -96,7 +96,6 @@ export default function hydrateStructuredReport(
     // that measurements were added to the display set are the same order as
     // the measurementGroups in the instance.
     sopInstanceUIDToImageId,
-    utilities.imageToWorldCoords,
     metaData
   );
 
@@ -119,40 +118,17 @@ export default function hydrateStructuredReport(
     }
   });
 
-  // Set the series touched as tracked.
-  const imageIds = [];
-
-  // TODO: notification if no hydratable?
-  Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
-    const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
-
-    toolDataForAnnotationType.forEach(toolData => {
-      // Add the measurement to toolState
-      // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
-      // files, and looking up the imageId from sopInstanceUIDToImageId results
-      // in the wrong value.
-      const frameNumber = (toolData.annotation.data && toolData.annotation.data.frameNumber) || 1;
-      const imageId =
-        imageIdsForToolState[toolData.sopInstanceUid][frameNumber] ||
-        sopInstanceUIDToImageId[toolData.sopInstanceUid];
-
-      if (!imageIds.includes(imageId)) {
-        imageIds.push(imageId);
-      }
-    });
-  });
-
   let targetStudyInstanceUID;
   const SeriesInstanceUIDs = [];
 
-  for (let i = 0; i < imageIds.length; i++) {
-    const imageId = imageIds[i];
-    const { SeriesInstanceUID, StudyInstanceUID } = metaData.get('instance', imageId);
+  // Set the series touched as tracked.
+  const imageIds = getImageIds(hydratableMeasurementsInSR, sopInstanceUIDToImageId);
 
+  for (const imageId of imageIds) {
+    const { SeriesInstanceUID, StudyInstanceUID } = metaData.get('instance', imageId);
     if (!SeriesInstanceUIDs.includes(SeriesInstanceUID)) {
       SeriesInstanceUIDs.push(SeriesInstanceUID);
     }
-
     if (!targetStudyInstanceUID) {
       targetStudyInstanceUID = StudyInstanceUID;
     } else if (targetStudyInstanceUID !== StudyInstanceUID) {
@@ -160,38 +136,79 @@ export default function hydrateStructuredReport(
     }
   }
 
+  // For 3d annotations there are no image IDs,
+  // so we need to find the display sets by frame of reference to get the SeriesInstanceUIDs
+  const frameOfReferenceUIDs = getFrameOfReferenceUIDs(
+    hydratableMeasurementsInSR,
+    sopInstanceUIDToImageId
+  );
+
+  for (const FrameOfReferenceUID of frameOfReferenceUIDs) {
+    const displaySetsFOR = displaySetService.getDisplaySetsBy(
+      ds => ds.FrameOfReferenceUID === FrameOfReferenceUID && !ds.isDerivedDisplaySet
+    );
+    const ds = chooseDisplaySet(displaySetsFOR, FrameOfReferenceUID);
+    if (!ds) {
+      continue;
+    }
+    if (!SeriesInstanceUIDs.includes(ds.SeriesInstanceUID)) {
+      SeriesInstanceUIDs.push(ds.SeriesInstanceUID);
+    }
+    if (!targetStudyInstanceUID) {
+      targetStudyInstanceUID = ds.StudyInstanceUID;
+    } else if (targetStudyInstanceUID !== ds.StudyInstanceUID) {
+      console.warn('NO SUPPORT FOR SRs THAT HAVE MEASUREMENTS FROM MULTIPLE STUDIES.');
+    }
+  }
+
+  /**
+   * Gets reference data for what frame of reference and the referenced
+   * image id, or for 3d measurements, the volumeId to apply this annotation to.
+   */
+  function getReferenceData(toolData): ToolTypes.AnnotationMetadata {
+    // Add the measurement to toolState
+    // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
+    // files, and looking up the imageId from sopInstanceUIDToImageId results
+    // in the wrong value.
+    const frameNumber = (toolData.annotation.data && toolData.annotation.data.frameNumber) || 1;
+    const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
+
+    if (!imageId) {
+      return getReferenceData3D(toolData, servicesManager);
+    }
+
+    const instance = metaData.get('instance', imageId);
+    const {
+      FrameOfReferenceUID,
+      // SOPInstanceUID,
+      // SeriesInstanceUID,
+      // StudyInstanceUID,
+    } = instance;
+
+    return {
+      referencedImageId: imageId,
+      FrameOfReferenceUID,
+    };
+  }
+
   Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
     const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
 
     toolDataForAnnotationType.forEach(toolData => {
-      // Add the measurement to toolState
-      // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
-      // files, and looking up the imageId from sopInstanceUIDToImageId results
-      // in the wrong value.
-      const frameNumber = (toolData.annotation.data && toolData.annotation.data.frameNumber) || 1;
-      const imageId =
-        imageIdsForToolState[toolData.sopInstanceUid][frameNumber] ||
-        sopInstanceUIDToImageId[toolData.sopInstanceUid];
-
       toolData.uid = guid();
-
-      const instance = metaData.get('instance', imageId);
-      const {
-        FrameOfReferenceUID,
-        // SOPInstanceUID,
-        // SeriesInstanceUID,
-        // StudyInstanceUID,
-      } = instance;
+      const referenceData = getReferenceData(toolData);
+      const { referencedImageId } = referenceData;
 
       const annotation = {
         annotationUID: toolData.annotation.annotationUID,
         data: toolData.annotation.data,
+        predecessorImageId: toolData.predecessorImageId,
         metadata: {
+          ...referenceData,
           toolName: annotationType,
-          referencedImageId: imageId,
-          FrameOfReferenceUID,
         },
       };
+      utilities.updatePlaneRestriction(annotation.data.handles.points, annotation.metadata);
 
       const source = measurementService.getSource(
         CORNERSTONE_3D_TOOLS_SOURCE_NAME,
@@ -225,8 +242,8 @@ export default function hydrateStructuredReport(
         locking.setAnnotationLocked(newAnnotationUID, true);
       }
 
-      if (!imageIds.includes(imageId)) {
-        imageIds.push(imageId);
+      if (referencedImageId && !imageIds.includes(referencedImageId)) {
+        imageIds.push(referencedImageId);
       }
     });
   });
@@ -238,3 +255,141 @@ export default function hydrateStructuredReport(
     SeriesInstanceUIDs,
   };
 }
+
+/**
+ * Gets the unique imageIds from hydratable measurements that have an imageId reference
+ * (i.e., 2D/SCOORD annotations).
+ */
+function getImageIds(hydratableMeasurementsInSR, sopInstanceUIDToImageId): string[] {
+  const imageIds: string[] = [];
+  Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
+    const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
+
+    toolDataForAnnotationType.forEach(toolData => {
+      // Add the measurement to toolState
+      // dcmjs and Cornerstone3D has structural defect in supporting multi-frame
+      // files, and looking up the imageId from sopInstanceUIDToImageId results
+      // in the wrong value.
+      const frameNumber = toolData.annotation.data?.frameNumber || 1;
+      const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
+
+      if (imageId && !imageIds.includes(imageId)) {
+        imageIds.push(imageId);
+      }
+    });
+  });
+  return imageIds;
+}
+
+/**
+ * Gets the unique FrameOfReferenceUIDs from hydratable measurements that have no imageId reference
+ * (i.e., 3D/SCOORD3D annotations). This excludes annotations handled by the getImageIds function.
+ */
+function getFrameOfReferenceUIDs(hydratableMeasurementsInSR, sopInstanceUIDToImageId): string[] {
+  const frameOfReferenceUIDs: string[] = [];
+
+  Object.keys(hydratableMeasurementsInSR).forEach(annotationType => {
+    const toolDataForAnnotationType = hydratableMeasurementsInSR[annotationType];
+    toolDataForAnnotationType.forEach(toolData => {
+      const frameNumber = toolData.annotation.data?.frameNumber || 1;
+      const imageId = sopInstanceUIDToImageId[`${toolData.sopInstanceUid}:${frameNumber}`];
+
+      if (!imageId) {
+        const { FrameOfReferenceUID } = toolData.annotation.metadata;
+        if (FrameOfReferenceUID && !frameOfReferenceUIDs.includes(FrameOfReferenceUID)) {
+          frameOfReferenceUIDs.push(FrameOfReferenceUID);
+        }
+      }
+    });
+  });
+  return frameOfReferenceUIDs;
+}
+
+/**
+ * For 3d annotations, there are often several display sets which could
+ * be used to display the annotation.  Choose the first annotation with the
+ * same frame of reference that is reconstructable, or the first display set
+ * otherwise.
+ */
+function chooseDisplaySet(displaySets, reference) {
+  if (!displaySets?.length) {
+    console.warn('No display set found for', reference);
+    return;
+  }
+  if (displaySets.length === 1) {
+    return displaySets[0];
+  }
+  const volumeDs = displaySets.find(ds => ds.isReconstructable);
+  if (volumeDs) {
+    return volumeDs;
+  }
+  return displaySets[0];
+}
+
+/**
+ * Gets the additional reference data appropriate for a 3d reference.
+ * This will choose a volume id, frame of reference and a plane restriction.
+ */
+function getReferenceData3D(toolData, servicesManager: Types.ServicesManager) {
+  const { FrameOfReferenceUID } = toolData.annotation.metadata;
+  const { points } = toolData.annotation.data.handles;
+  const { displaySetService } = servicesManager.services;
+  const displaySetsFOR = displaySetService.getDisplaySetsBy(
+    ds => ds.FrameOfReferenceUID === FrameOfReferenceUID
+  );
+  if (!displaySetsFOR.length || !points?.length) {
+    return {
+      FrameOfReferenceUID,
+    };
+  }
+  const ds = chooseDisplaySet(displaySetsFOR, toolData.annotation);
+  const cameraView = chooseCameraView(ds, points);
+
+  const viewReference = {
+    ...cameraView,
+    volumeId: ds.displaySetInstanceUID,
+    FrameOfReferenceUID,
+  };
+  utilities.updatePlaneRestriction(points, viewReference);
+  return viewReference;
+}
+
+/**
+ * Chooses a possible camera view - right now this is fairly basic,
+ * just setting the unknowns to null.
+ */
+function chooseCameraView(_ds, points) {
+  const selectedPoints = choosePoints(points);
+  const cameraFocalPoint = <Point3>centerOf(selectedPoints);
+  // These are sufficient to be null for now and can be set on first view
+  let viewPlaneNormal: Types.Point3 = null;
+  let viewUp: Types.Point3 = null;
+
+  return {
+    cameraFocalPoint,
+    viewPlaneNormal,
+    viewUp,
+  };
+}
+
+function centerOf(points) {
+  const scale = 1 / points.length;
+  const center = vec3.create();
+  for (const point of points) {
+    vec3.scaleAndAdd(center, center, point, scale);
+  }
+  return center;
+}
+
+function choosePoints(points) {
+  if (points.length === 1 || points.length === 2) {
+    return points;
+  }
+  const firstIndex = 0;
+  const secondIndex = Math.ceil(points.length / 4);
+  const thirdIndex = Math.ceil(points.length / 2);
+  // TODO - check if colinear, if so try to find another 3 points.
+
+  const newPoints = [points[firstIndex], points[secondIndex], points[thirdIndex]];
+  return newPoints;
+}

extensions/cornerstone-dicom-sr/src/utils/isRehydratable.ts

@@ -22,13 +22,20 @@ export default function isRehydratable(displaySet, mappings) {
   const { measurements } = displaySet;
 
   for (let i = 0; i < measurements.length; i++) {
-    const { TrackingIdentifier } = measurements[i] || {};
-    if (!TrackingIdentifier) {
-      console.warn('No tracking identifier for measurement ', measurements[i]);
+    const measurement = measurements[i];
+    if (!measurement) {
+      continue;
+    }
+    const { TrackingIdentifier = '', graphicType, graphicCode, pointsLength } = measurement;
+    if (!TrackingIdentifier && !graphicType) {
+      console.warn('No tracking identifier  or graphicType for measurement ', measurement);
       continue;
     }
     const adapter = MeasurementReport.getAdapterForTrackingIdentifier(TrackingIdentifier);
-    const hydratable = adapter && mappingDefinitions.has(adapter.toolType);
+    const adapters = MeasurementReport.getAdaptersForTypes(graphicCode, graphicType, pointsLength);
+    const hydratable =
+      (adapter && mappingDefinitions.has(adapter.toolType)) ||
+      (adapters && adapters.some(adapter => mappingDefinitions.has(adapter.toolType)));
 
     if (hydratable) {
       return true;

extensions/cornerstone-dynamic-volume/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dynamic-volume",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "description": "OHIF extension for 4D volumes data",
   "author": "OHIF",
   "license": "MIT",
@@ -29,21 +29,21 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.11.0-beta.15",
-    "@ohif/extension-cornerstone": "3.11.0-beta.15",
-    "@ohif/extension-default": "3.11.0-beta.15",
-    "@ohif/i18n": "3.11.0-beta.15",
-    "@ohif/ui": "3.11.0-beta.15",
-    "dcmjs": "*",
-    "dicom-parser": "^1.8.21",
-    "hammerjs": "^2.0.8",
-    "prop-types": "^15.6.2",
-    "react": "^18.3.1"
+    "@ohif/core": "3.13.0-beta.78",
+    "@ohif/extension-cornerstone": "3.13.0-beta.78",
+    "@ohif/extension-default": "3.13.0-beta.78",
+    "@ohif/i18n": "3.13.0-beta.78",
+    "@ohif/ui": "3.13.0-beta.78",
+    "dcmjs": "0.49.4",
+    "dicom-parser": "1.8.21",
+    "hammerjs": "2.0.8",
+    "prop-types": "15.8.1",
+    "react": "18.3.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/core": "^3.9.5",
-    "@cornerstonejs/tools": "^3.9.5",
-    "classnames": "^2.3.2"
+    "@babel/runtime": "7.28.2",
+    "@cornerstonejs/core": "4.22.8",
+    "@cornerstonejs/tools": "4.22.8",
+    "classnames": "2.5.1"
   }
 }

extensions/cornerstone-dynamic-volume/src/commandsModule.ts

@@ -1,8 +1,10 @@
-import * as importedActions from './actions';
 import { utilities, Enums } from '@cornerstonejs/tools';
 import { cache } from '@cornerstonejs/core';
+import { utils } from '@ohif/core';
 
-const LABELMAP = Enums.SegmentationRepresentations.Labelmap;
+import * as importedActions from './actions';
+
+const { downloadCsv } = utils;
 
 const commandsModule = ({ commandsManager, servicesManager }: withAppTypes) => {
   const services = servicesManager.services;
@@ -37,7 +39,7 @@ const commandsModule = ({ commandsManager, servicesManager }: withAppTypes) => {
       });
       return computedDisplaySets;
     },
-    exportTimeReportCSV: ({ segmentations, config, options, summaryStats }) => {
+    exportTimeReportCSV: ({ segmentations, summaryStats }) => {
       const dynamic4DDisplaySet = actions.getDynamic4DDisplaySet();
 
       const volumeId = dynamic4DDisplaySet?.displaySetInstanceUID;
@@ -203,15 +205,7 @@ const commandsModule = ({ commandsManager, servicesManager }: withAppTypes) => {
 
       // Generate filename and trigger download
       const filename = `${instance.PatientID}.csv`;
-      const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
-      const link = document.createElement('a');
-      const url = URL.createObjectURL(blob);
-      link.setAttribute('href', url);
-      link.setAttribute('download', filename);
-      link.style.visibility = 'hidden';
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
+      downloadCsv(csvContent, { filename });
     },
     swapDynamicWithComputedDisplaySet: ({ displaySet }) => {
       const computedDisplaySet = displaySet;

extensions/cornerstone-dynamic-volume/src/getPanelModule.tsx

@@ -5,6 +5,8 @@ import { PanelSegmentation } from '@ohif/extension-cornerstone';
 import DynamicExport from './panels/DynamicExport';
 
 function getPanelModule({ commandsManager, extensionManager, servicesManager, configuration }) {
+  const { toolbarService } = servicesManager.services;
+
   const wrappedDynamicDataPanel = () => {
     return (
       <DynamicDataPanel
@@ -19,8 +21,8 @@ function getPanelModule({ commandsManager, extensionManager, servicesManager, co
     return (
       <>
         <Toolbox
-          buttonSectionId="dynamic-toolbox"
-          title="Threshold Tools"
+          buttonSectionId={toolbarService.sections.dynamicToolbox}
+          title="Buttons:Threshold Tools"
         />
         <PanelSegmentation
           servicesManager={servicesManager}

extensions/cornerstone-dynamic-volume/src/panels/DynamicDataPanel.tsx

@@ -5,7 +5,7 @@ function DynamicDataPanel({ servicesManager, commandsManager, tab }: withAppType
   return (
     <>
       <div
-        className="flex flex-col text-white"
+        className="text-foreground flex flex-col"
         data-cy={'dynamic-volume-panel'}
       >
         <PanelGenerateImage

extensions/cornerstone-dynamic-volume/src/panels/WorkflowPanel.tsx

@@ -10,7 +10,7 @@ function WorkflowPanel({ servicesManager }: { servicesManager: ServicesManager }
   return (
     <div
       data-cy={'workflow-panel'}
-      className="bg-secondary-dark mb-1 px-3 py-4"
+      className="bg-popover mb-1 px-3 py-4"
     >
       <div className="mb-1">Workflow</div>
       <div>

extensions/cornerstone/jest.config.js

@@ -1,9 +1,13 @@
 const base = require('../../jest.config.base.js');
-const pkg = require('./package');
 
 module.exports = {
   ...base,
-  displayName: pkg.name,
+  moduleNameMapper: {
+    ...base.moduleNameMapper,
+    '@ohif/(.*)': '<rootDir>/../../platform/$1/src',
+    '^@cornerstonejs/([^/]+)/(.*)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm/$2',
+    '^@cornerstonejs/([^/]+)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm',
+  },
   // rootDir: "../.."
   // testMatch: [
   //   //`<rootDir>/platform/${pack.name}/**/*.spec.js`

extensions/cornerstone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "3.11.0-beta.15",
+  "version": "3.13.0-beta.78",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -31,41 +31,44 @@
     "dev:cornerstone": "yarn run dev",
     "build": "cross-env NODE_ENV=production webpack --progress --config .webpack/webpack.prod.js",
     "build:package-1": "yarn run build",
-    "start": "yarn run dev"
+    "start": "yarn run dev",
+    "test:unit": "jest --watchAll",
+    "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@cornerstonejs/codec-charls": "^1.2.3",
-    "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
-    "@cornerstonejs/codec-openjpeg": "^1.2.4",
-    "@cornerstonejs/codec-openjph": "^2.4.5",
-    "@cornerstonejs/dicom-image-loader": "^3.9.5",
-    "@ohif/core": "3.11.0-beta.15",
-    "@ohif/ui": "3.11.0-beta.15",
-    "dcmjs": "*",
-    "dicom-parser": "^1.8.21",
-    "hammerjs": "^2.0.8",
-    "prop-types": "^15.6.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-resize-detector": "^10.0.1"
+    "@cornerstonejs/codec-charls": "1.2.3",
+    "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
+    "@cornerstonejs/codec-openjpeg": "1.3.0",
+    "@cornerstonejs/codec-openjph": "2.4.7",
+    "@cornerstonejs/dicom-image-loader": "4.22.8",
+    "@ohif/core": "3.13.0-beta.78",
+    "@ohif/ui": "3.13.0-beta.78",
+    "dcmjs": "0.49.4",
+    "dicom-parser": "1.8.21",
+    "hammerjs": "2.0.8",
+    "prop-types": "15.8.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-resize-detector": "10.0.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^3.9.5",
-    "@cornerstonejs/ai": "^3.9.5",
-    "@cornerstonejs/core": "^3.9.5",
-    "@cornerstonejs/labelmap-interpolation": "^3.9.5",
-    "@cornerstonejs/polymorphic-segmentation": "^3.9.5",
-    "@cornerstonejs/tools": "^3.9.5",
+    "@babel/runtime": "7.28.2",
+    "@cornerstonejs/adapters": "4.22.8",
+    "@cornerstonejs/ai": "4.22.8",
+    "@cornerstonejs/core": "4.22.8",
+    "@cornerstonejs/labelmap-interpolation": "4.22.8",
+    "@cornerstonejs/polymorphic-segmentation": "4.22.8",
+    "@cornerstonejs/tools": "4.22.8",
+    "@icr/polyseg-wasm": "0.4.0",
     "@itk-wasm/morphological-contour-interpolation": "1.1.0",
-    "@kitware/vtk.js": "32.12.0",
-    "html2canvas": "^1.4.1",
-    "lodash.compact": "^3.0.1",
-    "lodash.debounce": "^4.0.8",
-    "lodash.flatten": "^4.4.0",
-    "lodash.merge": "^4.6.2",
-    "lodash.zip": "^4.2.0",
-    "shader-loader": "^1.3.1",
-    "worker-loader": "^3.0.8"
+    "@kitware/vtk.js": "34.15.1",
+    "html2canvas": "1.4.1",
+    "immutability-helper": "3.1.1",
+    "lodash.compact": "3.0.1",
+    "lodash.debounce": "4.0.8",
+    "lodash.flatten": "4.4.0",
+    "lodash.zip": "4.2.0",
+    "shader-loader": "1.3.1",
+    "worker-loader": "3.0.8"
   }
 }

extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.css

@@ -2,6 +2,11 @@
   width: 100%;
   height: 100%; /* MUST have `height` to prevent resize infinite loop */
   position: relative;
+  /* Prevent text selection on the entire viewport wrapper */
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
 }
 
 .cornerstone-viewport-element {
@@ -16,4 +21,26 @@
   /* Prevents the entire page from getting larger
      when the magnify tool is near the sides/corners of the page */
   overflow: hidden;
+  
+  /* Prevent text selection on the viewport element */
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
+
+/* Prevent text selection on overlay elements */
+.noselect {
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
+
+/* Ensure all elements within viewport wrapper prevent text selection */
+.viewport-wrapper * {
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
 }

extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.tsx

@@ -1,9 +1,7 @@
 import React, { useEffect, useRef, useCallback, useState } from 'react';
-import { useResizeDetector } from 'react-resize-detector';
 import * as cs3DTools from '@cornerstonejs/tools';
 import { Enums, eventTarget, getEnabledElement } from '@cornerstonejs/core';
-import { MeasurementService } from '@ohif/core';
-import { AllInOneMenu } from '@ohif/ui-next';
+import { MeasurementService, useViewportRef } from '@ohif/core';
 import { useViewportDialog } from '@ohif/ui-next';
 import type { Types as csTypes } from '@cornerstonejs/core';
 
@@ -15,8 +13,6 @@ import CinePlayer from '../components/CinePlayer';
 import type { Types } from '@ohif/core';
 
 import OHIFViewportActionCorners from '../components/OHIFViewportActionCorners';
-import { getWindowLevelActionMenu } from '../components/WindowLevelActionMenu/getWindowLevelActionMenu';
-import { getViewportDataOverlaySettingsMenu } from '../components/ViewportDataOverlaySettingMenu';
 import { getViewportPresentations } from '../utils/presentations/getViewportPresentations';
 import { useSynchronizersStore } from '../stores/useSynchronizersStore';
 import ActiveViewportBehavior from '../utils/ActiveViewportBehavior';
@@ -24,6 +20,9 @@ import { WITH_NAVIGATION } from '../services/ViewportService/CornerstoneViewport
 
 const STACK = 'stack';
 
+// Cache for viewport dimensions, persists across component remounts
+const viewportDimensions = new Map<string, { width: number; height: number }>();
+
 // Todo: This should be done with expose of internal API similar to react-vtkjs-viewport
 // Then we don't need to worry about the re-renders if the props change.
 const OHIFCornerstoneViewport = React.memo(
@@ -41,7 +40,6 @@ const OHIFCornerstoneViewport = React.memo(
       viewportOptions,
       displaySetOptions,
       servicesManager,
-      commandsManager,
       onElementEnabled,
       // eslint-disable-next-line react/prop-types
       onElementDisabled,
@@ -83,6 +81,7 @@ const OHIFCornerstoneViewport = React.memo(
     const [scrollbarHeight, setScrollbarHeight] = useState('100px');
     const [enabledVPElement, setEnabledVPElement] = useState(null);
     const elementRef = useRef() as React.MutableRefObject<HTMLDivElement>;
+    const viewportRef = useViewportRef(viewportId);
 
     const {
       displaySetService,
@@ -92,7 +91,6 @@ const OHIFCornerstoneViewport = React.memo(
       cornerstoneViewportService,
       segmentationService,
       cornerstoneCacheService,
-      viewportActionCornersService,
       customizationService,
       measurementService,
     } = servicesManager.services;
@@ -105,12 +103,44 @@ const OHIFCornerstoneViewport = React.memo(
     }, [elementRef]);
 
     // useCallback for onResize
-    const onResize = useCallback(() => {
-      if (elementRef.current) {
-        cornerstoneViewportService.resize();
-        setImageScrollBarHeight();
+    const onResize = useCallback(
+      (entries: ResizeObserverEntry[]) => {
+        if (elementRef.current && entries?.length) {
+          const entry = entries[0];
+          const { width, height } = entry.contentRect;
+
+          const prevDimensions = viewportDimensions.get(viewportId) || { width: 0, height: 0 };
+
+          // Check if dimensions actually changed and then only resize if they have changed
+          const hasDimensionsChanged =
+            prevDimensions.width !== width || prevDimensions.height !== height;
+
+          if (width > 0 && height > 0 && hasDimensionsChanged) {
+            viewportDimensions.set(viewportId, { width, height });
+            // Perform resize operations
+            cornerstoneViewportService.resize();
+            setImageScrollBarHeight();
+          }
+        }
+      },
+      [viewportId, elementRef, cornerstoneViewportService, setImageScrollBarHeight]
+    );
+
+    useEffect(() => {
+      const element = elementRef.current;
+      if (!element) {
+        return;
       }
-    }, [elementRef]);
+
+      const resizeObserver = new ResizeObserver(onResize);
+      resizeObserver.observe(element);
+
+      // Cleanup function
+      return () => {
+        resizeObserver.unobserve(element);
+        resizeObserver.disconnect();
+      };
+    }, [onResize]);
 
     const cleanUpServices = useCallback(
       viewportInfo => {
@@ -121,16 +151,8 @@ const OHIFCornerstoneViewport = React.memo(
         syncGroupService.removeViewportFromSyncGroup(viewportId, renderingEngineId, syncGroups);
 
         segmentationService.clearSegmentationRepresentations(viewportId);
-
-        viewportActionCornersService.clear(viewportId);
       },
-      [
-        viewportId,
-        segmentationService,
-        syncGroupService,
-        toolGroupService,
-        viewportActionCornersService,
-      ]
+      [viewportId, segmentationService, syncGroupService, toolGroupService]
     );
 
     const elementEnabledHandler = useCallback(
@@ -198,6 +220,7 @@ const OHIFCornerstoneViewport = React.memo(
         }
 
         cornerstoneViewportService.disableElement(viewportId);
+        viewportRef.unregister();
 
         eventTarget.removeEventListener(Enums.Events.ELEMENT_ENABLED, elementEnabledHandler);
       };
@@ -281,79 +304,6 @@ const OHIFCornerstoneViewport = React.memo(
       loadViewportData();
     }, [viewportOptions, displaySets, dataSource]);
 
-    /**
-     * There are two scenarios for jump to click
-     * 1. Current viewports contain the displaySet that the annotation was drawn on
-     * 2. Current viewports don't contain the displaySet that the annotation was drawn on
-     * and we need to change the viewports displaySet for jumping.
-     * Since measurement_jump happens via events and listeners, the former case is handled
-     * by the measurement_jump direct callback, but the latter case is handled first by
-     * the viewportGrid to set the correct displaySet on the viewport, AND THEN we check
-     * the cache for jumping to see if there is any jump queued, then we jump to the correct slice.
-     */
-    useEffect(() => {
-      if (isJumpToMeasurementDisabled) {
-        return;
-      }
-
-      const { unsubscribe } = measurementService.subscribe(
-        MeasurementService.EVENTS.JUMP_TO_MEASUREMENT_VIEWPORT,
-        event => handleJumpToMeasurement(event, elementRef, viewportId, cornerstoneViewportService)
-      );
-
-      return () => {
-        unsubscribe();
-      };
-    }, [displaySets, elementRef, viewportId, isJumpToMeasurementDisabled, servicesManager]);
-
-    // Set up the window level action menu in the viewport action corners.
-    useEffect(() => {
-      const windowLevelActionMenu = customizationService.getCustomization(
-        'viewportActionMenu.windowLevelActionMenu'
-      );
-      const segmentationOverlay = customizationService.getCustomization(
-        'viewportActionMenu.segmentationOverlay'
-      );
-
-      if (windowLevelActionMenu?.enabled) {
-        viewportActionCornersService.addComponent({
-          viewportId,
-          id: 'windowLevelActionMenu',
-          component: getWindowLevelActionMenu({
-            viewportId,
-            element: elementRef.current,
-            displaySets,
-            servicesManager,
-            commandsManager,
-            location: windowLevelActionMenu.location,
-            verticalDirection: AllInOneMenu.VerticalDirection.TopToBottom,
-            horizontalDirection: AllInOneMenu.HorizontalDirection.RightToLeft,
-          }),
-          location: windowLevelActionMenu.location,
-        });
-      }
-
-      if (segmentationOverlay?.enabled) {
-        viewportActionCornersService.addComponent({
-          viewportId,
-          id: 'segmentation',
-          component: getViewportDataOverlaySettingsMenu({
-            viewportId,
-            element: elementRef.current,
-            displaySets,
-            servicesManager,
-            commandsManager,
-            location: segmentationOverlay.location,
-          }),
-          location: segmentationOverlay.location,
-        });
-      }
-    }, [displaySets, viewportId, viewportActionCornersService, servicesManager, commandsManager]);
-
-    const { ref: resizeRef } = useResizeDetector({
-      onResize,
-    });
-
     const Notification = customizationService.getCustomization('ui.notificationComponent');
 
     return (
@@ -364,9 +314,12 @@ const OHIFCornerstoneViewport = React.memo(
             style={{ height: '100%', width: '100%' }}
             onContextMenu={e => e.preventDefault()}
             onMouseDown={e => e.preventDefault()}
+            data-viewportid={viewportId}
             ref={el => {
-              resizeRef.current = el;
               elementRef.current = el;
+              if (el) {
+                viewportRef.register(el);
+              }
             }}
           ></div>
           <CornerstoneOverlays
@@ -408,54 +361,6 @@ const OHIFCornerstoneViewport = React.memo(
   areEqual
 );
 
-// Helper function to handle jumping to measurements
-function handleJumpToMeasurement(event, elementRef, viewportId, cornerstoneViewportService) {
-  const { measurement, isConsumed } = event;
-  if (!measurement || isConsumed) {
-    return;
-  }
-
-  const enabledElement = getEnabledElement(elementRef.current);
-
-  if (!enabledElement) {
-    return;
-  }
-
-  const viewport = enabledElement.viewport as csTypes.IStackViewport | csTypes.IVolumeViewport;
-
-  const { metadata, displaySetInstanceUID } = measurement;
-
-  const viewportDisplaySets = cornerstoneViewportService.getViewportDisplaySets(viewportId);
-
-  const showingDisplaySet = viewportDisplaySets.find(
-    ds => ds.displaySetInstanceUID === displaySetInstanceUID
-  );
-
-  let metadataToUse = metadata;
-  // if it is not showing the displaySet we need to remove the FOR from the metadata
-  if (!showingDisplaySet) {
-    metadataToUse = {
-      ...metadata,
-      FrameOfReferenceUID: undefined,
-    };
-  }
-
-  // Todo: make it work with cases where we want to define FOR based measurements too
-  if (!viewport.isReferenceViewable(metadataToUse, WITH_NAVIGATION)) {
-    return;
-  }
-
-  try {
-    viewport.setViewReference(metadata);
-    viewport.render();
-  } catch (e) {
-    console.warn('Unable to apply', metadata, e);
-  }
-
-  cs3DTools.annotation.selection.setAnnotationSelected(measurement.uid);
-  event?.consume?.();
-}
-
 function _rehydrateSynchronizers(viewportId: string, syncGroupService: any) {
   const { synchronizersStore } = useSynchronizersStore.getState();
   const synchronizers = synchronizersStore[viewportId];
@@ -516,22 +421,18 @@ OHIFCornerstoneViewport.displayName = 'OHIFCornerstoneViewport';
 
 function areEqual(prevProps, nextProps) {
   if (nextProps.needsRerendering) {
-    console.debug('OHIFCornerstoneViewport: Rerender caused by: needsRerendering');
     return false;
   }
 
   if (prevProps.displaySets.length !== nextProps.displaySets.length) {
-    console.debug('OHIFCornerstoneViewport: Rerender caused by: displaySets length change');
     return false;
   }
 
   if (prevProps.viewportOptions.orientation !== nextProps.viewportOptions.orientation) {
-    console.debug('OHIFCornerstoneViewport: Rerender caused by: orientation change');
     return false;
   }
 
   if (prevProps.viewportOptions.toolGroupId !== nextProps.viewportOptions.toolGroupId) {
-    console.debug('OHIFCornerstoneViewport: Rerender caused by: toolGroupId change');
     return false;
   }
 
@@ -539,12 +440,10 @@ function areEqual(prevProps, nextProps) {
     nextProps.viewportOptions.viewportType &&
     prevProps.viewportOptions.viewportType !== nextProps.viewportOptions.viewportType
   ) {
-    console.debug('OHIFCornerstoneViewport: Rerender caused by: viewportType change');
     return false;
   }
 
   if (nextProps.viewportOptions.needsRerendering) {
-    console.debug('OHIFCornerstoneViewport: Rerender caused by: viewportOptions.needsRerendering');
     return false;
   }
 
@@ -552,7 +451,6 @@ function areEqual(prevProps, nextProps) {
   const nextDisplaySets = nextProps.displaySets;
 
   if (prevDisplaySets.length !== nextDisplaySets.length) {
-    console.debug('OHIFCornerstoneViewport: Rerender caused by: displaySets length mismatch');
     return false;
   }
 
@@ -565,13 +463,11 @@ function areEqual(prevProps, nextProps) {
     );
 
     if (!foundDisplaySet) {
-      console.debug('OHIFCornerstoneViewport: Rerender caused by: displaySet not found');
       return false;
     }
 
     // check they contain the same image
     if (foundDisplaySet.images?.length !== prevDisplaySet.images?.length) {
-      console.debug('OHIFCornerstoneViewport: Rerender caused by: images length mismatch');
       return false;
     }
 
@@ -579,7 +475,6 @@ function areEqual(prevProps, nextProps) {
     if (foundDisplaySet.images?.length) {
       for (let j = 0; j < foundDisplaySet.images.length; j++) {
         if (foundDisplaySet.images[j].imageId !== prevDisplaySet.images[j].imageId) {
-          console.debug('OHIFCornerstoneViewport: Rerender caused by: imageId mismatch');
           return false;
         }
       }
@@ -589,16 +484,4 @@ function areEqual(prevProps, nextProps) {
   return true;
 }
 
-// Helper function to check if display sets have changed
-function haveDisplaySetsChanged(prevDisplaySets, currentDisplaySets) {
-  if (prevDisplaySets.length !== currentDisplaySets.length) {
-    return true;
-  }
-
-  return currentDisplaySets.some((currentDS, index) => {
-    const prevDS = prevDisplaySets[index];
-    return currentDS.displaySetInstanceUID !== prevDS.displaySetInstanceUID;
-  });
-}
-
 export default OHIFCornerstoneViewport;

extensions/cornerstone/src/Viewport/Overlays/CornerstoneOverlays.tsx

@@ -1,13 +1,14 @@
 import React, { useEffect, useState } from 'react';
 
 import ViewportImageScrollbar from './ViewportImageScrollbar';
+import ViewportSliceProgressScrollbar from './ViewportSliceProgressScrollbar/ViewportSliceProgressScrollbar';
 import CustomizableViewportOverlay from './CustomizableViewportOverlay';
 import ViewportOrientationMarkers from './ViewportOrientationMarkers';
 import ViewportImageSliceLoadingIndicator from './ViewportImageSliceLoadingIndicator';
 
 function CornerstoneOverlays(props: withAppTypes) {
   const { viewportId, element, scrollbarHeight, servicesManager } = props;
-  const { cornerstoneViewportService } = servicesManager.services;
+  const { cornerstoneViewportService, customizationService } = servicesManager.services;
   const [imageSliceData, setImageSliceData] = useState({
     imageIndex: 0,
     numberOfSlices: 0,
@@ -43,17 +44,31 @@ function CornerstoneOverlays(props: withAppTypes) {
     }
   }
 
+  const viewportScrollbarVariant = customizationService.getCustomization('viewportScrollbar.variant');
+  const useProgressScrollbar = viewportScrollbarVariant !== 'legacy';
+
   return (
     <div className="noselect">
-      <ViewportImageScrollbar
-        viewportId={viewportId}
-        viewportData={viewportData}
-        element={element}
-        imageSliceData={imageSliceData}
-        setImageSliceData={setImageSliceData}
-        scrollbarHeight={scrollbarHeight}
-        servicesManager={servicesManager}
-      />
+      {useProgressScrollbar ? (
+        <ViewportSliceProgressScrollbar
+          viewportId={viewportId}
+          viewportData={viewportData}
+          element={element}
+          imageSliceData={imageSliceData}
+          setImageSliceData={setImageSliceData}
+          servicesManager={servicesManager}
+        />
+      ) : (
+        <ViewportImageScrollbar
+          viewportId={viewportId}
+          viewportData={viewportData}
+          element={element}
+          imageSliceData={imageSliceData}
+          setImageSliceData={setImageSliceData}
+          scrollbarHeight={scrollbarHeight}
+          servicesManager={servicesManager}
+        />
+      )}
 
       <CustomizableViewportOverlay
         imageSliceData={imageSliceData}

extensions/cornerstone/src/Viewport/Overlays/CustomizableViewportOverlay.tsx

@@ -1,15 +1,17 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { vec3 } from 'gl-matrix';
 import PropTypes from 'prop-types';
-import { metaData, Enums, utilities } from '@cornerstonejs/core';
+import { metaData, Enums, utilities, eventTarget } from '@cornerstonejs/core';
+import { Enums as csToolsEnums, UltrasoundPleuraBLineTool } from '@cornerstonejs/tools';
 import type { ImageSliceData } from '@cornerstonejs/core/types';
-import { ViewportOverlay } from '@ohif/ui-next';
+import { ViewportOverlay, formatDICOMDate } from '@ohif/ui-next';
 import type { InstanceMetadata } from '@ohif/core/src/types';
-import { formatDICOMDate, formatDICOMTime, formatNumberPrecision } from './utils';
+import { formatDICOMTime, formatNumberPrecision } from './utils';
 import { utils } from '@ohif/core';
 import { StackViewportData, VolumeViewportData } from '../../types/CornerstoneCacheService';
 
 import './CustomizableViewportOverlay.css';
+import { useViewportRendering } from '../../hooks';
 
 const EPSILON = 1e-4;
 const { formatPN } = utils;
@@ -65,8 +67,9 @@ function CustomizableViewportOverlay({
 }) {
   const { cornerstoneViewportService, customizationService, toolGroupService, displaySetService } =
     servicesManager.services;
-  const [voi, setVOI] = useState({ windowCenter: null, windowWidth: null });
   const [scale, setScale] = useState(1);
+  const [annotationState, setAnnotationState] = useState(0);
+  const { isViewportBackgroundLight: isLight, windowLevel: voi } = useViewportRendering(viewportId);
   const { imageIndex } = imageSliceData;
 
   // Historical usage defined the overlays as separate items due to lack of
@@ -106,30 +109,20 @@ function CustomizableViewportOverlay({
     };
   }, [viewportData, viewportId, instanceNumber, cornerstoneViewportService]);
 
-  /**
-   * Updating the VOI when the viewport changes its voi
-   */
+  const annotationModified = useCallback(evt => {
+    if (evt.detail.annotation.metadata.toolName === UltrasoundPleuraBLineTool.toolName) {
+      // Update the annotation state to trigger a re-render
+      setAnnotationState(prevState => prevState + 1);
+    }
+  }, []);
+
   useEffect(() => {
-    const updateVOI = eventDetail => {
-      const { range } = eventDetail.detail;
-
-      if (!range) {
-        return;
-      }
-
-      const { lower, upper } = range;
-      const { windowWidth, windowCenter } = utilities.windowLevel.toWindowLevel(lower, upper);
-
-      setVOI({ windowCenter, windowWidth });
-    };
-
-    element.addEventListener(Enums.Events.VOI_MODIFIED, updateVOI);
+    eventTarget.addEventListener(csToolsEnums.Events.ANNOTATION_MODIFIED, annotationModified);
 
     return () => {
-      element.removeEventListener(Enums.Events.VOI_MODIFIED, updateVOI);
+      eventTarget.removeEventListener(csToolsEnums.Events.ANNOTATION_MODIFIED, annotationModified);
     };
-  }, [viewportId, viewportData, voi, element]);
-
+  }, [annotationModified]);
   /**
    * Updating the scale when the viewport changes its zoom
    */
@@ -170,6 +163,7 @@ function CustomizableViewportOverlay({
         viewportId,
         servicesManager,
         customization: item,
+        isLight,
         formatters: {
           formatPN,
           formatDate: formatDICOMDate,
@@ -206,6 +200,8 @@ function CustomizableViewportOverlay({
       voi,
       scale,
       instanceNumber,
+      annotationState,
+      isLight,
     ]
   );
 
@@ -219,6 +215,7 @@ function CustomizableViewportOverlay({
         instanceNumber,
         viewportId,
         toolGroupService,
+        isLight,
       };
 
       return (
@@ -241,6 +238,8 @@ function CustomizableViewportOverlay({
       topRight={getContent(topRightCustomization, 'topRightOverlayItem')}
       bottomLeft={getContent(bottomLeftCustomization, 'bottomLeftOverlayItem')}
       bottomRight={getContent(bottomRightCustomization, 'bottomRightOverlayItem')}
+      color={isLight ? 'text-neutral-dark' : 'text-neutral-light'}
+      shadowClass={isLight ? 'shadow-light' : 'shadow-dark'}
     />
   );
 }
@@ -368,16 +367,18 @@ function OverlayItem(props) {
       title={title}
     >
       {label ? <span className="mr-1 shrink-0">{label}</span> : null}
-      <span className="ml-0 mr-2 shrink-0">{value}</span>
+      <span className="ml-0 shrink-0">{value}</span>
     </div>
   );
 }
 
 /**
  * Window Level / Center Overlay item
+ * //
  */
 function VOIOverlayItem({ voi, customization }: OverlayItemProps) {
   const { windowWidth, windowCenter } = voi;
+  const { title } = customization;
   if (typeof windowCenter !== 'number' || typeof windowWidth !== 'number') {
     return null;
   }
@@ -386,10 +387,11 @@ function VOIOverlayItem({ voi, customization }: OverlayItemProps) {
     <div
       className="overlay-item flex flex-row"
       style={{ color: customization?.color }}
+      title={title}
     >
-      <span className="mr-0.5 shrink-0 opacity-[0.67]">W:</span>
+      <span className="mr-0.5 shrink-0 opacity-[0.70]">W:</span>
       <span className="mr-2.5 shrink-0">{windowWidth.toFixed(0)}</span>
-      <span className="mr-0.5 shrink-0 opacity-[0.67]">L:</span>
+      <span className="mr-0.5 shrink-0 opacity-[0.70]">L:</span>
       <span className="shrink-0">{windowCenter.toFixed(0)}</span>
     </div>
   );
@@ -404,7 +406,7 @@ function ZoomOverlayItem({ scale, customization }: OverlayItemProps) {
       className="overlay-item flex flex-row"
       style={{ color: (customization && customization.color) || undefined }}
     >
-      <span className="mr-0.5 shrink-0 opacity-[0.67]">Zoom:</span>
+      <span className="mr-0.5 shrink-0 opacity-[0.70]">Zoom:</span>
       <span>{scale.toFixed(2)}x</span>
     </div>
   );
@@ -419,16 +421,18 @@ function InstanceNumberOverlayItem({
   customization,
 }: OverlayItemProps) {
   const { imageIndex, numberOfSlices } = imageSliceData;
+  const { title } = customization;
 
   return (
     <div
       className="overlay-item flex flex-row"
       style={{ color: (customization && customization.color) || undefined }}
+      title={title}
     >
       <span>
         {instanceNumber !== undefined && instanceNumber !== null ? (
           <>
-            <span className="mr-0.5 shrink-0 opacity-[0.67]">I:</span>
+            <span className="mr-0.5 shrink-0 opacity-[0.70]">I:</span>
             <span>{`${instanceNumber} (${imageIndex + 1}/${numberOfSlices})`}</span>
           </>
         ) : (

extensions/cornerstone/src/Viewport/Overlays/ViewportImageScrollbar.tsx

@@ -63,7 +63,7 @@ function CornerstoneImageScrollbar({
     }
     const { viewportType } = viewportData;
     const eventId =
-      (viewportType === Enums.ViewportType.STACK && Enums.Events.STACK_VIEWPORT_SCROLL) ||
+      (viewportType === Enums.ViewportType.STACK && Enums.Events.STACK_NEW_IMAGE) ||
       (viewportType === Enums.ViewportType.ORTHOGRAPHIC && Enums.Events.VOLUME_NEW_IMAGE) ||
       Enums.Events.IMAGE_RENDERED;
 
@@ -72,11 +72,11 @@ function CornerstoneImageScrollbar({
       if (!viewport || viewport instanceof VolumeViewport3D) {
         return;
       }
-      const { imageIndex, newImageIdIndex = imageIndex } = event.detail;
+      const { imageIndex, newImageIdIndex = imageIndex, imageIdIndex } = event.detail;
       const numberOfSlices = viewport.getNumberOfSlices();
       // find the index of imageId in the imageIds
       setImageSliceData({
-        imageIndex: newImageIdIndex,
+        imageIndex: newImageIdIndex ?? imageIdIndex,
         numberOfSlices,
       });
     };

extensions/cornerstone/src/Viewport/Overlays/ViewportImageSliceLoadingIndicator.tsx

@@ -51,7 +51,7 @@ function ViewportImageSliceLoadingIndicator({ viewportData, element }) {
       <>
         <div className="absolute top-0 left-0 h-full w-full bg-black opacity-50">
           <div className="transparent flex h-full w-full items-center justify-center">
-            <p className="text-primary-light text-xl font-light">
+            <p className="text-highlight text-xl font-light">
               <h4>Error Loading Image</h4>
               <p>An error has occurred.</p>
               <p>{error}</p>
@@ -68,7 +68,7 @@ function ViewportImageSliceLoadingIndicator({ viewportData, element }) {
       // interacting with the mouse, since scrolling should propagate to the viewport underneath
       <div className="pointer-events-none absolute top-0 left-0 h-full w-full bg-black opacity-50">
         <div className="transparent flex h-full w-full items-center justify-center">
-          <p className="text-primary-light text-xl font-light">Loading...</p>
+          <p className="text-highlight text-xl font-light">Loading...</p>
         </div>
       </div>
     );

extensions/cornerstone/src/Viewport/Overlays/ViewportOrientationMarkers.css

@@ -11,18 +11,22 @@
 .ViewportOrientationMarkers .top-mid {
   top: 0.38rem;
   left: 50%;
+  transform: translateX(-50%);
 }
 .ViewportOrientationMarkers .left-mid {
-  top: 47%;
+  top: 50%;
   left: 0.38rem;
+  transform: translateY(-50%);
 }
 .ViewportOrientationMarkers .right-mid {
-  top: 47%;
+  top: 50%;
   left: calc(100% - var(--marker-width) - var(--scrollbar-width));
+  transform: translateY(-50%);
 }
 .ViewportOrientationMarkers .bottom-mid {
   top: calc(100% - var(--marker-height) - 0.6rem);
-  left: 47%;
+  left: 50%;
+  transform: translateX(-50%);
 }
 .ViewportOrientationMarkers .right-mid .orientation-marker-value {
   display: flex;

extensions/cornerstone/src/Viewport/Overlays/ViewportOrientationMarkers.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect, useState, useMemo } from 'react';
 import classNames from 'classnames';
-import { metaData, Enums, Types, getEnabledElement } from '@cornerstonejs/core';
+import { metaData, Enums, getEnabledElement } from '@cornerstonejs/core';
 import { utilities } from '@cornerstonejs/tools';
 import { vec3 } from 'gl-matrix';
 
 import './ViewportOrientationMarkers.css';
-
+import { useViewportRendering } from '../../hooks';
 const { getOrientationStringLPS, invertOrientationStringLPS } = utilities.orientation;
 
 function ViewportOrientationMarkers({
@@ -16,49 +16,36 @@ function ViewportOrientationMarkers({
   servicesManager,
   orientationMarkers = ['top', 'left'],
 }: withAppTypes) {
-  // Rotation is in degrees
-  const [rotation, setRotation] = useState(0);
-  const [flipHorizontal, setFlipHorizontal] = useState(false);
-  const [flipVertical, setFlipVertical] = useState(false);
+  const [cameraModifiedTime, setCameraModifiedTime] = useState(0);
+  const { isViewportBackgroundLight: isLight } = useViewportRendering(viewportId);
   const { cornerstoneViewportService } = servicesManager.services;
 
   useEffect(() => {
-    const cameraModifiedListener = (evt: Types.EventTypes.CameraModifiedEvent) => {
-      const { previousCamera, camera } = evt.detail;
-
-      const { rotation } = camera;
-      if (rotation !== undefined) {
-        setRotation(rotation);
-      }
-
-      if (
-        camera.flipHorizontal !== undefined &&
-        previousCamera.flipHorizontal !== camera.flipHorizontal
-      ) {
-        setFlipHorizontal(camera.flipHorizontal);
-      }
-
-      if (
-        camera.flipVertical !== undefined &&
-        previousCamera.flipVertical !== camera.flipVertical
-      ) {
-        setFlipVertical(camera.flipVertical);
-      }
-    };
-
+    const cameraModifiedListener = () => setCameraModifiedTime(Date.now());
     element.addEventListener(Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
 
     return () => {
       element.removeEventListener(Enums.Events.CAMERA_MODIFIED, cameraModifiedListener);
     };
-  }, []);
+  }, [element]);
 
   const markers = useMemo(() => {
-    if (!viewportData) {
+    if (!viewportData || cameraModifiedTime === 0) {
+      return '';
+    }
+
+    if (!element || !getEnabledElement(element)) {
+      console.log(`ViewportOrientationMarkers :: Viewport element not enabled (${viewportId})`);
+      return '';
+    }
+
+    const ohifViewport = cornerstoneViewportService.getViewportInfo(viewportId);
+
+    if (!ohifViewport) {
+      console.log(`ViewportOrientationMarkers :: No viewport (${viewportId})`);
       return '';
     }
 
-    let rowCosines, columnCosines, isDefaultValueSetForRowCosine, isDefaultValueSetForColumnCosine;
     if (viewportData.viewportType === 'stack') {
       const imageIndex = imageSliceData.imageIndex;
       const imageId = viewportData.data[0].imageIds?.[imageIndex];
@@ -68,58 +55,33 @@ function ViewportOrientationMarkers({
         return false;
       }
 
-      ({
-        rowCosines,
-        columnCosines,
-        isDefaultValueSetForColumnCosine,
-        isDefaultValueSetForColumnCosine,
-      } = metaData.get('imagePlaneModule', imageId) || {});
-    } else {
-      if (!element || !getEnabledElement(element)) {
+      const { isDefaultValueSetForRowCosine, isDefaultValueSetForColumnCosine } =
+        metaData.get('imagePlaneModule', imageId) || {};
+
+      if (isDefaultValueSetForColumnCosine || isDefaultValueSetForRowCosine) {
         return '';
       }
-
-      const { viewport } = getEnabledElement(element);
-      const { viewUp, viewPlaneNormal } = viewport.getCamera();
-
-      const viewRight = vec3.create();
-      vec3.cross(viewRight, viewUp, viewPlaneNormal);
-
-      columnCosines = [-viewUp[0], -viewUp[1], -viewUp[2]];
-      rowCosines = viewRight;
     }
 
-    if (
-      !rowCosines ||
-      !columnCosines ||
-      rotation === undefined ||
-      isDefaultValueSetForRowCosine ||
-      isDefaultValueSetForColumnCosine
-    ) {
-      return '';
-    }
+    const { viewport } = getEnabledElement(element);
+    const p00 = viewport.canvasToWorld([0, 0]);
+    const p10 = viewport.canvasToWorld([1, 0]);
+    const p01 = viewport.canvasToWorld([0, 1]);
+    const rowCosines = vec3.sub(vec3.create(), p10, p00);
+    const columnCosines = vec3.sub(vec3.create(), p01, p00);
 
-    const markers = _getOrientationMarkers(
-      rowCosines,
-      columnCosines,
-      rotation,
-      flipVertical,
-      flipHorizontal
-    );
+    vec3.normalize(rowCosines, rowCosines);
+    vec3.normalize(columnCosines, columnCosines);
 
-    const ohifViewport = cornerstoneViewportService.getViewportInfo(viewportId);
-
-    if (!ohifViewport) {
-      console.log('ViewportOrientationMarkers::No viewport');
-      return null;
-    }
+    const markers = _getOrientationMarkers(rowCosines, columnCosines);
 
     return orientationMarkers.map((m, index) => (
       <div
         className={classNames(
           'overlay-text',
           `${m}-mid orientation-marker`,
-          'text-highlight/65',
+          isLight ? 'text-neutral-dark/70' : 'text-neutral-light/70',
+          isLight ? 'shadow-light' : 'shadow-dark',
           'text-base',
           'leading-5'
         )}
@@ -128,15 +90,7 @@ function ViewportOrientationMarkers({
         <div className="orientation-marker-value">{markers[m]}</div>
       </div>
     ));
-  }, [
-    viewportData,
-    imageSliceData,
-    rotation,
-    flipVertical,
-    flipHorizontal,
-    orientationMarkers,
-    element,
-  ]);
+  }, [viewportData, imageSliceData, cameraModifiedTime, orientationMarkers, element, isLight]);
 
   return <div className="ViewportOrientationMarkers select-none">{markers}</div>;
 }
@@ -148,10 +102,8 @@ function ViewportOrientationMarkers({
  *
  * @param {*} rowCosines
  * @param {*} columnCosines
- * @param {*} rotation in degrees
- * @returns
  */
-function _getOrientationMarkers(rowCosines, columnCosines, rotation, flipVertical, flipHorizontal) {
+function _getOrientationMarkers(rowCosines, columnCosines) {
   const rowString = getOrientationStringLPS(rowCosines);
   const columnString = getOrientationStringLPS(columnCosines);
   const oppositeRowString = invertOrientationStringLPS(rowString);
@@ -164,43 +116,6 @@ function _getOrientationMarkers(rowCosines, columnCosines, rotation, flipVertica
     bottom: columnString,
   };
 
-  // If any vertical or horizontal flips are applied, change the orientation strings ahead of
-  // the rotation applications
-  if (flipVertical) {
-    markers.top = invertOrientationStringLPS(markers.top);
-    markers.bottom = invertOrientationStringLPS(markers.bottom);
-  }
-
-  if (flipHorizontal) {
-    markers.left = invertOrientationStringLPS(markers.left);
-    markers.right = invertOrientationStringLPS(markers.right);
-  }
-
-  // Swap the labels accordingly if the viewport has been rotated
-  // This could be done in a more complex way for intermediate rotation values (e.g. 45 degrees)
-  if (rotation === 90 || rotation === -270) {
-    return {
-      top: markers.left,
-      left: invertOrientationStringLPS(markers.top),
-      right: invertOrientationStringLPS(markers.bottom),
-      bottom: markers.right, // left
-    };
-  } else if (rotation === -90 || rotation === 270) {
-    return {
-      top: invertOrientationStringLPS(markers.left),
-      left: markers.top,
-      bottom: markers.left,
-      right: markers.bottom,
-    };
-  } else if (rotation === 180 || rotation === -180) {
-    return {
-      top: invertOrientationStringLPS(markers.top),
-      left: invertOrientationStringLPS(markers.left),
-      bottom: invertOrientationStringLPS(markers.bottom),
-      right: invertOrientationStringLPS(markers.right),
-    };
-  }
-
   return markers;
 }
 

extensions/cornerstone/src/Viewport/Overlays/ViewportSliceProgressScrollbar/ViewportSliceProgressScrollbar.tsx

@@ -0,0 +1,200 @@
+import React, { useMemo } from 'react';
+import PropTypes from 'prop-types';
+import { VolumeViewport3D, utilities as csUtils } from '@cornerstonejs/core';
+import {
+  SmartScrollbar,
+  SmartScrollbarTrack,
+  SmartScrollbarFill,
+  SmartScrollbarIndicator,
+  SmartScrollbarEndpoints,
+} from '@ohif/ui-next';
+import { getViewportImageIds } from './helpers';
+import {
+  useLoadedSliceBytes,
+  useProgressScrollbarMode,
+  useViewedSliceBytes,
+  useViewportSliceSync,
+} from './hooks';
+import { ViewportSliceProgressScrollbarProps } from './types';
+
+function ViewportSliceProgressScrollbar({
+  viewportData,
+  viewportId,
+  element,
+  imageSliceData,
+  setImageSliceData,
+  servicesManager,
+}: ViewportSliceProgressScrollbarProps) {
+  const { cineService, cornerstoneViewportService, customizationService, viewedDataService } =
+    servicesManager.services;
+
+  const showLoadedEndpoints =
+    customizationService.getCustomization('viewportScrollbar.showLoadedEndpoints') !== false;
+  const showLoadedFill =
+    customizationService.getCustomization('viewportScrollbar.showLoadedFill') !== false;
+  const showViewedFill =
+    customizationService.getCustomization('viewportScrollbar.showViewedFill') !== false;
+  const showLoadingPattern =
+    customizationService.getCustomization('viewportScrollbar.showLoadingPattern') !== false;
+  const viewedDwellMsRaw = customizationService.getCustomization('viewportScrollbar.viewedDwellMs');
+  const loadedBatchIntervalMsRaw = customizationService.getCustomization(
+    'viewportScrollbar.loadedBatchIntervalMs'
+  );
+  const viewedDwellMs =
+    typeof viewedDwellMsRaw === 'number' && viewedDwellMsRaw >= 0 ? viewedDwellMsRaw : 0;
+  const loadedBatchIntervalMs =
+    typeof loadedBatchIntervalMsRaw === 'number' && loadedBatchIntervalMsRaw >= 0
+      ? loadedBatchIntervalMsRaw
+      : 200;
+
+  const { numberOfSlices, imageIndex } = imageSliceData;
+
+  const imageIds = useMemo(() => getViewportImageIds(viewportData), [viewportData]);
+  const imageIdToIndex = useMemo(() => {
+    const map = new Map<string, number>();
+    for (let i = 0; i < imageIds.length; i++) {
+      const imageId = imageIds[i];
+      if (imageId) {
+        map.set(imageId, i);
+      }
+    }
+    return map;
+  }, [imageIds]);
+
+  const isFullMode = useProgressScrollbarMode({
+    viewportData,
+    viewportId,
+    element,
+    cornerstoneViewportService,
+  });
+
+  useViewportSliceSync({
+    viewportData,
+    viewportId,
+    element,
+    cornerstoneViewportService,
+    setImageSliceData,
+  });
+
+  const {
+    bytes: loadedBytes,
+    version: loadedVersion,
+    isFull: isFullyLoaded,
+  } = useLoadedSliceBytes({
+    isFullMode,
+    numberOfSlices,
+    viewportData,
+    imageIds,
+    imageIdToIndex,
+    loadedBatchIntervalMs,
+  });
+
+  const { bytes: viewedBytes, version: viewedVersion } = useViewedSliceBytes({
+    isFullMode,
+    numberOfSlices,
+    imageIndex,
+    imageIds,
+    imageIdToIndex,
+    viewedDwellMs,
+    viewedDataService,
+  });
+
+  const onScrollbarValueChange = targetImageIndex => {
+    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+
+    if (!viewport || viewport instanceof VolumeViewport3D) {
+      return;
+    }
+
+    const { isCineEnabled } = cineService.getState();
+
+    if (isCineEnabled) {
+      cineService.stopClip(element, { viewportId });
+      cineService.setCine({ id: viewportId, frameRate: undefined, isPlaying: false });
+    }
+
+    csUtils.jumpToSlice(viewport.element, {
+      imageIndex: targetImageIndex,
+      debounceLoading: true,
+    });
+  };
+
+  const isLoading = isFullMode && showLoadingPattern ? !isFullyLoaded : false;
+
+  if (!numberOfSlices || numberOfSlices <= 1) {
+    return null;
+  }
+
+  return (
+    <div
+      style={{
+        position: 'absolute',
+        right: 0,
+        top: 0,
+        height: '100%',
+        padding: '8px 5px',
+        zIndex: 10,
+      }}
+    >
+      <div
+        style={{
+          position: 'relative',
+          height: '100%',
+          width: '11px',
+        }}
+      >
+        <SmartScrollbar
+          className="absolute inset-0"
+          value={imageIndex || 0}
+          total={numberOfSlices}
+          onValueChange={onScrollbarValueChange}
+          isLoading={isLoading}
+          enableKeyboardNavigation={false}
+          aria-label="Image navigation scrollbar"
+          indicator={
+            customizationService.getCustomization('viewportScrollbar.indicator') as
+              | Record<string, unknown>
+              | undefined
+          }
+        >
+          <SmartScrollbarTrack>
+            {isFullMode && showLoadedFill && (
+              <SmartScrollbarFill
+                marked={loadedBytes}
+                version={loadedVersion}
+                className="bg-neutral/25"
+                loadingClassName="bg-neutral/50"
+              />
+            )}
+            {isFullMode && showViewedFill && (
+              <SmartScrollbarFill
+                marked={viewedBytes}
+                version={viewedVersion}
+                className="bg-primary/35"
+                loadingClassName="bg-primary/35"
+              />
+            )}
+          </SmartScrollbarTrack>
+          <SmartScrollbarIndicator />
+          {isFullMode && showLoadedEndpoints && (
+            <SmartScrollbarEndpoints
+              marked={loadedBytes}
+              version={loadedVersion}
+            />
+          )}
+        </SmartScrollbar>
+      </div>
+    </div>
+  );
+}
+
+ViewportSliceProgressScrollbar.propTypes = {
+  viewportData: PropTypes.object,
+  viewportId: PropTypes.string.isRequired,
+  element: PropTypes.instanceOf(Element),
+  imageSliceData: PropTypes.object.isRequired,
+  setImageSliceData: PropTypes.func.isRequired,
+  servicesManager: PropTypes.object.isRequired,
+};
+
+export default ViewportSliceProgressScrollbar;

extensions/cornerstone/src/Viewport/Overlays/ViewportSliceProgressScrollbar/helpers.ts

@@ -0,0 +1,40 @@
+import { Enums, VolumeViewport3D } from '@cornerstonejs/core';
+import { ViewportData } from './types';
+
+export function getImageIndexFromEvent(event): number | undefined {
+  const { imageIndex, newImageIdIndex = imageIndex, imageIdIndex } = event.detail;
+  return newImageIdIndex ?? imageIdIndex;
+}
+
+export function getViewportImageIds(viewportData: ViewportData): string[] {
+  if (!viewportData?.data?.length) {
+    return [];
+  }
+
+  const firstData = viewportData.data[0];
+  const volumeImageIds = (firstData as any).volume?.imageIds as string[] | undefined;
+  const datumImageIds = (firstData as any).imageIds as string[] | undefined;
+
+  return volumeImageIds || datumImageIds || [];
+}
+
+export function isProgressFullMode(viewportData: ViewportData, viewport): boolean {
+  if (!viewportData || !viewport || viewport instanceof VolumeViewport3D) {
+    return false;
+  }
+
+  if (viewportData.viewportType === Enums.ViewportType.STACK) {
+    return true;
+  }
+
+  if (viewportData.viewportType === Enums.ViewportType.ORTHOGRAPHIC) {
+    return !!viewport.isInAcquisitionPlane?.();
+  }
+
+  return false;
+}
+
+export function getImageIdFromCacheEvent(event): string | undefined {
+  const detail = event?.detail;
+  return detail?.imageId || detail?.image?.imageId || detail?.cachedImage?.imageId;
+}

extensions/cornerstone/src/Viewport/Overlays/ViewportSliceProgressScrollbar/hooks.ts

@@ -0,0 +1,353 @@
+import { useEffect, useRef, useState } from 'react';
+import {
+  cache as cornerstoneCache,
+  Enums,
+  eventTarget,
+  utilities,
+  VolumeViewport3D,
+} from '@cornerstonejs/core';
+import { useByteArray } from '@ohif/ui-next';
+import { getImageIdFromCacheEvent, getImageIndexFromEvent, isProgressFullMode } from './helpers';
+import { ImageSliceData, ViewportData } from './types';
+
+export function useProgressScrollbarMode({
+  viewportData,
+  viewportId,
+  element,
+  cornerstoneViewportService,
+}: {
+  viewportData: ViewportData;
+  viewportId: string;
+  element: HTMLElement;
+  cornerstoneViewportService: AppTypes.CornerstoneViewportService;
+}) {
+  const [isFullMode, setIsFullMode] = useState(false);
+  const lastViewPlaneNormalRef = useRef<number[] | null>(null);
+
+  /**
+   * Tracks whether this viewport should render full progress UI (stack or acquisition-plane
+   * orthographic volume) versus minimal UI. We compute once on setup and recompute on each
+   * CAMERA_MODIFIED event so stack->MPR transitions and acquisition-plane changes are reflected
+   * immediately.
+   */
+  useEffect(() => {
+    if (!viewportData) {
+      return;
+    }
+
+    const updateMode = () => {
+      const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+      const viewportImageData = viewport?.getImageData?.();
+      const nextViewPlaneNormal = viewport?.getCamera?.()?.viewPlaneNormal as number[] | undefined;
+      // Do not update the lastViewPlaneNormalRef until we have a valid viewportImageData.
+      // Without viewportImageData, the viewport is not fully initialized and the isAcquisitionPlane
+      // check will not be accurate.
+      if (viewportImageData && nextViewPlaneNormal) {
+        lastViewPlaneNormalRef.current = [...nextViewPlaneNormal];
+      }
+      const nextMode = isProgressFullMode(viewportData, viewport);
+      setIsFullMode(prevMode => (prevMode === nextMode ? prevMode : nextMode));
+    };
+
+    updateMode();
+
+    const onCameraModified = () => {
+      const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+      const nextViewPlaneNormal = viewport?.getCamera?.()?.viewPlaneNormal as number[] | undefined;
+      const previousViewPlaneNormal = lastViewPlaneNormalRef.current;
+
+      // Ignore camera updates that keep the same orientation (pan/zoom/scroll).
+      if (nextViewPlaneNormal && previousViewPlaneNormal) {
+        if (utilities.isEqual(nextViewPlaneNormal, previousViewPlaneNormal)) {
+          return;
+        }
+      }
+
+      updateMode();
+    };
+    element.addEventListener(Enums.Events.CAMERA_MODIFIED, onCameraModified);
+
+    return () => {
+      element.removeEventListener(Enums.Events.CAMERA_MODIFIED, onCameraModified);
+    };
+  }, [viewportData, viewportId, cornerstoneViewportService, element]);
+
+  return isFullMode;
+}
+
+export function useViewportSliceSync({
+  viewportData,
+  viewportId,
+  element,
+  cornerstoneViewportService,
+  setImageSliceData,
+}: {
+  viewportData: ViewportData;
+  viewportId: string;
+  element: HTMLElement;
+  cornerstoneViewportService: AppTypes.CornerstoneViewportService;
+  setImageSliceData: (data: ImageSliceData) => void;
+}) {
+  /**
+   * Keeps shared slice state in sync: first initialize from the live viewport snapshot, then
+   * subscribe to navigation/render events for incremental updates while users scroll.
+   */
+  useEffect(() => {
+    if (!viewportData) {
+      return;
+    }
+
+    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+    if (viewport && !(viewport instanceof VolumeViewport3D)) {
+      try {
+        const currentImageIndex = viewport.getCurrentImageIdIndex();
+        const currentNumberOfSlices = viewport.getNumberOfSlices();
+
+        setImageSliceData({
+          imageIndex: currentImageIndex,
+          numberOfSlices: currentNumberOfSlices,
+        });
+      } catch (error) {
+        console.warn(error);
+      }
+    }
+
+    const { viewportType } = viewportData;
+    const eventId =
+      (viewportType === Enums.ViewportType.STACK && Enums.Events.STACK_NEW_IMAGE) ||
+      (viewportType === Enums.ViewportType.ORTHOGRAPHIC && Enums.Events.VOLUME_NEW_IMAGE) ||
+      Enums.Events.IMAGE_RENDERED;
+
+    const updateIndex = event => {
+      const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
+      if (!viewport || viewport instanceof VolumeViewport3D) {
+        return;
+      }
+
+      const nextImageIndex = getImageIndexFromEvent(event);
+      if (nextImageIndex == null) {
+        return;
+      }
+      const nextNumberOfSlices = viewport.getNumberOfSlices();
+
+      setImageSliceData({
+        imageIndex: nextImageIndex,
+        numberOfSlices: nextNumberOfSlices,
+      });
+    };
+
+    element.addEventListener(eventId, updateIndex);
+
+    return () => {
+      element.removeEventListener(eventId, updateIndex);
+    };
+  }, [viewportData, element, viewportId, cornerstoneViewportService, setImageSliceData]);
+}
+
+export function useLoadedSliceBytes({
+  isFullMode,
+  numberOfSlices,
+  viewportData,
+  imageIds,
+  imageIdToIndex,
+  loadedBatchIntervalMs,
+}: {
+  isFullMode: boolean;
+  numberOfSlices: number;
+  viewportData: ViewportData;
+  imageIds: string[];
+  imageIdToIndex: Map<string, number>;
+  loadedBatchIntervalMs: number;
+}) {
+  const loadedState = useByteArray(numberOfSlices || 0, loadedBatchIntervalMs);
+  const {
+    resetWith: resetLoaded,
+    setByte: setLoadedByte,
+    clearByte: clearLoadedByte,
+  } = loadedState;
+
+  /**
+   * Keeps the loaded byte array in sync with Cornerstone cache: seed from cache whenever stack /
+   * mode / slice count changes, then subscribe so cache add/remove updates stay incremental.
+   * Seeding runs immediately before registering listeners in the same effect.
+   */
+  useEffect(() => {
+    if (isFullMode && numberOfSlices) {
+      resetLoaded(bytes => {
+        for (let i = 0; i < bytes.length; i++) {
+          const imageId = imageIds[i];
+          if (imageId && cornerstoneCache.isLoaded(imageId)) {
+            bytes[i] = 1;
+          }
+        }
+      });
+    }
+
+    if (!isFullMode || !viewportData) {
+      return;
+    }
+
+    const markLoaded = event => {
+      const imageId = getImageIdFromCacheEvent(event);
+      if (!imageId) {
+        return;
+      }
+      const index = imageIdToIndex.get(imageId);
+      if (index !== undefined) {
+        setLoadedByte(index);
+      }
+    };
+
+    const markRemoved = event => {
+      const imageId = getImageIdFromCacheEvent(event);
+      if (!imageId) {
+        return;
+      }
+      const index = imageIdToIndex.get(imageId);
+      if (index !== undefined) {
+        clearLoadedByte(index);
+      }
+    };
+
+    eventTarget.addEventListener(Enums.Events.IMAGE_CACHE_IMAGE_ADDED, markLoaded);
+    eventTarget.addEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, markRemoved);
+
+    return () => {
+      eventTarget.removeEventListener(Enums.Events.IMAGE_CACHE_IMAGE_ADDED, markLoaded);
+      eventTarget.removeEventListener(Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, markRemoved);
+    };
+  }, [
+    imageIds,
+    isFullMode,
+    numberOfSlices,
+    viewportData,
+    imageIdToIndex,
+    resetLoaded,
+    setLoadedByte,
+    clearLoadedByte,
+  ]);
+
+  return loadedState;
+}
+
+export function useViewedSliceBytes({
+  isFullMode,
+  numberOfSlices,
+  imageIndex,
+  imageIds,
+  imageIdToIndex,
+  viewedDwellMs,
+  viewedDataService,
+}: {
+  isFullMode: boolean;
+  numberOfSlices: number;
+  imageIndex: number;
+  imageIds: string[];
+  imageIdToIndex: Map<string, number>;
+  viewedDwellMs: number;
+  viewedDataService: AppTypes.ViewedDataService;
+}) {
+  const viewedState = useByteArray(numberOfSlices || 0);
+  const { resetWith: resetViewed, setByte: setViewedByte } = viewedState;
+
+  /**
+   * Keeps the viewed byte array in sync with the global viewed-data store: seed from the store
+   * whenever stack / mode / slice count changes, then subscribe so `markDataViewed` updates stay
+   * incremental. Seeding runs immediately before registering the listener in the same effect.
+   */
+  useEffect(() => {
+    if (isFullMode && numberOfSlices) {
+      resetViewed(bytes => {
+        for (let i = 0; i < bytes.length; i++) {
+          const imageId = imageIds[i];
+          if (imageId && viewedDataService?.isDataViewed(imageId)) {
+            bytes[i] = 1;
+          }
+        }
+      });
+    }
+
+    if (!viewedDataService) {
+      return;
+    }
+
+    const subscription = viewedDataService.subscribeViewedDataChanges(
+      ({
+        viewedDataId,
+        viewedDataCleared,
+      }: {
+        viewedDataId?: string;
+        viewedDataCleared?: boolean;
+      }) => {
+        if (!isFullMode || !numberOfSlices) {
+          return;
+        }
+
+        if (viewedDataCleared) {
+          resetViewed(bytes => {
+            bytes.fill(0);
+          });
+          return;
+        }
+
+        const index = imageIdToIndex.get(viewedDataId);
+        if (index !== undefined) {
+          setViewedByte(index);
+        }
+      }
+    );
+
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [
+    imageIds,
+    isFullMode,
+    numberOfSlices,
+    imageIdToIndex,
+    resetViewed,
+    setViewedByte,
+    viewedDataService,
+  ]);
+
+  /**
+   * Marks slices as viewed in full mode. With `viewedDwellMs === 0`, marking is immediate on
+   * index change; otherwise a dwell timer is used and cleaned up on subsequent changes/unmount.
+   */
+  useEffect(() => {
+    if (!isFullMode || !numberOfSlices) {
+      return;
+    }
+
+    const markViewed = (targetIndex: number) => {
+      setViewedByte(targetIndex);
+      const imageId = imageIds[targetIndex];
+      if (imageId) {
+        viewedDataService?.markDataViewed(imageId);
+      }
+    };
+
+    if (viewedDwellMs === 0) {
+      markViewed(imageIndex || 0);
+      return;
+    }
+
+    const timerId = window.setTimeout(() => {
+      markViewed(imageIndex || 0);
+    }, viewedDwellMs);
+
+    return () => {
+      window.clearTimeout(timerId);
+    };
+  }, [
+    isFullMode,
+    numberOfSlices,
+    imageIndex,
+    imageIds,
+    setViewedByte,
+    viewedDwellMs,
+    viewedDataService,
+  ]);
+
+  return viewedState;
+}

extensions/cornerstone/src/Viewport/Overlays/ViewportSliceProgressScrollbar/index.ts

@@ -0,0 +1 @@
+export { default } from './ViewportSliceProgressScrollbar';

extensions/cornerstone/src/Viewport/Overlays/ViewportSliceProgressScrollbar/types.ts

@@ -0,0 +1,17 @@
+import { StackViewportData, VolumeViewportData } from '../../../types/CornerstoneCacheService';
+
+export type ViewportData = StackViewportData | VolumeViewportData;
+
+export type ImageSliceData = {
+  imageIndex: number;
+  numberOfSlices: number;
+};
+
+export type ViewportSliceProgressScrollbarProps = {
+  viewportData: ViewportData | null;
+  viewportId: string;
+  element: HTMLElement;
+  imageSliceData: ImageSliceData;
+  setImageSliceData: (data: ImageSliceData) => void;
+  servicesManager: AppTypes.ServicesManager;
+};

extensions/cornerstone/src/Viewport/Overlays/utils.ts

@@ -1,5 +1,7 @@
 import moment from 'moment';
+import i18n from 'i18next';
 import { metaData } from '@cornerstonejs/core';
+import { formatDICOMDate } from '@ohif/ui-next';
 
 /**
  * Checks if value is valid.
@@ -24,17 +26,6 @@ export function formatNumberPrecision(number, precision = 0) {
   }
 }
 
-/**
- * Formats DICOM date.
- *
- * @param {string} date
- * @param {string} strFormat
- * @returns {string} formatted date.
- */
-export function formatDICOMDate(date, strFormat = 'MMM D, YYYY') {
-  return moment(date, 'YYYYMMDD').format(strFormat);
-}
-
 /**
  *    DICOM Time is stored as HHmmss.SSS, where:
  *      HH 24 hour time:
@@ -71,3 +62,5 @@ export function getCompression(imageId) {
 
   return 'Lossless / Uncompressed';
 }
+
+export { formatDICOMDate };

extensions/cornerstone/src/components/AccordionGroup/AccordionGroup.tsx

@@ -55,7 +55,7 @@ const DEFAULT_TYPES = [GroupAccordion, Content, Trigger];
  * measurements panel for a practical, working example.
  */
 export function AccordionGroup(props) {
-  const { grouping, items, children, sourceChildren, type } = props;
+  const { grouping, items, children, sourceChildren } = props;
   const childProps = useSystem();
   let defaultValue = props.defaultValue;
   const groups = grouping.groupingFunction(items, grouping, childProps);
@@ -91,14 +91,14 @@ function DefaultAccordion(props) {
     return null;
   }
 
-  if (Boolean(asChild)) {
+  if (asChild) {
     return React.cloneElement(props.children, props);
   }
 
   return (
     <Accordion
       type={grouping.type || 'multiple'}
-      className="text-white"
+      className="text-foreground"
       defaultValue={defaultValue}
     >
       {[...groups.entries()].map(([key, group]) => {

extensions/cornerstone/src/components/AdvancedRenderingControls/AdvancedRenderingControls.tsx

@@ -0,0 +1,149 @@
+import { useToolbar, useViewportMousePosition } from '@ohif/core/src/hooks';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { useViewportRendering } from '../../hooks';
+import { ButtonLocation } from '@ohif/core/src/services/ToolBarService/ToolbarService';
+import classNames from 'classnames';
+
+const mouseNearControlsRanges = {
+  [ButtonLocation.TopMiddle]: { minX: 0, minY: 0, maxX: 1, maxY: 0.1 },
+  [ButtonLocation.BottomMiddle]: { minX: 0, minY: 0.9, maxX: 1, maxY: 1 },
+  [ButtonLocation.LeftMiddle]: { minX: 0, minY: 0, maxX: 0.1, maxY: 1 },
+  [ButtonLocation.RightMiddle]: { minX: 0.9, minY: 0, maxX: 1, maxY: 1 },
+};
+
+const getFlexDirectionClassName = (location: ButtonLocation) =>
+  location === ButtonLocation.LeftMiddle || location === ButtonLocation.RightMiddle
+    ? 'flex-col'
+    : 'flex-row';
+
+function AdvancedRenderingControls({
+  viewportId,
+  location,
+  buttonSection,
+}: {
+  viewportId: string;
+  location: number;
+  buttonSection: string;
+}) {
+  const {
+    onInteraction,
+    toolbarButtons,
+    isItemOpen,
+    isItemLocked,
+    openItem,
+    closeItem,
+    toggleLock,
+  } = useToolbar({
+    buttonSection,
+  });
+
+  const mousePosition = useViewportMousePosition(viewportId);
+  const [isMouseNearControls, setIsMouseNearControls] = useState(false);
+  const [showAllIcons, setShowAllIcons] = useState(true);
+  const firstMountRef = useRef(true);
+  const { hasColorbar } = useViewportRendering(viewportId);
+  const [isAnItemOpen, setIsAnItemOpen] = useState(false);
+
+  useEffect(() => {
+    if (firstMountRef.current) {
+      firstMountRef.current = false;
+
+      const timer = setTimeout(() => {
+        setShowAllIcons(false);
+      }, 3000);
+
+      return () => clearTimeout(timer);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!showAllIcons && mousePosition.isInViewport) {
+      const mouseHoverLocation = mouseNearControlsRanges[location];
+      if (mousePosition.isWithinNormalizedBox(mouseHoverLocation)) {
+        setIsMouseNearControls(true);
+      } else {
+        setIsMouseNearControls(false);
+      }
+    }
+  }, [location, mousePosition, showAllIcons]);
+
+  const handleOnItemOpen = useCallback(
+    (id, viewportId) => {
+      openItem(id, viewportId);
+      setIsAnItemOpen(true);
+    },
+    [openItem, setIsAnItemOpen]
+  );
+
+  const handleOnItemClose = useCallback(
+    (id, viewportId) => {
+      closeItem(id, viewportId);
+      setIsAnItemOpen(false);
+    },
+    [closeItem, setIsAnItemOpen]
+  );
+
+  if (!toolbarButtons?.length) {
+    return null;
+  }
+
+  if (!hasColorbar) {
+    return null;
+  }
+
+  return (
+    <div className={classNames('flex gap-2', getFlexDirectionClassName(location))}>
+      {toolbarButtons.map(toolDef => {
+        if (!toolDef) {
+          return null;
+        }
+
+        const { id, Component, componentProps } = toolDef;
+
+        // Enhanced props with state and actions - respecting viewport specificity
+        const enhancedProps = {
+          ...componentProps,
+          isOpen: isItemOpen(id, viewportId),
+          isLocked: isItemLocked(id, viewportId),
+          onOpen: () => handleOnItemOpen(id, viewportId),
+          onClose: () => handleOnItemClose(id, viewportId),
+          onToggleLock: () => toggleLock(id, viewportId),
+          viewportId,
+        };
+
+        const tool = (
+          <Component
+            key={id}
+            id={id}
+            location={location}
+            onInteraction={args => {
+              onInteraction({
+                ...args,
+                itemId: id,
+                viewportId,
+              });
+            }}
+            {...enhancedProps}
+          />
+        );
+
+        // Always show all icons on first mount for 3 seconds
+        // After that, always show Colorbar, show others only when mouse is at bottom
+        const shouldBeVisible =
+          isAnItemOpen || showAllIcons || id === 'Colorbar' || isMouseNearControls;
+
+        return (
+          <div
+            key={id}
+            className={shouldBeVisible ? 'opacity-100' : 'pointer-events-none opacity-0'}
+            style={{ transition: 'opacity 0.2s ease-in-out' }}
+          >
+            {tool}
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
+export default AdvancedRenderingControls;