@cornerstonejs/core 4.11.2 → 4.11.3

package/dist/esm/enums/MetadataModules.d.ts

@@ -19,6 +19,19 @@ declare enum MetadataModules {
     SOP_COMMON = "sopCommonModule",
     ULTRASOUND_ENHANCED_REGION = "ultrasoundEnhancedRegionModule",
     VOI_LUT = "voiLutModule",
-    WADO_WEB_CLIENT = "wadoWebClient"
+    FRAME_MODULE = "frameModule",
+    WADO_WEB_CLIENT = "wadoWebClient",
+    INSTANCE = "instance",
+    IMAGE_SOP_INSTANCE_REFERENCE = "ImageSopInstanceReference",
+    REFERENCED_SERIES_REFERENCE = "ReferencedSeriesReference",
+    PREDECESSOR_SEQUENCE = "PredecessorSequence",
+    STUDY_DATA = "StudyData",
+    SERIES_DATA = "SeriesData",
+    IMAGE_DATA = "ImageData",
+    RTSS_INSTANCE_DATA = "RtssInstanceData",
+    NEW_INSTANCE_DATA = "NewInstanceData",
+    RTSS_CONTOUR = "metaRTSSContour",
+    SEG_BIT = "metaSegBitmap",
+    SR_ANNOTATION = "metaSrAnnotation"
 }
 export default MetadataModules;

package/dist/esm/enums/MetadataModules.js

@@ -20,6 +20,19 @@ var MetadataModules;
     MetadataModules["SOP_COMMON"] = "sopCommonModule";
     MetadataModules["ULTRASOUND_ENHANCED_REGION"] = "ultrasoundEnhancedRegionModule";
     MetadataModules["VOI_LUT"] = "voiLutModule";
+    MetadataModules["FRAME_MODULE"] = "frameModule";
     MetadataModules["WADO_WEB_CLIENT"] = "wadoWebClient";
+    MetadataModules["INSTANCE"] = "instance";
+    MetadataModules["IMAGE_SOP_INSTANCE_REFERENCE"] = "ImageSopInstanceReference";
+    MetadataModules["REFERENCED_SERIES_REFERENCE"] = "ReferencedSeriesReference";
+    MetadataModules["PREDECESSOR_SEQUENCE"] = "PredecessorSequence";
+    MetadataModules["STUDY_DATA"] = "StudyData";
+    MetadataModules["SERIES_DATA"] = "SeriesData";
+    MetadataModules["IMAGE_DATA"] = "ImageData";
+    MetadataModules["RTSS_INSTANCE_DATA"] = "RtssInstanceData";
+    MetadataModules["NEW_INSTANCE_DATA"] = "NewInstanceData";
+    MetadataModules["RTSS_CONTOUR"] = "metaRTSSContour";
+    MetadataModules["SEG_BIT"] = "metaSegBitmap";
+    MetadataModules["SR_ANNOTATION"] = "metaSrAnnotation";
 })(MetadataModules || (MetadataModules = {}));
 export default MetadataModules;

package/dist/esm/metaData.d.ts

@@ -2,4 +2,7 @@ export declare function addProvider(provider: (type: string, ...query: string[])
 export declare function removeProvider(provider: (type: string, query: unknown) => unknown): void;
 export declare function removeAllProviders(): void;
 declare function getMetaData(type: string, ...queries: any[]): any;
+export declare function getNormalized(imageId: string, types: string[], metaDataProvider?: typeof getMetaData): {};
+export declare const toUpperCamelTag: (tag: string) => string;
+export declare const toLowerCamelTag: (tag: string) => string;
 export { getMetaData as get };

package/dist/esm/metaData.js

@@ -32,4 +32,44 @@ function getMetaData(type, ...queries) {
         }
     }
 }
