fix: MPR metadata parsing for spacings (#2517)
* fix: MPR metadata parsing for spacings * fix: OHIF Metadata provider for validNumbers for imagePlaneModule
This commit is contained in:
parent
cafb7d3f7b
commit
715dfc556a
@ -72,7 +72,7 @@ class OHIFVTKViewport extends Component {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
onScroll: () => {},
|
onScroll: () => { },
|
||||||
};
|
};
|
||||||
|
|
||||||
static id = 'OHIFVTKViewport';
|
static id = 'OHIFVTKViewport';
|
||||||
@ -271,7 +271,7 @@ class OHIFVTKViewport extends Component {
|
|||||||
|
|
||||||
volumeMapper.setSampleDistance(sampleDistance);
|
volumeMapper.setSampleDistance(sampleDistance);
|
||||||
|
|
||||||
// Be generous to surpress warnings, as the logging really hurts performance.
|
// Be generous to suppress warnings, as the logging really hurts performance.
|
||||||
// TODO: maybe we should auto adjust samples to 1000.
|
// TODO: maybe we should auto adjust samples to 1000.
|
||||||
volumeMapper.setMaximumSamplesPerRay(4000);
|
volumeMapper.setMaximumSamplesPerRay(4000);
|
||||||
|
|
||||||
|
|||||||
@ -231,26 +231,26 @@ class MetadataProvider {
|
|||||||
let columnCosines;
|
let columnCosines;
|
||||||
|
|
||||||
if (PixelSpacing) {
|
if (PixelSpacing) {
|
||||||
rowPixelSpacing = PixelSpacing[0];
|
rowPixelSpacing = validNumber(PixelSpacing[0]);
|
||||||
columnPixelSpacing = PixelSpacing[1];
|
columnPixelSpacing = validNumber(PixelSpacing[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ImageOrientationPatient) {
|
if (ImageOrientationPatient) {
|
||||||
rowCosines = ImageOrientationPatient.slice(0, 3);
|
rowCosines = validNumber(ImageOrientationPatient.slice(0, 3));
|
||||||
columnCosines = ImageOrientationPatient.slice(3, 6);
|
columnCosines = validNumber(ImageOrientationPatient.slice(3, 6));
|
||||||
}
|
}
|
||||||
|
|
||||||
metadata = {
|
metadata = {
|
||||||
frameOfReferenceUID: instance.FrameOfReferenceUID,
|
frameOfReferenceUID: instance.FrameOfReferenceUID,
|
||||||
rows: instance.Rows,
|
rows: instance.Rows,
|
||||||
columns: instance.Columns,
|
columns: instance.Columns,
|
||||||
imageOrientationPatient: ImageOrientationPatient,
|
imageOrientationPatient: validNumber(ImageOrientationPatient),
|
||||||
rowCosines,
|
rowCosines,
|
||||||
columnCosines,
|
columnCosines,
|
||||||
imagePositionPatient: instance.ImagePositionPatient,
|
imagePositionPatient: validNumber(instance.ImagePositionPatient),
|
||||||
sliceThickness: instance.SliceThickness,
|
sliceThickness: validNumber(instance.SliceThickness),
|
||||||
sliceLocation: instance.SliceLocation,
|
sliceLocation: validNumber(instance.SliceLocation),
|
||||||
pixelSpacing: PixelSpacing,
|
pixelSpacing: validNumber(PixelSpacing),
|
||||||
rowPixelSpacing,
|
rowPixelSpacing,
|
||||||
columnPixelSpacing,
|
columnPixelSpacing,
|
||||||
};
|
};
|
||||||
|
|||||||
@ -124,6 +124,6 @@ window.config = {
|
|||||||
// If the server is particularly slow to respond to series metadata
|
// If the server is particularly slow to respond to series metadata
|
||||||
// requests as it extracts the metadata from raw files everytime,
|
// requests as it extracts the metadata from raw files everytime,
|
||||||
// try setting this to even lower value
|
// try setting this to even lower value
|
||||||
// Leave it undefined for no limit, sutiable for HTTP/2 enabled servers
|
// Leave it undefined for no limit, suitable for HTTP/2 enabled servers
|
||||||
// maxConcurrentMetadataRequests: 5,
|
// maxConcurrentMetadataRequests: 5,
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user