chore(version): Update package versions [skip ci]

.circleci/config.yml

@@ -1,72 +1,52 @@
 version: 2.1
 
-### ABOUT
-#
-# This configuration powers our Circleci.io integration
-#
-# Note:
-# Netlify works independently from this configuration to
-# create pull request previews and to update `https://docs.ohif.org`
-###
-
-## https://github.com/cypress-io/circleci-orb
-##
 orbs:
   codecov: codecov/codecov@1.0.5
   cypress: cypress-io/cypress@3.3.1
 
-executors:
-  cypress-custom:
-    description: |
-      Single Docker container used to run Cypress Tests
-    docker:
-      - image: cimg/node:<< parameters.node-version >>-browsers
-    parameters:
-      node-version:
-        default: '18.16.1'
-        description: |
-          The version of Node to run your tests with.
-        type: string
-
 defaults: &defaults
   docker:
     - image: cimg/node:18.18
       environment:
-        TERM: xterm # Enable colors in term
+        TERM: xterm
         QUICK_BUILD: true
   working_directory: ~/repo
 
+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
+            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:
-  ###
-  # Workflow: PR_CHECKS
-  ###
   UNIT_TESTS:
     <<: *defaults
     resource_class: large
     steps:
-      # Update yarn
-      - run: yarn -v
+      - install_bun
       - run: node --version
-      # Checkout code and ALL Git Tags
       - checkout
-      - restore_cache:
-          name: Restore Yarn and Cypress Package Cache
-          keys:
-            # when lock file changes, use increasingly general patterns to restore cache
-            - yarn-packages-{{ checksum "yarn.lock" }}
-            - yarn-packages-
       - run:
           name: Install Dependencies
-          command: yarn install --frozen-lockfile
-      - save_cache:
-          name: Save Yarn Package Cache
-          paths:
-            - ~/.cache ## Cache yarn and Cypress
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          command: bun install --no-save
       # RUN TESTS
       - run:
           name: 'JavaScript Test Suite'
-          command: yarn run test:unit:ci
+          command: bun run test:unit:ci
       # platform/app
       - run:
           name: 'VIEWER: Combine report output'
@@ -94,36 +74,23 @@ jobs:
           file: '/home/circleci/repo/platform/core/coverage/reports'
           flags: 'core'
 
-  ###
-  # Workflow: DEPLOY
-  ###
   BUILD:
     <<: *defaults
     resource_class: large
     steps:
       # Checkout code and ALL Git Tags
       - checkout
-      - restore_cache:
-          name: Restore Yarn and Cypress Package Cache
-          keys:
-            # when lock file changes, use increasingly general patterns to restore cache
-            - yarn-packages-{{ checksum "yarn.lock" }}
-            - yarn-packages-
+      - install_bun
       - run:
           name: Install Dependencies
-          command: yarn install --frozen-lockfile
-      - save_cache:
-          name: Save Yarn Package Cache
-          paths:
-            - ~/.cache ## Cache yarn and Cypress
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          command: bun install --no-save
       # Build & Test
       - run:
           name: 'Perform the versioning before build'
-          command: node ./version.mjs
+          command: bun ./version.mjs
       - run:
           name: 'Build the OHIF Viewer'
-          command: yarn run build
+          command: bun run build
           no_output_timeout: 45m
       - run:
           name: 'Upload SourceMaps, Send Deploy Notification'
@@ -145,30 +112,18 @@ jobs:
             - commit.txt
             - version.json
 
-  # just to make sure later on we can publish them
   BUILD_PACKAGES_QUICK:
     <<: *defaults
     resource_class: large
     steps:
-      - run: yarn -v
+      - install_bun
       # Checkout code and ALL Git Tags
       - checkout
       - attach_workspace:
           at: ~/repo
-      # Use increasingly general patterns to restore cache
-      - restore_cache:
-          name: Restore Yarn and Cypress Package Cache
-          keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
-            - yarn-packages-
       - run:
           name: Install Dependencies
-          command: yarn install --frozen-lockfile
-      - save_cache:
-          name: Save Yarn Package Cache
-          paths:
-            - ~/.cache/yarn
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          command: bun install --frozen-lockfile
       - run:
           name: Avoid hosts unknown for github
           command: |
@@ -183,38 +138,24 @@ jobs:
       - run:
           name: build half of the packages (to avoid out of memory in circleci)
           command: |
-            yarn run build:package-all
+            bun run build:package-all
       - run:
           name: build the other half of the packages
           command: |
-            yarn run build:package-all-1
+            bun run build:package-all-1
 
-  ###
-  # Workflow: RELEASE
-  ###
   NPM_PUBLISH:
     <<: *defaults
     resource_class: large
     steps:
-      - run: yarn -v
+      - install_bun
       # Checkout code and ALL Git Tags
       - checkout
       - attach_workspace:
           at: ~/repo
-      # Use increasingly general patterns to restore cache
-      - restore_cache:
-          name: Restore Yarn and Cypress Package Cache
-          keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
-            - yarn-packages-
       - run:
           name: Install Dependencies
-          command: yarn install --frozen-lockfile
-      - save_cache:
-          name: Save Yarn Package Cache
-          paths:
-            - ~/.cache/yarn
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          command: bun install --no-save
       - run:
           name: Avoid hosts unknown for github
           command: |
@@ -229,11 +170,11 @@ jobs:
       - run:
           name: build half of the packages (to avoid out of memory in circleci)
           command: |
-            yarn run build:package-all
+            bun run build:package-all
       - run:
           name: build the other half of the packages
           command: |
-            yarn run build:package-all-1
+            bun run build:package-all-1
       - run:
           name: increase min time out
           command: |
@@ -245,14 +186,14 @@ jobs:
       - run:
           name: publish package versions
           command: |
-            node ./publish-version.mjs
+            bun ./publish-version.mjs
       - run:
           name: Again set the NPM registry (was deleted in the version script)
           command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
       - run:
           name: publish package dist
           command: |
-            node ./publish-package.mjs
+            bun ./publish-package.mjs
       - persist_to_workspace:
           root: ~/repo
           paths:
@@ -324,93 +265,31 @@ jobs:
               docker push ohif/app:$IMAGE_VERSION_FULL
             fi
 
-  # This is copied from the Cypress orb since the default for cypress/run is node 16 and
-  # we migrated to 18
-  CYPRESS_CUSTOM_RUN:
-    description: |
-      A single, complete job to run Cypress end-to-end tests in your application.
-    executor: cypress-custom
-    parallelism: << parameters.parallelism >>
-    parameters:
-      cypress-cache-key:
-        default: cypress-cache-{{ arch }}-{{ checksum "package.json" }}
-        description: Cache key used to cache the Cypress binary.
-        type: string
-      cypress-cache-path:
-        default: ~/.cache/Cypress
-        description: |
-          By default, this will cache the '~/.cache/Cypress' directory so that the Cypress binary is cached. You can override this by providing your own cache path.
-        type: string
-      cypress-command:
-        default: npx cypress run
-        description: Command used to run your Cypress tests
-        type: string
-      include-branch-in-node-cache-key:
-        default: false
-        description: |
-          If true, this cache will only apply to runs within the same branch. (Adds -{{ .Branch }}- to the node cache key)
-        type: boolean
-      install-browsers:
-        default: false
-        description: |
-          Cypress runs by default in the Electron browser. Use this flag to install additional browsers to run your tests in.
-          This is only needed if you are passing the `--browser` flag in your `cypress-command`.
-          This parameter leverages the `circleci/browser-tools` orb and includes Chrome and FireFox.
-          If you need additional browser support you can set this to false and use an executor with a docker image
-          that includes the browsers of your choosing. See https://hub.docker.com/r/cypress/browsers/tags
-        type: boolean
-      install-command:
-        default: ''
-        description: Overrides the default NPM command (npm ci)
-        type: string
-      node-cache-version:
-        default: v1
-        description:
-          Change the default node cache version if you need to clear the cache for any reason.
-        type: string
-      package-manager:
-        default: npm
-        description: Select the default node package manager to use. NPM v5+ Required.
-        enum:
-          - npm
-          - yarn
-          - yarn-berry
-        type: enum
-      parallelism:
-        default: 4
-        description: |
-          Number of Circle machines to use for load balancing, min 1
-          (requires `parallel` and `record` flags in your `cypress-command`)
-        type: integer
-      post-install:
-        default: ''
-        description: |
-          Additional commands to run after running install but before verifying Cypress and saving cache.
-        type: string
-      start-command:
-        default: ''
-        description: Command used to start your local dev server for Cypress to tests against
-        type: string
-      working-directory:
-        default: ''
-        description: Directory containing package.json
-        type: string
+  CYPRESS:
+    <<: *defaults
     resource_class: large
+    parallelism: 8
     steps:
+      - install_bun
+      - run:
+          name: Install Xvfb
+          command: sudo apt-get update && sudo apt-get install -y xvfb
+      - run:
+          name: Start Xvfb
+          command: Xvfb :99 -screen 0 1920x1080x24 &
+          background: true
+      - run:
+          name: Export Display Variable
+          command: export DISPLAY=:99
       - cypress/install:
-          cypress-cache-key: << parameters.cypress-cache-key >>
-          cypress-cache-path: << parameters.cypress-cache-path >>
-          include-branch-in-node-cache-key: << parameters.include-branch-in-node-cache-key >>
-          install-browsers: << parameters.install-browsers >>
-          install-command: << parameters.install-command >>
-          node-cache-version: << parameters.node-cache-version >>
-          package-manager: << parameters.package-manager >>
-          post-install: << parameters.post-install >>
-          working-directory: << parameters.working-directory >>
+          install-browsers: true
+          install-command: bun install --no-save
+          package-manager: yarn
       - cypress/run-tests:
-          cypress-command: << parameters.cypress-command >>
-          start-command: << parameters.start-command >>
-          working-directory: << parameters.working-directory >>
+          cypress-command:
+            npx wait-on@latest http://localhost:3000 && cd platform/app &&  npx cypress run --record
+            --browser chrome --parallel
+          start-command: bun run test:data && bun run test:e2e:serve
 
 workflows:
   PR_CHECKS:
@@ -419,61 +298,12 @@ workflows:
           filters:
             branches:
               ignore: master
-      - UNIT_TESTS:
-          requires:
-            - BUILD_PACKAGES_QUICK
-      - CYPRESS_CUSTOM_RUN:
+      - UNIT_TESTS
+      - CYPRESS:
           name: 'Cypress Tests'
           context: cypress
-          matrix:
-            parameters:
-              start-command:
-                - yarn run test:data && yarn run test:e2e:serve
-              install-browsers:
-                - true
-              cypress-command:
-                - 'npx wait-on@latest http://localhost:3000 && cd platform/app &&  npx cypress run
-                  --record --browser chrome --parallel'
-              package-manager:
-                - 'yarn'
-              cypress-cache-key:
-                - 'yarn-packages-{{ checksum "yarn.lock" }}'
-              cypress-cache-path:
-                - '~/.cache/Cypress'
-          requires:
-            - BUILD_PACKAGES_QUICK
 
-  # PR_OPTIONAL_VISUAL_TESTS:
-  #   jobs:
-  #     - AWAIT_APPROVAL:
-  #         type: approval
-  #     # Update hub.docker.org
-  #     - cypress/run:
-  #         name: 'Generate Percy Snapshots'
-  #         executor: cypress/browsers-chrome76
-  #         browser: chrome
-  #         pre-steps:
-  #           - run: 'rm -rf ~/.yarn && yarn -v && yarn global add wait-on'
-  #         yarn: true
-  #         store_artifacts: false
-  #         working_directory: platform/app
-  #         build:
-  #           yarn test:data && npx cross-env QUICK_BUILD=true APP_CONFIG=config/dicomweb-server.js
-  #           yarn run build
-  #         # start server --> verify running --> percy + chrome + cypress
-  #         command: yarn run test:e2e:dist
-  #         cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
-  #         no-workspace: true # Don't persist workspace
-  #         post-steps:
-  #           - store_artifacts:
-  #               path: platform/app/cypress/screenshots
-  #           - store_artifacts:
-  #               path: platform/app/cypress/videos
-  #         requires:
-  #           - AWAIT_APPROVAL
-
-  # Our master branch deploys to viewer-dev.ohif.org, the viewer.ohif.org is
-  # deployed from the release branch which is more stable and less frequently updated.
+  # viewer-dev.ohif.org
   DEPLOY_MASTER:
     jobs:
       - BUILD:
@@ -487,8 +317,7 @@ workflows:
           requires:
             - NPM_PUBLISH
 