+export function getNormalized(imageId, types, metaDataProvider = getMetaData) {
+    const result = {};
+    for (const t of types) {
+        try {
+            const data = metaDataProvider(t, imageId);
+            if (data) {
+                const capitalizedData = {};
+                for (const key in data) {
+                    if (key in data) {
+                        const capitalizedKey = toUpperCamelTag(key);
+                        capitalizedData[capitalizedKey] = data[key];
+                    }
+                }
+                Object.assign(result, capitalizedData);
+            }
+        }
+        catch (error) {
+            console.error(`Error retrieving ${t} data:`, error);
+        }
+    }
+    return result;
+}
+export const toUpperCamelTag = (tag) => {
+    if (tag.startsWith('sop')) {
+        return `SOP${tag.substring(3)}`;
+    }
+    if (tag.endsWith('Id')) {
+        tag = `${tag.substring(0, tag.length - 2)}ID`;
+    }
+    return tag.charAt(0).toUpperCase() + tag.slice(1);
+};
+export const toLowerCamelTag = (tag) => {
+    if (tag.startsWith('SOP')) {
+        return `sop${tag.substring(3)}`;
+    }
+    if (tag.endsWith('ID')) {
+        tag = `${tag.substring(0, tag.length - 2)}Id`;
+    }
+    return tag.charAt(0).toLowerCase() + tag.slice(1);
+};
 export { getMetaData as get };

package/dist/esm/types/InstanceTypes.d.ts

@@ -0,0 +1,35 @@
+export type SimpleData = string | number | null | undefined | boolean;
+export type SimpleModule = {
+    StudyInstanceUID?: string;
+    SeriesInstanceUID?: string;
+    SeriesDescription?: string;
+    SeriesNumber?: number | string;
+    SeriesDate?: string;
+    SeriesTime?: string;
+    Modality?: string;
+    SOPInstanceUID?: string;
+    SOPClassUID?: string;
+    InstanceNumber?: string | number;
+    FrameOfReferenceUID?: string;
+    [key: string]: SimpleData;
+};
+export type FunctionalGroups = {
+    [key: string]: NormalModule;
+};
+export type NormalModule = SimpleModule & {
+    PerFrameFunctionalGroupsSequence?: FunctionalGroups[];
+    SharedFunctionalGroupsSequence?: FunctionalGroups;
+};
+export type RtssModule = NormalModule & {
+    StructureSetROISequence: NormalModule[];
+    ROIContourSequence: NormalModule[];
+    RTROIObservationsSequence: NormalModule[];
+    ReferencedSeriesSequence: NormalModule[];
+    ReferencedFrameOfReferenceSequence: NormalModule[];
+    Modality: 'RTSTRUCT';
+    PositionReferenceIndicator: string;
+    StructureSetLabel: string;
+    StructureSetName: string;
+    StructureSetDate: string;
+    StructureSetTime: string;
+};

package/dist/esm/types/MetadataModuleTypes.d.ts

@@ -61,6 +61,10 @@ export interface SopCommonModuleMetadata {
     sopClassUID: string;
     sopInstanceUID: string;
 }
+export interface FrameMetadata extends SopCommonModuleMetadata {
+    frameNumber: number;
+    numberOfFrames: number;
+}
 export interface TransferSyntaxMetadata {
     transferSyntaxUID: string;
 }

package/dist/esm/types/index.d.ts

@@ -80,7 +80,7 @@ import type { PixelDataTypedArray, PixelDataTypedArrayString } from './PixelData
 import type { ImagePixelModule } from './ImagePixelModule';
 import type { ImagePlaneModule } from './ImagePlaneModule';
 import type { AffineMatrix } from './AffineMatrix';
-export type { RetrieveStage, RetrieveOptions, RangeRetrieveOptions, StreamingRetrieveOptions, NearbyFrames, IRetrieveConfiguration, IImagesLoader, } from './IRetrieveConfiguration';
+export type * from './IRetrieveConfiguration';
 import type { ImageLoadListener } from './ImageLoadListener';
 import type { Color, ColorLUT } from './Color';
 import type VideoViewportProperties from './VideoViewportProperties';
@@ -94,7 +94,6 @@ import type { VolumeProps } from './VolumeProps';
 import type { BoundsLPS } from './BoundsLPS';
 import type { IPointsManager, PolyDataPointConfiguration } from './IPointsManager';
 import type IImageFrame from './IImageFrame';
-import type { DicomDateObject, DicomTimeObject, GeneralSeriesModuleMetadata, ImagePlaneModuleMetadata, SopCommonModuleMetadata, ImagePixelModuleMetadata, PatientStudyModuleMetadata, TransferSyntaxMetadata } from './MetadataModuleTypes';
 import type { IVoxelManager } from './IVoxelManager';
 import type { IRLEVoxelMap, RLERun } from './IRLEVoxelMap';
 import type ImageLoadRequests from './ImageLoadRequests';
