Merge pull request #13 from cornerstonejs/merge/mgh-20240503

merge: mgh merge from cs3d 20240503
cornerstonejs · May 3, 2024 · 02b2337 · 02b2337
2 parents 795413a + 13d59c0
commit 02b2337
Show file tree

Hide file tree

Showing 60 changed files with 2,384 additions and 470 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.71.0](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.15...v1.71.0) (2024-05-03)
+
+### Features
+
+- **SculptorTool:** Add sculptor tool ([#967](https://github.com/cornerstonejs/cornerstone3D/issues/967)) ([9864e20](https://github.com/cornerstonejs/cornerstone3D/commit/9864e20c35b3eff0e0cc021779875797584462bc))
+
+## [1.70.15](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.14...v1.70.15) (2024-04-30)
+
+### Bug Fixes
+
+- **orientation-marker:** remove if viewport is undefined ([#1230](https://github.com/cornerstonejs/cornerstone3D/issues/1230)) ([fe511d9](https://github.com/cornerstonejs/cornerstone3D/commit/fe511d97377c1ca22b776458fc924129d6fa5ceb))
+
+## [1.70.14](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.13...v1.70.14) (2024-04-29)
+
+### Bug Fixes
+
+- **colormap:** Resolve bugs related to colormap reset and colorbar ([#1225](https://github.com/cornerstonejs/cornerstone3D/issues/1225)) ([aaac143](https://github.com/cornerstonejs/cornerstone3D/commit/aaac14353c6cd37d242b1d33adbb861a398c82b8))
+
 ## [1.70.13](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.12...v1.70.13) (2024-04-25)
 
 ### Bug Fixes

diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-04b25ba51fe2568049ee261413286638e52a3ebc
+9864e20c35b3eff0e0cc021779875797584462bc
diff --git a/common/reviews/api/core.api.md b/common/reviews/api/core.api.md
@@ -49,7 +49,7 @@ type ActorEntry = {
 };
 
 // @public (undocumented)
-function actorIsA(actorEntry: Types.ActorEntry, actorType: actorTypes): boolean;
+function actorIsA(actorEntry: Types.ActorEntry | Types.Actor, actorType: actorTypes): boolean;
 
 // @public (undocumented)
 type ActorSliceRange = {
@@ -146,6 +146,8 @@ export abstract class BaseVolumeViewport extends Viewport implements IVolumeView
     // (undocumented)
     getViewReference(viewRefSpecifier?: ViewReferenceSpecifier): ViewReference;
     // (undocumented)
+    protected getVOIModifiedEventDetail(volumeId: string): VoiModifiedEventDetail;
+    // (undocumented)
     protected getVolumeId(specifier: ViewReferenceSpecifier): string;
     // (undocumented)
     hasImageURI: (imageURI: string) => boolean;
@@ -287,7 +289,8 @@ declare namespace colormap {
     export {
         getColormap,
         getColormapNames,
-        registerColormap
+        registerColormap,
+        findMatchingColormap
     }
 }
 
@@ -311,7 +314,7 @@ type ColormapPublic = {
 type ColormapRegistration = {
     ColorSpace: string;
     Name: string;
-    RGBPoints: RGB[];
+    RGBPoints: RGB[] | number[];
 };
 
 // @public (undocumented)
@@ -933,6 +936,9 @@ declare namespace EventTypes {
     }
 }
 
+// @public (undocumented)
+function findMatchingColormap(rgbPoints: any, actor: any): ColormapPublic | null;
+
 // @public (undocumented)
 type FlipDirection = {
     flipHorizontal?: boolean;
@@ -4159,6 +4165,7 @@ type VoiModifiedEventDetail = {
     VOILUTFunction?: VOILUTFunctionType;
     invert?: boolean;
     invertStateChanged?: boolean;
+    colormap?: ColormapPublic;
 };
 
 // @public (undocumented)

diff --git a/common/reviews/api/tools.api.md b/common/reviews/api/tools.api.md
@@ -3017,6 +3017,22 @@ function isClosed(polyline: Types_2.Point2[]): boolean;
 // @public (undocumented)
 function isContourSegmentationAnnotation(annotation: Annotation): annotation is ContourSegmentationAnnotation;
 
+// @public (undocumented)
+interface ISculptToolShape {
+    // (undocumented)
+    configureToolSize(evt: EventTypes_2.InteractionEventType): void;
+    // (undocumented)
+    getInsertPosition(previousIndex: number, nextIndex: number, sculptData: SculptData): Types_2.Point3;
+    // (undocumented)
+    getMaxSpacing(minSpacing: number): number;
+    // (undocumented)
+    pushHandles(viewport: Types_2.IViewport, sculptData: SculptData): PushedHandles;
+    // (undocumented)
+    renderShape(svgDrawingHelper: SVGDrawingHelper, canvasLocation: Types_2.Point2, options: any): void;
+    // (undocumented)
+    updateToolSize(canvasCoords: Types_2.Point2, viewport: Types_2.IViewport, activeAnnotation: ContourAnnotation): void;
+}
+
 // @public (undocumented)
 function isObject(value: any): boolean;
 
@@ -4737,6 +4753,33 @@ type ScrollOptions_2 = {
     scrollSlabs?: boolean;
 };
 
+// @public (undocumented)
+export class SculptorTool extends BaseTool {
+    constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
+    // (undocumented)
+    protected activateModify(element: HTMLDivElement): void;
+    // (undocumented)
+    protected deactivateModify(element: HTMLDivElement): void;
+    // (undocumented)
+    protected interpolatePointsWithinMaxSpacing(i: number, points: Array<Types_2.Point3>, indicesToInsertAfter: Array<number>, maxSpacing: number): void;
+    // (undocumented)
+    mouseMoveCallback: (evt: EventTypes_2.InteractionEventType) => void;
+    // (undocumented)
+    preMouseDownCallback: (evt: EventTypes_2.InteractionEventType) => boolean;
+    // (undocumented)
+    registeredShapes: Map<any, any>;
+    // (undocumented)
+    registerShapes<T extends ISculptToolShape>(shapeName: string, shapeClass: new () => T): void;
+    // (undocumented)
+    renderAnnotation(enabledElement: Types_2.IEnabledElement, svgDrawingHelper: SVGDrawingHelper): void;
+    // (undocumented)
+    protected sculpt(eventData: any, points: Array<Types_2.Point3>): void;
+    // (undocumented)
+    setToolShape(toolShape: string): void;
+    // (undocumented)
+    static toolName: string;
+}
+
 // @public (undocumented)
 type Segmentation = {
     segmentationId: string;
@@ -5976,6 +6019,7 @@ declare namespace Types {
         FloodFillGetter,
         FloodFillOptions,
         ContourSegmentationData,
+        ISculptToolShape,
         Statistics,
         NamedStatistics,
         LabelmapToolOperationData,

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.70.13",
+  "version": "1.71.0",
   "packages": [
     "packages/adapters",
     "packages/core",

diff --git a/packages/adapters/CHANGELOG.md b/packages/adapters/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.71.0](https://github.com/dcmjs-org/dcmjs/compare/v1.70.15...v1.71.0) (2024-05-03)
+
+**Note:** Version bump only for package @cornerstonejs/adapters
+
+## [1.70.15](https://github.com/dcmjs-org/dcmjs/compare/v1.70.14...v1.70.15) (2024-04-30)
+
+**Note:** Version bump only for package @cornerstonejs/adapters
+
+## [1.70.14](https://github.com/dcmjs-org/dcmjs/compare/v1.70.13...v1.70.14) (2024-04-29)
+
+**Note:** Version bump only for package @cornerstonejs/adapters
+
 ## [1.70.13](https://github.com/dcmjs-org/dcmjs/compare/v1.70.12...v1.70.13) (2024-04-25)
 
 **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.70.13",
+    "version": "1.71.0",
     "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.70.13",
+        "@cornerstonejs/tools": "^1.71.0",
         "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.70.13",
-        "@cornerstonejs/streaming-image-volume-loader": "^1.70.13"
+        "@cornerstonejs/core": "^1.71.0",
+        "@cornerstonejs/streaming-image-volume-loader": "^1.71.0"
     }
 }
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.71.0](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.15...v1.71.0) (2024-05-03)
+
+**Note:** Version bump only for package @cornerstonejs/core
+
+## [1.70.15](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.14...v1.70.15) (2024-04-30)
+
+**Note:** Version bump only for package @cornerstonejs/core
+
+## [1.70.14](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.13...v1.70.14) (2024-04-29)
+
+### Bug Fixes
+
+- **colormap:** Resolve bugs related to colormap reset and colorbar ([#1225](https://github.com/cornerstonejs/cornerstone3D/issues/1225)) ([aaac143](https://github.com/cornerstonejs/cornerstone3D/commit/aaac14353c6cd37d242b1d33adbb861a398c82b8))
+
 ## [1.70.13](https://github.com/cornerstonejs/cornerstone3D/compare/v1.70.12...v1.70.13) (2024-04-25)
 
 **Note:** Version bump only for package @cornerstonejs/core

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.70.13",
+  "version": "1.71.0",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -30,7 +30,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@kitware/vtk.js": "30.3.3",
+    "@kitware/vtk.js": "30.4.1",
     "comlink": "^4.4.1",
     "detect-gpu": "^5.0.22",
     "gl-matrix": "^3.4.3",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		04b25ba51fe2568049ee261413286638e52a3ebc
		9864e20c35b3eff0e0cc021779875797584462bc