@cornerstonejs/core 1.75.2 → 1.76.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/RenderingEngine/helpers/addImageSlicesToViewports.d.ts +1 -1
- package/dist/cjs/RenderingEngine/helpers/addImageSlicesToViewports.js +2 -2
- package/dist/cjs/RenderingEngine/helpers/addImageSlicesToViewports.js.map +1 -1
- package/dist/cjs/loaders/imageLoader.js +6 -1
- package/dist/cjs/loaders/imageLoader.js.map +1 -1
- package/dist/cjs/types/IStackViewport.d.ts +2 -49
- package/dist/cjs/types/IStackViewport.js +1 -0
- package/dist/cjs/types/IStackViewport.js.map +1 -1
- package/dist/cjs/utilities/getScalingParameters.js +3 -2
- package/dist/cjs/utilities/getScalingParameters.js.map +1 -1
- package/dist/cjs/utilities/loadImageToCanvas.d.ts +21 -5
- package/dist/cjs/utilities/loadImageToCanvas.js +32 -17
- package/dist/cjs/utilities/loadImageToCanvas.js.map +1 -1
- package/dist/cjs/utilities/renderToCanvasCPU.d.ts +3 -2
- package/dist/cjs/utilities/renderToCanvasCPU.js +7 -2
- package/dist/cjs/utilities/renderToCanvasCPU.js.map +1 -1
- package/dist/cjs/utilities/renderToCanvasGPU.d.ts +5 -2
- package/dist/cjs/utilities/renderToCanvasGPU.js +45 -12
- package/dist/cjs/utilities/renderToCanvasGPU.js.map +1 -1
- package/dist/cjs/utilities/sortImageIdsAndGetSpacing.js +7 -3
- package/dist/cjs/utilities/sortImageIdsAndGetSpacing.js.map +1 -1
- package/dist/esm/RenderingEngine/helpers/addImageSlicesToViewports.js +2 -2
- package/dist/esm/RenderingEngine/helpers/addImageSlicesToViewports.js.map +1 -1
- package/dist/esm/loaders/imageLoader.js +13 -1
- package/dist/esm/loaders/imageLoader.js.map +1 -1
- package/dist/esm/types/IStackViewport.js +1 -1
- package/dist/esm/types/IStackViewport.js.map +1 -1
- package/dist/esm/utilities/getScalingParameters.js +2 -2
- package/dist/esm/utilities/getScalingParameters.js.map +1 -1
- package/dist/esm/utilities/loadImageToCanvas.js +33 -17
- package/dist/esm/utilities/loadImageToCanvas.js.map +1 -1
- package/dist/esm/utilities/renderToCanvasCPU.js +7 -2
- package/dist/esm/utilities/renderToCanvasCPU.js.map +1 -1
- package/dist/esm/utilities/renderToCanvasGPU.js +45 -12
- package/dist/esm/utilities/renderToCanvasGPU.js.map +1 -1
- package/dist/esm/utilities/sortImageIdsAndGetSpacing.js +7 -3
- package/dist/esm/utilities/sortImageIdsAndGetSpacing.js.map +1 -1
- package/dist/types/RenderingEngine/helpers/addImageSlicesToViewports.d.ts +1 -1
- package/dist/types/RenderingEngine/helpers/addImageSlicesToViewports.d.ts.map +1 -1
- package/dist/types/loaders/imageLoader.d.ts.map +1 -1
- package/dist/types/types/IStackViewport.d.ts +2 -49
- package/dist/types/types/IStackViewport.d.ts.map +1 -1
- package/dist/types/utilities/loadImageToCanvas.d.ts +21 -5
- package/dist/types/utilities/loadImageToCanvas.d.ts.map +1 -1
- package/dist/types/utilities/renderToCanvasCPU.d.ts +3 -2
- package/dist/types/utilities/renderToCanvasCPU.d.ts.map +1 -1
- package/dist/types/utilities/renderToCanvasGPU.d.ts +5 -2
- package/dist/types/utilities/renderToCanvasGPU.d.ts.map +1 -1
- package/dist/types/utilities/sortImageIdsAndGetSpacing.d.ts.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/src/RenderingEngine/helpers/addImageSlicesToViewports.ts +2 -5
- package/src/loaders/imageLoader.ts +20 -8
- package/src/types/IStackViewport.ts +2 -178
- package/src/utilities/getScalingParameters.ts +2 -2
- package/src/utilities/loadImageToCanvas.ts +93 -32
- package/src/utilities/renderToCanvasCPU.ts +10 -3
- package/src/utilities/renderToCanvasGPU.ts +61 -24
- package/src/utilities/sortImageIdsAndGetSpacing.ts +12 -6
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { IStackInput, IRenderingEngine } from '../../types';
|
|
2
|
-
declare function addImageSlicesToViewports(renderingEngine: IRenderingEngine, stackInputs: Array<IStackInput>, viewportIds: Array<string
|
|
2
|
+
declare function addImageSlicesToViewports(renderingEngine: IRenderingEngine, stackInputs: Array<IStackInput>, viewportIds: Array<string>): Promise<void>;
|
|
3
3
|
export default addImageSlicesToViewports;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds
|
|
12
|
+
function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds) {
|
|
13
13
|
return __awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
for (const viewportId of viewportIds) {
|
|
15
15
|
const viewport = renderingEngine.getViewport(viewportId);
|
|
@@ -23,7 +23,7 @@ function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds, im
|
|
|
23
23
|
}
|
|
24
24
|
const addStackPromises = viewportIds.map((viewportId) => __awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
const viewport = renderingEngine.getViewport(viewportId);
|
|
26
|
-
return viewport.addImages(stackInputs
|
|
26
|
+
return viewport.addImages(stackInputs);
|
|
27
27
|
}));
|
|
28
28
|
yield Promise.all(addStackPromises);
|
|
29
29
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addImageSlicesToViewports.js","sourceRoot":"","sources":["../../../../src/RenderingEngine/helpers/addImageSlicesToViewports.ts"],"names":[],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"addImageSlicesToViewports.js","sourceRoot":"","sources":["../../../../src/RenderingEngine/helpers/addImageSlicesToViewports.ts"],"names":[],"mappings":";;;;;;;;;;;AAkBA,SAAe,yBAAyB,CACtC,eAAiC,EACjC,WAA+B,EAC/B,WAA0B;;QAG1B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAEzD,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,UAAU,iBAAiB,CAAC,CAAC;aAClE;YAGD,IAAI,CAAE,QAA2B,CAAC,SAAS,EAAE;gBAC3C,OAAO,CAAC,IAAI,CACV,oBAAoB,UAAU,2EAA2E,CAC1G,CAAC;gBAEF,OAAO;aACR;SACF;QAED,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAO,UAAU,EAAE,EAAE;YAC5D,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,UAAU,CAAmB,CAAC;YAE3E,OAAO,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC,CAAA,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;CAAA;AAED,kBAAe,yBAAyB,CAAC"}
|
|
@@ -103,12 +103,17 @@ function createAndCacheDerivedImage(referencedImageId, options = {}, preventCach
|
|
|
103
103
|
const { TypedArrayConstructor } = (0, utilities_1.getBufferConfiguration)(options.targetBufferType, length);
|
|
104
104
|
const imageScalarData = new TypedArrayConstructor(skipCreateBuffer ? 1 : length);
|
|
105
105
|
const derivedImageId = imageId;
|
|
106
|
-
['
|
|
106
|
+
['imagePlaneModule', 'generalSeriesModule'].forEach((type) => {
|
|
107
107
|
utilities_1.genericMetadataProvider.add(derivedImageId, {
|
|
108
108
|
type,
|
|
109
109
|
metadata: __1.metaData.get(type, referencedImageId),
|
|
110
110
|
});
|
|
111
111
|
});
|
|
112
|
+
const imagePixelModule = __1.metaData.get('imagePixelModule', referencedImageId);
|
|
113
|
+
utilities_1.genericMetadataProvider.add(derivedImageId, {
|
|
114
|
+
type: 'imagePixelModule',
|
|
115
|
+
metadata: Object.assign(Object.assign({}, imagePixelModule), { bitsAllocated: 8, bitsStored: 8, highBit: 7, samplesPerPixel: 1, pixelRepresentation: 0 }),
|
|
116
|
+
});
|
|
112
117
|
const localImage = createAndCacheLocalImage({ scalarData: imageScalarData, onCacheAdd, skipCreateBuffer }, imageId, true);
|
|
113
118
|
const imageLoadObject = {
|
|
114
119
|
promise: Promise.resolve(localImage),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imageLoader.js","sourceRoot":"","sources":["../../../src/loaders/imageLoader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"imageLoader.js","sourceRoot":"","sources":["../../../src/loaders/imageLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,49 +1,2 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
import IImageData from './IImageData';
|
|
4
|
-
import { IViewport } from './IViewport';
|
|
5
|
-
import Point2 from './Point2';
|
|
6
|
-
import Point3 from './Point3';
|
|
7
|
-
import { Scaling } from './ScalingParameters';
|
|
8
|
-
import StackViewportProperties from './StackViewportProperties';
|
|
9
|
-
import type IImage from './IImage';
|
|
10
|
-
import { IStackInput } from './IStackInput';
|
|
11
|
-
export default interface IStackViewport extends IViewport {
|
|
12
|
-
modality: string;
|
|
13
|
-
scaling: Scaling;
|
|
14
|
-
stackActorReInitialized: boolean;
|
|
15
|
-
resize: () => void;
|
|
16
|
-
getFrameOfReferenceUID: () => string;
|
|
17
|
-
setDefaultProperties(ViewportProperties: StackViewportProperties, imageId?: string): void;
|
|
18
|
-
clearDefaultProperties(imageId?: string): void;
|
|
19
|
-
setProperties({ voiRange, invert, interpolationType, rotation, colormap, }: StackViewportProperties, suppressEvents?: boolean): void;
|
|
20
|
-
getDefaultProperties: (imageId?: string) => StackViewportProperties;
|
|
21
|
-
getProperties: () => StackViewportProperties;
|
|
22
|
-
canvasToWorld: (canvasPos: Point2) => Point3;
|
|
23
|
-
worldToCanvas: (worldPos: Point3) => Point2;
|
|
24
|
-
getCurrentImageIdIndex: () => number;
|
|
25
|
-
getImageIds: () => string[];
|
|
26
|
-
hasImageId: (imageId: string) => boolean;
|
|
27
|
-
hasImageURI: (imageURI: string) => boolean;
|
|
28
|
-
getCurrentImageId: () => string;
|
|
29
|
-
addImages(stackInputs: Array<IStackInput>, immediateRender: boolean, suppressEvents: boolean): any;
|
|
30
|
-
getImageDataMetadata(image: IImage): any;
|
|
31
|
-
customRenderViewportToCanvas: () => {
|
|
32
|
-
canvas: HTMLCanvasElement;
|
|
33
|
-
element: HTMLDivElement;
|
|
34
|
-
viewportId: string;
|
|
35
|
-
renderingEngineId: string;
|
|
36
|
-
};
|
|
37
|
-
getImageData(): IImageData | CPUIImageData;
|
|
38
|
-
getCornerstoneImage: () => IImage;
|
|
39
|
-
resetToDefaultProperties(): void;
|
|
40
|
-
resetProperties(): void;
|
|
41
|
-
getCamera(): ICamera;
|
|
42
|
-
setCamera(cameraInterface: ICamera): void;
|
|
43
|
-
setStack(imageIds: Array<string>, currentImageIdIndex?: number): Promise<string>;
|
|
44
|
-
resetCamera(resetPan?: boolean, resetZoom?: boolean): boolean;
|
|
45
|
-
setImageIdIndex(imageIdIndex: number): Promise<string>;
|
|
46
|
-
calibrateSpacing(imageId: string): void;
|
|
47
|
-
getRenderer(): any;
|
|
48
|
-
unsetColormap(): void;
|
|
49
|
-
}
|
|
1
|
+
import type IStackViewport from '../RenderingEngine/StackViewport';
|
|
2
|
+
export default IStackViewport;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IStackViewport.js","sourceRoot":"","sources":["../../../src/types/IStackViewport.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"IStackViewport.js","sourceRoot":"","sources":["../../../src/types/IStackViewport.ts"],"names":[],"mappings":";;AAEA,kBAAe,cAAc,CAAC"}
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const metaData_1 = require("../metaData");
|
|
4
4
|
function getScalingParameters(imageId) {
|
|
5
|
+
var _a;
|
|
5
6
|
const modalityLutModule = (0, metaData_1.get)('modalityLutModule', imageId) || {};
|
|
6
7
|
const generalSeriesModule = (0, metaData_1.get)('generalSeriesModule', imageId) || {};
|
|
7
8
|
const { modality } = generalSeriesModule;
|
|
8
9
|
const scalingParameters = {
|
|
9
|
-
rescaleSlope: modalityLutModule.rescaleSlope,
|
|
10
|
-
rescaleIntercept: modalityLutModule.rescaleIntercept,
|
|
10
|
+
rescaleSlope: modalityLutModule.rescaleSlope || 1,
|
|
11
|
+
rescaleIntercept: (_a = modalityLutModule.rescaleIntercept) !== null && _a !== void 0 ? _a : 0,
|
|
11
12
|
modality,
|
|
12
13
|
};
|
|
13
14
|
const suvFactor = (0, metaData_1.get)('scalingModule', imageId) || {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getScalingParameters.js","sourceRoot":"","sources":["../../../src/utilities/getScalingParameters.ts"],"names":[],"mappings":";;AAAA,0CAAiD;AAUjD,SAAwB,oBAAoB,CAC1C,OAAe
|
|
1
|
+
{"version":3,"file":"getScalingParameters.js","sourceRoot":"","sources":["../../../src/utilities/getScalingParameters.ts"],"names":[],"mappings":";;AAAA,0CAAiD;AAUjD,SAAwB,oBAAoB,CAC1C,OAAe;;IAEf,MAAM,iBAAiB,GAAG,IAAA,cAAW,EAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC1E,MAAM,mBAAmB,GAAG,IAAA,cAAW,EAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAE9E,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAC;IAEzC,MAAM,iBAAiB,GAAG;QACxB,YAAY,EAAE,iBAAiB,CAAC,YAAY,IAAI,CAAC;QACjD,gBAAgB,EAAE,MAAA,iBAAiB,CAAC,gBAAgB,mCAAI,CAAC;QACzD,QAAQ;KACT,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,cAAW,EAAC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAE9D,uCACK,iBAAiB,GACjB,CAAC,QAAQ,KAAK,IAAI,IAAI;QACvB,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,MAAM,EAAE,SAAS,CAAC,MAAM;KACzB,CAAC,EACF;AACJ,CAAC;AAxBD,uCAwBC"}
|
|
@@ -1,8 +1,24 @@
|
|
|
1
|
-
import type { ViewportInputOptions } from '../types';
|
|
1
|
+
import type { ViewPresentation, ViewReference, ViewportInputOptions, Point3 } from '../types';
|
|
2
2
|
import { RequestType } from '../enums';
|
|
3
|
-
export
|
|
4
|
-
canvas: HTMLCanvasElement;
|
|
3
|
+
export declare type StackLoadImageOptions = {
|
|
5
4
|
imageId: string;
|
|
5
|
+
};
|
|
6
|
+
export declare type FullImageLoadOptions = {
|
|
7
|
+
viewReference: ViewReference;
|
|
8
|
+
viewPresentation: ViewPresentation;
|
|
9
|
+
imageId: undefined;
|
|
10
|
+
};
|
|
11
|
+
export declare type CanvasLoadPosition = {
|
|
12
|
+
origin: Point3;
|
|
13
|
+
topRight: Point3;
|
|
14
|
+
bottomLeft: Point3;
|
|
15
|
+
thicknessMm: number;
|
|
16
|
+
};
|
|
17
|
+
export declare type LoadImageOptions = {
|
|
18
|
+
canvas: HTMLCanvasElement;
|
|
19
|
+
imageId?: string;
|
|
20
|
+
viewReference?: ViewReference;
|
|
21
|
+
viewPresentation?: ViewPresentation;
|
|
6
22
|
requestType?: RequestType;
|
|
7
23
|
priority?: number;
|
|
8
24
|
renderingEngineId?: string;
|
|
@@ -11,5 +27,5 @@ export interface LoadImageOptions {
|
|
|
11
27
|
imageAspect?: boolean;
|
|
12
28
|
physicalPixels?: boolean;
|
|
13
29
|
viewportOptions?: ViewportInputOptions;
|
|
14
|
-
}
|
|
15
|
-
export default function loadImageToCanvas(options: LoadImageOptions): Promise<
|
|
30
|
+
} & (StackLoadImageOptions | FullImageLoadOptions);
|
|
31
|
+
export default function loadImageToCanvas(options: LoadImageOptions): Promise<CanvasLoadPosition>;
|
|
@@ -33,29 +33,36 @@ const imageLoadPoolManager_1 = __importDefault(require("../requestPool/imageLoad
|
|
|
33
33
|
const renderToCanvasGPU_1 = __importDefault(require("./renderToCanvasGPU"));
|
|
34
34
|
const renderToCanvasCPU_1 = __importDefault(require("./renderToCanvasCPU"));
|
|
35
35
|
const init_1 = require("../init");
|
|
36
|
+
const cache_1 = __importDefault(require("../cache"));
|
|
36
37
|
function loadImageToCanvas(options) {
|
|
37
|
-
const { canvas, imageId, requestType = enums_1.RequestType.Thumbnail, priority = -5, renderingEngineId = '_thumbnails', useCPURendering = false, thumbnail = false, imageAspect = false,
|
|
38
|
-
const
|
|
38
|
+
const { canvas, imageId, viewReference, requestType = enums_1.RequestType.Thumbnail, priority = -5, renderingEngineId = '_thumbnails', useCPURendering = false, thumbnail = false, imageAspect = false, viewportOptions: baseViewportOptions, } = options;
|
|
39
|
+
const volumeId = viewReference === null || viewReference === void 0 ? void 0 : viewReference.volumeId;
|
|
40
|
+
const isVolume = volumeId && !imageId;
|
|
41
|
+
const viewportOptions = viewReference && baseViewportOptions
|
|
42
|
+
? Object.assign(Object.assign({}, baseViewportOptions), { viewReference }) : baseViewportOptions;
|
|
39
43
|
const renderFn = useCPURendering ? renderToCanvasCPU_1.default : renderToCanvasGPU_1.default;
|
|
40
44
|
return new Promise((resolve, reject) => {
|
|
41
|
-
function successCallback(
|
|
45
|
+
function successCallback(imageOrVolume, imageId) {
|
|
42
46
|
var _a;
|
|
43
47
|
const { modality } = metaData.get('generalSeriesModule', imageId) || {};
|
|
44
|
-
|
|
48
|
+
const image = !isVolume && imageOrVolume;
|
|
49
|
+
const volume = isVolume && imageOrVolume;
|
|
50
|
+
if (image) {
|
|
51
|
+
image.isPreScaled = image.isPreScaled || ((_a = image.preScale) === null || _a === void 0 ? void 0 : _a.scaled);
|
|
52
|
+
}
|
|
45
53
|
if (thumbnail) {
|
|
46
54
|
canvas.height = 256;
|
|
47
55
|
canvas.width = 256;
|
|
48
56
|
}
|
|
49
|
-
if (
|
|
50
|
-
canvas.width = canvas.
|
|
51
|
-
canvas.height = canvas.offsetHeight * devicePixelRatio;
|
|
57
|
+
if (imageAspect && image) {
|
|
58
|
+
canvas.width = image && (canvas.height * image.width) / image.height;
|
|
52
59
|
}
|
|
53
|
-
|
|
54
|
-
|
|
60
|
+
canvas.style.width = `${canvas.width / devicePixelRatio}px`;
|
|
61
|
+
canvas.style.height = `${canvas.height / devicePixelRatio}px`;
|
|
62
|
+
if (volume && useCPURendering) {
|
|
63
|
+
reject(new Error('CPU rendering of volume not supported'));
|
|
55
64
|
}
|
|
56
|
-
renderFn(canvas,
|
|
57
|
-
resolve(imageId);
|
|
58
|
-
});
|
|
65
|
+
renderFn(canvas, imageOrVolume, modality, renderingEngineId, viewportOptions).then(resolve);
|
|
59
66
|
}
|
|
60
67
|
function errorCallback(error, imageId) {
|
|
61
68
|
console.error(error, imageId);
|
|
@@ -68,20 +75,28 @@ function loadImageToCanvas(options) {
|
|
|
68
75
|
errorCallback.call(this, error, imageId);
|
|
69
76
|
});
|
|
70
77
|
}
|
|
71
|
-
const { useNorm16Texture
|
|
72
|
-
const useNativeDataType = useNorm16Texture || preferSizeOverAccuracy;
|
|
78
|
+
const { useNorm16Texture } = (0, init_1.getConfiguration)().rendering;
|
|
73
79
|
const options = {
|
|
74
80
|
targetBuffer: {
|
|
75
|
-
type:
|
|
81
|
+
type: useNorm16Texture ? undefined : 'Float32Array',
|
|
76
82
|
},
|
|
77
83
|
preScale: {
|
|
78
84
|
enabled: true,
|
|
79
85
|
},
|
|
80
|
-
useNativeDataType,
|
|
81
86
|
useRGBA: !!useCPURendering,
|
|
82
87
|
requestType,
|
|
83
88
|
};
|
|
84
|
-
|
|
89
|
+
if (volumeId) {
|
|
90
|
+
const volume = cache_1.default.getVolume(volumeId);
|
|
91
|
+
if (!volume) {
|
|
92
|
+
reject(new Error(`Volume id ${volumeId} not found in cache`));
|
|
93
|
+
}
|
|
94
|
+
const useImageId = volume.imageIds[0];
|
|
95
|
+
successCallback(volume, useImageId);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
imageLoadPoolManager_1.default.addRequest(sendRequest.bind(null, imageId, null, options), requestType, { imageId }, priority);
|
|
99
|
+
}
|
|
85
100
|
});
|
|
86
101
|
}
|
|
87
102
|
exports.default = loadImageToCanvas;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadImageToCanvas.js","sourceRoot":"","sources":["../../../src/utilities/loadImageToCanvas.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"loadImageToCanvas.js","sourceRoot":"","sources":["../../../src/utilities/loadImageToCanvas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
import { IImage, ViewportInputOptions } from '../types';
|
|
2
|
-
|
|
1
|
+
import { IImage, ViewportInputOptions, IVolume } from '../types';
|
|
2
|
+
import type { CanvasLoadPosition } from './loadImageToCanvas';
|
|
3
|
+
export default function renderToCanvasCPU(canvas: HTMLCanvasElement, imageOrVolume: IImage | IVolume, modality?: string, _renderingEngineId?: string, _viewportOptions?: ViewportInputOptions): Promise<CanvasLoadPosition>;
|
|
@@ -6,7 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const getDefaultViewport_1 = __importDefault(require("../RenderingEngine/helpers/cpuFallback/rendering/getDefaultViewport"));
|
|
7
7
|
const calculateTransform_1 = __importDefault(require("../RenderingEngine/helpers/cpuFallback/rendering/calculateTransform"));
|
|
8
8
|
const drawImageSync_1 = __importDefault(require("../RenderingEngine/helpers/cpuFallback/drawImageSync"));
|
|
9
|
-
function renderToCanvasCPU(canvas,
|
|
9
|
+
function renderToCanvasCPU(canvas, imageOrVolume, modality, _renderingEngineId, _viewportOptions) {
|
|
10
|
+
const volume = imageOrVolume;
|
|
11
|
+
if (volume.volumeId) {
|
|
12
|
+
throw new Error('Unsupported volume rendering for CPU');
|
|
13
|
+
}
|
|
14
|
+
const image = imageOrVolume;
|
|
10
15
|
const viewport = (0, getDefaultViewport_1.default)(canvas, image, modality);
|
|
11
16
|
const enabledElement = {
|
|
12
17
|
canvas,
|
|
@@ -18,7 +23,7 @@ function renderToCanvasCPU(canvas, image, modality, _renderingEngineId, _viewpor
|
|
|
18
23
|
const invalidated = true;
|
|
19
24
|
return new Promise((resolve, reject) => {
|
|
20
25
|
(0, drawImageSync_1.default)(enabledElement, invalidated);
|
|
21
|
-
resolve(
|
|
26
|
+
resolve(null);
|
|
22
27
|
});
|
|
23
28
|
}
|
|
24
29
|
exports.default = renderToCanvasCPU;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderToCanvasCPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasCPU.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"renderToCanvasCPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasCPU.ts"],"names":[],"mappings":";;;;;AAOA,6HAAqG;AACrG,6HAAqG;AACrG,yGAAiF;AAUjF,SAAwB,iBAAiB,CACvC,MAAyB,EACzB,aAA+B,EAC/B,QAAiB,EACjB,kBAA2B,EAC3B,gBAAuC;IAEvC,MAAM,MAAM,GAAG,aAAwB,CAAC;IACxC,IAAI,MAAM,CAAC,QAAQ,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IACD,MAAM,KAAK,GAAG,aAAuB,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IAE7D,MAAM,cAAc,GAA8B;QAChD,MAAM;QACN,QAAQ;QACR,KAAK;QACL,cAAc,EAAE,EAAE;KACnB,CAAC;IAEF,cAAc,CAAC,SAAS,GAAG,IAAA,4BAAkB,EAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAA,uBAAa,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,oCA4BC"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
|
-
import { IImage, ViewportInputOptions } from '../types';
|
|
2
|
-
|
|
1
|
+
import { IImage, IVolume, ViewportInputOptions, ViewReference } from '../types';
|
|
2
|
+
import { CanvasLoadPosition } from './loadImageToCanvas';
|
|
3
|
+
export default function renderToCanvasGPU(canvas: HTMLCanvasElement, imageOrVolume: IImage | IVolume, modality?: any, renderingEngineId?: string, viewportOptions?: ViewportInputOptions & {
|
|
4
|
+
viewReference?: ViewReference;
|
|
5
|
+
}): Promise<CanvasLoadPosition>;
|
|
@@ -31,23 +31,28 @@ const enums_1 = require("../enums");
|
|
|
31
31
|
const getRenderingEngine_1 = require("../RenderingEngine/getRenderingEngine");
|
|
32
32
|
const RenderingEngine_1 = __importDefault(require("../RenderingEngine"));
|
|
33
33
|
const isPTPrescaledWithSUV_1 = __importDefault(require("./isPTPrescaledWithSUV"));
|
|
34
|
-
function renderToCanvasGPU(canvas,
|
|
34
|
+
function renderToCanvasGPU(canvas, imageOrVolume, modality = undefined, renderingEngineId = '_thumbnails', viewportOptions = {
|
|
35
|
+
displayArea: { imageArea: [1, 1] },
|
|
36
|
+
}) {
|
|
35
37
|
if (!canvas || !(canvas instanceof HTMLCanvasElement)) {
|
|
36
38
|
throw new Error('canvas element is required');
|
|
37
39
|
}
|
|
38
|
-
const
|
|
40
|
+
const isVolume = !imageOrVolume.imageId;
|
|
41
|
+
const image = !isVolume && imageOrVolume;
|
|
42
|
+
const volume = isVolume && imageOrVolume;
|
|
43
|
+
const imageIdToPrint = (image === null || image === void 0 ? void 0 : image.imageId) || (volume === null || volume === void 0 ? void 0 : volume.volumeId);
|
|
39
44
|
const viewportId = `renderGPUViewport-${imageIdToPrint}`;
|
|
40
|
-
const imageId = image.imageId;
|
|
41
45
|
const element = document.createElement('div');
|
|
42
46
|
const devicePixelRatio = window.devicePixelRatio || 1;
|
|
47
|
+
if (!viewportOptions.displayArea) {
|
|
48
|
+
viewportOptions.displayArea = { imageArea: [1, 1] };
|
|
49
|
+
}
|
|
43
50
|
const originalWidth = canvas.width;
|
|
44
51
|
const originalHeight = canvas.height;
|
|
45
|
-
element.style.width = `${originalWidth + getOrCreateCanvas_1.EPSILON}px`;
|
|
46
|
-
element.style.height = `${originalHeight + getOrCreateCanvas_1.EPSILON}px`;
|
|
52
|
+
element.style.width = `${originalWidth / devicePixelRatio + getOrCreateCanvas_1.EPSILON}px`;
|
|
53
|
+
element.style.height = `${originalHeight / devicePixelRatio + getOrCreateCanvas_1.EPSILON}px`;
|
|
47
54
|
element.style.visibility = 'hidden';
|
|
48
55
|
element.style.position = 'absolute';
|
|
49
|
-
canvas.width = originalWidth * devicePixelRatio;
|
|
50
|
-
canvas.height = originalHeight * devicePixelRatio;
|
|
51
56
|
document.body.appendChild(element);
|
|
52
57
|
const uniqueId = viewportId.split(':').join('-');
|
|
53
58
|
element.setAttribute('viewport-id-for-remove', uniqueId);
|
|
@@ -56,23 +61,41 @@ function renderToCanvasGPU(canvas, image, modality = undefined, renderingEngineI
|
|
|
56
61
|
new RenderingEngine_1.default(renderingEngineId);
|
|
57
62
|
let viewport = renderingEngine.getViewport(viewportId);
|
|
58
63
|
if (!viewport) {
|
|
59
|
-
const
|
|
64
|
+
const viewportInput = {
|
|
60
65
|
viewportId,
|
|
61
|
-
type: enums_1.ViewportType.STACK,
|
|
66
|
+
type: isVolume ? enums_1.ViewportType.ORTHOGRAPHIC : enums_1.ViewportType.STACK,
|
|
62
67
|
element,
|
|
63
68
|
defaultOptions: Object.assign(Object.assign({}, viewportOptions), { suppressEvents: true }),
|
|
64
69
|
};
|
|
65
|
-
renderingEngine.enableElement(
|
|
70
|
+
renderingEngine.enableElement(viewportInput);
|
|
66
71
|
viewport = renderingEngine.getViewport(viewportId);
|
|
67
72
|
}
|
|
68
73
|
return new Promise((resolve) => {
|
|
69
74
|
let elementRendered = false;
|
|
75
|
+
let { viewReference } = viewportOptions;
|
|
70
76
|
const onImageRendered = (eventDetail) => {
|
|
71
77
|
if (elementRendered) {
|
|
72
78
|
return;
|
|
73
79
|
}
|
|
80
|
+
if (viewReference) {
|
|
81
|
+
const useViewRef = viewReference;
|
|
82
|
+
viewReference = null;
|
|
83
|
+
viewport.setViewReference(useViewRef);
|
|
84
|
+
viewport.render();
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
74
87
|
const context = canvas.getContext('2d');
|
|
75
88
|
context.drawImage(temporaryCanvas, 0, 0, temporaryCanvas.width, temporaryCanvas.height, 0, 0, canvas.width, canvas.height);
|
|
89
|
+
const origin = viewport.canvasToWorld([0, 0]);
|
|
90
|
+
const topRight = viewport.canvasToWorld([
|
|
91
|
+
temporaryCanvas.width / devicePixelRatio,
|
|
92
|
+
0,
|
|
93
|
+
]);
|
|
94
|
+
const bottomLeft = viewport.canvasToWorld([
|
|
95
|
+
0,
|
|
96
|
+
temporaryCanvas.height / devicePixelRatio,
|
|
97
|
+
]);
|
|
98
|
+
const thicknessMm = 1;
|
|
76
99
|
elementRendered = true;
|
|
77
100
|
element.removeEventListener(enums_1.Events.IMAGE_RENDERED, onImageRendered);
|
|
78
101
|
setTimeout(() => {
|
|
@@ -82,10 +105,20 @@ function renderToCanvasGPU(canvas, image, modality = undefined, renderingEngineI
|
|
|
82
105
|
element.remove();
|
|
83
106
|
});
|
|
84
107
|
}, 0);
|
|
85
|
-
resolve(
|
|
108
|
+
resolve({
|
|
109
|
+
origin,
|
|
110
|
+
bottomLeft,
|
|
111
|
+
topRight,
|
|
112
|
+
thicknessMm,
|
|
113
|
+
});
|
|
86
114
|
};
|
|
87
115
|
element.addEventListener(enums_1.Events.IMAGE_RENDERED, onImageRendered);
|
|
88
|
-
|
|
116
|
+
if (isVolume) {
|
|
117
|
+
viewport.setVolumes([volume], false, true);
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
viewport.renderImageObject(imageOrVolume);
|
|
121
|
+
}
|
|
89
122
|
viewport.resetCamera();
|
|
90
123
|
if (modality === 'PT' && !(0, isPTPrescaledWithSUV_1.default)(image)) {
|
|
91
124
|
viewport.setProperties({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderToCanvasGPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasGPU.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kGAEsD;AACtD,oCAAgD;
|
|
1
|
+
{"version":3,"file":"renderToCanvasGPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasGPU.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,11 +59,15 @@ function sortImageIdsAndGetSpacing(imageIds, scanAxisNormal) {
|
|
|
59
59
|
Math.abs(distanceBetweenFirstAndMiddleImages) /
|
|
60
60
|
Math.floor(imageIds.length / 2);
|
|
61
61
|
}
|
|
62
|
-
const { imagePositionPatient: origin, sliceThickness } = __1.metaData.get('imagePlaneModule', sortedImageIds[0]);
|
|
62
|
+
const { imagePositionPatient: origin, sliceThickness, spacingBetweenSlices, } = __1.metaData.get('imagePlaneModule', sortedImageIds[0]);
|
|
63
63
|
const { strictZSpacingForVolumeViewport } = (0, __1.getConfiguration)().rendering;
|
|
64
64
|
if (zSpacing === 0 && !strictZSpacingForVolumeViewport) {
|
|
65
|
-
if (sliceThickness) {
|
|
66
|
-
console.log('Could not calculate zSpacing. Using
|
|
65
|
+
if (sliceThickness && spacingBetweenSlices) {
|
|
66
|
+
console.log('Could not calculate zSpacing. Using spacingBetweenSlices');
|
|
67
|
+
zSpacing = spacingBetweenSlices;
|
|
68
|
+
}
|
|
69
|
+
else if (sliceThickness) {
|
|
70
|
+
console.log('Could not calculate zSpacing and no spacingBetweenSlices. Using sliceThickness');
|
|
67
71
|
zSpacing = sliceThickness;
|
|
68
72
|
}
|
|
69
73
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortImageIdsAndGetSpacing.js","sourceRoot":"","sources":["../../../src/utilities/sortImageIdsAndGetSpacing.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sortImageIdsAndGetSpacing.js","sourceRoot":"","sources":["../../../src/utilities/sortImageIdsAndGetSpacing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds
|
|
1
|
+
async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds) {
|
|
2
2
|
for (const viewportId of viewportIds) {
|
|
3
3
|
const viewport = renderingEngine.getViewport(viewportId);
|
|
4
4
|
if (!viewport) {
|
|
@@ -11,7 +11,7 @@ async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportI
|
|
|
11
11
|
}
|
|
12
12
|
const addStackPromises = viewportIds.map(async (viewportId) => {
|
|
13
13
|
const viewport = renderingEngine.getViewport(viewportId);
|
|
14
|
-
return viewport.addImages(stackInputs
|
|
14
|
+
return viewport.addImages(stackInputs);
|
|
15
15
|
});
|
|
16
16
|
await Promise.all(addStackPromises);
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addImageSlicesToViewports.js","sourceRoot":"","sources":["../../../../src/RenderingEngine/helpers/addImageSlicesToViewports.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"addImageSlicesToViewports.js","sourceRoot":"","sources":["../../../../src/RenderingEngine/helpers/addImageSlicesToViewports.ts"],"names":[],"mappings":"AAkBA,KAAK,UAAU,yBAAyB,CACtC,eAAiC,EACjC,WAA+B,EAC/B,WAA0B;IAG1B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAEzD,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,UAAU,iBAAiB,CAAC,CAAC;SAClE;QAGD,IAAI,CAAE,QAA2B,CAAC,SAAS,EAAE;YAC3C,OAAO,CAAC,IAAI,CACV,oBAAoB,UAAU,2EAA2E,CAC1G,CAAC;YAEF,OAAO;SACR;KACF;IAED,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QAC5D,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,UAAU,CAAmB,CAAC;QAE3E,OAAO,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AACtC,CAAC;AAED,eAAe,yBAAyB,CAAC"}
|
|
@@ -93,12 +93,24 @@ export function createAndCacheDerivedImage(referencedImageId, options = {}, prev
|
|
|
93
93
|
const { TypedArrayConstructor } = getBufferConfiguration(options.targetBufferType, length);
|
|
94
94
|
const imageScalarData = new TypedArrayConstructor(skipCreateBuffer ? 1 : length);
|
|
95
95
|
const derivedImageId = imageId;
|
|
96
|
-
['
|
|
96
|
+
['imagePlaneModule', 'generalSeriesModule'].forEach((type) => {
|
|
97
97
|
genericMetadataProvider.add(derivedImageId, {
|
|
98
98
|
type,
|
|
99
99
|
metadata: metaData.get(type, referencedImageId),
|
|
100
100
|
});
|
|
101
101
|
});
|
|
102
|
+
const imagePixelModule = metaData.get('imagePixelModule', referencedImageId);
|
|
103
|
+
genericMetadataProvider.add(derivedImageId, {
|
|
104
|
+
type: 'imagePixelModule',
|
|
105
|
+
metadata: {
|
|
106
|
+
...imagePixelModule,
|
|
107
|
+
bitsAllocated: 8,
|
|
108
|
+
bitsStored: 8,
|
|
109
|
+
highBit: 7,
|
|
110
|
+
samplesPerPixel: 1,
|
|
111
|
+
pixelRepresentation: 0,
|
|
112
|
+
},
|
|
113
|
+
});
|
|
102
114
|
const localImage = createAndCacheLocalImage({ scalarData: imageScalarData, onCacheAdd, skipCreateBuffer }, imageId, true);
|
|
103
115
|
const imageLoadObject = {
|
|
104
116
|
promise: Promise.resolve(localImage),
|