@@ -104,4 +103,6 @@ import type JumpToSliceOptions from './JumpToSliceOptions';
 import type GeometryLoaderFn from './GeometryLoaderFn';
 import type { RenderingEngineModeType } from './RenderingEngineMode';
 import type { VtkOffscreenMultiRenderWindow } from './VtkOffscreenMultiRenderWindow';
-export type { Cornerstone3DConfig, IBaseStreamingImageVolume, ICamera, IStackViewport, IVideoViewport, IWSIViewport, IVolumeViewport, IEnabledElement, ICache, IVolume, IViewportId, IImageVolume, ImageVolumeProps, IDynamicImageVolume, IRenderingEngine, ScalingParameters, PTScaling, IPointsManager, PolyDataPointConfiguration, Scaling, IStreamingImageVolume, IImage, IImageData, IImageCalibration, CPUIImageData, CPUImageData, EventTypes, ImageLoaderFn, VolumeLoaderFn, IRegisterImageLoader, IStreamingVolumeProperties, IViewport, ViewReference, DataSetOptions as ImageSetOptions, ViewPresentation, ViewPresentationSelector, ReferenceCompatibleOptions, ViewReferenceSpecifier, StackViewportProperties, VolumeViewportProperties, ViewportProperties, PublicViewportInput, VolumeActor, Actor, ActorEntry, ImageActor, ICanvasActor, IImageLoadObject, IVolumeLoadObject, IVolumeInput, VolumeInputCallback, IStackInput, StackInputCallback, ViewportPreset, Metadata, OrientationVectors, AABB2, AABB3, Point2, Point3, PointsXYZ, Point4, Mat3, Plane, ViewportInputOptions, VideoViewportProperties, WSIViewportProperties, VOIRange, VOI, DisplayArea, FlipDirection, ICachedImage, ICachedVolume, CPUFallbackEnabledElement, CPUFallbackViewport, CPUFallbackTransform, CPUFallbackColormapData, CPUFallbackViewportDisplayedArea, CPUFallbackColormapsData, CPUFallbackColormap, TransformMatrix2D, CPUFallbackLookupTable, CPUFallbackLUT, CPUFallbackRenderingTools, CustomEventType, ActorSliceRange, ImageSliceData, IGeometry, IGeometryLoadObject, ICachedGeometry, PublicContourSetData, ContourSetData, ContourData, IContourSet, IContour, PublicSurfaceData, SurfaceData, ISurface, PublicMeshData, MeshData, IMesh, RGB, ColormapPublic, ColormapRegistration, PixelDataTypedArray, PixelDataTypedArrayString, ImagePixelModule, ImagePlaneModule, AffineMatrix, ImageLoadListener, InternalVideoCamera, VideoViewportInput, BoundsIJK, BoundsLPS, Color, ColorLUT, VolumeProps, IImageFrame, DicomDateObject, DicomTimeObject, GeneralSeriesModuleMetadata, ImagePlaneModuleMetadata, SopCommonModuleMetadata, ImagePixelModuleMetadata, PatientStudyModuleMetadata, TransferSyntaxMetadata, LocalVolumeOptions, IVoxelManager, IRLEVoxelMap, RLERun, ViewportInput, ImageLoadRequests, IBaseVolumeViewport, GeometryLoaderFn, ScrollOptions, JumpToSliceOptions, Memo, HistoryMemo, VoxelManager, RLEVoxelMap, RenderingEngineModeType, VtkOffscreenMultiRenderWindow, };
+export type * from './MetadataModuleTypes';
+export type * from './InstanceTypes';
+export type { Cornerstone3DConfig, IBaseStreamingImageVolume, ICamera, IStackViewport, IVideoViewport, IWSIViewport, IVolumeViewport, IEnabledElement, ICache, IVolume, IViewportId, IImageVolume, ImageVolumeProps, IDynamicImageVolume, IRenderingEngine, ScalingParameters, PTScaling, IPointsManager, PolyDataPointConfiguration, Scaling, IStreamingImageVolume, IImage, IImageData, IImageCalibration, CPUIImageData, CPUImageData, EventTypes, ImageLoaderFn, VolumeLoaderFn, IRegisterImageLoader, IStreamingVolumeProperties, IViewport, ViewReference, DataSetOptions as ImageSetOptions, ViewPresentation, ViewPresentationSelector, ReferenceCompatibleOptions, ViewReferenceSpecifier, StackViewportProperties, VolumeViewportProperties, ViewportProperties, PublicViewportInput, VolumeActor, Actor, ActorEntry, ImageActor, ICanvasActor, IImageLoadObject, IVolumeLoadObject, IVolumeInput, VolumeInputCallback, IStackInput, StackInputCallback, ViewportPreset, Metadata, OrientationVectors, AABB2, AABB3, Point2, Point3, PointsXYZ, Point4, Mat3, Plane, ViewportInputOptions, VideoViewportProperties, WSIViewportProperties, VOIRange, VOI, DisplayArea, FlipDirection, ICachedImage, ICachedVolume, CPUFallbackEnabledElement, CPUFallbackViewport, CPUFallbackTransform, CPUFallbackColormapData, CPUFallbackViewportDisplayedArea, CPUFallbackColormapsData, CPUFallbackColormap, TransformMatrix2D, CPUFallbackLookupTable, CPUFallbackLUT, CPUFallbackRenderingTools, CustomEventType, ActorSliceRange, ImageSliceData, IGeometry, IGeometryLoadObject, ICachedGeometry, PublicContourSetData, ContourSetData, ContourData, IContourSet, IContour, PublicSurfaceData, SurfaceData, ISurface, PublicMeshData, MeshData, IMesh, RGB, ColormapPublic, ColormapRegistration, PixelDataTypedArray, PixelDataTypedArrayString, ImagePixelModule, ImagePlaneModule, AffineMatrix, ImageLoadListener, InternalVideoCamera, VideoViewportInput, BoundsIJK, BoundsLPS, Color, ColorLUT, VolumeProps, IImageFrame, LocalVolumeOptions, IVoxelManager, IRLEVoxelMap, RLERun, ViewportInput, ImageLoadRequests, IBaseVolumeViewport, GeometryLoaderFn, ScrollOptions, JumpToSliceOptions, Memo, HistoryMemo, VoxelManager, RLEVoxelMap, RenderingEngineModeType, VtkOffscreenMultiRenderWindow, };

