@cornerstonejs/core 2.1.15 → 2.1.17
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/esm/RenderingEngine/BaseVolumeViewport.js +14 -17
- package/dist/esm/cache/classes/BaseStreamingImageVolume.js +5 -1
- package/dist/esm/cache/classes/ImageVolume.d.ts +1 -1
- package/dist/esm/loaders/cornerstoneStreamingImageVolumeLoader.js +1 -3
- package/dist/esm/loaders/volumeLoader.js +2 -1
- package/package.json +2 -2
|
@@ -84,26 +84,23 @@ class BaseVolumeViewport extends Viewport {
|
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
86
|
const { colormap: latestColormap, VOILUTFunction, interpolationType, invert, slabThickness, preset, } = this.viewportProperties;
|
|
87
|
-
|
|
87
|
+
volumeId ||= this.getVolumeId();
|
|
88
|
+
const volume = cache.getVolume(volumeId);
|
|
88
89
|
if (!volume) {
|
|
89
90
|
return null;
|
|
90
91
|
}
|
|
91
|
-
const
|
|
92
|
-
.
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
103
|
-
.filter(Boolean);
|
|
104
|
-
const voiRange = volumeId
|
|
105
|
-
? voiRanges.find((range) => range.volumeId === volumeId)?.voiRange
|
|
106
|
-
: voiRanges[0]?.voiRange;
|
|
92
|
+
const volumeActorEntry = this.getActors().find((actorEntry) => {
|
|
93
|
+
return actorEntry.referencedId === volumeId;
|
|
94
|
+
});
|
|
95
|
+
if (!volumeActorEntry) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
const volumeActor = volumeActorEntry.actor;
|
|
99
|
+
const cfun = volumeActor.getProperty().getRGBTransferFunction(0);
|
|
100
|
+
const [lower, upper] = this.viewportProperties?.VOILUTFunction === 'SIGMOID'
|
|
101
|
+
? getVoiFromSigmoidRGBTransferFunction(cfun)
|
|
102
|
+
: cfun.getRange();
|
|
103
|
+
const voiRange = { lower, upper };
|
|
107
104
|
const volumeColormap = this.getColormap(volumeId);
|
|
108
105
|
const colormap = volumeId && volumeColormap ? volumeColormap : latestColormap;
|
|
109
106
|
return {
|
|
@@ -2,7 +2,11 @@ import * as metaData from '../../metaData';
|
|
|
2
2
|
import { Events, ImageQualityStatus, RequestType } from '../../enums';
|
|
3
3
|
import eventTarget from '../../eventTarget';
|
|
4
4
|
import imageLoadPoolManager from '../../requestPool/imageLoadPoolManager';
|
|
5
|
-
import
|
|
5
|
+
import ProgressiveIterator from '../../utilities/ProgressiveIterator';
|
|
6
|
+
import imageRetrieveMetadataProvider from '../../utilities/imageRetrieveMetadataProvider';
|
|
7
|
+
import { hasFloatScalingParameters } from '../../utilities/hasFloatScalingParameters';
|
|
8
|
+
import autoLoad from '../../utilities/autoLoad';
|
|
9
|
+
import triggerEvent from '../../utilities/triggerEvent';
|
|
6
10
|
import ImageVolume from './ImageVolume';
|
|
7
11
|
import ProgressiveRetrieveImages from '../../loaders/ProgressiveRetrieveImages';
|
|
8
12
|
import { canRenderFloatTextures } from '../../init';
|
|
@@ -49,7 +49,7 @@ export declare class ImageVolume {
|
|
|
49
49
|
getImageIdIndex(imageId: string): number;
|
|
50
50
|
getImageIdByIndex(imageIdIndex: number): string;
|
|
51
51
|
getImageURIIndex(imageURI: string): number;
|
|
52
|
-
load(callback
|
|
52
|
+
load(callback?: (...args: unknown[]) => void): void;
|
|
53
53
|
destroy(): void;
|
|
54
54
|
invalidate(): void;
|
|
55
55
|
modified(): void;
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import StreamingImageVolume from '../cache/classes/StreamingImageVolume';
|
|
2
2
|
import { RequestType } from '../enums';
|
|
3
3
|
import imageLoadPoolManager from '../requestPool/imageLoadPoolManager';
|
|
4
|
-
import { generateVolumePropsFromImageIds } from '../utilities';
|
|
4
|
+
import { generateVolumePropsFromImageIds } from '../utilities/generateVolumePropsFromImageIds';
|
|
5
5
|
import { loadImage } from './imageLoader';
|
|
6
|
-
import { registerUnknownVolumeLoader } from './volumeLoader';
|
|
7
6
|
function cornerstoneStreamingImageVolumeLoader(volumeId, options) {
|
|
8
7
|
if (!options || !options.imageIds || !options.imageIds.length) {
|
|
9
8
|
throw new Error('ImageIds must be provided to create a streaming image volume');
|
|
@@ -71,5 +70,4 @@ function cornerstoneStreamingImageVolumeLoader(volumeId, options) {
|
|
|
71
70
|
},
|
|
72
71
|
};
|
|
73
72
|
}
|
|
74
|
-
registerUnknownVolumeLoader(cornerstoneStreamingImageVolumeLoader);
|
|
75
73
|
export { cornerstoneStreamingImageVolumeLoader };
|
|
@@ -8,8 +8,9 @@ import uuidv4 from '../utilities/uuidv4';
|
|
|
8
8
|
import VoxelManager from '../utilities/VoxelManager';
|
|
9
9
|
import { createAndCacheLocalImage, createAndCacheDerivedImages, } from './imageLoader';
|
|
10
10
|
import { generateVolumePropsFromImageIds } from '../utilities/generateVolumePropsFromImageIds';
|
|
11
|
+
import { cornerstoneStreamingImageVolumeLoader } from './cornerstoneStreamingImageVolumeLoader';
|
|
11
12
|
const volumeLoaders = {};
|
|
12
|
-
let unknownVolumeLoader;
|
|
13
|
+
let unknownVolumeLoader = cornerstoneStreamingImageVolumeLoader;
|
|
13
14
|
function loadVolumeFromVolumeLoader(volumeId, options) {
|
|
14
15
|
const colonIndex = volumeId.indexOf(':');
|
|
15
16
|
const scheme = volumeId.substring(0, colonIndex);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cornerstonejs/core",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.17",
|
|
4
4
|
"description": "",
|
|
5
5
|
"module": "./dist/esm/index.js",
|
|
6
6
|
"types": "./dist/esm/index.d.ts",
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
"type": "individual",
|
|
84
84
|
"url": "https://ohif.org/donate"
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "b5d10ad761e36b40c53de1bf3cbbf751bf6e8a87"
|
|
87
87
|
}
|