Skip to content

Commit

Permalink
Merge branch 'main' into feat/update-nii-reader
Browse files Browse the repository at this point in the history
  • Loading branch information
sedghi authored May 28, 2024
2 parents 54f63ef + be9803c commit a1bcda2
Show file tree
Hide file tree
Showing 47 changed files with 761 additions and 535 deletions.
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,34 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.76.1](https://github.com/cornerstonejs/cornerstone3D/compare/v1.76.0...v1.76.1) (2024-05-28)

**Note:** Version bump only for package root

# [1.76.0](https://github.com/cornerstonejs/cornerstone3D/compare/v1.75.2...v1.76.0) (2024-05-28)

### Features

- Add render to canvas for mpr/volume viewports ([#1215](https://github.com/cornerstonejs/cornerstone3D/issues/1215)) ([e400277](https://github.com/cornerstonejs/cornerstone3D/commit/e4002774bcedeb2334d008cb3ab3e294ff1c088b))

## [1.75.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.75.1...v1.75.2) (2024-05-28)

### Bug Fixes

- **core:** correctly set the orientation of the volume ([#1287](https://github.com/cornerstonejs/cornerstone3D/issues/1287)) ([9637dfb](https://github.com/cornerstonejs/cornerstone3D/commit/9637dfbb64eeb39d92c979d5922604079847b1e9))

## [1.75.1](https://github.com/cornerstonejs/cornerstone3D/compare/v1.75.0...v1.75.1) (2024-05-28)

### Bug Fixes

- **color:** Fix RGB inconsistencies ([#829](https://github.com/cornerstonejs/cornerstone3D/issues/829)) ([2fc22bc](https://github.com/cornerstonejs/cornerstone3D/commit/2fc22bcd1c0cac22b88e964699d55c51bd83283e))

# [1.75.0](https://github.com/cornerstonejs/cornerstone3D/compare/v1.74.8...v1.75.0) (2024-05-28)

### Features

- **nifti:** NIFTI data type enhancement ([#1219](https://github.com/cornerstonejs/cornerstone3D/issues/1219)) ([03a2335](https://github.com/cornerstonejs/cornerstone3D/commit/03a233525a67ac9bc6bc9a6d144334e67756f11f))

## [1.74.8](https://github.com/cornerstonejs/cornerstone3D/compare/v1.74.7...v1.74.8) (2024-05-24)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8f4ff3e3b836ca4d5817f90ac7349232635cdac1
d68d6d0c4b9c7b18b794ccac90695b79ac87fc30
101 changes: 15 additions & 86 deletions common/reviews/api/core.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ type ActorSliceRange = {
};

// @public (undocumented)
export function addImageSlicesToViewports(renderingEngine: IRenderingEngine, stackInputs: Array<IStackInput>, viewportIds: Array<string>, immediateRender?: boolean, suppressEvents?: boolean): Promise<void>;
export function addImageSlicesToViewports(renderingEngine: IRenderingEngine, stackInputs: Array<IStackInput>, viewportIds: Array<string>): Promise<void>;

// @public (undocumented)
function addProvider(provider: (type: string, ...query: string[]) => any, priority?: number): void;
Expand Down Expand Up @@ -230,7 +230,7 @@ declare namespace cacheUtils {
}

// @public (undocumented)
function calculateViewportsSpatialRegistration(viewport1: IStackViewport | IVolumeViewport, viewport2: IStackViewport | IVolumeViewport): void;
function calculateViewportsSpatialRegistration(viewport1: StackViewport | IVolumeViewport, viewport2: StackViewport | IVolumeViewport): void;

// @public (undocumented)
enum CalibrationTypes {
Expand Down Expand Up @@ -376,7 +376,7 @@ enum ContourType {

// @public (undocumented)
function convertStackToVolumeViewport({ viewport, options, }: {
viewport: IStackViewport;
viewport: StackViewport;
options: {
volumeId: string;
viewportId?: string;
Expand Down Expand Up @@ -991,7 +991,7 @@ function getBufferConfiguration(targetBufferType: PixelDataTypedArrayString, len
function getClosestImageId(imageVolume: IImageVolume, worldPos: Point3, viewPlaneNormal: Point3): string;

// @public (undocumented)
function getClosestStackImageIndexForPoint(point: Point3, viewport: IStackViewport): number | null;
function getClosestStackImageIndexForPoint(point: Point3, viewport: StackViewport): number | null;

// @public (undocumented)
function getColormap(name: any): any;
Expand Down Expand Up @@ -1088,7 +1088,7 @@ function getTransferFunctionNodes(transferFunction: any): any[];
function getUnknownVolumeLoaderSchema(): string;

// @public (undocumented)
function getViewportImageCornersInWorld(viewport: IStackViewport | IVolumeViewport): Point3[];
function getViewportImageCornersInWorld(viewport: StackViewport | IVolumeViewport): Point3[];

// @public (undocumented)
function getViewportImageIds(viewport: IViewport): string[];
Expand Down Expand Up @@ -1339,7 +1339,7 @@ interface IEnabledElement {
// (undocumented)
renderingEngineId: string;
// (undocumented)
viewport: IStackViewport | IVolumeViewport;
viewport: StackViewport | IVolumeViewport;
// (undocumented)
viewportId: string;
}
Expand Down Expand Up @@ -2005,7 +2005,7 @@ interface IRenderingEngine {
// (undocumented)
fillCanvasWithBackgroundColor(canvas: HTMLCanvasElement, backgroundColor: [number, number, number]): void;
// (undocumented)
getStackViewports(): Array<IStackViewport>;
getStackViewports(): Array<StackViewport>;
// (undocumented)
getVideoViewports(): Array<IVideoViewport>;
// (undocumented)
Expand Down Expand Up @@ -2079,79 +2079,6 @@ interface IStackInput {
visibility?: boolean;
}

// @public (undocumented)
interface IStackViewport extends IViewport {
// (undocumented)
addImages(stackInputs: Array<IStackInput>, immediateRender: boolean, suppressEvents: boolean): any;
// (undocumented)
calibrateSpacing(imageId: string): void;
// (undocumented)
canvasToWorld: (canvasPos: Point2) => Point3;
// (undocumented)
clearDefaultProperties(imageId?: string): void;
// (undocumented)
customRenderViewportToCanvas: () => {
canvas: HTMLCanvasElement;
element: HTMLDivElement;
viewportId: string;
renderingEngineId: string;
};
// (undocumented)
getCamera(): ICamera;
// (undocumented)
getCornerstoneImage: () => IImage;
// (undocumented)
getCurrentImageId: () => string;
// (undocumented)
getCurrentImageIdIndex: () => number;
// (undocumented)
getDefaultProperties: (imageId?: string) => StackViewportProperties;
// (undocumented)
getFrameOfReferenceUID: () => string;
// (undocumented)
getImageData(): IImageData | CPUIImageData;
// (undocumented)
getImageDataMetadata(image: IImage): any;
// (undocumented)
getImageIds: () => string[];
// (undocumented)
getProperties: () => StackViewportProperties;
// (undocumented)
getRenderer(): any;
// (undocumented)
hasImageId: (imageId: string) => boolean;
// (undocumented)
hasImageURI: (imageURI: string) => boolean;
// (undocumented)
modality: string;
// (undocumented)
resetCamera(resetPan?: boolean, resetZoom?: boolean): boolean;
// (undocumented)
resetProperties(): void;
// (undocumented)
resetToDefaultProperties(): void;
// (undocumented)
resize: () => void;
// (undocumented)
scaling: Scaling;
// (undocumented)
setCamera(cameraInterface: ICamera): void;
// (undocumented)
setDefaultProperties(ViewportProperties: StackViewportProperties, imageId?: string): void;
// (undocumented)
setImageIdIndex(imageIdIndex: number): Promise<string>;
// (undocumented)
setProperties({ voiRange, invert, interpolationType, rotation, colormap, }: StackViewportProperties, suppressEvents?: boolean): void;
// (undocumented)
setStack(imageIds: Array<string>, currentImageIdIndex?: number): Promise<string>;
// (undocumented)
stackActorReInitialized: boolean;
// (undocumented)
unsetColormap(): void;
// (undocumented)
worldToCanvas: (worldPos: Point3) => Point2;
}

// @public (undocumented)
interface IStreamingImageVolume extends ImageVolume {
// (undocumented)
Expand Down Expand Up @@ -2476,7 +2403,7 @@ function loadAndCacheImages(imageIds: Array<string>, options?: ImageLoaderOption
function loadImage(imageId: string, options?: ImageLoaderOptions): Promise<IImage>;

// @public (undocumented)
function loadImageToCanvas(options: LoadImageOptions): Promise<string>;
function loadImageToCanvas(options: LoadImageOptions): Promise<CanvasLoadPosition>;

// @public (undocumented)
function loadVolume(volumeId: string, options?: VolumeLoaderOptions): Promise<IImageVolume>;
Expand Down Expand Up @@ -2865,7 +2792,7 @@ export class RenderingEngine implements IRenderingEngine {
// (undocumented)
fillCanvasWithBackgroundColor(canvas: HTMLCanvasElement, backgroundColor: [number, number, number]): void;
// (undocumented)
getStackViewports(): Array<IStackViewport>;
getStackViewports(): Array<StackViewport>;
// (undocumented)
getVideoViewports(): Array<IVideoViewport>;
// (undocumented)
Expand Down Expand Up @@ -2897,10 +2824,12 @@ export class RenderingEngine implements IRenderingEngine {
}

// @public (undocumented)
function renderToCanvasCPU(canvas: HTMLCanvasElement, image: IImage, modality?: string, _renderingEngineId?: string, _viewportOptions?: ViewportInputOptions): Promise<string>;
function renderToCanvasCPU(canvas: HTMLCanvasElement, imageOrVolume: IImage | IVolume, modality?: string, _renderingEngineId?: string, _viewportOptions?: ViewportInputOptions): Promise<CanvasLoadPosition>;

// @public (undocumented)
function renderToCanvasGPU(canvas: HTMLCanvasElement, image: IImage, modality?: any, renderingEngineId?: string, viewportOptions?: ViewportInputOptions): Promise<string>;
function renderToCanvasGPU(canvas: HTMLCanvasElement, imageOrVolume: IImage | IVolume, modality?: any, renderingEngineId?: string, viewportOptions?: ViewportInputOptions & {
viewReference?: ViewReference;
}): Promise<CanvasLoadPosition>;

// @public (undocumented)
enum RequestType {
Expand Down Expand Up @@ -3114,7 +3043,7 @@ type StackNewImageEventDetail = {
};

// @public (undocumented)
export class StackViewport extends Viewport implements IStackViewport, IImagesLoader {
export class StackViewport extends Viewport implements StackViewport, IImagesLoader {
constructor(props: ViewportInput);
// (undocumented)
addActor: (actorEntry: ActorEntry) => void;
Expand Down Expand Up @@ -3392,7 +3321,7 @@ declare namespace Types {
IImagesLoader,
Cornerstone3DConfig,
ICamera,
IStackViewport,
StackViewport as IStackViewport,
IVideoViewport,
IVolumeViewport,
IEnabledElement,
Expand Down
5 changes: 4 additions & 1 deletion common/reviews/api/nifti-volume-loader.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
```ts

import type { GetGPUTier } from 'detect-gpu';
import type { mat4 } from 'gl-matrix';
import { mat4 } from 'gl-matrix';
import type { TierResult } from 'detect-gpu';
import type vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
import type { vtkCamera } from '@kitware/vtk.js/Rendering/Core/Camera';
import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
import vtkImageSlice from '@kitware/vtk.js/Rendering/Core/ImageSlice';
import type { vtkObject } from '@kitware/vtk.js/interfaces';
import vtkPlane from '@kitware/vtk.js/Common/DataModel/Plane';
import type vtkVolume from '@kitware/vtk.js/Rendering/Core/Volume';

// @public (undocumented)
Expand Down
5 changes: 4 additions & 1 deletion common/reviews/api/streaming-image-volume-loader.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
```ts

import type { GetGPUTier } from 'detect-gpu';
import type { mat4 } from 'gl-matrix';
import { mat4 } from 'gl-matrix';
import type { TierResult } from 'detect-gpu';
import type vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
import type { vtkCamera } from '@kitware/vtk.js/Rendering/Core/Camera';
import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
import vtkImageSlice from '@kitware/vtk.js/Rendering/Core/ImageSlice';
import type { vtkObject } from '@kitware/vtk.js/interfaces';
import vtkPlane from '@kitware/vtk.js/Common/DataModel/Plane';
import type vtkVolume from '@kitware/vtk.js/Rendering/Core/Volume';

// @public (undocumented)
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.74.8",
"version": "1.76.1",
"packages": [
"packages/adapters",
"packages/core",
Expand Down
20 changes: 20 additions & 0 deletions packages/adapters/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.76.1](https://github.com/dcmjs-org/dcmjs/compare/v1.76.0...v1.76.1) (2024-05-28)

**Note:** Version bump only for package @cornerstonejs/adapters

# [1.76.0](https://github.com/dcmjs-org/dcmjs/compare/v1.75.2...v1.76.0) (2024-05-28)

**Note:** Version bump only for package @cornerstonejs/adapters

## [1.75.2](https://github.com/dcmjs-org/dcmjs/compare/v1.75.1...v1.75.2) (2024-05-28)

**Note:** Version bump only for package @cornerstonejs/adapters

## [1.75.1](https://github.com/dcmjs-org/dcmjs/compare/v1.75.0...v1.75.1) (2024-05-28)

**Note:** Version bump only for package @cornerstonejs/adapters

# [1.75.0](https://github.com/dcmjs-org/dcmjs/compare/v1.74.8...v1.75.0) (2024-05-28)

**Note:** Version bump only for package @cornerstonejs/adapters

## [1.74.8](https://github.com/dcmjs-org/dcmjs/compare/v1.74.7...v1.74.8) (2024-05-24)

**Note:** Version bump only for package @cornerstonejs/adapters
Expand Down
8 changes: 4 additions & 4 deletions packages/adapters/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cornerstonejs/adapters",
"version": "1.74.8",
"version": "1.76.1",
"description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
"src": "src/index.ts",
"main": "./dist/@cornerstonejs/adapters.es.js",
Expand Down Expand Up @@ -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.74.8",
"@cornerstonejs/tools": "^1.76.1",
"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.74.8",
"@cornerstonejs/streaming-image-volume-loader": "^1.74.8"
"@cornerstonejs/core": "^1.76.1",
"@cornerstonejs/streaming-image-volume-loader": "^1.76.1"
}
}
26 changes: 26 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.76.1](https://github.com/cornerstonejs/cornerstone3D/compare/v1.76.0...v1.76.1) (2024-05-28)

**Note:** Version bump only for package @cornerstonejs/core

# [1.76.0](https://github.com/cornerstonejs/cornerstone3D/compare/v1.75.2...v1.76.0) (2024-05-28)

### Features

- Add render to canvas for mpr/volume viewports ([#1215](https://github.com/cornerstonejs/cornerstone3D/issues/1215)) ([e400277](https://github.com/cornerstonejs/cornerstone3D/commit/e4002774bcedeb2334d008cb3ab3e294ff1c088b))

## [1.75.2](https://github.com/cornerstonejs/cornerstone3D/compare/v1.75.1...v1.75.2) (2024-05-28)

### Bug Fixes

- **core:** correctly set the orientation of the volume ([#1287](https://github.com/cornerstonejs/cornerstone3D/issues/1287)) ([9637dfb](https://github.com/cornerstonejs/cornerstone3D/commit/9637dfbb64eeb39d92c979d5922604079847b1e9))

## [1.75.1](https://github.com/cornerstonejs/cornerstone3D/compare/v1.75.0...v1.75.1) (2024-05-28)

**Note:** Version bump only for package @cornerstonejs/core

# [1.75.0](https://github.com/cornerstonejs/cornerstone3D/compare/v1.74.8...v1.75.0) (2024-05-28)

### Features

- **nifti:** NIFTI data type enhancement ([#1219](https://github.com/cornerstonejs/cornerstone3D/issues/1219)) ([03a2335](https://github.com/cornerstonejs/cornerstone3D/commit/03a233525a67ac9bc6bc9a6d144334e67756f11f))

## [1.74.8](https://github.com/cornerstonejs/cornerstone3D/compare/v1.74.7...v1.74.8) (2024-05-24)

**Note:** Version bump only for package @cornerstonejs/core
Expand Down
Loading

0 comments on commit a1bcda2

Please sign in to comment.