package/dist/esm/utilities/getPixelSpacingInformation.js

@@ -14,6 +14,7 @@ const projectionRadiographSOPClassUIDs = new Set([
     '1.2.840.10008.5.1.4.1.1.12.2.1',
     '1.2.840.10008.5.1.4.1.1.12.3',
 ]);
+const alreadySeenWarn = new Set();
 function calculateRadiographicPixelSpacing(instance) {
     const { PixelSpacing, ImagerPixelSpacing, EstimatedRadiographicMagnificationFactor, PixelSpacingCalibrationType, PixelSpacingCalibrationDescription, } = instance;
     const isProjection = true;
@@ -26,7 +27,10 @@ function calculateRadiographicPixelSpacing(instance) {
     }
     if (!PixelSpacing) {
         if (!EstimatedRadiographicMagnificationFactor) {
-            console.warn('EstimatedRadiographicMagnificationFactor was not present. Unable to correct ImagerPixelSpacing.');
+            if (!alreadySeenWarn.has(instance.SeriesInstanceUID)) {
+                console.warn('EstimatedRadiographicMagnificationFactor was not present on series', instance.SeriesInstanceUID, ' Unable to correct ImagerPixelSpacing.');
+                alreadySeenWarn.add(instance.SeriesInstanceUID);
+            }
             return {
                 PixelSpacing: ImagerPixelSpacing,
                 type: CalibrationTypes.PROJECTION,

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.11.2";
+export declare const version = "4.11.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.11.2';
+export const version = '4.11.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "4.11.2",
+  "version": "4.11.3",
   "description": "Cornerstone3D Core",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -97,5 +97,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "c7a497d005516256a2048ba0337153f32921ec6d"
+  "gitHead": "e7b0cea10f4ceb71710d3f01eaead75152180b7a"
 }