othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test for private tag handling

Browse Source
This commit is contained in:
weiwei 2016-09-13 14:59:02 +08:00 committed by Erik Ziegler
parent 06a499087c
commit c5596128c1
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Packages/ohif-dicom-services/server/DIMSE/Data.js
View File

@ -39,6 +39,10 @@ Tag.prototype.element = function() {
return this.value & 0xffff; return this.value & 0xffff;
}; };
Tag.prototype.isPixelDataTag = function() {
return this.is(0x7fe00010);
}
tagFromNumbers = function(group, element) { tagFromNumbers = function(group, element) {
return new Tag(((group << 16) | element) >>> 0); return new Tag(((group << 16) | element) >>> 0);
}; };
@ -816,8 +820,12 @@ elementDataByTag = function(tag) {
}; };
elementKeywordByTag = function(tag) { elementKeywordByTag = function(tag) {
var nk = elementDataByTag(tag); try {
return nk.keyword; var nk = elementDataByTag(tag);
return nk.keyword;
} catch (ex) {
return 'UnknownTag';
}
}; };
vrByType = function(type) { vrByType = function(type) {
@ -950,14 +958,29 @@ DataElement.prototype.readBytes = function(stream) {
element = stream.read(C.TYPE_UINT16), element = stream.read(C.TYPE_UINT16),
tag = tagFromNumbers(group, element); tag = tagFromNumbers(group, element);
var length = null, var length = null, vr = null, edata, vm;
vr = null,
edata = elementDataByTag(tag.value), try {
edata = elementDataByTag(tag.value);
vm = edata.vm; vm = edata.vm;
} catch (ex) {
edata = null;
vm = null;
}
if (this.implicit) { if (this.implicit) {
length = stream.read(C.TYPE_UINT32); length = stream.read(C.TYPE_UINT32);
vr = edata.vr; if (!edata) {
if (length == 0xffffffff) {
vr = 'SQ';
} else if (tag.isPixelDataTag()) {
vr = 'OW';
} else {
vr = 'UN';
}
} else {
vr = edata.vr;
}
} else { } else {
vr = stream.read(C.TYPE_ASCII, 2); vr = stream.read(C.TYPE_ASCII, 2);
if (explicitVRList.indexOf(vr) !== -1) { if (explicitVRList.indexOf(vr) !== -1) {