DICOM Dump with Data Dictionary v
// data. Note that the length of the element will be 0 to indicate "no data"
// so we don't put anything here for the value in that case.
if (str !== undefined) {
- text += '"' + str + '"' + mapUid(str);
+ text += '"' + escapeSpecialCharacters(str) + '"' + mapUid(str);
}
}
else {
@@ -468,7 +471,7 @@ DICOM Dump with Data Dictionary v
// data. Note that the length of the element will be 0 to indicate "no data"
// so we don't put anything here for the value in that case.
if (str !== undefined) {
- text += '"' + str + '"' + mapUid(str);
+ text += '"' + escapeSpecialCharacters(str) + '"' + mapUid(str);
}
}
else {
@@ -519,9 +522,9 @@ DICOM Dump with Data Dictionary v
color = '#C8C8C8';
// If it is some other length and we have no string
if(element.length === 2) {
- text += "" + dataDownloadLink(element, "binary data") + " of length " + element.length + " as uint16: " +dataSet.uint16(propertyName);
+ text += "" + dataDownloadLink(element, "binary data") + " of length " + element.length + " as uint16: " +dataSet.uint16(propertyName) + "";
} else if(element.length === 4) {
- text += "" + dataDownloadLink(element, "binary data") + " of length " + element.length + " as uint32: " +dataSet.uint32(propertyName);
+ text += "" + dataDownloadLink(element, "binary data") + " of length " + element.length + " as uint32: " +dataSet.uint32(propertyName) + "";
} else {
text += "" + dataDownloadLink(element, "binary data") + " of length " + element.length + " and VR " + vr + "";
}
@@ -623,11 +626,15 @@ DICOM Dump with Data Dictionary v
setTimeout(function() {
var sha1Hash = sha1(byteArray, 0, byteArray.length);
- // Invoke the paresDicom function and get back a DataSet object with the contents
+ // Invoke the parseDicom function and get back a DataSet object with the contents
try {
var start = new Date().getTime();
var options = {
- untilTag: untilTag
+ untilTag: untilTag,
+ vrCallback(tag) {
+ const formatted = `(${tag.substring(1, 5).toUpperCase()},${tag.substring(5, 9).toUpperCase()})`;
+ return !!TAG_DICT[formatted] ? TAG_DICT[formatted].vr : undefined;
+ }
};
dataSet = dicomParser.parseDicom(byteArray, options);
diff --git a/examples/explicitDataSetToJS/index.html b/examples/explicitDataSetToJS/index.html
index 9acf4615..12f25775 100644
--- a/examples/explicitDataSetToJS/index.html
+++ b/examples/explicitDataSetToJS/index.html
@@ -29,7 +29,9 @@ DICOM Dump using explicitDataSetToJS
This example illustrates how to recursively iterate over a parsed data set to dump all data elements
- into a tree like structure using the explicitDataSetToJS utility function. Note that DICOM files dropped here are not uploaded anywhere, all processing
+ into a tree like structure using the explicitDataSetToJS utility function. This example parses using
+ a data dictionary via the vrCallback option in order to use explicitDataSetToJS even with implicit
+ VR data sets. Note that DICOM files dropped here are not uploaded anywhere, all processing
is done inside your web browser in Javascript.
Use of this example require IE10+ or any other modern browser.
@@ -59,6 +61,7 @@ DICOM Dump using explicitDataSetToJS
+
@@ -138,11 +141,14 @@ DICOM Dump using explicitDataSetToJS
// set a short timeout to do the parse so the DOM has time to update itself with the above message
setTimeout(function() {
- // Invoke the paresDicom function and get back a DataSet object with the contents
+ // Invoke the parseDicom function and get back a DataSet object with the contents
var dataSet;
try {
var start = new Date().getTime();
- dataSet = dicomParser.parseDicom(byteArray);
+ dataSet = dicomParser.parseDicom(byteArray, { vrCallback(tag) {
+ const formatted = `(${tag.substr(1, 4).toUpperCase()},${tag.substr(5,9).toUpperCase()})`;
+ return !!TAG_DICT[formatted] ? TAG_DICT[formatted].vr : undefined;
+ }});
var options = {
omitPrivateAttibutes :false ,
diff --git a/examples/explicitDataSetToJson/index.html b/examples/explicitDataSetToJson/index.html
index 3a286c46..37dd4114 100644
--- a/examples/explicitDataSetToJson/index.html
+++ b/examples/explicitDataSetToJson/index.html
@@ -28,7 +28,9 @@ DICOM Dump to JSON
Drag and drop a DICOM Part 10 file into the light gray region below for a json version of it
- This example illustrates how to generate a JSON string from a DICOM SOP Instance.
+ This example illustrates how to generate a JSON string from a DICOM SOP Instance. This example parses using
+ a data dictionary via the vrCallback option in order to use explicitDataSetToJS even with implicit
+ VR data sets.
Note that DICOM files dropped here are not uploaded anywhere, all processing
is done inside your web browser in Javascript.
@@ -65,6 +67,7 @@ DICOM Dump to JSON
+
@@ -102,11 +105,14 @@ DICOM Dump to JSON
// set a short timeout to do the parse so the DOM has time to update itself with the above message
setTimeout(function() {
- // Invoke the paresDicom function and get back a DataSet object with the contents
+ // Invoke the parseDicom function and get back a DataSet object with the contents
var dataSet;
try {
var start = new Date().getTime();
- dataSet = dicomParser.parseDicom(byteArray);
+ dataSet = dicomParser.parseDicom(byteArray, { vrCallback(tag) {
+ const formatted = `(${tag.substr(1, 4).toUpperCase()},${tag.substr(5,9).toUpperCase()})`;
+ return !!TAG_DICT[formatted] ? TAG_DICT[formatted].vr : undefined;
+ }});
var options = {
omitPrivateAttibutes :false ,
diff --git a/examples/index.html b/examples/index.html
index 77658b62..6b8d8081 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -42,7 +42,7 @@ dicomParser Examples
-