diff --git a/.circleci/config.yml b/.circleci/config.yml index c8c7afabe8..f8fced4379 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -229,6 +229,36 @@ jobs: docker push ohif/app:latest fi + DOCKER_RELEASE_PUBLISH_ARM: + <<: *defaults + resource_class: arm.large + steps: + - attach_workspace: + at: ~/repo + - setup_remote_docker: + docker_layer_caching: false + - run: + name: Build and push ARM64 Docker image from the release branch + command: | + # This file will exist if a new version was published by + # our command in the previous job. + if [[ ! -e version.txt ]]; then + exit 0 + else + # Remove npm config + rm -f ./.npmrc + # Set our version number using vars + export IMAGE_VERSION=$(cat version.txt) + export IMAGE_VERSION_FULL=v$IMAGE_VERSION + echo $IMAGE_VERSION + echo $IMAGE_VERSION_FULL + # Build our ARM64 image, auth, and push + docker build --tag ohif/app:$IMAGE_VERSION_FULL-arm64 --tag ohif/app:latest-arm64 . + echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin + docker push ohif/app:$IMAGE_VERSION_FULL-arm64 + docker push ohif/app:latest-arm64 + fi + DOCKER_BETA_PUBLISH: <<: *defaults resource_class: large @@ -265,6 +295,41 @@ jobs: docker push ohif/app:$IMAGE_VERSION_FULL fi + DOCKER_BETA_PUBLISH_ARM: + <<: *defaults + resource_class: arm.large + steps: + - attach_workspace: + at: ~/repo + - setup_remote_docker: + docker_layer_caching: false + - run: + name: Build and push ARM64 Docker image from the master branch (beta releases) + command: | + echo $(ls -l) + + # This file will exist if a new version was published by + # our command in the previous job. + if [[ ! -e version.txt ]]; then + echo "don't have version txt" + exit 0 + else + echo "Building and pushing ARM64 Docker image from the master branch (beta releases)" + rm -f ./.npmrc + # Set our version number using vars + export IMAGE_VERSION=$(cat version.txt) + export IMAGE_VERSION_FULL=v$IMAGE_VERSION + echo $IMAGE_VERSION + echo $IMAGE_VERSION_FULL + # Build our ARM64 image, auth, and push + echo "starting docker build" + docker build --tag ohif/app:$IMAGE_VERSION_FULL-arm64 . + echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin + + echo "starting docker push" + docker push ohif/app:$IMAGE_VERSION_FULL-arm64 + fi + CYPRESS: <<: *defaults resource_class: large @@ -316,6 +381,9 @@ workflows: - DOCKER_BETA_PUBLISH: requires: - NPM_PUBLISH + - DOCKER_BETA_PUBLISH_ARM: + requires: + - NPM_PUBLISH # viewer.ohif.org DEPLOY_RELEASE: @@ -334,3 +402,6 @@ workflows: - DOCKER_RELEASE_PUBLISH: requires: - NPM_PUBLISH + - DOCKER_RELEASE_PUBLISH_ARM: + requires: + - NPM_PUBLISH diff --git a/.docker/Viewer-v3.x/default.conf.template b/.docker/Viewer-v3.x/default.conf.template index 11206da2a6..bbee324496 100644 --- a/.docker/Viewer-v3.x/default.conf.template +++ b/.docker/Viewer-v3.x/default.conf.template @@ -1,4 +1,7 @@ server { + gzip_static always; + gzip_proxied expired no-cache no-store private auth; + gunzip on; listen ${PORT} default_server; listen [::]:${PORT} default_server; location / { diff --git a/.docker/Viewer-v3.x/entrypoint.sh b/.docker/Viewer-v3.x/entrypoint.sh index 988e087e83..75e27a8cb7 100644 --- a/.docker/Viewer-v3.x/entrypoint.sh +++ b/.docker/Viewer-v3.x/entrypoint.sh @@ -7,9 +7,18 @@ if [ -n "$SSL_PORT" ] envsubst '${PORT}' < /usr/src/default.conf.template > /etc/nginx/conf.d/default.conf fi -if [ -n "$APP_CONFIG" ] +if [ -n "$APP_CONFIG" ] ; then + echo "$APP_CONFIG" > /usr/share/nginx/html${PUBLIC_URL}app-config.js + # Removes the old compressed app-config file, then compresses the replacement + # and finally creates a new empty file so that gunzip works correctly. + # This code is correct despite the AI warning otherwise about order of create/delete + rm /usr/share/nginx/html${PUBLIC_URL}app-config.js.gz + gzip /usr/share/nginx/html${PUBLIC_URL}app-config.js + touch /usr/share/nginx/html${PUBLIC_URL}app-config.js +fi +if [ ! -n "$APP_CONFIG" ] then - echo "$APP_CONFIG" > /usr/share/nginx/html/app-config.js + echo "Not using custom app config" fi if [ -n "$CLIENT_ID" ] || [ -n "$HEALTHCARE_API_ENDPOINT" ] @@ -40,6 +49,6 @@ if [ -n "$CLIENT_ID" ] || [ -n "$HEALTHCARE_API_ENDPOINT" ] cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js fi -echo "Starting Nginx to serve the OHIF Viewer..." +echo "Starting Nginx to serve the OHIF Viewer on ${PUBLIC_URL}" exec "$@" diff --git a/.docker/compressDist.sh b/.docker/compressDist.sh new file mode 100644 index 0000000000..4aaf932a31 --- /dev/null +++ b/.docker/compressDist.sh @@ -0,0 +1,4 @@ +find platform/app/dist -name "*.js" -exec gzip -9 "{}" \; -exec touch "{}" \; +find platform/app/dist -name "*.map" -exec gzip -9 "{}" \; -exec touch "{}" \; +find platform/app/dist -name "*.css" -exec gzip -9 "{}" \; -exec touch "{}" \; +find platform/app/dist -name "*.svg" -exec gzip -9 "{}" \; -exec touch "{}" \; diff --git a/.dockerignore b/.dockerignore index ca74c53988..f906eff86b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,11 +8,11 @@ # have this file as their .dockerignore. # Output -dist/ -build/ +**/dist/ +**/build/ # Dependencies -node_modules/ +**/node_modules/ # Root README.md @@ -33,5 +33,5 @@ dockerfile .scripts/ .vscode/ coverage/ -docs/ +platform/docs/ testdata/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b5fb55507..dda448f40d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,67 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + + +### Bug Fixes + +* **context menu:** Implemented closing of context menu on outside click ([#4627](https://github.com/OHIF/Viewers/issues/4627)) ([6b851df](https://github.com/OHIF/Viewers/commit/6b851dfc12f4cf617d02f683e0661feeebfbcf20)) +* **context menu:** restrict the context menu accessibility for locked and hidden annotations ([#4625](https://github.com/OHIF/Viewers/issues/4625)) ([e11ceb9](https://github.com/OHIF/Viewers/commit/e11ceb9d20fa5e680a0247f6ca7c27825daea6c5)) + + +### Features + +* Implemented CSV support for Arrow annotation. ([#4623](https://github.com/OHIF/Viewers/issues/4623)) ([55fe185](https://github.com/OHIF/Viewers/commit/55fe185c72500256452e25d2f2b17fc9faa99dff)) + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + + +### Bug Fixes + +* **3D rendering:** disabled light sliders when shade is off ([#4631](https://github.com/OHIF/Viewers/issues/4631)) ([5322064](https://github.com/OHIF/Viewers/commit/5322064e9eb66791bc598f82bdf4edd35e40be11)) + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + + +### Bug Fixes + +* Docker build time was very slow on a tiny change ([#4559](https://github.com/OHIF/Viewers/issues/4559)) ([7e43b2f](https://github.com/OHIF/Viewers/commit/7e43b2f768cfc3e08ecde9dfdae275194daece2b)) + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + + +### Bug Fixes + +* **datasource:** attach auth headers for delete requests in the dicomweb datasource ([#4619](https://github.com/OHIF/Viewers/issues/4619)) ([8d0ed80](https://github.com/OHIF/Viewers/commit/8d0ed80e0c4570ab799281c29e487dbb39f47b95)) + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) diff --git a/Dockerfile b/Dockerfile index 141b139a43..29fce9964e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1.7-labs # This dockerfile is used to publish the `ohif/app` image on dockerhub. # # It's a good example of how to build our static application and package it @@ -19,61 +20,79 @@ # -# Stage 1: Build the application -# docker build -t ohif/viewer:latest . -FROM node:20.18.1-slim as json-copier - -RUN mkdir /usr/src/app -WORKDIR /usr/src/app - -COPY ["package.json", "yarn.lock", "preinstall.js", "./"] -COPY extensions /usr/src/app/extensions -COPY modes /usr/src/app/modes -COPY platform /usr/src/app/platform +# syntax=docker/dockerfile:1.7-labs +# This dockerfile is used to publish the `ohif/app` image on dockerhub. +# +# It's a good example of how to build our static application and package it +# with a web server capable of hosting it as static content. +# +# 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 is used as an input for a second stage to make things run faster. +# -# Find and remove non-package.json files -#RUN find extensions \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf -#RUN find modes \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf -#RUN find platform \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf +# Stage 1: Build the application +# docker build -t ohif/viewer:latest . # Copy Files FROM node:20.18.1-slim as builder RUN apt-get update && apt-get install -y build-essential python3 RUN mkdir /usr/src/app WORKDIR /usr/src/app +RUN npm install -g bun +# RUN npm install -g lerna@7.4.2 +ENV PATH=/usr/src/app/node_modules/.bin:$PATH -COPY --from=json-copier /usr/src/app . - +# Do an initial install and then a final install +COPY package.json yarn.lock preinstall.js lerna.json ./ +COPY --parents ./addOns/package.json ./addOns/*/*/package.json ./extensions/*/package.json ./modes/*/package.json ./platform/*/package.json ./ # Run the install before copying the rest of the files -RUN yarn config set workspaces-experimental true -RUN yarn install --frozen-lockfile --verbose +RUN bun install +# Copy the local directory +COPY --link --exclude=yarn.lock --exclude=package.json --exclude=Dockerfile . . +# Do a second install to finalize things after the copy +RUN bun run show:config +RUN bun install -COPY . . - -# To restore workspaces symlinks -RUN yarn install --frozen-lockfile --verbose - -ENV PATH /usr/src/app/node_modules/.bin:$PATH +# Build here +# After install it should hopefully be stable until the local directory changes ENV QUICK_BUILD true # ENV GENERATE_SOURCEMAP=false -# ENV REACT_APP_CONFIG=config/default.js +ARG APP_CONFIG=config/default.js +ARG PUBLIC_URL=/ + +RUN bun run show:config +RUN bun run build -RUN yarn run build +# Precompress files +RUN chmod u+x .docker/compressDist.sh +RUN ./.docker/compressDist.sh # Stage 3: Bundle the built application into a Docker container # which runs Nginx using Alpine Linux -FROM nginxinc/nginx-unprivileged:1.25-alpine as final +FROM nginxinc/nginx-unprivileged:1.27-alpine as final #RUN apk add --no-cache bash -ENV PORT=80 +ARG PORT=80 +ENV PORT=${PORT} +ARG PUBLIC_URL=/ +ENV PUBLIC_URL=${PUBLIC_URL} RUN rm /etc/nginx/conf.d/default.conf USER nginx COPY --chown=nginx:nginx .docker/Viewer-v3.x /usr/src RUN chmod 777 /usr/src/entrypoint.sh -COPY --from=builder /usr/src/app/platform/app/dist /usr/share/nginx/html +COPY --from=builder /usr/src/app/platform/app/dist /usr/share/nginx/html${PUBLIC_URL} +COPY --from=builder /usr/src/app/platform/app/dist/index.html /usr/share/nginx/html # In entrypoint.sh, app-config.js might be overwritten, so chmod it to be writeable. # The nginx user cannot chmod it, so change to root. USER root -RUN chmod 666 /usr/share/nginx/html/app-config.js +RUN chown -R nginx:nginx /usr/share/nginx/html USER nginx ENTRYPOINT ["/usr/src/entrypoint.sh"] CMD ["nginx", "-g", "daemon off;"] diff --git a/addOns/externals/devDependencies/CHANGELOG.md b/addOns/externals/devDependencies/CHANGELOG.md index d759e5293e..79ae243c93 100644 --- a/addOns/externals/devDependencies/CHANGELOG.md +++ b/addOns/externals/devDependencies/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @externals/devDependencies + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @externals/devDependencies + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @externals/devDependencies + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @externals/devDependencies + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @externals/devDependencies + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @externals/devDependencies diff --git a/addOns/externals/devDependencies/package.json b/addOns/externals/devDependencies/package.json index 5f414d45ca..24ee73de5e 100644 --- a/addOns/externals/devDependencies/package.json +++ b/addOns/externals/devDependencies/package.json @@ -1,7 +1,7 @@ { "name": "@externals/devDependencies", "description": "External dev dependencies - put dev build dependencies here", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "license": "MIT", "private": true, "engines": { diff --git a/addOns/externals/dicom-microscopy-viewer/CHANGELOG.md b/addOns/externals/dicom-microscopy-viewer/CHANGELOG.md index 26f822d437..652c6b6e8b 100644 --- a/addOns/externals/dicom-microscopy-viewer/CHANGELOG.md +++ b/addOns/externals/dicom-microscopy-viewer/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @externals/dicom-microscopy-viewer + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @externals/dicom-microscopy-viewer + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @externals/dicom-microscopy-viewer + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @externals/dicom-microscopy-viewer + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @externals/dicom-microscopy-viewer + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @externals/dicom-microscopy-viewer diff --git a/addOns/externals/dicom-microscopy-viewer/package.json b/addOns/externals/dicom-microscopy-viewer/package.json index ecefbe54e1..2d46496145 100644 --- a/addOns/externals/dicom-microscopy-viewer/package.json +++ b/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.10.0-beta.31", + "version": "3.10.0-beta.36", "license": "MIT", "dependencies": { "dicom-microscopy-viewer": "^0.46.1" diff --git a/bun.lockb b/bun.lockb index fcc3b40881..609e29776a 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/commit.txt b/commit.txt index cfac08f999..f4fb14d9f7 100644 --- a/commit.txt +++ b/commit.txt @@ -1 +1 @@ -faf5515e4b93da58b673f1ae59ec345e30870446 \ No newline at end of file +55fe185c72500256452e25d2f2b17fc9faa99dff \ No newline at end of file diff --git a/extensions/cornerstone-dicom-pmap/CHANGELOG.md b/extensions/cornerstone-dicom-pmap/CHANGELOG.md index d9d0a86568..1ee94af302 100644 --- a/extensions/cornerstone-dicom-pmap/CHANGELOG.md +++ b/extensions/cornerstone-dicom-pmap/CHANGELOG.md @@ -3,6 +3,49 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap diff --git a/extensions/cornerstone-dicom-pmap/package.json b/extensions/cornerstone-dicom-pmap/package.json index 78317678c5..f76e91fb1a 100644 --- a/extensions/cornerstone-dicom-pmap/package.json +++ b/extensions/cornerstone-dicom-pmap/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone-dicom-pmap", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "description": "DICOM Parametric Map read workflow", "author": "OHIF", "license": "MIT", @@ -33,10 +33,10 @@ "start": "yarn run dev" }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/i18n": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/i18n": "3.10.0-beta.36", "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.11.2", - "@cornerstonejs/core": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-rt/CHANGELOG.md b/extensions/cornerstone-dicom-rt/CHANGELOG.md index 43d11e33e8..69bed281f9 100644 --- a/extensions/cornerstone-dicom-rt/CHANGELOG.md +++ b/extensions/cornerstone-dicom-rt/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt diff --git a/extensions/cornerstone-dicom-rt/package.json b/extensions/cornerstone-dicom-rt/package.json index d6ac9d44ab..b83b01946a 100644 --- a/extensions/cornerstone-dicom-rt/package.json +++ b/extensions/cornerstone-dicom-rt/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone-dicom-rt", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "description": "DICOM RT read workflow", "author": "OHIF", "license": "MIT", @@ -33,10 +33,10 @@ "start": "yarn run dev" }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/i18n": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/i18n": "3.10.0-beta.36", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/extensions/cornerstone-dicom-seg/CHANGELOG.md b/extensions/cornerstone-dicom-seg/CHANGELOG.md index c45c154447..3ccb9826fa 100644 --- a/extensions/cornerstone-dicom-seg/CHANGELOG.md +++ b/extensions/cornerstone-dicom-seg/CHANGELOG.md @@ -3,6 +3,49 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index b2caf9e0e7..e33efb1ac5 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone-dicom-seg", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "description": "DICOM SEG read workflow", "author": "OHIF", "license": "MIT", @@ -33,10 +33,10 @@ "start": "yarn run dev" }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/i18n": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/i18n": "3.10.0-beta.36", "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.11.2", - "@cornerstonejs/core": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-sr/CHANGELOG.md b/extensions/cornerstone-dicom-sr/CHANGELOG.md index 46cefe9fd0..aec8971262 100644 --- a/extensions/cornerstone-dicom-sr/CHANGELOG.md +++ b/extensions/cornerstone-dicom-sr/CHANGELOG.md @@ -3,6 +3,49 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index 0c35cdaa05..c01da01da0 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone-dicom-sr", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-measurement-tracking": "3.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-measurement-tracking": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", @@ -46,9 +46,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.11.2", - "@cornerstonejs/core": "^2.11.2", - "@cornerstonejs/tools": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone-dynamic-volume/CHANGELOG.md b/extensions/cornerstone-dynamic-volume/CHANGELOG.md index dec8c2bae6..5f92fbb9b5 100644 --- a/extensions/cornerstone-dynamic-volume/CHANGELOG.md +++ b/extensions/cornerstone-dynamic-volume/CHANGELOG.md @@ -3,6 +3,49 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json index a760f16c08..6c92acfa4a 100644 --- a/extensions/cornerstone-dynamic-volume/package.json +++ b/extensions/cornerstone-dynamic-volume/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone-dynamic-volume", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/i18n": "3.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/i18n": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "dcmjs": "*", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -42,8 +42,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/core": "^2.11.2", - "@cornerstonejs/tools": "^2.11.2", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/CHANGELOG.md index 11f0239c77..229e19f77d 100644 --- a/extensions/cornerstone/CHANGELOG.md +++ b/extensions/cornerstone/CHANGELOG.md @@ -3,6 +3,55 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + + +### Features + +* Implemented CSV support for Arrow annotation. ([#4623](https://github.com/OHIF/Viewers/issues/4623)) ([55fe185](https://github.com/OHIF/Viewers/commit/55fe185c72500256452e25d2f2b17fc9faa99dff)) + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + + +### Bug Fixes + +* **3D rendering:** disabled light sliders when shade is off ([#4631](https://github.com/OHIF/Viewers/issues/4631)) ([5322064](https://github.com/OHIF/Viewers/commit/5322064e9eb66791bc598f82bdf4edd35e40be11)) + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-cornerstone + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-cornerstone + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 8c828c0e20..27e505c999 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-cornerstone", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.11.2", + "@cornerstonejs/dicom-image-loader": "^2.14.2", "@icr/polyseg-wasm": "^0.4.0", - "@ohif/core": "3.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "dcmjs": "*", "dicom-parser": "^1.8.21", "hammerjs": "^2.0.8", @@ -55,9 +55,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.11.2", - "@cornerstonejs/core": "^2.11.2", - "@cornerstonejs/tools": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", "@icr/polyseg-wasm": "^0.4.0", "@kitware/vtk.js": "32.1.1", "html2canvas": "^1.4.1", diff --git a/extensions/cornerstone/src/commandsModule.ts b/extensions/cornerstone/src/commandsModule.ts index 857997dee1..597721eff8 100644 --- a/extensions/cornerstone/src/commandsModule.ts +++ b/extensions/cornerstone/src/commandsModule.ts @@ -14,6 +14,7 @@ import { } from '@cornerstonejs/tools'; import { Types as OhifTypes } from '@ohif/core'; +import i18n from '@ohif/i18n'; import { callLabelAutocompleteDialog, showLabelAnnotationPopup, @@ -902,7 +903,7 @@ function commandsModule({ segments: options.createInitialSegment ? { 1: { - label: 'Segment 1', + label: `${i18n.t('Segment')} 1`, active: true, }, } diff --git a/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeLighting.tsx b/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeLighting.tsx index 6aa6f5610a..a6c07ddc2c 100644 --- a/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeLighting.tsx +++ b/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeLighting.tsx @@ -5,6 +5,7 @@ export function VolumeLighting({ servicesManager, commandsManager, viewportId, + hasShade, }: VolumeLightingProps): ReactElement { const { cornerstoneViewportService } = servicesManager.services; const [ambient, setAmbient] = useState(null); @@ -38,11 +39,15 @@ export function VolumeLighting({ setDiffuse(diffuse); setSpecular(specular); }, [viewportId, cornerstoneViewportService]); + const disableOption = hasShade ? '' : 'ohif-disabled !opacity-40'; + const disableSlider = !hasShade; return ( <> -
+
-
+
-
+
); diff --git a/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeShade.tsx b/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeShade.tsx index 4ef52c0b2e..cc7cee7d00 100644 --- a/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeShade.tsx +++ b/extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeShade.tsx @@ -6,6 +6,7 @@ export function VolumeShade({ commandsManager, viewportId, servicesManager, + onClickShade = bool => {}, }: VolumeShadeProps): ReactElement { const { cornerstoneViewportService } = servicesManager.services; const [shade, setShade] = useState(true); @@ -22,6 +23,7 @@ export function VolumeShade({ const { actor } = viewport.getActors()[0]; const shade = actor.getProperty().getShade(); setShade(shade); + onClickShade(shade); setKey(key + 1); }, [viewportId, cornerstoneViewportService]); @@ -32,6 +34,7 @@ export function VolumeShade({ checked={shade} onChange={() => { setShade(!shade); + onClickShade(!shade); onShadeChange(!shade); }} /> diff --git a/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts b/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts index b259558545..49e672af7d 100644 --- a/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts +++ b/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts @@ -15,6 +15,7 @@ import { Types as cstTypes, } from '@cornerstonejs/tools'; import { PubSubService, Types as OHIFTypes } from '@ohif/core'; +import i18n from '@ohif/i18n'; import { easeInOutBell, reverseEaseInOutBell } from '../../utils/transitions'; import { mapROIContoursToRTStructData } from './RTSTRUCT/mapROIContoursToRTStructData'; import { SegmentationRepresentations } from '@cornerstonejs/tools/enums'; @@ -361,11 +362,11 @@ class SegmentationService extends PubSubService { options.segments && Object.keys(options.segments).length > 0 ? options.segments : { - 1: { - label: 'Segment 1', - active: true, + 1: { + label: `${i18n.t('Segment')} 1`, + active: true, + }, }, - }, cachedStats: { info: `S${displaySet.SeriesNumber}: ${displaySet.SeriesDescription}`, }, @@ -382,8 +383,8 @@ class SegmentationService extends PubSubService { segmentationId?: string; type: SegmentationRepresentations; } = { - type: LABELMAP, - } + type: LABELMAP, + } ): Promise { const { type } = options; let { segmentationId } = options; @@ -535,8 +536,8 @@ class SegmentationService extends PubSubService { segmentationId?: string; type: SegmentationRepresentations; } = { - type: CONTOUR, - } + type: CONTOUR, + } ): Promise { const { type } = options; let { segmentationId } = options; @@ -799,7 +800,7 @@ class SegmentationService extends PubSubService { } = {} ): void { if (config?.segmentIndex === 0) { - throw new Error('Segment index 0 is reserved for "no label"'); + throw new Error(i18n.t('Segment') + ' index 0 is reserved for "no label"'); } const csSegmentation = this.getCornerstoneSegmentation(segmentationId); @@ -813,7 +814,7 @@ class SegmentationService extends PubSubService { // update the segmentation if (!config.label) { - config.label = `Segment ${segmentIndex}`; + config.label = `${i18n.t('Segment')} ${segmentIndex}`; } const currentSegments = csSegmentation.segments; diff --git a/extensions/cornerstone/src/types/ViewportPresets.ts b/extensions/cornerstone/src/types/ViewportPresets.ts index e954c2292c..fc27bd324e 100644 --- a/extensions/cornerstone/src/types/ViewportPresets.ts +++ b/extensions/cornerstone/src/types/ViewportPresets.ts @@ -57,10 +57,12 @@ export type VolumeShadeProps = { viewportId: string; commandsManager: CommandsManager; servicesManager: AppTypes.ServicesManager; + onClickShade?: (bool: boolean) => void; }; export type VolumeLightingProps = { viewportId: string; commandsManager: CommandsManager; servicesManager: AppTypes.ServicesManager; + hasShade: boolean; }; diff --git a/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts b/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts index bffba4a2aa..edd57546c8 100644 --- a/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts +++ b/extensions/cornerstone/src/utils/measurementServiceMappings/ArrowAnnotate.ts @@ -57,6 +57,7 @@ const Length = { const mappedAnnotations = getMappedAnnotations(annotation, displaySetService); const displayText = getDisplayText(mappedAnnotations, displaySet); + const getReport = () => _getReport(mappedAnnotations, points, FrameOfReferenceUID); return { uid: annotationUID, @@ -77,9 +78,7 @@ const Length = { displayText: displayText, data: data.cachedStats, type: getValueTypeFromToolType(toolName), - getReport: () => { - throw new Error('Not implemented'); - }, + getReport, }; }, }; @@ -145,4 +144,32 @@ function getDisplayText(mappedAnnotations, displaySet) { return displayText; } +function _getReport(mappedAnnotations, points, FrameOfReferenceUID) { + const columns = []; + const values = []; + + columns.push('AnnotationType'); + values.push('Cornerstone:ArrowAnnote'); + + mappedAnnotations.forEach(annotation => { + const { text } = annotation; + columns.push(`Text`); + values.push(text); + }); + + if (FrameOfReferenceUID) { + columns.push('FrameOfReferenceUID'); + values.push(FrameOfReferenceUID); + } + + if (points) { + columns.push('points'); + values.push(points.map(p => p.join(' ')).join(';')); + } + + return { + columns, + values, + }; +} export default Length; diff --git a/extensions/default/CHANGELOG.md b/extensions/default/CHANGELOG.md index a813cfdd62..b3d5efca7d 100644 --- a/extensions/default/CHANGELOG.md +++ b/extensions/default/CHANGELOG.md @@ -3,6 +3,55 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + + +### Bug Fixes + +* **context menu:** restrict the context menu accessibility for locked and hidden annotations ([#4625](https://github.com/OHIF/Viewers/issues/4625)) ([e11ceb9](https://github.com/OHIF/Viewers/commit/e11ceb9d20fa5e680a0247f6ca7c27825daea6c5)) + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-default + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + + +### Bug Fixes + +* Docker build time was very slow on a tiny change ([#4559](https://github.com/OHIF/Viewers/issues/4559)) ([7e43b2f](https://github.com/OHIF/Viewers/commit/7e43b2f768cfc3e08ecde9dfdae275194daece2b)) + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-default + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + + +### Bug Fixes + +* **datasource:** attach auth headers for delete requests in the dicomweb datasource ([#4619](https://github.com/OHIF/Viewers/issues/4619)) ([8d0ed80](https://github.com/OHIF/Viewers/commit/8d0ed80e0c4570ab799281c29e487dbb39f47b95)) + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) diff --git a/extensions/default/package.json b/extensions/default/package.json index 90be6d3cf6..7145540027 100644 --- a/extensions/default/package.json +++ b/extensions/default/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-default", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/i18n": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/i18n": "3.10.0-beta.36", "dcmjs": "*", "dicomweb-client": "^0.10.4", "prop-types": "^15.6.2", diff --git a/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx b/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx index 2e7af439c4..5323308046 100644 --- a/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx +++ b/extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx @@ -48,15 +48,13 @@ export default class ContextMenuController { const { event, subMenu, menuId, menus, selectorProps } = contextMenuProps; - const annotationManager = CsAnnotation.state.getAnnotationManager(); - const { locking } = CsAnnotation; + const { locking, visibility } = CsAnnotation; const targetAnnotationId = selectorProps?.nearbyToolData?.annotationUID as string; - const isLocked = locking.isAnnotationLocked( - annotationManager.getAnnotation(targetAnnotationId) - ); + const isLocked = locking.isAnnotationLocked(targetAnnotationId); + const isVisible = visibility.isAnnotationVisible(targetAnnotationId); - if (isLocked) { - console.warn('Annotation is locked.'); + if (isLocked || !isVisible) { + console.warn(`Annotation is ${isLocked ? 'locked' : 'not visible'}.`); return; } diff --git a/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js b/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js index 542267abef..979a682523 100644 --- a/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js +++ b/extensions/default/src/DicomWebDataSource/dcm4cheeReject.js @@ -1,4 +1,4 @@ -export default function (wadoRoot) { +export default function (wadoRoot, getAuthrorizationHeader) { return { series: (StudyInstanceUID, SeriesInstanceUID) => { return new Promise((resolve, reject) => { @@ -10,6 +10,12 @@ export default function (wadoRoot) { const xhr = new XMLHttpRequest(); xhr.open('POST', url, true); + const headers = getAuthrorizationHeader(); + + for (const key in headers) { + xhr.setRequestHeader(key, headers[key]); + } + //Send the proper header information along with the request // TODO -> Auth when we re-add authorization. diff --git a/extensions/default/src/DicomWebDataSource/index.ts b/extensions/default/src/DicomWebDataSource/index.ts index b41335c055..676b54bbb6 100644 --- a/extensions/default/src/DicomWebDataSource/index.ts +++ b/extensions/default/src/DicomWebDataSource/index.ts @@ -602,7 +602,7 @@ function createDicomWebApi(dicomWebConfig: DicomWebConfig, servicesManager) { }; if (dicomWebConfig.supportsReject) { - implementation.reject = dcm4cheeReject(dicomWebConfig.wadoRoot); + implementation.reject = dcm4cheeReject(dicomWebConfig.wadoRoot, getAuthorizationHeader); } return IWebApiDataSource.create(implementation); diff --git a/extensions/default/src/ViewerLayout/ViewerHeader.tsx b/extensions/default/src/ViewerLayout/ViewerHeader.tsx index ced72eb6f2..470528fd3b 100644 --- a/extensions/default/src/ViewerLayout/ViewerHeader.tsx +++ b/extensions/default/src/ViewerLayout/ViewerHeader.tsx @@ -10,6 +10,7 @@ import { hotkeys } from '@ohif/core'; import { Toolbar } from '../Toolbar/Toolbar'; import HeaderPatientInfo from './HeaderPatientInfo'; import { PatientInfoVisibility } from './HeaderPatientInfo/HeaderPatientInfo'; +import { preserveQueryParameters, publicUrl } from '@ohif/app'; const { availableLanguages, defaultLanguage, currentLanguage } = i18n; @@ -41,7 +42,7 @@ function ViewerHeader({ } navigate({ - pathname: '/', + pathname: publicUrl, search: decodeURIComponent(searchQuery.toString()), }); }; diff --git a/extensions/dicom-microscopy/CHANGELOG.md b/extensions/dicom-microscopy/CHANGELOG.md index 0442d16308..5c04b86e39 100644 --- a/extensions/dicom-microscopy/CHANGELOG.md +++ b/extensions/dicom-microscopy/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-dicom-microscopy + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-dicom-microscopy + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-dicom-microscopy + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-dicom-microscopy + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-dicom-microscopy + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-dicom-microscopy diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json index 19f96c6e2e..9b80131b81 100644 --- a/extensions/dicom-microscopy/package.json +++ b/extensions/dicom-microscopy/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-dicom-microscopy", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/i18n": "3.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/i18n": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "prop-types": "^15.6.2", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/extensions/dicom-pdf/CHANGELOG.md b/extensions/dicom-pdf/CHANGELOG.md index fad7498bd1..a8b004352a 100644 --- a/extensions/dicom-pdf/CHANGELOG.md +++ b/extensions/dicom-pdf/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-dicom-pdf + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-dicom-pdf + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-dicom-pdf + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-dicom-pdf + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-dicom-pdf + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-dicom-pdf diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json index 845c64934f..54aa5b0f6d 100644 --- a/extensions/dicom-pdf/package.json +++ b/extensions/dicom-pdf/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-dicom-pdf", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", diff --git a/extensions/dicom-video/CHANGELOG.md b/extensions/dicom-video/CHANGELOG.md index 49513e767e..0717846e94 100644 --- a/extensions/dicom-video/CHANGELOG.md +++ b/extensions/dicom-video/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-dicom-video + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-dicom-video + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-dicom-video + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-dicom-video + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-dicom-video + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-dicom-video diff --git a/extensions/dicom-video/package.json b/extensions/dicom-video/package.json index 4973d96e55..6701f65939 100644 --- a/extensions/dicom-video/package.json +++ b/extensions/dicom-video/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-dicom-video", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", diff --git a/extensions/measurement-tracking/CHANGELOG.md b/extensions/measurement-tracking/CHANGELOG.md index a12b252ec8..ed6c2fa4fe 100644 --- a/extensions/measurement-tracking/CHANGELOG.md +++ b/extensions/measurement-tracking/CHANGELOG.md @@ -3,6 +3,49 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-measurement-tracking + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-measurement-tracking + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-measurement-tracking + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-measurement-tracking + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-measurement-tracking diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index b98e99cf78..2b94df249a 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-measurement-tracking", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.11.2", - "@cornerstonejs/tools": "^2.11.2", - "@ohif/core": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "classnames": "^2.3.2", "dcmjs": "*", "lodash.debounce": "^4.0.8", @@ -49,7 +49,7 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/ui": "3.10.0-beta.36", "@xstate/react": "^3.2.2", "xstate": "^4.10.0" } diff --git a/extensions/test-extension/CHANGELOG.md b/extensions/test-extension/CHANGELOG.md index e8d6d7d044..b430ff7e73 100644 --- a/extensions/test-extension/CHANGELOG.md +++ b/extensions/test-extension/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-test + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-test + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-test + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-test + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-test + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-test diff --git a/extensions/test-extension/package.json b/extensions/test-extension/package.json index 7a3ac182a8..d0d9f8d04c 100644 --- a/extensions/test-extension/package.json +++ b/extensions/test-extension/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-test", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "dcmjs": "0.29.11", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", diff --git a/extensions/tmtv/CHANGELOG.md b/extensions/tmtv/CHANGELOG.md index 169d7d252b..541220b7b5 100644 --- a/extensions/tmtv/CHANGELOG.md +++ b/extensions/tmtv/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-tmtv + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/extension-tmtv + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/extension-tmtv + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-tmtv + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/extension-tmtv + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/extension-tmtv diff --git a/extensions/tmtv/package.json b/extensions/tmtv/package.json index 1cf7a2c355..ef7587b82f 100644 --- a/extensions/tmtv/package.json +++ b/extensions/tmtv/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/extension-tmtv", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", "dcmjs": "*", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", diff --git a/extensions/tmtv/src/commandsModule.ts b/extensions/tmtv/src/commandsModule.ts index 35e6f67ef4..078af64d8c 100644 --- a/extensions/tmtv/src/commandsModule.ts +++ b/extensions/tmtv/src/commandsModule.ts @@ -2,6 +2,7 @@ import OHIF from '@ohif/core'; import * as cs from '@cornerstonejs/core'; import * as csTools from '@cornerstonejs/tools'; import { classes } from '@ohif/core'; +import i18n from '@ohif/i18n'; import getThresholdValues from './utils/getThresholdValue'; import createAndDownloadTMTVReport from './utils/createAndDownloadTMTVReport'; @@ -182,7 +183,7 @@ const commandsModule = ({ servicesManager, commandsManager, extensionManager }: const segmentationId = await segmentationService.createLabelmapForDisplaySet(displaySet, { label: `Segmentation ${currentSegmentations.length + 1}`, - segments: { 1: { label: 'Segment 1', active: true } }, + segments: { 1: { label: `${i18n.t('Segment')} 1`, active: true } }, }); segmentationService.addSegmentationRepresentation(withPTViewportId, { diff --git a/lerna.json b/lerna.json index 45b56741b7..82d6d49b3d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "packages": ["extensions/*", "platform/*", "modes/*", "addOns/externals/*"], "npmClient": "yarn" } diff --git a/modes/basic-dev-mode/CHANGELOG.md b/modes/basic-dev-mode/CHANGELOG.md index 9543fea43f..04956e98d2 100644 --- a/modes/basic-dev-mode/CHANGELOG.md +++ b/modes/basic-dev-mode/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-basic-dev-mode + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-basic-dev-mode + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/mode-basic-dev-mode + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-basic-dev-mode + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-basic-dev-mode + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/mode-basic-dev-mode diff --git a/modes/basic-dev-mode/package.json b/modes/basic-dev-mode/package.json index 15b0b9d898..1885b37254 100644 --- a/modes/basic-dev-mode/package.json +++ b/modes/basic-dev-mode/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/mode-basic-dev-mode", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/extension-dicom-pdf": "3.10.0-beta.31", - "@ohif/extension-dicom-video": "3.10.0-beta.31" + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/extension-dicom-pdf": "3.10.0-beta.36", + "@ohif/extension-dicom-video": "3.10.0-beta.36" }, "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/modes/basic-test-mode/CHANGELOG.md b/modes/basic-test-mode/CHANGELOG.md index d1a1888743..ad2a90e2e4 100644 --- a/modes/basic-test-mode/CHANGELOG.md +++ b/modes/basic-test-mode/CHANGELOG.md @@ -3,6 +3,49 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-test + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-test + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/mode-test + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-test + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/mode-test diff --git a/modes/basic-test-mode/package.json b/modes/basic-test-mode/package.json index c8881aa3ef..8bb2dc1e5f 100644 --- a/modes/basic-test-mode/package.json +++ b/modes/basic-test-mode/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/mode-test", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/extension-dicom-pdf": "3.10.0-beta.31", - "@ohif/extension-dicom-video": "3.10.0-beta.31", - "@ohif/extension-measurement-tracking": "3.10.0-beta.31", - "@ohif/extension-test": "3.10.0-beta.31" + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/extension-dicom-pdf": "3.10.0-beta.36", + "@ohif/extension-dicom-video": "3.10.0-beta.36", + "@ohif/extension-measurement-tracking": "3.10.0-beta.36", + "@ohif/extension-test": "3.10.0-beta.36" }, "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/modes/basic-test-mode/src/initToolGroups.ts b/modes/basic-test-mode/src/initToolGroups.ts index ef56f9cd60..45742848b8 100644 --- a/modes/basic-test-mode/src/initToolGroups.ts +++ b/modes/basic-test-mode/src/initToolGroups.ts @@ -202,6 +202,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) { { toolName: toolNames.WindowLevelRegion }, { toolName: toolNames.PlanarFreehandROI }, { toolName: toolNames.SplineROI }, + { toolName: toolNames.LivewireContour }, ], disabled: [ { diff --git a/modes/longitudinal/CHANGELOG.md b/modes/longitudinal/CHANGELOG.md index fbb864e299..2933f1459c 100644 --- a/modes/longitudinal/CHANGELOG.md +++ b/modes/longitudinal/CHANGELOG.md @@ -3,6 +3,49 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-longitudinal + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-longitudinal + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/mode-longitudinal + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-longitudinal + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/mode-longitudinal diff --git a/modes/longitudinal/package.json b/modes/longitudinal/package.json index c86bc49ed1..8ab5c82978 100644 --- a/modes/longitudinal/package.json +++ b/modes/longitudinal/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/mode-longitudinal", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "description": "Longitudinal Workflow", "author": "OHIF", "license": "MIT", @@ -34,15 +34,15 @@ "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests" }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/extension-dicom-pdf": "3.10.0-beta.31", - "@ohif/extension-dicom-video": "3.10.0-beta.31", - "@ohif/extension-measurement-tracking": "3.10.0-beta.31" + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/extension-dicom-pdf": "3.10.0-beta.36", + "@ohif/extension-dicom-video": "3.10.0-beta.36", + "@ohif/extension-measurement-tracking": "3.10.0-beta.36" }, "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/modes/longitudinal/src/initToolGroups.js b/modes/longitudinal/src/initToolGroups.js index 6743602d02..2622d40f6d 100644 --- a/modes/longitudinal/src/initToolGroups.js +++ b/modes/longitudinal/src/initToolGroups.js @@ -243,6 +243,8 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m { toolName: toolNames.Angle }, { toolName: toolNames.CobbAngle }, { toolName: toolNames.PlanarFreehandROI }, + { toolName: toolNames.SplineROI }, + { toolName: toolNames.LivewireContour }, { toolName: toolNames.WindowLevelRegion }, { toolName: toolNames.PlanarFreehandContourSegmentation, diff --git a/modes/microscopy/CHANGELOG.md b/modes/microscopy/CHANGELOG.md index 0013c24f41..56b7fe7036 100644 --- a/modes/microscopy/CHANGELOG.md +++ b/modes/microscopy/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-microscopy + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-microscopy + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/mode-microscopy + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-microscopy + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-microscopy + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/mode-microscopy diff --git a/modes/microscopy/package.json b/modes/microscopy/package.json index 0bf427eda2..2ee21b43d3 100644 --- a/modes/microscopy/package.json +++ b/modes/microscopy/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/mode-microscopy", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-dicom-microscopy": "3.10.0-beta.31" + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-dicom-microscopy": "3.10.0-beta.36" }, "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/modes/preclinical-4d/CHANGELOG.md b/modes/preclinical-4d/CHANGELOG.md index 24d766dbb4..8ad87d365b 100644 --- a/modes/preclinical-4d/CHANGELOG.md +++ b/modes/preclinical-4d/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-preclinical-4d + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-preclinical-4d + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/mode-preclinical-4d + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-preclinical-4d + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-preclinical-4d + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/mode-preclinical-4d diff --git a/modes/preclinical-4d/package.json b/modes/preclinical-4d/package.json index bee4f22256..f4c27529c5 100644 --- a/modes/preclinical-4d/package.json +++ b/modes/preclinical-4d/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/mode-preclinical-4d", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "description": "4D Workflow", "author": "OHIF", "license": "MIT", @@ -33,12 +33,12 @@ "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests" }, "peerDependencies": { - "@ohif/core": "3.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dynamic-volume": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/extension-tmtv": "3.10.0-beta.31" + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dynamic-volume": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/extension-tmtv": "3.10.0-beta.36" }, "dependencies": { "@babel/runtime": "^7.20.13" diff --git a/modes/segmentation/CHANGELOG.md b/modes/segmentation/CHANGELOG.md index 9d08ade1eb..e228714a2d 100644 --- a/modes/segmentation/CHANGELOG.md +++ b/modes/segmentation/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-segmentation + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-segmentation + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/mode-segmentation + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-segmentation + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-segmentation + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/mode-segmentation diff --git a/modes/segmentation/package.json b/modes/segmentation/package.json index 8334e16caa..9dfbb85cc3 100644 --- a/modes/segmentation/package.json +++ b/modes/segmentation/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/mode-segmentation", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/extension-dicom-pdf": "3.10.0-beta.31", - "@ohif/extension-dicom-video": "3.10.0-beta.31" + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/extension-dicom-pdf": "3.10.0-beta.36", + "@ohif/extension-dicom-video": "3.10.0-beta.36" }, "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/modes/tmtv/CHANGELOG.md b/modes/tmtv/CHANGELOG.md index b90e41f0d0..bdc95aba0b 100644 --- a/modes/tmtv/CHANGELOG.md +++ b/modes/tmtv/CHANGELOG.md @@ -3,6 +3,46 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-tmtv + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/mode-tmtv + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + +**Note:** Version bump only for package @ohif/mode-tmtv + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-tmtv + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/mode-tmtv + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/mode-tmtv diff --git a/modes/tmtv/package.json b/modes/tmtv/package.json index fb67a6a733..9c1893de92 100644 --- a/modes/tmtv/package.json +++ b/modes/tmtv/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/mode-tmtv", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "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.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/extension-dicom-pdf": "3.10.0-beta.31", - "@ohif/extension-dicom-video": "3.10.0-beta.31", - "@ohif/extension-measurement-tracking": "3.10.0-beta.31" + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/extension-dicom-pdf": "3.10.0-beta.36", + "@ohif/extension-dicom-video": "3.10.0-beta.36", + "@ohif/extension-measurement-tracking": "3.10.0-beta.36" }, "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/package.json b/package.json index e69f2ccf33..29deca0246 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "build:demo": "lerna run build:viewer:demo --stream", "build:package-all": "lerna run build:package --parallel --stream", "build:package-all-1": "lerna run build:package-1 --parallel --stream", + "show:config": "echo Config is $APP_CONFIG on $PUBLIC_URL", "dev": "lerna run dev:viewer --stream", "dev:no:cache": "lerna run dev:no:cache --stream", "dev:project": ".scripts/dev.sh", diff --git a/platform/app/CHANGELOG.md b/platform/app/CHANGELOG.md index 09b3d49d4f..43a13a870a 100644 --- a/platform/app/CHANGELOG.md +++ b/platform/app/CHANGELOG.md @@ -3,6 +3,52 @@ 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.36](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.35...v3.10.0-beta.36) (2025-01-03) + +**Note:** Version bump only for package @ohif/app + + + + + +# [3.10.0-beta.35](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.34...v3.10.0-beta.35) (2025-01-03) + +**Note:** Version bump only for package @ohif/app + + + + + +# [3.10.0-beta.34](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.33...v3.10.0-beta.34) (2025-01-02) + + +### Bug Fixes + +* Docker build time was very slow on a tiny change ([#4559](https://github.com/OHIF/Viewers/issues/4559)) ([7e43b2f](https://github.com/OHIF/Viewers/commit/7e43b2f768cfc3e08ecde9dfdae275194daece2b)) + + + + + +# [3.10.0-beta.33](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.32...v3.10.0-beta.33) (2024-12-20) + + +### Bug Fixes + +* **tools:** enable additional tools in volume viewport ([#4620](https://github.com/OHIF/Viewers/issues/4620)) ([1992002](https://github.com/OHIF/Viewers/commit/1992002d2dced171c17b9a0163baf707fc551e3d)) + + + + + +# [3.10.0-beta.32](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.31...v3.10.0-beta.32) (2024-12-20) + +**Note:** Version bump only for package @ohif/app + + + + + # [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20) **Note:** Version bump only for package @ohif/app diff --git a/platform/app/cypress/integration/volume/MPR.spec.js b/platform/app/cypress/integration/volume/MPR.spec.js index 5677468ca3..a315394d6f 100644 --- a/platform/app/cypress/integration/volume/MPR.spec.js +++ b/platform/app/cypress/integration/volume/MPR.spec.js @@ -39,7 +39,6 @@ describe('OHIF MPR', () => { .its('cornerstone') .then(cornerstone => { const viewports = cornerstone.getRenderingEngines()[0].getViewports(); - // The stack viewport still exists after the changes to viewportId and inde const imageData1 = viewports[0].getImageData(); const imageData2 = viewports[1].getImageData(); diff --git a/platform/app/package.json b/platform/app/package.json index 5c028fa47e..735f5dd51a 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -1,6 +1,6 @@ { "name": "@ohif/app", - "version": "3.10.0-beta.31", + "version": "3.10.0-beta.36", "productVersion": "3.4.0", "description": "OHIF Viewer", "author": "OHIF Contributors", @@ -53,25 +53,25 @@ "@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.11.2", + "@cornerstonejs/dicom-image-loader": "^2.14.2", "@emotion/serialize": "^1.1.3", - "@ohif/core": "3.10.0-beta.31", - "@ohif/extension-cornerstone": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.31", - "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", - "@ohif/extension-default": "3.10.0-beta.31", - "@ohif/extension-dicom-microscopy": "3.10.0-beta.31", - "@ohif/extension-dicom-pdf": "3.10.0-beta.31", - "@ohif/extension-dicom-video": "3.10.0-beta.31", - "@ohif/extension-test": "3.10.0-beta.31", - "@ohif/i18n": "3.10.0-beta.31", - "@ohif/mode-basic-dev-mode": "3.10.0-beta.31", - "@ohif/mode-longitudinal": "3.10.0-beta.31", - "@ohif/mode-microscopy": "3.10.0-beta.31", - "@ohif/mode-test": "3.10.0-beta.31", - "@ohif/ui": "3.10.0-beta.31", - "@ohif/ui-next": "3.10.0-beta.31", + "@ohif/core": "3.10.0-beta.36", + "@ohif/extension-cornerstone": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-rt": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-seg": "3.10.0-beta.36", + "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.36", + "@ohif/extension-default": "3.10.0-beta.36", + "@ohif/extension-dicom-microscopy": "3.10.0-beta.36", + "@ohif/extension-dicom-pdf": "3.10.0-beta.36", + "@ohif/extension-dicom-video": "3.10.0-beta.36", + "@ohif/extension-test": "3.10.0-beta.36", + "@ohif/i18n": "3.10.0-beta.36", + "@ohif/mode-basic-dev-mode": "3.10.0-beta.36", + "@ohif/mode-longitudinal": "3.10.0-beta.36", + "@ohif/mode-microscopy": "3.10.0-beta.36", + "@ohif/mode-test": "3.10.0-beta.36", + "@ohif/ui": "3.10.0-beta.36", + "@ohif/ui-next": "3.10.0-beta.36", "@svgr/webpack": "^8.1.0", "@types/react": "^18.3.3", "classnames": "^2.3.2", diff --git a/platform/app/public/config/default.js b/platform/app/public/config/default.js index c4cb16b344..ba63736e83 100644 --- a/platform/app/public/config/default.js +++ b/platform/app/public/config/default.js @@ -1,6 +1,7 @@ /** @type {AppTypes.Config} */ window.config = { + name: 'config/default.js', routerBasename: '/', // whiteLabeling: {}, extensions: [], diff --git a/platform/app/public/config/kheops.js b/platform/app/public/config/kheops.js index 15b739efd4..3e7bc79264 100644 --- a/platform/app/public/config/kheops.js +++ b/platform/app/public/config/kheops.js @@ -1,8 +1,8 @@ /** @type {AppTypes.Config} */ window.config = { + name: 'config/kheops.js', routerBasename: '/', - // whiteLabeling: {}, extensions: [], modes: [], customizationService: {}, @@ -24,8 +24,9 @@ window.config = { prefetch: 25, }, // filterQueryParam: false, - // Uses the dicomweb proxy as the default URL - defaultDataSourceName: 'dicomwebproxy', + // Uses the ohif datasource as the default - this requires that KHEOPS be + // configured with an OHIF path to .../viewer/dicomwebproxy + defaultDataSourceName: 'ohif3', /* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */ // dangerouslyUseDynamicConfig: { // enabled: true, diff --git a/platform/app/public/config/local_orthanc.js b/platform/app/public/config/local_orthanc.js index a3bdc8ace1..b17dc3fbe3 100644 --- a/platform/app/public/config/local_orthanc.js +++ b/platform/app/public/config/local_orthanc.js @@ -29,7 +29,6 @@ window.config = { enableStudyLazyLoad: true, supportsFuzzyMatching: true, supportsWildcard: true, - dicomUploadEnabled: true, omitQuotationForMultipartRequest: true, bulkDataURI: { enabled: true, diff --git a/platform/app/public/html-templates/index.html b/platform/app/public/html-templates/index.html index 25e718e79b..225a00697c 100644 --- a/platform/app/public/html-templates/index.html +++ b/platform/app/public/html-templates/index.html @@ -214,8 +214,9 @@ function browserImportFunction(moduleId) { return import(moduleId); } - + window.PUBLIC_URL = '<%= PUBLIC_URL %>'; +