Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cpu): could not render if switched to cpu in the middle #615

Merged
merged 3 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 63 additions & 37 deletions common/reviews/api/core.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -283,40 +283,8 @@ interface CPUFallbackEnabledElement {
dimensions?: Point3;
spacing?: Point3;
origin?: Point3;
imagePlaneModule?: {
frameOfReferenceUID: string;
rows: number;
columns: number;
imageOrientationPatient: number[];
rowCosines: Point3;
columnCosines: Point3;
imagePositionPatient: number[];
sliceThickness?: number;
sliceLocation?: number;
pixelSpacing: Point2;
rowPixelSpacing: number;
columnPixelSpacing: number;
};
imagePixelModule?: {
samplesPerPixel: number;
photometricInterpretation: string;
rows: number;
columns: number;
bitsAllocated: number;
bitsStored: number;
highBit: number;
pixelRepresentation: number;
planarConfiguration?: number;
pixelAspectRatio?: number;
smallestPixelValue?: number;
largestPixelValue?: number;
redPaletteColorLookupTableDescriptor?: number[];
greenPaletteColorLookupTableDescriptor?: number[];
bluePaletteColorLookupTableDescriptor?: number[];
redPaletteColorLookupTableData: number[];
greenPaletteColorLookupTableData: number[];
bluePaletteColorLookupTableData: number[];
};
imagePlaneModule?: ImagePlaneModule;
imagePixelModule?: ImagePixelModule;
};
// (undocumented)
needsRedraw?: boolean;
Expand Down Expand Up @@ -466,7 +434,7 @@ type CPUIImageData = {
metadata: {
Modality: string;
};
scalarData: number[];
scalarData: PixelDataTypedArray;
scaling: Scaling;
hasPixelSpacing?: boolean;
preScale?: {
Expand All @@ -488,7 +456,7 @@ type CPUImageData = {
getIndexToWorld?: () => Point3;
getSpacing?: () => Point3;
getDirection?: () => Mat3;
getScalarData?: () => number[];
getScalarData?: () => PixelDataTypedArray;
getDimensions?: () => Point3;
};

Expand Down Expand Up @@ -1344,6 +1312,58 @@ type ImageLoadProgressEventDetail = {
percent: number;
};

// @public (undocumented)
interface ImagePixelModule {
// (undocumented)
bitsAllocated: number;
// (undocumented)
bitsStored: number;
// (undocumented)
highBit: number;
// (undocumented)
modality: string;
// (undocumented)
photometricInterpretation: string;
// (undocumented)
pixelRepresentation: string;
// (undocumented)
samplesPerPixel: number;
// (undocumented)
voiLUTFunction: VOILUTFunctionType;
// (undocumented)
windowCenter: number | number[];
// (undocumented)
windowWidth: number | number[];
}

// @public (undocumented)
interface ImagePlaneModule {
// (undocumented)
columnCosines?: Point3;
// (undocumented)
columnPixelSpacing?: number;
// (undocumented)
columns: number;
// (undocumented)
frameOfReferenceUID: string;
// (undocumented)
imageOrientationPatient?: Float32Array;
// (undocumented)
imagePositionPatient?: Point3;
// (undocumented)
pixelSpacing?: Point2;
// (undocumented)
rowCosines?: Point3;
// (undocumented)
rowPixelSpacing?: number;
// (undocumented)
rows: number;
// (undocumented)
sliceLocation?: number;
// (undocumented)
sliceThickness?: number;
}

// @public (undocumented)
type ImageRenderedEvent = CustomEvent_2<ElementEnabledEventDetail>;

Expand Down Expand Up @@ -1913,6 +1933,9 @@ type OrientationVectors = {
viewUp: Point3;
};

// @public (undocumented)
type PixelDataTypedArray = Float32Array | Int16Array | Uint16Array | Uint8Array | Int8Array | Uint8ClampedArray;

declare namespace planar {
export {
linePlaneIntersection,
Expand Down Expand Up @@ -2390,7 +2413,10 @@ declare namespace Types {
IContour,
RGB,
ColormapPublic,
ColormapRegistration
ColormapRegistration,
PixelDataTypedArray,
ImagePixelModule,
ImagePlaneModule
}
}
export { Types }
Expand Down
101 changes: 65 additions & 36 deletions common/reviews/api/streaming-image-volume-loader.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,40 +197,8 @@ interface CPUFallbackEnabledElement {
dimensions?: Point3;
spacing?: Point3;
origin?: Point3;
imagePlaneModule?: {
frameOfReferenceUID: string;
rows: number;
columns: number;
imageOrientationPatient: number[];
rowCosines: Point3;
columnCosines: Point3;
imagePositionPatient: number[];
sliceThickness?: number;
sliceLocation?: number;
pixelSpacing: Point2;
rowPixelSpacing: number;
columnPixelSpacing: number;
};
imagePixelModule?: {
samplesPerPixel: number;
photometricInterpretation: string;
rows: number;
columns: number;
bitsAllocated: number;
bitsStored: number;
highBit: number;
pixelRepresentation: number;
planarConfiguration?: number;
pixelAspectRatio?: number;
smallestPixelValue?: number;
largestPixelValue?: number;
redPaletteColorLookupTableDescriptor?: number[];
greenPaletteColorLookupTableDescriptor?: number[];
bluePaletteColorLookupTableDescriptor?: number[];
redPaletteColorLookupTableData: number[];
greenPaletteColorLookupTableData: number[];
bluePaletteColorLookupTableData: number[];
};
imagePlaneModule?: ImagePlaneModule;
imagePixelModule?: ImagePixelModule;
};
// (undocumented)
needsRedraw?: boolean;
Expand Down Expand Up @@ -378,7 +346,7 @@ type CPUIImageData = {
origin: Point3;
imageData: CPUImageData;
metadata: { Modality: string };
scalarData: number[];
scalarData: PixelDataTypedArray;
scaling: Scaling;
hasPixelSpacing?: boolean;
preScale?: {
Expand All @@ -400,7 +368,7 @@ type CPUImageData = {
getIndexToWorld?: () => Point3;
getSpacing?: () => Point3;
getDirection?: () => Mat3;
getScalarData?: () => number[];
getScalarData?: () => PixelDataTypedArray;
getDimensions?: () => Point3;
};

Expand Down Expand Up @@ -939,6 +907,58 @@ type ImageLoadProgressEventDetail = {
percent: number;
};

// @public (undocumented)
interface ImagePixelModule {
// (undocumented)
bitsAllocated: number;
// (undocumented)
bitsStored: number;
// (undocumented)
highBit: number;
// (undocumented)
modality: string;
// (undocumented)
photometricInterpretation: string;
// (undocumented)
pixelRepresentation: string;
// (undocumented)
samplesPerPixel: number;
// (undocumented)
voiLUTFunction: VOILUTFunctionType;
// (undocumented)
windowCenter: number | number[];
// (undocumented)
windowWidth: number | number[];
}

// @public (undocumented)
interface ImagePlaneModule {
// (undocumented)
columnCosines?: Point3;
// (undocumented)
columnPixelSpacing?: number;
// (undocumented)
columns: number;
// (undocumented)
frameOfReferenceUID: string;
// (undocumented)
imageOrientationPatient?: Float32Array;
// (undocumented)
imagePositionPatient?: Point3;
// (undocumented)
pixelSpacing?: Point2;
// (undocumented)
rowCosines?: Point3;
// (undocumented)
rowPixelSpacing?: number;
// (undocumented)
rows: number;
// (undocumented)
sliceLocation?: number;
// (undocumented)
sliceThickness?: number;
}

// @public
type ImageRenderedEvent = CustomEvent_2<ElementEnabledEventDetail>;

Expand Down Expand Up @@ -1319,6 +1339,15 @@ type OrientationVectors = {
viewUp: Point3;
};

// @public (undocumented)
type PixelDataTypedArray =
| Float32Array
| Int16Array
| Uint16Array
| Uint8Array
| Int8Array
| Uint8ClampedArray;

// @public
type Plane = [number, number, number, number];

Expand Down
Loading