Merge remote-tracking branch 'origin/main' into feat/wsi-viewport

cornerstonejs · May 31, 2024 · a5d2e58 · a5d2e58
2 parents 6e59811 + a33572a
commit a5d2e58
Show file tree

Hide file tree

Showing 21 changed files with 64 additions and 48 deletions.
diff --git 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/commit.txt b/commit.txt
@@ -1 +1 @@
-561bd4bcd556d968b8e4f9ec48061aaeb434e045
+dbf3e881290cb382ec3dd665711c22cc931a1632
diff --git 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
@@ -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
@@ -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",
@@ -42,15 +42,15 @@
     "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",
         "lodash.clonedeep": "^4.5.0",
         "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/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
@@ -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
@@ -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
@@ -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",
@@ -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/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
@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "1.77.2",
+  "version": "1.77.3",
   "private": true,
   "repository": "https://github.com/cornerstonejs/cornerstone3D",
   "scripts": {
@@ -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/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
@@ -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",
@@ -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/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
@@ -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",
@@ -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/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
@@ -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",
@@ -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/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
@@ -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);

diff --git a/version.json b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.77.2",
-  "commit": "561bd4bcd556d968b8e4f9ec48061aaeb434e045"
+  "version": "1.77.3",
+  "commit": "dbf3e881290cb382ec3dd665711c22cc931a1632"
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.77.2
+1.77.3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		561bd4bcd556d968b8e4f9ec48061aaeb434e045
		dbf3e881290cb382ec3dd665711c22cc931a1632