1 parent
f84aeac3c3
commit
c5c5ddf282
7 files changed
+32
-339
No files matched your search
@@ -79,10 +79,6 @@ export class MetadataProvider {
|
||||
// the imagePlane object for easier use in the Viewer
|
||||
metadata.imagePlane = this.getImagePlane(instanceMetadata);
|
||||
|
||||
if (metadata.instance && !metadata.instance.multiframeMetadata) {
|
||||
metadata.instance.multiframeMetadata = this.getMultiframeModuleMetadata(data);
|
||||
}
|
||||
|
||||
// Add the metadata to the imageId lookup object
|
||||
this.metadataLookup.set(imageId, metadata);
|
||||
}
|
||||
@@ -117,10 +113,8 @@ export class MetadataProvider {
|
||||
|
||||
if(image.data) {
|
||||
value = this.getFromDataSet(image.data, type, tag);
|
||||
} else if(image.instance) {
|
||||
value = image.instance[attrName];
|
||||
} else {
|
||||
value = image[attrName];
|
||||
value = image.instance[attrName];
|
||||
}
|
||||
|
||||
return value == null ? defaultValue : value;
|
||||
@@ -219,7 +213,7 @@ export class MetadataProvider {
|
||||
imageMetadata.instance.frameTime = imageMetadata.instance.frameTime || this.getFromDataSet(image.data, 'string', 'x00181063');
|
||||
imageMetadata.instance.frameTimeVector = imageMetadata.instance.frameTimeVector || this.getFromDataSet(image.data, 'string', 'x00181065');
|
||||
|
||||
if (!imageMetadata.instance.multiframeMetadata) {
|
||||
if ((image.data || image.instance) && !imageMetadata.instance.multiframeMetadata) {
|
||||
imageMetadata.instance.multiframeMetadata = this.getMultiframeModuleMetadata(image);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user