-  # Our release branch deploys to viewer.ohif.org and is more stable and less
-  # frequently updated after being tested in the staging environment.
+  # viewer.ohif.org
   DEPLOY_RELEASE:
     jobs:
       - BUILD:
@@ -505,50 +334,3 @@ workflows:
       - DOCKER_RELEASE_PUBLISH:
           requires:
             - NPM_PUBLISH
-
-  ###
-  # Unit and E2E tests have already run for PR_CHECKS
-  # Re-running should not gain us any confidence here
-  ###
-  # RELEASE:
-  #   jobs:
-  #     - NPM_PUBLISH:
-  #         filters:
-  #           branches:
-  #             only: master
-  #     - DOCS_PUBLISH:
-  #         filters:
-  #           branches:
-  #             only: master
-  #     # Update base branch snapshots
-  #     # and record a Cypress dashboard test run
-  #     - cypress/run:
-  #         name: 'Generate Percy Snapshots'
-  #         executor: cypress/browsers-chrome76
-  #         browser: chrome
-  #         pre-steps:
-  #           - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
-  #               add wait-on' # Use yarn latest
-  #         yarn: true
-  #         store_artifacts: false
-  #         working_directory: platform/app
-  #         build:
-  #           npx cross-env QUICK_BUILD=true APP_CONFIG=config/e2e.js yarn run
-  #           build
-  #         # start server --> verify running --> percy + chrome + cypress
-  #         command: yarn run test:e2e:dist
-  #         cache-key: 'yarn-packages-{{ checksum "yarn.lock" }}'
-  #         no-workspace: true # Don't persist workspace
-  #         post-steps:
-  #           - store_artifacts:
-  #               path: platform/app/cypress/screenshots
-  #           - store_artifacts:
-  #               path: platform/app/cypress/videos
-  #           - store_test_results:
-  #               path: platform/app/cypress/results
-  #         filters:
-  #           branches:
-  #             only: master
-  #     - DOCKER_MASTER_PUBLISH:
-  #         requires:
-  #           - NPM_PUBLISH

.github/workflows/playwright.yml

@@ -8,23 +8,28 @@ jobs:
   playwright-tests:
     timeout-minutes: 60
     runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/playwright:v1.48.1-focal
     strategy:
       fail-fast: false
       matrix:
-        shardIndex: [1, 2, 3, 4, 5]
-        shardTotal: [5]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        shardTotal: [10]
     steps:
       - uses: actions/checkout@v4
+      - name: Install unzip
+        run: apt-get update && apt-get install -y unzip
+      - uses: oven-sh/setup-bun@v2
       - uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
-      - name: Install Playwright Browsers
-        run: npx playwright install --with-deps
+        run: bun install --frozen-lockfile
+      - name: Set up Git safe directory
+        run: git config --global --add safe.directory /__w/Viewers/Viewers
       - name: Run Playwright tests
         run:
-          export NODE_OPTIONS="--max_old_space_size=8192" && npx playwright test --shard=${{
+          export NODE_OPTIONS="--max_old_space_size=8192" && bun x playwright test --shard=${{
           matrix.shardIndex }}/${{ matrix.shardTotal }}
 
       - name: Upload blob report to GitHub Actions Artifacts
@@ -40,12 +45,15 @@ jobs:
     needs: [playwright-tests]
     runs-on: ubuntu-latest
     steps:
+      - name: Install unzip
+        run: apt-get update && apt-get install -y unzip
+      - uses: oven-sh/setup-bun@v2
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: bun install --frozen-lockfile
 
       - name: Download blob reports from GitHub Actions Artifacts
         uses: actions/download-artifact@v4
@@ -55,7 +63,7 @@ jobs:
           merge-multiple: true
 
       - name: Merge into HTML Report
-        run: npx playwright merge-reports --reporter html ./all-blob-reports
+        run: bun x playwright merge-reports --reporter html ./all-blob-reports
 
       - name: Upload HTML report
         uses: actions/upload-artifact@v4

CHANGELOG.md

@@ -3,6 +3,65 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+
+### Bug Fixes
+
+* avoid black images after hiding the viewports ([#4502](https://github.com/OHIF/Viewers/issues/4502)) ([ad8f205](https://github.com/OHIF/Viewers/commit/ad8f205e419d439bd8e51eff1101b2ef4c314214))
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package ohif-monorepo-root
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package ohif-monorepo-root
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package ohif-monorepo-root
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Have an addIcon that adds to both ui and ui-next ([#4490](https://github.com/OHIF/Viewers/issues/4490)) ([4a12523](https://github.com/OHIF/Viewers/commit/4a125236ddbf8a4a95fb9c5820f511d0224e663f))
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+* **styles:** several fixes for different styles ([#4483](https://github.com/OHIF/Viewers/issues/4483)) ([a5f0376](https://github.com/OHIF/Viewers/commit/a5f03764d1fe07b55635c52c5dac38ab5e694ba1))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 

README.md

@@ -176,7 +176,7 @@ also supports a number of commands that can be found in their respective
 | **Deploy**                   |                                                               |
 | `build`\*                    | Builds production output for our PWA Viewer                   |  |
 
-\* - For more information on our different builds, check out our [Deploy
+\* - For more information on different builds, check out our [Deploy
 Docs][deployment-docs]
 
 ## Project

addOns/externals/devDependencies/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @externals/devDependencies
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @externals/devDependencies
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @externals/devDependencies
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @externals/devDependencies
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @externals/devDependencies
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @externals/devDependencies
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @externals/devDependencies

addOns/externals/devDependencies/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@externals/devDependencies",
   "description": "External dev dependencies - put dev build dependencies here",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "license": "MIT",
   "private": true,
   "engines": {

addOns/externals/dicom-microscopy-viewer/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @externals/dicom-microscopy-viewer
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @externals/dicom-microscopy-viewer
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @externals/dicom-microscopy-viewer
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @externals/dicom-microscopy-viewer
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @externals/dicom-microscopy-viewer
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @externals/dicom-microscopy-viewer
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @externals/dicom-microscopy-viewer

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

@@ -1,7 +1,7 @@
 {
   "name": "@externals/dicom-microscopy-viewer",
   "description": "External reference to dicom-microscopy-viewer",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "license": "MIT",
   "dependencies": {
     "dicom-microscopy-viewer": "^0.46.1"

commit.txt

@@ -1 +1 @@
-8fb8b3bfd1c887cd67fc058629d7aba598c76f9e
+5aeed931c26041e56085862c97cb2f72433d286a

extensions/cornerstone-dicom-pmap/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap

extensions/cornerstone-dicom-pmap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-pmap",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "DICOM Parametric Map read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/i18n": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/i18n": "3.10.0-beta.3",
     "prop-types": "^15.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^2.1.17",
-    "@cornerstonejs/core": "^2.1.17",
+    "@cornerstonejs/adapters": "^2.2.3",
+    "@cornerstonejs/core": "^2.2.3",
     "@kitware/vtk.js": "32.1.0",
     "react-color": "^2.19.3"
   }

extensions/cornerstone-dicom-rt/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt

extensions/cornerstone-dicom-rt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-rt",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/i18n": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/i18n": "3.10.0-beta.3",
     "prop-types": "^15.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

extensions/cornerstone-dicom-seg/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg

extensions/cornerstone-dicom-seg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-seg",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/i18n": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/i18n": "3.10.0-beta.3",
     "prop-types": "^15.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^2.1.17",
-    "@cornerstonejs/core": "^2.1.17",
+    "@cornerstonejs/adapters": "^2.2.3",
+    "@cornerstonejs/core": "^2.2.3",
     "@kitware/vtk.js": "32.1.0",
     "react-color": "^2.19.3"
   }

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

@@ -4,7 +4,6 @@ import { LoadingIndicatorTotalPercent, useViewportGrid, ViewportActionArrows } f
 import createSEGToolGroupAndAddTools from '../utils/initSEGToolGroup';
 import promptHydrateSEG from '../utils/promptHydrateSEG';
 import _getStatusComponent from './_getStatusComponent';
-import { useSegmentationPresentationStore } from '@ohif/extension-cornerstone';
 import { SegmentationRepresentations } from '@cornerstonejs/tools/enums';
 
 const SEG_TOOLGROUP_BASE_NAME = 'SEGToolGroup';
@@ -251,6 +250,14 @@ function OHIFCornerstoneSEGViewport(props: withAppTypes) {
     if (toolGroup) {
       return;
     }
+
+    // keep the already stored segmentationPresentation for this viewport in memory
+    // so that we can restore it after hydrating the SEG
+    commandsManager.runCommand('updateStoredSegmentationPresentation', {
+      displaySet: segDisplaySet,
+      type: SegmentationRepresentations.Labelmap,
+    });
+
     // always start fresh for this viewport since it is special type of viewport
     // that should only show one segmentation at a time.
     segmentationService.clearSegmentationRepresentations(viewportId);

extensions/cornerstone-dicom-sr/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr

extensions/cornerstone-dicom-sr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-sr",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension for an SR Cornerstone Viewport",
   "author": "OHIF",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-measurement-tracking": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-measurement-tracking": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "dcmjs": "*",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
@@ -46,9 +46,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^2.1.17",
-    "@cornerstonejs/core": "^2.1.17",
-    "@cornerstonejs/tools": "^2.1.17",
+    "@cornerstonejs/adapters": "^2.2.3",
+    "@cornerstonejs/core": "^2.2.3",
+    "@cornerstonejs/tools": "^2.2.3",
     "classnames": "^2.3.2"
   }
 }

extensions/cornerstone-dynamic-volume/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume

extensions/cornerstone-dynamic-volume/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dynamic-volume",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension for 4D volumes data",
   "author": "OHIF",
   "license": "MIT",
@@ -29,11 +29,11 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/i18n": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/i18n": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "dcmjs": "*",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",
@@ -42,8 +42,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/core": "^2.1.17",
-    "@cornerstonejs/tools": "^2.1.17",
+    "@cornerstonejs/core": "^2.2.3",
+    "@cornerstonejs/tools": "^2.2.3",
     "classnames": "^2.3.2"
   }
 }

extensions/cornerstone/CHANGELOG.md

@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+
+### Bug Fixes
+
+* avoid black images after hiding the viewports ([#4502](https://github.com/OHIF/Viewers/issues/4502)) ([ad8f205](https://github.com/OHIF/Viewers/commit/ad8f205e419d439bd8e51eff1101b2ef4c314214))
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone

extensions/cornerstone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -38,10 +38,10 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.4",
     "@cornerstonejs/codec-openjph": "^2.4.5",
-    "@cornerstonejs/dicom-image-loader": "^2.1.17",
+    "@cornerstonejs/dicom-image-loader": "^2.2.3",
     "@icr/polyseg-wasm": "^0.4.0",
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "dcmjs": "*",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",
@@ -55,9 +55,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^2.1.17",
-    "@cornerstonejs/core": "^2.1.17",
-    "@cornerstonejs/tools": "^2.1.17",
+    "@cornerstonejs/adapters": "^2.2.3",
+    "@cornerstonejs/core": "^2.2.3",
+    "@cornerstonejs/tools": "^2.2.3",
     "@icr/polyseg-wasm": "^0.4.0",
     "@kitware/vtk.js": "32.1.0",
     "html2canvas": "^1.4.1",

extensions/cornerstone/src/commandsModule.ts

@@ -111,16 +111,14 @@ function commandsModule({
       commandsManager.run(options, optionsToUse);
     },
     updateStoredSegmentationPresentation: ({ displaySet, type }) => {
-      const { setSegmentationPresentation } = useSegmentationPresentationStore.getState();
+      const { addSegmentationPresentationItem } = useSegmentationPresentationStore.getState();
 
       const referencedDisplaySetInstanceUID = displaySet.referencedDisplaySetInstanceUID;
-      setSegmentationPresentation(referencedDisplaySetInstanceUID, [
-        {
-          segmentationId: displaySet.displaySetInstanceUID,
-          hydrated: true,
-          type,
-        },
-      ]);
+      addSegmentationPresentationItem(referencedDisplaySetInstanceUID, {
+        segmentationId: displaySet.displaySetInstanceUID,
+        hydrated: true,
+        type,
+      });
     },
     updateStoredPositionPresentation: ({ viewportId, displaySetInstanceUID }) => {
       const presentations = cornerstoneViewportService.getPresentations(viewportId);
@@ -1043,7 +1041,7 @@ function commandsModule({
      * @param props.key - The style key to set
      * @param props.value - The style value
      */
-    setSegmentationStyleCommand: ({ segmentationId, type, key, value }) => {
+    setSegmentationStyleCommand: ({ type, key, value }) => {
       const { segmentationService } = servicesManager.services;
       segmentationService.setStyle({ type }, { [key]: value });
     },
@@ -1150,12 +1148,17 @@ function commandsModule({
       const segment = segmentation.segments[segmentIndex];
       const { label } = segment;
 
-      callInputDialog(uiDialogService, label, (label, actionId) => {
+      const callback = (label, actionId) => {
         if (label === '') {
           return;
         }
 
         segmentationService.setSegmentLabel(segmentationId, segmentIndex, label);
+      };
+
+      callInputDialog(uiDialogService, label, callback, false, {
+        dialogTitle: 'Edit Segment Label',
+        inputLabel: 'Enter new label',
       });
     },
 
@@ -1169,12 +1172,17 @@ function commandsModule({
 
       const { label } = segmentation;
 
-      callInputDialog(uiDialogService, label, (label, actionId) => {
+      const callback = (label, actionId) => {
         if (label === '') {
           return;
         }
 
         segmentationService.addOrUpdateSegmentation({ segmentationId, label });
+      };
+
+      callInputDialog(uiDialogService, label, callback, false, {
+        dialogTitle: 'Edit Segmentation Label',
+        inputLabel: 'Enter new label',
       });
     },
 

extensions/cornerstone/src/getPanelModule.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 import { Toolbox } from '@ohif/ui-next';
 import PanelSegmentation from './panels/PanelSegmentation';
 import ActiveViewportWindowLevel from './components/ActiveViewportWindowLevel';
+import PanelMeasurementTable from './panels/PanelMeasurement';
 
 const getPanelModule = ({ commandsManager, servicesManager, extensionManager }: withAppTypes) => {
   const wrappedPanelSegmentation = ({ configuration }) => {
@@ -56,6 +57,19 @@ const getPanelModule = ({ commandsManager, servicesManager, extensionManager }:
     );
   };
 
+  const wrappedPanelMeasurement = ({ configuration }) => {
+    return (
+      <PanelMeasurementTable
+        commandsManager={commandsManager}
+        servicesManager={servicesManager}
+        extensionManager={extensionManager}
+        configuration={{
+          ...configuration,
+        }}
+      />
+    );
+  };
+
   return [
     {
       name: 'activeViewportWindowLevel',
@@ -63,6 +77,13 @@ const getPanelModule = ({ commandsManager, servicesManager, extensionManager }:
         return <ActiveViewportWindowLevel servicesManager={servicesManager} />;
       },
     },
+    {
+      name: 'panelMeasurement',
+      iconName: 'tab-linear',
+      iconLabel: 'Measure',
+      label: 'Measurement',
+      component: wrappedPanelMeasurement,
+    },
     {
       name: 'panelSegmentation',
       iconName: 'tab-segmentation',

extensions/cornerstone/src/initMeasurementService.ts

@@ -330,6 +330,9 @@ const connectMeasurementServiceToTools = (measurementService, cornerstoneViewpor
       }
       removeAnnotation(uid);
     }
+
+    // trigger a render
+    cornerstoneViewportService.getRenderingEngine().render();
   });
 
   measurementService.subscribe(

extensions/cornerstone/src/panels/PanelSegmentation.tsx

@@ -6,8 +6,6 @@ import { metaData } from '@cornerstonejs/core';
 export default function PanelSegmentation({
   servicesManager,
   commandsManager,
-  extensionManager,
-  configuration,
   children,
 }: withAppTypes) {
   const { customizationService, viewportGridService, displaySetService } = servicesManager.services;
@@ -91,23 +89,23 @@ export default function PanelSegmentation({
       commandsManager.run('deleteSegmentation', { segmentationId });
     },
 
-    setFillAlpha: (type, value) => {
+    setFillAlpha: ({ type }, value) => {
       commandsManager.run('setFillAlpha', { type, value });
     },
 
-    setOutlineWidth: (type, value) => {
+    setOutlineWidth: ({ type }, value) => {
       commandsManager.run('setOutlineWidth', { type, value });
     },
 
-    setRenderFill: (type, value) => {
+    setRenderFill: ({ type }, value) => {
       commandsManager.run('setRenderFill', { type, value });
     },
 
-    setRenderOutline: (type, value) => {
+    setRenderOutline: ({ type }, value) => {
       commandsManager.run('setRenderOutline', { type, value });
     },
 
-    setFillAlphaInactive: (type, value) => {
+    setFillAlphaInactive: ({ type }, value) => {
       commandsManager.run('setFillAlphaInactive', { type, value });
     },
 
@@ -152,6 +150,14 @@ export default function PanelSegmentation({
   const exportOptions = segmentationsWithRepresentations.map(({ segmentation }) => {
     const { representationData, segmentationId } = segmentation;
     const { Labelmap } = representationData;
+
+    if (!Labelmap) {
+      return {
+        segmentationId,
+        isExportable: true,
+      };
+    }
+
     const referencedImageIds = Labelmap.referencedImageIds;
     const firstImageId = referencedImageIds[0];
 

extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts

@@ -100,10 +100,16 @@ class SegmentationService extends PubSubService {
     this._segmentationIdToColorLUTIndexMap = new Map();
 
     this.servicesManager = servicesManager;
+  }
 
+  public onModeEnter(): void {
     this._initSegmentationService();
   }
 
+  public onModeExit(): void {
+    this.destroy();
+  }
+
   /**
    * Retrieves a segmentation by its ID.
    *
@@ -1386,7 +1392,11 @@ class SegmentationService extends PubSubService {
     const frameOfReferenceUID = viewport.getFrameOfReferenceUID();
     const segImage = cache.getImage(imageIds[0]);
 
-    if (segImage?.FrameOfReferenceUID === frameOfReferenceUID) {
+    if (
+      segImage?.FrameOfReferenceUID &&
+      frameOfReferenceUID &&
+      segImage.FrameOfReferenceUID === frameOfReferenceUID
+    ) {
       const isConverted = await this.convertStackToVolumeViewport(viewport);
       triggerSegmentationRepresentationModified(
         viewportId,

extensions/cornerstone/src/services/SyncGroupService/SyncGroupService.ts

@@ -148,6 +148,11 @@ export default class SyncGroupService {
       const { type, target = true, source = true, options = {}, id = type } = syncGroupObj;
 
       const synchronizer = this._getOrCreateSynchronizer(type, id, options);
+
+      if (!synchronizer) {
+        return;
+      }
+
       synchronizer.setOptions(viewportId, options);
 
       const viewportInfo = { viewportId, renderingEngineId };

extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts

@@ -130,6 +130,21 @@ class CornerstoneViewportService extends PubSubService implements IViewportServi
    * individual resize observers
    */
   public resize(isGridResize = false) {
+    // https://stackoverflow.com/a/26279685
+    // This resize() call, among other things, rerenders the viewports. But when the entire viewer is
+    // display: none'd, it makes the size of all hidden elements 0, including the viewport canvas and its containers.
+    // Even if the viewer is later displayed again, trying to render when the size is 0 permanently "breaks" the
+    // viewport, making it fully black even after the size is normal again. So just ignore resize events when hidden:
+    const areViewportsHidden = Array.from(this.viewportsById.values()).every(viewportInfo => {
+      const element = viewportInfo.getElement();
+
+      return element.clientWidth === 0 && element.clientHeight === 0;
+    });
+    if (areViewportsHidden) {
+      console.warn('Ignoring resize when viewports have size 0');
+      return;
+    }
+
     // if there is a grid resize happening, it means the viewport grid
     // has been manipulated (e.g., panels closed, added, etc.) and we need
     // to resize all viewports, so we will add a timeout here to make sure
@@ -763,6 +778,12 @@ class CornerstoneViewportService extends PubSubService implements IViewportServi
       });
     }
 
+    // It's crucial not to return here because the volume may be loaded,
+    // but the viewport also needs to set the volume.
+    // if (!volumesNotLoaded.length) {
+    //   return;
+    // }
+
     // This returns the async continuation only
     return this.setVolumesForViewport(viewport, volumeInputArray, presentations);
   }
@@ -1114,8 +1135,8 @@ class CornerstoneViewportService extends PubSubService implements IViewportServi
 
     const { segmentationService } = this.servicesManager.services;
 
-    segmentationPresentation.forEach((presentation: SegmentationPresentationItem) => {
-      const { segmentationId, type, hydrated } = presentation;
+    segmentationPresentation.forEach((presentationItem: SegmentationPresentationItem) => {
+      const { segmentationId, type, hydrated } = presentationItem;
 
       if (hydrated) {
         segmentationService.addSegmentationRepresentation(viewport.id, {

extensions/cornerstone/src/stores/useSegmentationPresentationStore.ts

@@ -1,6 +1,6 @@
 import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
-import { SegmentationPresentation } from '../types/Presentation';
+import { SegmentationPresentation, SegmentationPresentationItem } from '../types/Presentation';
 import { JOIN_STR } from './presentationUtils';
 import { getViewportOrientationFromImageOrientationPatient } from '../utils/getViewportOrientationFromImageOrientationPatient';
 
@@ -62,10 +62,9 @@ type SegmentationPresentationStore = {
    * @param segmentationPresentation - The `SegmentationPresentation` to add.
    * @param servicesManager - The services manager instance.
    */
-  addSegmentationPresentation: (
+  addSegmentationPresentationItem: (
     presentationId: string,
-    segmentationPresentation: SegmentationPresentation,
-    { servicesManager }: { servicesManager: AppTypes.ServicesManager }
+    segmentationPresentationItem: SegmentationPresentationItem
   ) => void;
 
   /**
@@ -183,33 +182,52 @@ const createSegmentationPresentationStore = set => ({
     set({ segmentationPresentationStore: {} }, false, 'clearSegmentationPresentationStore'),
 
   /**
-   * Adds a new segmentation presentation to the store.
+   * Adds a new segmentation presentation item to the store.
+   *
+   * segmentationPresentationItem: {
+   *   segmentationId: string;
+   *   type: SegmentationRepresentations;
+   *   hydrated: boolean | null;
+   *   config?: unknown;
+   * }
    */
-  addSegmentationPresentation: (
+  addSegmentationPresentationItem: (
     presentationId: string,
-    segmentationPresentation: SegmentationPresentation,
-    { servicesManager }: { servicesManager: AppTypes.ServicesManager }
+    segmentationPresentationItem: SegmentationPresentationItem
   ) =>
     set(
       state => ({
         segmentationPresentationStore: {
           ...state.segmentationPresentationStore,
-          [presentationId]: segmentationPresentation,
+          [presentationId]: [
+            ...(state.segmentationPresentationStore[presentationId] || []),
+            segmentationPresentationItem,
+          ],
         },
       }),
       false,
-      'addSegmentationPresentation'
+      'addSegmentationPresentationItem'
     ),
 
   /**
-   * Sets the segmentation presentation for a given presentation ID.
+   * Sets the segmentation presentation for a given presentation ID. A segmentation
+   * presentation is an array of SegmentationPresentationItem.
+   *
+   * segmentationPresentationItem: {
+   *   segmentationId: string;
+   *   type: SegmentationRepresentations;
+   *   hydrated: boolean | null;
+   *   config?: unknown;
+   * }
+   *
+   * segmentationPresentation: SegmentationPresentationItem[]
    */
-  setSegmentationPresentation: (presentationId: string, value: SegmentationPresentation) =>
+  setSegmentationPresentation: (presentationId: string, values: SegmentationPresentation) =>
     set(
       state => ({
         segmentationPresentationStore: {
           ...state.segmentationPresentationStore,
-          [presentationId]: value,
+          [presentationId]: values,
         },
       }),
       false,

extensions/cornerstone/src/utils/measurementServiceMappings/utils/getValueDisplayString.js

@@ -4,9 +4,9 @@ import getDisplayUnit from './getDisplayUnit';
 export const getStatisticDisplayString = (numbers, unit, key) => {
   if (Array.isArray(numbers) && numbers.length > 0) {
     const results = numbers.map(number => utils.roundNumber(number, 2));
-    return `${key.charAt(0).toUpperCase() + key.slice(1)}: ${results.join(', ')} <small>${getDisplayUnit(unit)}</small>`;
+    return `${key.charAt(0).toUpperCase() + key.slice(1)}: ${results.join(', ')} ${getDisplayUnit(unit)}`;
   }
 
   const result = utils.roundNumber(numbers, 2);
-  return `${key.charAt(0).toUpperCase() + key.slice(1)}: ${result} <small>${getDisplayUnit(unit)}</small>`;
+  return `${key.charAt(0).toUpperCase() + key.slice(1)}: ${result} ${getDisplayUnit(unit)}`;
 };

extensions/default/CHANGELOG.md

@@ -3,6 +3,61 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-default
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-default
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-default
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-default
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Have an addIcon that adds to both ui and ui-next ([#4490](https://github.com/OHIF/Viewers/issues/4490)) ([4a12523](https://github.com/OHIF/Viewers/commit/4a125236ddbf8a4a95fb9c5820f511d0224e663f))
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-default

extensions/default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-default",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "Common/default features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -32,8 +32,8 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/i18n": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/i18n": "3.10.0-beta.3",
     "dcmjs": "*",
     "dicomweb-client": "^0.10.4",
     "prop-types": "^15.6.2",

extensions/default/src/Components/SidePanelWithServices.tsx

@@ -23,16 +23,26 @@ const SidePanelWithServices = ({
 
   // Tracks whether this SidePanel has been opened at least once since this SidePanel was inserted into the DOM.
   // Thus going to the Study List page and back to the viewer resets this flag for a SidePanel.
-  const [hasBeenOpened, setHasBeenOpened] = useState(false);
+  const [sidePanelOpen, setSidePanelOpen] = useState(activeTabIndexProp !== null);
   const [activeTabIndex, setActiveTabIndex] = useState(activeTabIndexProp);
   const [tabs, setTabs] = useState(tabsProp ?? panelService.getPanels(side));
 
-  const handleSidePanelOpen = useCallback(() => {
-    setHasBeenOpened(true);
-  }, []);
-
   const handleActiveTabIndexChange = useCallback(({ activeTabIndex }) => {
     setActiveTabIndex(activeTabIndex);
+    setSidePanelOpen(activeTabIndex !== null);
+  }, []);
+
+  const handleOpen = useCallback(() => {
+    setSidePanelOpen(true);
+    // If panel is being opened but no tab is active, set first tab as active
+    if (activeTabIndex === null && tabs.length > 0) {
+      setActiveTabIndex(0);
+    }
+  }, [activeTabIndex, tabs]);
+
+  const handleClose = useCallback(() => {
+    setSidePanelOpen(false);
+    setActiveTabIndex(null);
   }, []);
 
   /** update the active tab index from outside */
@@ -61,7 +71,7 @@ const SidePanelWithServices = ({
     const activatePanelSubscription = panelService.subscribe(
       panelService.EVENTS.ACTIVATE_PANEL,
       (activatePanelEvent: Types.ActivatePanelEvent) => {
-        if (!hasBeenOpened || activatePanelEvent.forceActive) {
+        if (sidePanelOpen || activatePanelEvent.forceActive) {
           const tabIndex = tabs.findIndex(tab => tab.id === activatePanelEvent.panelId);
           if (tabIndex !== -1) {
             setActiveTabIndex(tabIndex);
@@ -73,7 +83,7 @@ const SidePanelWithServices = ({
     return () => {
       activatePanelSubscription.unsubscribe();
     };
-  }, [tabs, hasBeenOpened, panelService]);
+  }, [tabs, sidePanelOpen, panelService]);
 
   return (
     <SidePanel
@@ -81,10 +91,11 @@ const SidePanelWithServices = ({
       side={side}
       tabs={tabs}
       activeTabIndex={activeTabIndex}
-      onOpen={handleSidePanelOpen}
+      onOpen={handleOpen}
+      onClose={handleClose}
       onActiveTabIndexChange={handleActiveTabIndexChange}
       expandedWidth={expandedWidth}
-    ></SidePanel>
+    />
   );
 };
 

extensions/default/src/Panels/StudyBrowser/PanelStudyBrowserHeader.tsx

@@ -19,7 +19,18 @@ function PanelStudyBrowserHeader({
       <div className="bg-muted flex h-[40px] select-none rounded-t p-2">
         <div className={'flex h-[24px] w-full select-none justify-center self-center text-[14px]'}>
           <div className="flex w-full items-center gap-[10px]">
-            <div className="flex h-full items-center justify-center">
+            <div className="flex items-center justify-center">
+              <div className="text-primary-active flex items-center space-x-1">
+                {actionIcons.map((icon: actionIcon, index) =>
+                  React.createElement(Icons[icon.iconName] || Icons.MissingIcon, {
+                    key: index,
+                    onClick: () => updateActionIconValue(icon),
+                    className: `cursor-pointer`,
+                  })
+                )}
+              </div>
+            </div>
+            <div className="ml-auto flex h-full items-center justify-center">
               <ToggleGroup
                 type="single"
                 value={viewPresets.filter(preset => preset.selected)[0].id}
@@ -40,18 +51,6 @@ function PanelStudyBrowserHeader({
                 ))}
               </ToggleGroup>
             </div>
-
-            <div className="flex items-center justify-center">
-              <div className="text-primary-active flex items-center space-x-1">
-                {actionIcons.map((icon: actionIcon, index) =>
-                  React.createElement(Icons[icon.iconName] || Icons.MissingIcon, {
-                    key: index,
-                    onClick: () => updateActionIconValue(icon),
-                    className: `cursor-pointer`,
-                  })
-                )}
-              </div>
-            </div>
           </div>
         </div>
       </div>

extensions/default/src/index.ts

@@ -35,6 +35,8 @@ import colorPickerDialog from './utils/colorPickerDialog';
 import promptSaveReport from './utils/promptSaveReport';
 import promptLabelAnnotation from './utils/promptLabelAnnotation';
 import usePatientInfo from './hooks/usePatientInfo';
+import { PanelStudyBrowserHeader } from './Panels/StudyBrowser/PanelStudyBrowserHeader';
+import * as utils from './utils';
 
 const defaultExtension: Types.Extensions.Extension = {
   /**
@@ -98,4 +100,6 @@ export {
   promptLabelAnnotation,
   colorPickerDialog,
   usePatientInfo,
+  PanelStudyBrowserHeader,
+  utils,
 };

extensions/default/src/utils/addIcon.ts

@@ -0,0 +1,8 @@
+import { addIcon as addIconUI } from '@ohif/ui';
+import { Icons } from '@ohif/ui-next';
+
+/** Adds the icon to both ui and ui-next */
+export function addIcon(name, icon) {
+  addIconUI(name, icon);
+  Icons.addIcon(name, icon);
+}

extensions/default/src/utils/index.ts

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

extensions/dicom-microscopy/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-dicom-microscopy

extensions/dicom-microscopy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-microscopy",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension for DICOM microscopy",
   "author": "Bill Wallace, md-prog",
   "license": "MIT",
@@ -30,10 +30,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/i18n": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/i18n": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "prop-types": "^15.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

extensions/dicom-pdf/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-dicom-pdf

extensions/dicom-pdf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-pdf",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension for PDF display",
   "author": "OHIF",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "dcmjs": "*",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

extensions/dicom-video/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-dicom-video

extensions/dicom-video/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-video",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension for video display",
   "author": "OHIF",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "dcmjs": "*",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

extensions/measurement-tracking/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-measurement-tracking
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-measurement-tracking
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-measurement-tracking
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-measurement-tracking
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-measurement-tracking

extensions/measurement-tracking/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-measurement-tracking",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "Tracking features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -32,12 +32,12 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.1.17",
-    "@cornerstonejs/tools": "^2.1.17",
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@cornerstonejs/core": "^2.2.3",
+    "@cornerstonejs/tools": "^2.2.3",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "classnames": "^2.3.2",
     "dcmjs": "*",
     "lodash.debounce": "^4.0.8",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/ui": "3.10.0-beta.3",
     "@xstate/react": "^3.2.2",
     "xstate": "^4.10.0"
   }

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx

@@ -30,12 +30,7 @@ function TrackedMeasurementsContextProvider(
 
   const [viewportGrid, viewportGridService] = useViewportGrid();
   const { activeViewportId, viewports } = viewportGrid;
-  const {
-    measurementService,
-    displaySetService,
-    customizationService,
-    cornerstoneViewportService,
-  } = servicesManager.services;
+  const { measurementService, displaySetService, customizationService } = servicesManager.services;
 
   const machineOptions = Object.assign({}, defaultOptions);
   machineOptions.actions = Object.assign({}, machineOptions.actions, {

extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx

@@ -118,7 +118,7 @@ function PanelMeasurementTableTracking({
                     downloadCSVReport(trackedMeasurements);
                   }}
                 >
-                  <Icons.Download />
+                  <Icons.Download className="h-5 w-5" />
                   <span className="pl-1">CSV</span>
                 </Button>
                 <Button
@@ -133,7 +133,18 @@ function PanelMeasurementTableTracking({
                   }}
                 >
                   <Icons.Add />
-                  Create DICOM SR
+                  Create SR
+                </Button>
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  className="pl-0.5"
+                  onClick={() => {
+                    measurementService.clearMeasurements();
+                  }}
+                >
+                  <Icons.Delete />
+                  Delete All
                 </Button>
               </div>
             </div>

extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx

@@ -8,7 +8,7 @@ import { StudyBrowser } from '@ohif/ui-next';
 
 import { useTrackedMeasurements } from '../../getContextModule';
 import { Separator } from '@ohif/ui-next';
-import { PanelStudyBrowserTrackingHeader } from './PanelStudyBrowserTrackingHeader';
+import { PanelStudyBrowserHeader } from '@ohif/extension-default';
 import { defaultActionIcons, defaultViewPresets } from './constants';
 
 const { formatDate, createStudyBrowserTabs } = utils;
@@ -482,7 +482,7 @@ function PanelStudyBrowserTracking({
   return (
     <>
       <>
-        <PanelStudyBrowserTrackingHeader
+        <PanelStudyBrowserHeader
           viewPresets={viewPresets}
           updateViewPresetValue={updateViewPresetValue}
           actionIcons={actionIcons}

extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTrackingHeader.tsx

@@ -1,61 +0,0 @@
-import React from 'react';
-import { ToggleGroup, ToggleGroupItem } from '@ohif/ui-next';
-import { Icons } from '@ohif/ui-next';
-import { actionIcon, viewPreset } from './types';
-
-function PanelStudyBrowserTrackingHeader({
-  viewPresets,
-  updateViewPresetValue,
-  actionIcons,
-  updateActionIconValue,
-}: {
-  viewPresets: viewPreset[];
-  updateViewPresetValue: (viewPreset: viewPreset) => void;
-  actionIcons: actionIcon[];
-  updateActionIconValue: (actionIcon: actionIcon) => void;
-}) {
-  return (
-    <>
-      <div className="bg-muted flex h-[40px] select-none rounded-t p-2">
-        <div className={'flex h-[24px] w-full select-none justify-center self-center text-[14px]'}>
-          <div className="flex w-full items-center gap-[10px]">
-            <div className="flex h-full items-center justify-center">
-              <ToggleGroup
-                type="single"
-                value={viewPresets.filter(preset => preset.selected)[0].id}
-                onValueChange={value => {
-                  const selectedViewPreset = viewPresets.find(preset => preset.id === value);
-                  updateViewPresetValue(selectedViewPreset);
-                }}
-              >
-                {viewPresets.map((viewPreset: viewPreset, index) => (
-                  <ToggleGroupItem
-                    key={index}
-                    aria-label={viewPreset.id}
-                    value={viewPreset.id}
-                    className="text-actions-primary"
-                  >
-                    {React.createElement(Icons[viewPreset.iconName] || Icons.MissingIcon)}
-                  </ToggleGroupItem>
-                ))}
-              </ToggleGroup>
-            </div>
-            <div className="flex items-center justify-center">
-              <div className="text-primary-active flex items-center space-x-1">
-                {actionIcons.map((icon: actionIcon, index) =>
-                  React.createElement(Icons[icon.iconName] || Icons.MissingIcon, {
-                    key: index,
-                    onClick: () => updateActionIconValue(icon),
-                    className: `cursor-pointer`,
-                  })
-                )}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </>
-  );
-}
-
-export { PanelStudyBrowserTrackingHeader };

extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.tsx

@@ -98,6 +98,9 @@ function TrackedCornerstoneViewport(
   useEffect(() => {
     if (isTracked) {
       annotation.config.style.setViewportToolStyles(viewportId, {
+        ReferenceLines: {
+          lineDash: '4,4',
+        },
         global: {
           lineDash: '',
         },

extensions/test-extension/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-test
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-test
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-test
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-test
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-test
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @ohif/extension-test
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-test

extensions/test-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-test",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension used inside e2e testing",
   "author": "OHIF",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "dcmjs": "0.29.11",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

extensions/tmtv/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/extension-tmtv
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/extension-tmtv
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-tmtv
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-tmtv
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/extension-tmtv
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @ohif/extension-tmtv
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/extension-tmtv

extensions/tmtv/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-tmtv",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF extension for Total Metabolic Tumor Volume",
   "author": "OHIF",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/ui": "3.9.0-beta.109",
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/ui": "3.10.0-beta.3",
     "dcmjs": "*",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "packages": ["extensions/*", "platform/*", "modes/*", "addOns/externals/*"],
   "npmClient": "yarn"
 }

modes/basic-dev-mode/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/mode-basic-dev-mode
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/mode-basic-dev-mode
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-basic-dev-mode
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-basic-dev-mode
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-basic-dev-mode
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/mode-basic-dev-mode

modes/basic-dev-mode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-basic-dev-mode",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "Basic OHIF Viewer Using Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -31,12 +31,12 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/extension-dicom-pdf": "3.9.0-beta.109",
-    "@ohif/extension-dicom-video": "3.9.0-beta.109"
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/extension-dicom-pdf": "3.10.0-beta.3",
+    "@ohif/extension-dicom-video": "3.10.0-beta.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",

modes/basic-dev-mode/src/toolbarButtons.js

@@ -140,7 +140,13 @@ const toolbarButtons: Button[] = [
           context: 'CORNERSTONE',
         },
       ],
-      evaluate: 'evaluate.action',
+      evaluate: [
+        'evaluate.action',
+        {
+          name: 'evaluate.viewport.supported',
+          unsupportedViewportTypes: ['video', 'wholeSlide'],
+        },
+      ],
     },
   },
    {

modes/basic-test-mode/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/mode-test
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/mode-test
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-test
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-test
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-test
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/mode-test

modes/basic-test-mode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-test",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "Basic mode for testing",
   "author": "OHIF",
   "license": "MIT",
@@ -34,14 +34,14 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/extension-dicom-pdf": "3.9.0-beta.109",
-    "@ohif/extension-dicom-video": "3.9.0-beta.109",
-    "@ohif/extension-measurement-tracking": "3.9.0-beta.109",
-    "@ohif/extension-test": "3.9.0-beta.109"
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/extension-dicom-pdf": "3.10.0-beta.3",
+    "@ohif/extension-dicom-video": "3.10.0-beta.3",
+    "@ohif/extension-measurement-tracking": "3.10.0-beta.3",
+    "@ohif/extension-test": "3.10.0-beta.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",

modes/basic-test-mode/src/toolbarButtons.ts

@@ -213,7 +213,13 @@ const toolbarButtons: Button[] = [
       icon: 'tool-capture',
       label: 'Capture',
       commands: 'showDownloadViewportModal',
-      evaluate: 'evaluate.action',
+      evaluate: [
+        'evaluate.action',
+        {
+          name: 'evaluate.viewport.supported',
+          unsupportedViewportTypes: ['video', 'wholeSlide'],
+        },
+      ],
     },
   },
   {

modes/longitudinal/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/mode-longitudinal
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/mode-longitudinal
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-longitudinal
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-longitudinal
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/mode-longitudinal

modes/longitudinal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-longitudinal",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "Longitudinal Workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -34,15 +34,15 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-rt": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-seg": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/extension-dicom-pdf": "3.9.0-beta.109",
-    "@ohif/extension-dicom-video": "3.9.0-beta.109",
-    "@ohif/extension-measurement-tracking": "3.9.0-beta.109"
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/extension-dicom-pdf": "3.10.0-beta.3",
+    "@ohif/extension-dicom-video": "3.10.0-beta.3",
+    "@ohif/extension-measurement-tracking": "3.10.0-beta.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",

modes/longitudinal/src/index.ts

@@ -19,7 +19,7 @@ const ohif = {
 };
 
 const cornerstone = {
-  measurements: '@ohif/extension-cornerstone.panelModule.measurements',
+  measurements: '@ohif/extension-cornerstone.panelModule.panelMeasurement',
   segmentation: '@ohif/extension-cornerstone.panelModule.panelSegmentation',
 };
 
@@ -85,8 +85,14 @@ function modeFactory({ modeConfiguration }) {
      * Lifecycle hooks
      */
     onModeEnter: function ({ servicesManager, extensionManager, commandsManager }: withAppTypes) {
-      const { measurementService, toolbarService, toolGroupService, customizationService } =
-        servicesManager.services;
+      const {
+        measurementService,
+        toolbarService,
+        toolGroupService,
+        customizationService,
+        panelService,
+        segmentationService,
+      } = servicesManager.services;
 
       measurementService.clearMeasurements();
 
@@ -110,25 +116,23 @@ function modeFactory({ modeConfiguration }) {
 
       // // ActivatePanel event trigger for when a segmentation or measurement is added.
       // // Do not force activation so as to respect the state the user may have left the UI in.
-      // _activatePanelTriggersSubscriptions = [
-      //   ...panelService.addActivatePanelTriggers(dicomSeg.panel, [
-      //     {
-      //       sourcePubSubService: segmentationService,
-      //       sourceEvents: [
-      //         segmentationService.EVENTS.SEGMENTATION_PIXEL_DATA_CREATED,
-      //       ],
-      //     },
-      //   ]),
-      //   ...panelService.addActivatePanelTriggers(tracked.measurements, [
-      //     {
-      //       sourcePubSubService: measurementService,
-      //       sourceEvents: [
-      //         measurementService.EVENTS.MEASUREMENT_ADDED,
-      //         measurementService.EVENTS.RAW_MEASUREMENT_ADDED,
-      //       ],
-      //     },
-      //   ]),
-      // ];
+      _activatePanelTriggersSubscriptions = [
+        ...panelService.addActivatePanelTriggers(cornerstone.segmentation, [
+          {
+            sourcePubSubService: segmentationService,
+            sourceEvents: [segmentationService.EVENTS.SEGMENTATION_ADDED],
+          },
+        ]),
+        ...panelService.addActivatePanelTriggers(tracked.measurements, [
+          {
+            sourcePubSubService: measurementService,
+            sourceEvents: [
+              measurementService.EVENTS.MEASUREMENT_ADDED,
+              measurementService.EVENTS.RAW_MEASUREMENT_ADDED,
+            ],
+          },
+        ]),
+      ];
     },
     onModeExit: ({ servicesManager }: withAppTypes) => {
       const {

modes/longitudinal/src/toolbarButtons.ts

@@ -172,7 +172,7 @@ const toolbarButtons: Button[] = [
         'evaluate.action',
         {
           name: 'evaluate.viewport.supported',
-          unsupportedViewportTypes: ['video'],
+          unsupportedViewportTypes: ['video', 'wholeSlide'],
         },
       ],
     },

modes/microscopy/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/mode-microscopy
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/mode-microscopy
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-microscopy
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-microscopy
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-microscopy
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/mode-microscopy

modes/microscopy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-microscopy",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF mode for DICOM microscopy",
   "author": "OHIF",
   "license": "MIT",
@@ -35,8 +35,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-dicom-microscopy": "3.9.0-beta.109"
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-dicom-microscopy": "3.10.0-beta.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",

modes/microscopy/src/index.tsx

@@ -114,8 +114,7 @@ function modeFactory({ modeConfiguration }) {
       },
     ],
     extensions: extensionDependencies,
-    hangingProtocol: ['default'],
-
+    hangingProtocol: 'default',
     sopClassHandlers: [
       '@ohif/extension-cornerstone.sopClassHandlerModule.DicomMicroscopySopClassHandler',
       '@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySRSopClassHandler',

modes/preclinical-4d/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/mode-preclinical-4d
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/mode-preclinical-4d
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-preclinical-4d
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-preclinical-4d
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-preclinical-4d
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/mode-preclinical-4d

modes/preclinical-4d/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-preclinical-4d",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "4D Workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -30,12 +30,12 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-seg": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dynamic-volume": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/extension-tmtv": "3.9.0-beta.109"
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dynamic-volume": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/extension-tmtv": "3.10.0-beta.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13"

modes/preclinical-4d/src/toolbarButtons.tsx

@@ -114,7 +114,13 @@ const toolbarButtons = [
       icon: 'tool-capture',
       label: 'Capture',
       commands: 'showDownloadViewportModal',
-      evaluate: 'evaluate.action',
+      evaluate: [
+        'evaluate.action',
+        {
+          name: 'evaluate.viewport.supported',
+          unsupportedViewportTypes: ['video', 'wholeSlide'],
+        },
+      ],
     },
   },
   {

modes/segmentation/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/mode-segmentation
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/mode-segmentation
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-segmentation
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-segmentation
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-segmentation
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/mode-segmentation

modes/segmentation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-segmentation",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "OHIF segmentation mode which enables labelmap segmentation read/edit/export",
   "author": "@ohif",
   "license": "MIT",
@@ -35,14 +35,14 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-rt": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-seg": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/extension-dicom-pdf": "3.9.0-beta.109",
-    "@ohif/extension-dicom-video": "3.9.0-beta.109"
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/extension-dicom-pdf": "3.10.0-beta.3",
+    "@ohif/extension-dicom-video": "3.10.0-beta.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",

modes/segmentation/src/index.tsx

@@ -133,7 +133,7 @@ function modeFactory({ modeConfiguration }) {
             props: {
               leftPanels: [ohif.leftPanel],
               rightPanels: [cornerstone.panelTool],
-              leftPanelClosed: true,
+              // leftPanelClosed: true,
               viewports: [
                 {
                   namespace: cornerstone.viewport,

modes/segmentation/src/toolbarButtons.ts

@@ -69,7 +69,13 @@ const toolbarButtons: Button[] = [
       icon: 'tool-capture',
       label: 'Capture',
       commands: 'showDownloadViewportModal',
-      evaluate: 'evaluate.action',
+      evaluate: [
+        'evaluate.action',
+        {
+          name: 'evaluate.viewport.supported',
+          unsupportedViewportTypes: ['video', 'wholeSlide'],
+        },
+      ],
     },
   },
   {

modes/tmtv/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/mode-tmtv
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/mode-tmtv
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-tmtv
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-tmtv
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/mode-tmtv
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+**Note:** Version bump only for package @ohif/mode-tmtv
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 **Note:** Version bump only for package @ohif/mode-tmtv

modes/tmtv/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/mode-tmtv",
-  "version": "3.9.0-beta.109",
+  "version": "3.10.0-beta.3",
   "description": "Total Metabolic Tumor Volume Workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -34,13 +34,13 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone": "3.9.0-beta.109",
-    "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.109",
-    "@ohif/extension-default": "3.9.0-beta.109",
-    "@ohif/extension-dicom-pdf": "3.9.0-beta.109",
-    "@ohif/extension-dicom-video": "3.9.0-beta.109",
-    "@ohif/extension-measurement-tracking": "3.9.0-beta.109"
+    "@ohif/core": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone": "3.10.0-beta.3",
+    "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.3",
+    "@ohif/extension-default": "3.10.0-beta.3",
+    "@ohif/extension-dicom-pdf": "3.10.0-beta.3",
+    "@ohif/extension-dicom-video": "3.10.0-beta.3",
+    "@ohif/extension-measurement-tracking": "3.10.0-beta.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",

package.json

@@ -112,7 +112,6 @@
     "package-json": "^8.1.0",
     "typescript": "5.5.4",
     "sharp": "^0.32.6",
-    "ip": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
     "**/express/path-to-regexp": "0.1.10",
     "**/serve/serve-handler/path-to-regexp": "3.3.0",
     "**/@docusaurus/core/serve-handler/path-to-regexp": "3.3.0",

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc-Keycloak/config/nginx.conf

@@ -1,261 +0,0 @@
-worker_processes 2;
-error_log   /var/logs/nginx/mydomain.error.log;
-pid /var/run/nginx.pid;
-include /usr/share/nginx/modules/*.conf; # See /usr/share/doc/nginx/README.dynamic.
-
-events {
-    worker_connections 1024; ## Default: 1024
-    use epoll; # http://nginx.org/en/docs/events.html
-    multi_accept on; # http://nginx.org/en/docs/ngx_core_module.html#multi_accept
-}
-
-# Core Modules Docs:
-# http://nginx.org/en/docs/http/ngx_http_core_module.html
-http {
-    include    '/usr/local/openresty/nginx/conf/mime.types';
-    default_type application/octet-stream;
-
-    keepalive_timeout 65;
-    keepalive_requests 100000;
-    tcp_nopush on;
-    tcp_nodelay on;
-
-    # lua_ settings
-    #
-    lua_package_path '/usr/local/openresty/lualib/?.lua;;/usr/local/share/lua/5.4/?.lua;;';
-    lua_shared_dict discovery 1m; # cache for discovery metadata documents
-    lua_shared_dict jwks 1m;      # cache for JWKs
-    # lua_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
-
-    variables_hash_max_size 2048;
-    server_names_hash_bucket_size 128;
-    server_tokens off;
-
-    resolver 8.8.8.8 valid=30s ipv6=off;
-    resolver_timeout 11s;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    # No idea what this is doing
-    # https://stackoverflow.com/a/5877989/1867984
-    # upstream upstream_server {
-    #   # server 10.100.4.200:1010       max_fails=3 fail_timeout=30s;
-    #   server 127.0.0.1:
-    # }
-
-    # Nginx `listener` block
-    server {
-        listen [::]:80 default_server;
-        listen 80;
-        # listen      443 ssl;
-        access_log  /var/logs/nginx/mydomain.access.log;
-
-        # Domain to protect
-        server_name 127.0.0.1 localhost; # mydomain.com;
-        proxy_intercept_errors off;
-        # ssl_certificate /etc/letsencrypt/live/mydomain.co.uk/fullchain.pem;
-        # ssl_certificate_key /etc/letsencrypt/live/mydomain.co.uk/privkey.pem;
-        gzip on;
-        gzip_types text/css application/javascript application/json image/svg+xml;
-        gzip_comp_level 9;
-        etag on;
-
-        # https://github.com/bungle/lua-resty-session/issues/15
-        set $session_check_ssi off;
-        lua_code_cache off;
-        set $session_secret Eeko7aeb6iu5Wohch9Loo1aitha0ahd1;
-        set $session_storage cookie;
-
-        server_tokens off; # Hides server version num
-
-        # [PROTECTED] Reverse Proxy for `orthanc` admin
-        #
-        location /pacs-admin/ {
-          access_by_lua_block {
-            local opts = {
-              redirect_uri = "http://127.0.0.1/pacs-admin/admin",
-              discovery = "http://127.0.0.1/auth/realms/ohif/.well-known/openid-configuration",
-              token_endpoint_auth_method = "client_secret_basic",
-              client_id = "pacs",
-              client_secret = "66279641-eba6-47f5-9fdb-70c4ac74d548",
-              client_jwt_assertion_expires_in = 60 * 60,
-              ssl_verify = "no",
-              scope = "openid email profile",
-              refresh_session_interval = 900,
-              redirect_uri_scheme = "http",
-              redirect_after_logout_uri = "/",
-              session_contents = {id_token=true}
-            }
-
-            -- call authenticate for OpenID Connect user authentication
-            local res, err = require("resty.openidc").authenticate(opts)
-
-            if err or not res then
-              ngx.print(err)
-              ngx.status = 200
-              ngx.say(err and err or "no access_token provided")
-              ngx.exit(ngx.HTTP_FORBIDDEN)
-            end
-
-            -- Or set cookie?
-            -- ngx.req.set_header("Authorization", "Bearer " .. res.access_token)
-            ngx.req.set_header("X-USER", res.id_token.sub)
-          }
-
-
-          proxy_http_version 1.1;
-
-          proxy_set_header Host               $host;
-          proxy_set_header X-Real-IP          $remote_addr;
-          proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
-          proxy_set_header X-Forwarded-Proto  $scheme;
-
-          expires           0;
-          add_header        Cache-Control private;
-
-          proxy_pass        http://orthanc:8042/;
-        }
-
-        # [PROTECTED] Reverse Proxy for `orthanc` APIs (including DICOMWeb)
-        #
-        location /pacs/ {
-          access_by_lua_block {
-            local opts = {
-              discovery = "http://127.0.0.1/auth/realms/ohif/.well-known/openid-configuration",
-            }
-
-            -- call bearer_jwt_verify for OAuth 2.0 JWT validation
-            local res, err = require("resty.openidc").bearer_jwt_verify(opts)
-
-            if err or not res then
-              ngx.status = 403
-              ngx.say(err and err or "no access_token provided")
-              ngx.exit(ngx.HTTP_FORBIDDEN)
-            end
-          }
-
-          proxy_http_version 1.1;
-
-          proxy_set_header Host               $host;
-          proxy_set_header X-Real-IP          $remote_addr;
-          proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
-          proxy_set_header X-Forwarded-Proto  $scheme;
-#         proxy_set_header        Upgrade $http_upgrade;
-#         proxy_set_header        Connection "upgrade";
-
-          expires           0;
-          add_header        Cache-Control private;
-
-          proxy_pass        http://orthanc:8042/;
-
-          # By default, this endpoint is protected by CORS (cross-origin-resource-sharing)
-          # You can add headers to allow other domains to request this resource.
-          # See the "Updating CORS Settings" example below
-        }
-
-        # Keycloak
-        #
-        location /auth/ {
-          proxy_set_header X-Real-IP $remote_addr;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $http_host;
-
-          proxy_pass http://keycloak:8080/auth/;
-        }
-
-        # Do not cache sw.js, required for offline-first updates.
-        location /sw.js {
-          add_header Cache-Control "no-cache";
-          proxy_cache_bypass $http_pragma;
-          proxy_cache_revalidate on;
-          expires off;
-          access_log off;
-        }
-
-        # Single Page App
-        # Try files, fallback to index.html
-        #
-        location / {
-          alias  /var/www/html/;
-          index index.html;
-          try_files $uri $uri/ /index.html;
-          add_header Cache-Control "no-store, no-cache, must-revalidate";
-          add_header 'Cross-Origin-Opener-Policy' 'same-origin' always;
-      	  add_header 'Cross-Origin-Embedder-Policy' 'require-corp' always;
-        }
-
-        # EXAMPLE: Reverse Proxy, no auth
-        # [UNPROTECTED] reverse proxy for `orthanc`
-        #
-        # location /pacs/ {
-        #   proxy_set_header X-Real-IP  $remote_addr;
-        #   proxy_set_header X-Forwarded-For $remote_addr;
-        #   proxy_set_header Host $host;
-        #
-        #   proxy_pass        http://orthanc:8042/;
-        #
-        #   # OR
-        #   # rewrite ^/pacs(.*) /$1 break;
-        #   # proxy_pass        http://orthanc:8042;
-        # }
-
-        # EXAMPLE: Modifying headers to allow requests from other domains
-        # IE. Updating CORS settings
-        #
-        # location / {
-        #     if ($request_method = 'OPTIONS') {
-        #         add_header 'Access-Control-Allow-Origin' '*';
-        #         add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        #         #
-        #         # Custom headers and headers various browsers *should* be OK with but aren't
-        #         #
-        #         add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-        #         #
-        #         # Tell client that this pre-flight info is valid for 20 days
-        #         #
-        #         add_header 'Access-Control-Allow-Headers' 'Authorization';
-        #         add_header 'Access-Control-Allow-Credentials' true;
-        #         add_header 'Access-Control-Max-Age' 1728000;
-        #         add_header 'Content-Length' 0;
-        #         return 204;
-        #     }
-        #     if ($request_method = 'POST') {
-        #         add_header 'Access-Control-Allow-Origin' '*';
-        #         add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        #         add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-        #         add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
-        #     }
-        #     if ($request_method = 'GET') {
-        #         add_header 'Access-Control-Allow-Origin' '*';
-        #         add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        #         add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-        #         add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
-        #         add_header 'Access-Control-Allow-Headers' 'Authorization';
-        #         add_header 'Access-Control-Allow-Credentials' true;
-        #     }
-        #
-        #     # proxy_http_version 1.1;
-        #
-        #     # proxy_set_header Host               $host;
-        #     # proxy_set_header X-Real-IP          $remote_addr;
-        #     # proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
-        #     # proxy_set_header X-Forwarded-Proto  $scheme;
-        #
-        #     proxy_pass http://orthanc:8042;
- 	      # }
-
-        # EXAMPLE: Redirect server error pages to the static page /40x.html
-        #
-        # error_page 404 /404.html;
-        #     location = /40x.html {
-        # }
-
-        # EXAMPLE: Redirect server error pages to the static page /50x.html
-        #
-        # error_page 500 502 503 504 /50x.html;
-        #    location = /50x.html {
-        # }
-    }
-}

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc-Keycloak/config/orthanc.json

@@ -1,89 +0,0 @@
-{
-  "Name": "Orthanc inside Docker",
-  "StorageDirectory": "/var/lib/orthanc/db",
-  "IndexDirectory": "/var/lib/orthanc/db",
-  "StorageCompression": false,
-  "MaximumStorageSize": 0,
-  "MaximumPatientCount": 0,
-  "LuaScripts": [],
-  "Plugins": ["/usr/share/orthanc/plugins", "/usr/local/share/orthanc/plugins"],
-  "ConcurrentJobs": 2,
-  "HttpServerEnabled": true,
-  "HttpPort": 8042,
-  "HttpDescribeErrors": true,
-  "HttpCompressionEnabled": true,
-  "DicomServerEnabled": true,
-  "DicomAet": "ORTHANC",
-  "DicomCheckCalledAet": false,
-  "DicomPort": 4242,
-  "DefaultEncoding": "Latin1",
-  "DeflatedTransferSyntaxAccepted": true,
-  "JpegTransferSyntaxAccepted": true,
-  "Jpeg2000TransferSyntaxAccepted": true,
-  "JpegLosslessTransferSyntaxAccepted": true,
-  "JpipTransferSyntaxAccepted": true,
-  "Mpeg2TransferSyntaxAccepted": true,
-  "RleTransferSyntaxAccepted": true,
-  "UnknownSopClassAccepted": false,
-  "DicomScpTimeout": 30,
-
-  "RemoteAccessAllowed": true,
-  "SslEnabled": false,
-  "SslCertificate": "certificate.pem",
-  "AuthenticationEnabled": false,
-  "RegisteredUsers": {
-    "test": "test"
-  },
-  "DicomModalities": {},
-  "DicomModalitiesInDatabase": false,
-  "DicomAlwaysAllowEcho": true,
-  "DicomAlwaysAllowStore": true,
-  "DicomCheckModalityHost": false,
-  "DicomScuTimeout": 10,
-  "OrthancPeers": {},
-  "OrthancPeersInDatabase": false,
-  "HttpProxy": "",
-
-  "HttpVerbose": true,
-
-  "HttpTimeout": 10,
-  "HttpsVerifyPeers": true,
-  "HttpsCACertificates": "",
-  "UserMetadata": {},
-  "UserContentType": {},
-  "StableAge": 60,
-  "StrictAetComparison": false,
-  "StoreMD5ForAttachments": true,
-  "LimitFindResults": 0,
-  "LimitFindInstances": 0,
-  "LimitJobs": 10,
-  "LogExportedResources": false,
-  "KeepAlive": true,
-  "TcpNoDelay": true,
-  "HttpThreadsCount": 50,
-  "StoreDicom": true,
-  "DicomAssociationCloseDelay": 5,
-  "QueryRetrieveSize": 10,
-  "CaseSensitivePN": false,
-  "LoadPrivateDictionary": true,
-  "Dictionary": {},
-  "SynchronousCMove": true,
-  "JobsHistorySize": 10,
-  "SaveJobs": true,
-  "OverwriteInstances": false,
-  "MediaArchiveSize": 1,
-  "StorageAccessOnFind": "Always",
-  "MetricsEnabled": true,
-
-  "DicomWeb": {
-    "Enable": true,
-    "Root": "/dicom-web/",
-    "EnableWado": true,
-    "WadoRoot": "/wado",
-    "Host": "127.0.0.1",
-    "Ssl": false,
-    "StowMaxInstances": 10,
-    "StowMaxSize": 10,
-    "QidoCaseSensitive": false
-  }
-}

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc-Keycloak/docker-compose.yml

@@ -1,95 +0,0 @@
-# Reference:
-# - https://docs.docker.com/compose/compose-file
-# - https://eclipsesource.com/blogs/2018/01/11/authenticating-reverse-proxy-with-keycloak/
-
-version: '3.5'
-
-services:
-  # Exposed server that's handling incoming web requests
-  # Underlying image: openresty/openresty:alpine-fat
-  ohif_viewer:
-    build:
-      # Project root
-      context: ./../../../../
-      # Relative to context
-      dockerfile: ./platform/app/.recipes/OpenResty-Orthanc-Keycloak/dockerfile
-    image: webapp:latest
-    container_name: webapp
-    volumes:
-      # Nginx config
-      - ./config/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf:ro
-      # Logs
-      - ./logs/nginx:/var/logs/nginx
-      # Let's Encrypt
-      # - letsencrypt_certificates:/etc/letsencrypt
-      # - letsencrypt_challenges:/var/www/letsencrypt
-    ports:
-      - '443:443' # SSL
-      - '80:80' # Web
-    depends_on:
-      - keycloak
-      - orthanc
-    restart: on-failure
-
-  # LINK: https://hub.docker.com/r/jodogne/orthanc-plugins/
-  # TODO: Update to use Postgres
-  # https://github.com/mrts/docker-postgresql-multiple-databases
-  orthanc:
-    image: jodogne/orthanc-plugins
-    hostname: orthanc
-    container_name: orthanc
-    volumes:
-      # Config
-      - ./config/orthanc.json:/etc/orthanc/orthanc.json:ro
-      # Persist data
-      - ./volumes/orthanc-db/:/var/lib/orthanc/db/
-    restart: unless-stopped
-
-  # LINK: https://hub.docker.com/r/jboss/keycloak
-  keycloak:
-    image: quay.io/keycloak/keycloak:6.0.0
-    hostname: keycloak
-    container_name: keycloak
-    volumes:
-      # Theme: https://www.keycloak.org/docs/latest/server_development/index.html#_themes
-      - ./volumes/keycloak-themes/ohif:/opt/jboss/keycloak/themes/ohif
-      # Previous Realm Config
-      - ./config/ohif-keycloak-realm.json:/tmp/ohif-keycloak-realm.json
-    environment:
-      # Database
-      DB_VENDOR: postgres
-      DB_ADDR: postgres
-      DB_PORT: 5432
-      DB_DATABASE: keycloak
-      DB_SCHEMA: public
-      DB_USER: keycloak
-      DB_PASSWORD: password
-      # Keycloak
-      KEYCLOAK_USER: admin
-      KEYCLOAK_PASSWORD: password
-      KEYCLOAK_IMPORT: /tmp/ohif-keycloak-realm.json
-      # KEYCLOAK_WELCOME_THEME: <theme-name>
-      # KEYCLOAK_DEFAULT_THEME: <theme-name>
-      # KEYCLOAK_HOSTNAME: (recommended in prod)
-      # KEYCLOAK_LOGLEVEL: DEBUG
-      PROXY_ADDRESS_FORWARDING: 'true'
-    depends_on:
-      - postgres
-    restart: unless-stopped
-
-  # LINK: https://hub.docker.com/_/postgres/
-  postgres:
-    image: postgres:11.2
-    hostname: postgres
-    container_name: postgres
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: keycloak
-      POSTGRES_USER: keycloak
-      POSTGRES_PASSWORD: password
-    restart: unless-stopped
-
-volumes:
-  postgres_data:
-    driver: local

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc-Keycloak/dockerfile

@@ -1,85 +0,0 @@
-# docker-compose
-# --------------
-# This dockerfile is used by the `docker-compose.yml` adjacent file. When
-# running `docker compose build`, this dockerfile helps build the "webapp" image.
-# All paths are relative to the `context`, which is the project root directory.
-#
-# docker build
-# --------------
-# If you would like to use this dockerfile to build and tag an image, make sure
-# you set the context to the project's root directory:
-# https://docs.docker.com/engine/reference/commandline/build/
-#
-#
-# SUMMARY
-# --------------
-# This dockerfile has two stages:
-#
-# 1. Building the React application for production
-# 2. Setting up our Nginx (OpenResty*) image w/ step one's output
-#
-# * OpenResty is functionally identical to Nginx with the addition of Lua out of
-# the box.
-
-
-# Stage 1: Build the application
-FROM node:18.16.1-slim as builder
-
-RUN mkdir /usr/src/app
-WORKDIR /usr/src/app
-
-RUN apt-get update && apt-get install -y build-essential python3
-
-ENV APP_CONFIG=config/docker_openresty-orthanc-keycloak.js
-ENV PATH /usr/src/app/node_modules/.bin:$PATH
-
-# Copy all files from the root of the OHIF source and note
-# that the Docker ignore file at the root (i.e. ./dockerignore) will filter
-# out files and directories that are not needed.
-COPY ./ /usr/src/app/
-
-ADD . /usr/src/app/
-RUN yarn config set workspaces-experimental true
-RUN yarn install
-RUN yarn run build
-
-# Stage 2: Bundle the built application into a Docker container
-# which runs openresty (nginx) using Alpine Linux
-# LINK: https://hub.docker.com/r/openresty/openresty
-FROM openresty/openresty:1.21.4.2-0-bullseye-fat
-
-RUN mkdir /var/log/nginx
-RUN apt-get update && \
-  apt-get install -y openssl libssl-dev git gcc wget unzip make&& \
-  apt-get clean
-
-RUN apt-get install --assume-yes lua5.4 libzmq3-dev lua5.4-dev
-RUN cd /tmp && \
-  wget http://luarocks.org/releases/luarocks-3.9.2.tar.gz && \
-  tar zxpf luarocks-3.9.2.tar.gz && \
-  cd luarocks-3.9.2 && \
-  ./configure && \
-  make && \
-  make install
-
-# !!!
-RUN luarocks install lua-resty-http
-# RUN luarocks install lua-nginx-module
-RUN luarocks install lua-cjson
-RUN luarocks install lua-resty-string
-RUN luarocks install lua-resty-session
-RUN luarocks install lua-resty-jwt
-RUN luarocks install lua-resty-openidc
-
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-#
-RUN luarocks install lua-resty-http
-# !!!
-RUN luarocks install lua-resty-auto-ssl
-
-
-# Copy build output to image
-COPY --from=builder /usr/src/app/platform/app/dist /var/www/html
-
-ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/resources/css/styles.css

@@ -1,196 +0,0 @@
-body {
-  background-color: #040507;
-  background-image: url('../img/background.jpg');
-  background-size: cover;
-  background-repeat: no-repeat;
-
-  width: 100vw;
-  height: 100vh;
-  overflow: hidden;
-
-  color: #fff;
-  font-family: sans-serif;
-  text-shadow: 0px 0px 10px #000;
-}
-
-a {
-  color: #fff;
-}
-
-div#kc-content {
-  position: absolute;
-  top: 20%;
-  left: 50%;
-  width: 550px;
-  margin-left: -180px;
-}
-
-div#kc-form {
-  float: left;
-  width: 350px;
-}
-
-div#kc-form label {
-  display: block;
-  font-size: 16px;
-}
-
-div#info-area {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  margin-top: 40px;
-  background-color: rgba(0, 0, 0, 0.4);
-  padding: 20px;
-  width: 100%;
-}
-
-div#info-area p {
-  margin-right: 30px;
-  display: inline;
-  text-shadow: none;
-}
-
-input[type='text'],
-input[type='password'] {
-  color: #333;
-  font-size: 18px;
-  margin-bottom: 20px;
-  background-color: rgba(256, 256, 256, 0.7);
-  border: 0px solid rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 0 2px 2px rgba(0, 0, 0, 0.15);
-  padding: 10px;
-  width: 296px;
-}
-
-input[type='text']:hover,
-input[type='password']:hover {
-  background-color: rgba(256, 256, 256, 0.9);
-}
-
-input[type='submit'] {
-  border: none;
-
-  background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1));
-  background: -moz-linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1));
-  background: -ms-linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1));
-  background: -o-linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1));
-
-  box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.5);
-
-  color: rgba(0, 0, 0, 0.6);
-
-  font-size: 14px;
-  font-weight: bold;
-
-  padding: 10px;
-  margin-top: 20px;
-  margin-right: 10px;
-  width: 150px;
-}
-
-input[type='submit']:hover {
-  background-color: rgba(255, 255, 255, 0.8);
-}
-
-div#kc-form-options div {
-  display: inline-block;
-  margin-right: 20px;
-  font-size: 12px;
-}
-
-div#kc-form-options div label {
-  font-size: 12px;
-}
-
-div#kc-feedback {
-  box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.5);
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  text-align: center;
-}
-
-div#kc-feedback-wrapper {
-  padding: 1em;
-}
-
-div.feedback-success {
-  background-color: rgba(155, 155, 255, 0.1);
-}
-
-div.feedback-warning {
-  background-color: rgba(255, 175, 0, 0.1);
-}
-
-div.feedback-error {
-  background-color: rgba(255, 0, 0, 0.1);
-}
-
-div#kc-header {
-  display: none;
-}
-
-div#kc-registration {
-  margin-bottom: 20px;
-}
-
-div#social-login {
-  border-left: 1px solid rgba(255, 255, 255, 0.2);
-  float: right;
-  width: 150px;
-  padding: 20px 0 200px 40px;
-}
-
-div.social-login span {
-  display: none;
-}
-
-div#kc-social-providers ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-div#kc-social-providers ul li {
-  margin-bottom: 20px;
-}
-
-div#kc-social-providers ul li span {
-  display: inline;
-  width: 100px;
-}
-
-a.zocial {
-  border: none;
-  background: -webkit-linear-gradient(
-    top,
-    rgba(255, 255, 255, 0.8),
-    rgba(255, 255, 255, 0.1)
-  ) !important;
-  background: -moz-linear-gradient(
-    top,
-    rgba(255, 255, 255, 0.8),
-    rgba(255, 255, 255, 0.1)
-  ) !important;
-  background: -ms-linear-gradient(
-    top,
-    rgba(255, 255, 255, 0.8),
-    rgba(255, 255, 255, 0.1)
-  ) !important;
-  background: -o-linear-gradient(
-    top,
-    rgba(255, 255, 255, 0.8),
-    rgba(255, 255, 255, 0.1)
-  ) !important;
-  box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.5);
-  color: rgba(0, 0, 0, 0.6);
-  width: 130px;
-  text-shadow: none;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-  padding-top: 0.2em;
-  padding-bottom: 0.2em;
-}

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc-Keycloak/volumes/keycloak-themes/ohif/login/theme.properties

@@ -1,3 +0,0 @@
-parent=base
-import=common/keycloak
-styles=lib/zocial/zocial.css css/styles.css

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc-Keycloak/volumes/orthanc-db/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc/config/nginx.conf

@@ -1,137 +0,0 @@
-worker_processes 2;
-error_log   /var/logs/nginx/mydomain.error.log;
-pid /var/run/nginx.pid;
-include /usr/share/nginx/modules/*.conf; # See /usr/share/doc/nginx/README.dynamic.
-
-events {
-    worker_connections 1024; ## Default: 1024
-    use epoll; # http://nginx.org/en/docs/events.html
-    multi_accept on; # http://nginx.org/en/docs/ngx_core_module.html#multi_accept
-}
-
-# Core Modules Docs:
-# http://nginx.org/en/docs/http/ngx_http_core_module.html
-http {
-    include    '/usr/local/openresty/nginx/conf/mime.types';
-    default_type application/octet-stream;
-
-    keepalive_timeout 65;
-    keepalive_requests 100000;
-    tcp_nopush on;
-    tcp_nodelay on;
-
-    # lua_ settings
-    #
-    lua_package_path '/usr/local/openresty/lualib/?.lua;;';
-    lua_shared_dict discovery 1m; # cache for discovery metadata documents
-    lua_shared_dict jwks 1m;      # cache for JWKs
-    # lua_ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
-
-    variables_hash_max_size 2048;
-    server_names_hash_bucket_size 128;
-    server_tokens off;
-
-    resolver 8.8.8.8 valid=30s ipv6=off;
-    resolver_timeout 11s;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    # Nginx `listener` block
-    server {
-        listen [::]:80 default_server;
-        listen 80;
-        # listen      443 ssl;
-        access_log  /var/logs/nginx/mydomain.access.log;
-
-        # Domain to protect
-        server_name 127.0.0.1 localhost; # mydomain.com;
-        proxy_intercept_errors off;
-        # ssl_certificate /etc/letsencrypt/live/mydomain.co.uk/fullchain.pem;
-        # ssl_certificate_key /etc/letsencrypt/live/mydomain.co.uk/privkey.pem;
-        gzip on;
-        gzip_types text/css application/javascript application/json image/svg+xml;
-        gzip_comp_level 9;
-        etag on;
-
-        # https://github.com/bungle/lua-resty-session/issues/15
-        set $session_check_ssi off;
-        lua_code_cache off;
-        set $session_secret Eeko7aeb6iu5Wohch9Loo1aitha0ahd1;
-        set $session_storage cookie;
-
-        server_tokens off; # Hides server version num
-
-        # Reverse Proxy for `orthanc` admin
-        #
-        location /pacs-admin/ {
-
-          proxy_http_version 1.1;
-
-          proxy_set_header Host               $host;
-          proxy_set_header X-Real-IP          $remote_addr;
-          proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
-          proxy_set_header X-Forwarded-Proto  $scheme;
-
-          expires           0;
-          add_header        Cache-Control private;
-
-          proxy_pass        http://orthanc:8042/;
-        }
-
-        # Reverse Proxy for `orthanc` APIs (including DICOMWeb)
-        #
-        location /pacs/ {
-
-          proxy_http_version 1.1;
-
-          proxy_set_header Host               $host;
-          proxy_set_header X-Real-IP          $remote_addr;
-          proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
-          proxy_set_header X-Forwarded-Proto  $scheme;
-
-          expires           0;
-          add_header        Cache-Control private;
-
-          proxy_pass        http://orthanc:8042/;
-
-          # By default, this endpoint is protected by CORS (cross-origin-resource-sharing)
-          # You can add headers to allow other domains to request this resource.
-          # See the "Updating CORS Settings" example below
-        }
-
-        # Do not cache sw.js, required for offline-first updates.
-        location /sw.js {
-          add_header Cache-Control "no-cache";
-          proxy_cache_bypass $http_pragma;
-          proxy_cache_revalidate on;
-          expires off;
-          access_log off;
-        }
-
-        # Single Page App
-        # Try files, fallback to index.html
-        #
-        location / {
-          alias  /var/www/html/;
-          index index.html;
-          try_files $uri $uri/ /index.html;
-          add_header Cache-Control "no-store, no-cache, must-revalidate";
-          add_header 'Cross-Origin-Opener-Policy' 'same-origin' always;
-      	  add_header 'Cross-Origin-Embedder-Policy' 'require-corp' always;
-        }
-
-        # EXAMPLE: Redirect server error pages to the static page /40x.html
-        #
-        # error_page 404 /404.html;
-        #     location = /40x.html {
-        # }
-
-        # EXAMPLE: Redirect server error pages to the static page /50x.html
-        #
-        # error_page 500 502 503 504 /50x.html;
-        #    location = /50x.html {
-        # }
-    }
-}

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc/config/orthanc.json

@@ -1,89 +0,0 @@
-{
-  "Name": "Orthanc inside Docker",
-  "StorageDirectory": "/var/lib/orthanc/db",
-  "IndexDirectory": "/var/lib/orthanc/db",
-  "StorageCompression": false,
-  "MaximumStorageSize": 0,
-  "MaximumPatientCount": 0,
-  "LuaScripts": [],
-  "Plugins": ["/usr/share/orthanc/plugins", "/usr/local/share/orthanc/plugins"],
-  "ConcurrentJobs": 2,
-  "HttpServerEnabled": true,
-  "HttpPort": 8042,
-  "HttpDescribeErrors": true,
-  "HttpCompressionEnabled": true,
-  "DicomServerEnabled": true,
-  "DicomAet": "ORTHANC",
-  "DicomCheckCalledAet": false,
-  "DicomPort": 4242,
-  "DefaultEncoding": "Latin1",
-  "DeflatedTransferSyntaxAccepted": true,
-  "JpegTransferSyntaxAccepted": true,
-  "Jpeg2000TransferSyntaxAccepted": true,
-  "JpegLosslessTransferSyntaxAccepted": true,
-  "JpipTransferSyntaxAccepted": true,
-  "Mpeg2TransferSyntaxAccepted": true,
-  "RleTransferSyntaxAccepted": true,
-  "UnknownSopClassAccepted": false,
-  "DicomScpTimeout": 30,
-
-  "RemoteAccessAllowed": true,
-  "SslEnabled": false,
-  "SslCertificate": "certificate.pem",
-  "AuthenticationEnabled": false,
-  "RegisteredUsers": {
-    "test": "test"
-  },
-  "DicomModalities": {},
-  "DicomModalitiesInDatabase": false,
-  "DicomAlwaysAllowEcho": true,
-  "DicomAlwaysAllowStore": true,
-  "DicomCheckModalityHost": false,
-  "DicomScuTimeout": 10,
-  "OrthancPeers": {},
-  "OrthancPeersInDatabase": false,
-  "HttpProxy": "",
-
-  "HttpVerbose": true,
-
-  "HttpTimeout": 10,
-  "HttpsVerifyPeers": true,
-  "HttpsCACertificates": "",
-  "UserMetadata": {},
-  "UserContentType": {},
-  "StableAge": 60,
-  "StrictAetComparison": false,
-  "StoreMD5ForAttachments": true,
-  "LimitFindResults": 0,
-  "LimitFindInstances": 0,
-  "LimitJobs": 10,
-  "LogExportedResources": false,
-  "KeepAlive": true,
-  "TcpNoDelay": true,
-  "HttpThreadsCount": 50,
-  "StoreDicom": true,
-  "DicomAssociationCloseDelay": 5,
-  "QueryRetrieveSize": 10,
-  "CaseSensitivePN": false,
-  "LoadPrivateDictionary": true,
-  "Dictionary": {},
-  "SynchronousCMove": true,
-  "JobsHistorySize": 10,
-  "SaveJobs": true,
-  "OverwriteInstances": false,
-  "MediaArchiveSize": 1,
-  "StorageAccessOnFind": "Always",
-  "MetricsEnabled": true,
-
-  "DicomWeb": {
-    "Enable": true,
-    "Root": "/dicom-web/",
-    "EnableWado": true,
-    "WadoRoot": "/wado",
-    "Host": "127.0.0.1",
-    "Ssl": false,
-    "StowMaxInstances": 10,
-    "StowMaxSize": 10,
-    "QidoCaseSensitive": false
-  }
-}

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc/docker-compose.yml

@@ -1,47 +0,0 @@
-# Reference:
-# - https://docs.docker.com/compose/compose-file
-# - https://eclipsesource.com/blogs/2018/01/11/authenticating-reverse-proxy-with-keycloak/
-
-version: '3.5'
-
-services:
-  # Exposed server that's handling incoming web requests
-  # Underlying image: openresty/openresty:alpine-fat
-  ohif_viewer:
-    build:
-      # Project root
-      context: ./../../../../
-      # Relative to context
-      dockerfile: ./platform/app/.recipes/OpenResty-Orthanc/dockerfile
-    image: webapp:latest
-    container_name: webapp
-    volumes:
-      # Nginx config
-      - ./config/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf:ro
-      # Logs
-      - ./logs/nginx:/var/logs/nginx
-      # Let's Encrypt
-      # - letsencrypt_certificates:/etc/letsencrypt
-      # - letsencrypt_challenges:/var/www/letsencrypt
-    ports:
-      - '443:443' # SSL
-      - '80:80' # Web
-    depends_on:
-      - orthanc
-    restart: on-failure
-
-  # LINK: https://hub.docker.com/r/jodogne/orthanc-plugins/
-  # TODO: Update to use Postgres
-  # https://github.com/mrts/docker-postgresql-multiple-databases
-  orthanc:
-    image: jodogne/orthanc-plugins
-    hostname: orthanc
-    container_name: orthanc
-    volumes:
-      # Config
-      - ./config/orthanc.json:/etc/orthanc/orthanc.json:ro
-      # Persist data
-      - ./volumes/orthanc-db/:/var/lib/orthanc/db/
-    restart: unless-stopped
-    ports:
-      - '4242:4242' # DIMSE

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc/dockerfile

@@ -1,79 +0,0 @@
-# docker-compose
-# --------------
-# This dockerfile is used by the `docker-compose.yml` adjacent file. When
-# running `docker compose build`, this dockerfile helps build the "webapp" image.
-# All paths are relative to the `context`, which is the project root directory.
-#
-# docker build
-# --------------
-# If you would like to use this dockerfile to build and tag an image, make sure
-# you set the context to the project's root directory:
-# https://docs.docker.com/engine/reference/commandline/build/
-#
-#
-# SUMMARY
-# --------------
-# This dockerfile has two stages:
-#
-# 1. Building the React application for production
-# 2. Setting up our Nginx (OpenResty*) image w/ step one's output
-#
-# * OpenResty is functionally identical to Nginx with the addition of Lua out of
-# the box.
-
-
-# Stage 1: Build the application
-FROM node:18.16.1-slim as builder
-
-RUN mkdir /usr/src/app
-WORKDIR /usr/src/app
-
-# Copy all files from the root of the OHIF source and note
-# that the Docker ignore file at the root (i.e. ./dockerignore) will filter
-# out files and directories that are not needed.
-COPY ./ /usr/src/app/
-
-# For arm builds since parcel doesn't have prebuilt binaries for arm yet
-RUN apt-get update && apt-get install -y build-essential python3
-
-
-# ADD . /usr/src/app/
-RUN yarn config set workspaces-experimental true
-RUN yarn install
-
-ENV APP_CONFIG=config/docker_openresty-orthanc.js
-ENV PATH /usr/src/app/node_modules/.bin:$PATH
-
-ENV QUICK_BUILD true
-RUN yarn run build
-
-# ADD . /usr/src/app/
-# RUN yarn install
-# RUN yarn run build:web
-
-
-# Stage 2: Bundle the built application into a Docker container
-# which runs openresty (nginx) using Alpine Linux
-# LINK: https://hub.docker.com/r/openresty/openresty
-FROM openresty/openresty:1.15.8.1rc1-0-alpine-fat
-
-RUN mkdir /var/log/nginx
-RUN apk add --no-cache openssl
-RUN apk add --no-cache openssl-dev
-RUN apk add --no-cache git
-RUN apk add --no-cache gcc
-# !!!
-RUN luarocks install lua-resty-openidc
-
-#
-RUN luarocks install lua-resty-jwt
-RUN luarocks install lua-resty-session
-RUN luarocks install lua-resty-http
-# !!!
-RUN luarocks install lua-resty-openidc
-RUN luarocks install luacrypto
-
-# Copy build output to image
-COPY --from=builder /usr/src/app/platform/app/dist /var/www/html
-
-ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]

platform/app/.recipes/deprecated-recipes/OpenResty-Orthanc/volumes/orthanc-db/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

platform/app/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.3](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.2...v3.10.0-beta.3) (2024-11-14)
+
+**Note:** Version bump only for package @ohif/app
+
+
+
+
+
+# [3.10.0-beta.2](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.1...v3.10.0-beta.2) (2024-11-13)
+
+**Note:** Version bump only for package @ohif/app
+
+
+
+
+
+# [3.10.0-beta.1](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.0...v3.10.0-beta.1) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/app
+
+
+
+
+
+# [3.10.0-beta.0](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.111...v3.10.0-beta.0) (2024-11-12)
+
+**Note:** Version bump only for package @ohif/app
+
+
+
+
+
+# [3.9.0-beta.111](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.110...v3.9.0-beta.111) (2024-11-12)
+
+
+### Bug Fixes
+
+* Measurement Tracking: Various UI and functionality improvements ([#4481](https://github.com/OHIF/Viewers/issues/4481)) ([62b2748](https://github.com/OHIF/Viewers/commit/62b27488471c9d5979142e2d15872a85778b90ed))
+
+
+
+
+
+# [3.9.0-beta.110](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.109...v3.9.0-beta.110) (2024-11-11)
+
+
+### Bug Fixes
+
+* **bugs:** Update dependencies and enhance UI components ([#4478](https://github.com/OHIF/Viewers/issues/4478)) ([05d41c5](https://github.com/OHIF/Viewers/commit/05d41c52068a3b7ba249f15ecdf71838c352fd30))
+
+
+
+
+
 # [3.9.0-beta.109](https://github.com/OHIF/Viewers/compare/v3.9.0-beta.108...v3.9.0-beta.109) (2024-11-08)
 
 

platform/app/cypress/integration/measurement-tracking/OHIFMeasurementPanel.spec.js

@@ -16,7 +16,12 @@ describe('OHIF Measurement Panel', function () {
     cy.get('@measurementsPanel').should('not.exist');
 
     cy.get('@RightCollapseBtn').click();
-    cy.get('@measurementsPanel').should('exist');
+
+    // segmentation panel should be visible
+    cy.get('@segmentationPanel').should('be.visible');
+
+    // measurements panel should be clickable
+    cy.get('@measurementsBtn').click();
     cy.get('@measurementsPanel').should('be.visible');
   });
 

platform/app/cypress/support/aliases.js

@@ -27,6 +27,7 @@ export function initCommonElementsAliases(skipMarkers) {
 
   // TODO: Panels are not in DOM when closed, move this somewhere else
   cy.get('[data-cy="trackedMeasurements-panel"]').as('measurementsPanel');
+  cy.get('[data-cy="panelSegmentation-btn"]').as('segmentationPanel');
   cy.get('[data-cy="studyBrowser-panel"]').as('seriesPanel');
   cy.get('[data-cy="viewport-overlay-top-right"]').as('viewportInfoTopRight');
   cy.get('[data-cy="viewport-overlay-top-left"]').as('viewportInfoTopLeft');