From dbf3e881290cb382ec3dd665711c22cc931a1632 Mon Sep 17 00:00:00 2001 From: Alireza Date: Thu, 30 May 2024 14:44:52 -0400 Subject: [PATCH 1/3] fix: Disable viewport indicators in CrosshairsTool by default (#1296) --- packages/tools/src/tools/CrosshairsTool.ts | 24 ++----------------- .../tools/src/tools/base/AnnotationTool.ts | 2 +- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/packages/tools/src/tools/CrosshairsTool.ts b/packages/tools/src/tools/CrosshairsTool.ts index 6da1f0ffb1..f83cc3678c 100644 --- a/packages/tools/src/tools/CrosshairsTool.ts +++ b/packages/tools/src/tools/CrosshairsTool.ts @@ -54,27 +54,6 @@ import { CONSTANTS } from '@cornerstonejs/core'; const { RENDERING_DEFAULTS } = CONSTANTS; -// TODO: nested config is weird -interface ToolConfiguration { - configuration?: { - getReferenceLineColor?: (viewportId: string) => string; - getReferenceLineControllable?: (viewportId: string) => boolean; - getReferenceLineDraggableRotatable?: (viewportId: string) => boolean; - getReferenceLineSlabThicknessControlsOn?: (viewportId: string) => boolean; - referenceLinesCenterGapRadius?: number; - shadow?: boolean; - autopan?: { - enabled: boolean; - panSize: number; - }; - mobile?: { - enabled: boolean; - opacity: number; - handleRadius: number; - }; - }; -} - interface CrosshairsAnnotation extends Annotation { data: { handles: { @@ -142,7 +121,7 @@ class CrosshairsTool extends AnnotationTool { shadow: true, // renders a colored circle on top right of the viewports whose color // matches the color of the reference line - viewportIndicators: true, + viewportIndicators: false, viewportIndicatorsConfig: { radius: 5, @@ -1454,6 +1433,7 @@ class CrosshairsTool extends AnnotationTool { data.handles.rotationPoints = newRtpoints; data.handles.slabThicknessPoints = newStpoints; + debugger; if (this.configuration.viewportIndicators) { const { viewportIndicatorsConfig } = this.configuration; diff --git a/packages/tools/src/tools/base/AnnotationTool.ts b/packages/tools/src/tools/base/AnnotationTool.ts index 4c711e7b5b..d95a47aac1 100644 --- a/packages/tools/src/tools/base/AnnotationTool.ts +++ b/packages/tools/src/tools/base/AnnotationTool.ts @@ -376,7 +376,7 @@ abstract class AnnotationTool extends AnnotationDisplayTool { if (viewport instanceof BaseVolumeViewport) { const volumeId = csUtils.getVolumeId(targetId); const volume = cache.getVolume(volumeId); - return volume.scaling?.PT !== undefined; + return volume?.scaling?.PT !== undefined; } const scalingModule: Types.ScalingParameters | undefined = imageId && metaData.get('scalingModule', imageId); From fb61d88189430175054219a970a09d9030a1fd88 Mon Sep 17 00:00:00 2001 From: ohif-bot Date: Thu, 30 May 2024 18:53:46 +0000 Subject: [PATCH 2/3] chore(version): version.json [skip ci] --- commit.txt | 2 +- packages/adapters/package.json | 6 +++--- packages/dicomImageLoader/package.json | 2 +- packages/docs/package.json | 12 ++++++------ packages/nifti-volume-loader/package.json | 2 +- packages/streaming-image-volume-loader/package.json | 2 +- packages/tools/package.json | 2 +- version.json | 4 ++-- version.txt | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/commit.txt b/commit.txt index e19803642f..731164787b 100644 --- a/commit.txt +++ b/commit.txt @@ -1 +1 @@ -561bd4bcd556d968b8e4f9ec48061aaeb434e045 \ No newline at end of file +dbf3e881290cb382ec3dd665711c22cc931a1632 \ No newline at end of file diff --git a/packages/adapters/package.json b/packages/adapters/package.json index 872fb9ad6b..8c2d43e255 100644 --- a/packages/adapters/package.json +++ b/packages/adapters/package.json @@ -42,7 +42,7 @@ "homepage": "https://github.com/cornerstonejs/cornerstone3D/blob/main/packages/adapters/README.md", "dependencies": { "@babel/runtime-corejs2": "^7.17.8", - "@cornerstonejs/tools": "^1.77.2", + "@cornerstonejs/tools": "^1.77.3", "buffer": "^6.0.3", "dcmjs": "^0.29.8", "gl-matrix": "^3.4.3", @@ -50,7 +50,7 @@ "ndarray": "^1.0.19" }, "devDependencies": { - "@cornerstonejs/core": "^1.77.2", - "@cornerstonejs/streaming-image-volume-loader": "^1.77.2" + "@cornerstonejs/core": "^1.77.3", + "@cornerstonejs/streaming-image-volume-loader": "^1.77.3" } } diff --git a/packages/dicomImageLoader/package.json b/packages/dicomImageLoader/package.json index c5325325fb..c65600f851 100644 --- a/packages/dicomImageLoader/package.json +++ b/packages/dicomImageLoader/package.json @@ -66,7 +66,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/core": "^1.77.2", + "@cornerstonejs/core": "^1.77.3", "dicom-parser": "^1.8.9", "pako": "^2.0.4", "uuid": "^9.0.0" diff --git a/packages/docs/package.json b/packages/docs/package.json index 0878283ee8..867b1bd1ec 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -29,12 +29,12 @@ "write-heading-ids": "docusaurus write-heading-ids" }, "dependencies": { - "@cornerstonejs/adapters": "^1.77.2", - "@cornerstonejs/core": "^1.77.2", - "@cornerstonejs/dicom-image-loader": "^1.77.2", - "@cornerstonejs/nifti-volume-loader": "^1.77.2", - "@cornerstonejs/streaming-image-volume-loader": "^1.77.2", - "@cornerstonejs/tools": "^1.77.2", + "@cornerstonejs/adapters": "^1.77.3", + "@cornerstonejs/core": "^1.77.3", + "@cornerstonejs/dicom-image-loader": "^1.77.3", + "@cornerstonejs/nifti-volume-loader": "^1.77.3", + "@cornerstonejs/streaming-image-volume-loader": "^1.77.3", + "@cornerstonejs/tools": "^1.77.3", "@docusaurus/core": "2.3.1", "@docusaurus/module-type-aliases": "2.3.1", "@docusaurus/plugin-google-gtag": "2.3.1", diff --git a/packages/nifti-volume-loader/package.json b/packages/nifti-volume-loader/package.json index dd9da53034..ea5387d338 100644 --- a/packages/nifti-volume-loader/package.json +++ b/packages/nifti-volume-loader/package.json @@ -29,7 +29,7 @@ "webpack:watch": "webpack --mode development --progress --watch --config ./.webpack/webpack.dev.js" }, "dependencies": { - "@cornerstonejs/core": "^1.77.2", + "@cornerstonejs/core": "^1.77.3", "nifti-reader-js": "^0.6.8" }, "contributors": [ diff --git a/packages/streaming-image-volume-loader/package.json b/packages/streaming-image-volume-loader/package.json index 033aceff84..1e72c876b3 100644 --- a/packages/streaming-image-volume-loader/package.json +++ b/packages/streaming-image-volume-loader/package.json @@ -29,7 +29,7 @@ "webpack:watch": "webpack --mode development --progress --watch --config ./.webpack/webpack.dev.js" }, "dependencies": { - "@cornerstonejs/core": "^1.77.2", + "@cornerstonejs/core": "^1.77.3", "comlink": "^4.4.1" }, "contributors": [ diff --git a/packages/tools/package.json b/packages/tools/package.json index 028f343e4c..65282f4346 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -29,7 +29,7 @@ "webpack:watch": "webpack --mode development --progress --watch --config ./.webpack/webpack.dev.js" }, "dependencies": { - "@cornerstonejs/core": "^1.77.2", + "@cornerstonejs/core": "^1.77.3", "@icr/polyseg-wasm": "0.4.0", "@types/offscreencanvas": "2019.7.3", "comlink": "^4.4.1", diff --git a/version.json b/version.json index 2325dac07d..15cf217651 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.77.2", - "commit": "561bd4bcd556d968b8e4f9ec48061aaeb434e045" + "version": "1.77.3", + "commit": "dbf3e881290cb382ec3dd665711c22cc931a1632" } \ No newline at end of file diff --git a/version.txt b/version.txt index 6cdeba3855..e168f31cb2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.77.2 \ No newline at end of file +1.77.3 \ No newline at end of file From a33572ac280ef5d42b56083161c020d04e4d30c2 Mon Sep 17 00:00:00 2001 From: ohif-bot Date: Thu, 30 May 2024 18:54:00 +0000 Subject: [PATCH 3/3] chore(version): Update package versions [skip ci] --- CHANGELOG.md | 6 ++++++ lerna.json | 2 +- packages/adapters/CHANGELOG.md | 4 ++++ packages/adapters/package.json | 2 +- packages/core/CHANGELOG.md | 4 ++++ packages/core/package.json | 2 +- packages/dicomImageLoader/CHANGELOG.md | 4 ++++ packages/dicomImageLoader/package.json | 2 +- packages/docs/CHANGELOG.md | 4 ++++ packages/docs/package.json | 2 +- packages/nifti-volume-loader/CHANGELOG.md | 4 ++++ packages/nifti-volume-loader/package.json | 2 +- packages/streaming-image-volume-loader/CHANGELOG.md | 4 ++++ packages/streaming-image-volume-loader/package.json | 2 +- packages/tools/CHANGELOG.md | 6 ++++++ packages/tools/package.json | 2 +- 16 files changed, 44 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50ea24a5c6..f39326fc7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.2...v1.77.3) (2024-05-30) + +### Bug Fixes + +- Disable viewport indicators in CrosshairsTool by default ([#1296](https://github.com/cornerstonejs/cornerstone3D/issues/1296)) ([dbf3e88](https://github.com/cornerstonejs/cornerstone3D/commit/dbf3e881290cb382ec3dd665711c22cc931a1632)) + ## [1.77.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.1...v1.77.2) (2024-05-29) ### Bug Fixes diff --git a/lerna.json b/lerna.json index 61502cbe04..68ead3530a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.77.2", + "version": "1.77.3", "packages": [ "packages/adapters", "packages/core", diff --git a/packages/adapters/CHANGELOG.md b/packages/adapters/CHANGELOG.md index d25c67a318..4409b13e42 100644 --- a/packages/adapters/CHANGELOG.md +++ b/packages/adapters/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/dcmjs-org/dcmjs/compare/v1.77.2...v1.77.3) (2024-05-30) + +**Note:** Version bump only for package @cornerstonejs/adapters + ## [1.77.2](https://github.com/dcmjs-org/dcmjs/compare/v1.77.1...v1.77.2) (2024-05-29) **Note:** Version bump only for package @cornerstonejs/adapters diff --git a/packages/adapters/package.json b/packages/adapters/package.json index 8c2d43e255..7b71503603 100644 --- a/packages/adapters/package.json +++ b/packages/adapters/package.json @@ -1,6 +1,6 @@ { "name": "@cornerstonejs/adapters", - "version": "1.77.2", + "version": "1.77.3", "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others", "src": "src/index.ts", "main": "./dist/@cornerstonejs/adapters.es.js", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 48e2d5ec2d..975c24e8eb 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.2...v1.77.3) (2024-05-30) + +**Note:** Version bump only for package @cornerstonejs/core + ## [1.77.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.1...v1.77.2) (2024-05-29) ### Bug Fixes diff --git a/packages/core/package.json b/packages/core/package.json index 1af5864ca3..1958113fd7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@cornerstonejs/core", - "version": "1.77.2", + "version": "1.77.3", "description": "", "main": "src/index.ts", "types": "dist/types/index.d.ts", diff --git a/packages/dicomImageLoader/CHANGELOG.md b/packages/dicomImageLoader/CHANGELOG.md index fde5ca2e3f..5cac060bb4 100644 --- a/packages/dicomImageLoader/CHANGELOG.md +++ b/packages/dicomImageLoader/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.2...v1.77.3) (2024-05-30) + +**Note:** Version bump only for package @cornerstonejs/dicom-image-loader + ## [1.77.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.1...v1.77.2) (2024-05-29) **Note:** Version bump only for package @cornerstonejs/dicom-image-loader diff --git a/packages/dicomImageLoader/package.json b/packages/dicomImageLoader/package.json index c65600f851..713ef75a9f 100644 --- a/packages/dicomImageLoader/package.json +++ b/packages/dicomImageLoader/package.json @@ -1,6 +1,6 @@ { "name": "@cornerstonejs/dicom-image-loader", - "version": "1.77.2", + "version": "1.77.3", "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file", "keywords": [ "DICOM", diff --git a/packages/docs/CHANGELOG.md b/packages/docs/CHANGELOG.md index ede5324d06..58deaf80e6 100644 --- a/packages/docs/CHANGELOG.md +++ b/packages/docs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.2...v1.77.3) (2024-05-30) + +**Note:** Version bump only for package docs + ## [1.77.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.1...v1.77.2) (2024-05-29) **Note:** Version bump only for package docs diff --git a/packages/docs/package.json b/packages/docs/package.json index 867b1bd1ec..50a69f27a3 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,6 +1,6 @@ { "name": "docs", - "version": "1.77.2", + "version": "1.77.3", "private": true, "repository": "https://github.com/cornerstonejs/cornerstone3D", "scripts": { diff --git a/packages/nifti-volume-loader/CHANGELOG.md b/packages/nifti-volume-loader/CHANGELOG.md index 2913540280..28e9c47c2a 100644 --- a/packages/nifti-volume-loader/CHANGELOG.md +++ b/packages/nifti-volume-loader/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.2...v1.77.3) (2024-05-30) + +**Note:** Version bump only for package @cornerstonejs/nifti-volume-loader + ## [1.77.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.1...v1.77.2) (2024-05-29) **Note:** Version bump only for package @cornerstonejs/nifti-volume-loader diff --git a/packages/nifti-volume-loader/package.json b/packages/nifti-volume-loader/package.json index ea5387d338..fa92ac726e 100644 --- a/packages/nifti-volume-loader/package.json +++ b/packages/nifti-volume-loader/package.json @@ -1,6 +1,6 @@ { "name": "@cornerstonejs/nifti-volume-loader", - "version": "1.77.2", + "version": "1.77.3", "description": "", "main": "dist/umd/index.js", "types": "dist/esm/index.d.ts", diff --git a/packages/streaming-image-volume-loader/CHANGELOG.md b/packages/streaming-image-volume-loader/CHANGELOG.md index ee7e5966e4..5ad1848c59 100644 --- a/packages/streaming-image-volume-loader/CHANGELOG.md +++ b/packages/streaming-image-volume-loader/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.2...v1.77.3) (2024-05-30) + +**Note:** Version bump only for package @cornerstonejs/streaming-image-volume-loader + ## [1.77.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.1...v1.77.2) (2024-05-29) **Note:** Version bump only for package @cornerstonejs/streaming-image-volume-loader diff --git a/packages/streaming-image-volume-loader/package.json b/packages/streaming-image-volume-loader/package.json index 1e72c876b3..c1f46b7405 100644 --- a/packages/streaming-image-volume-loader/package.json +++ b/packages/streaming-image-volume-loader/package.json @@ -1,6 +1,6 @@ { "name": "@cornerstonejs/streaming-image-volume-loader", - "version": "1.77.2", + "version": "1.77.3", "description": "", "main": "src/index.ts", "types": "dist/esm/index.d.ts", diff --git a/packages/tools/CHANGELOG.md b/packages/tools/CHANGELOG.md index 2a396d7a2d..d60a93aa4f 100644 --- a/packages/tools/CHANGELOG.md +++ b/packages/tools/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.77.3](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.2...v1.77.3) (2024-05-30) + +### Bug Fixes + +- Disable viewport indicators in CrosshairsTool by default ([#1296](https://github.com/cornerstonejs/cornerstone3D/issues/1296)) ([dbf3e88](https://github.com/cornerstonejs/cornerstone3D/commit/dbf3e881290cb382ec3dd665711c22cc931a1632)) + ## [1.77.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.77.1...v1.77.2) (2024-05-29) **Note:** Version bump only for package @cornerstonejs/tools diff --git a/packages/tools/package.json b/packages/tools/package.json index 65282f4346..afa54723e2 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@cornerstonejs/tools", - "version": "1.77.2", + "version": "1.77.3", "description": "Cornerstone3D Tools", "main": "src/index.ts", "types": "dist/types/index.d.ts",