orthanc: OrthancServer/OrthancExplorer/explorer.js comparison

comparison OrthancServer/OrthancExplorer/explorer.js @ 4697:569d9ef165b1

Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 18 Jun 2021 16:08:35 +0200
parents	8262ffb393ff
children	f0038043fb97 283d246fafdb

comparison

equal deleted inserted replaced

-:dd6274412ff4
+:569d9ef165b1
 var LIMIT_RESOURCES = 100;
 var currentPage = '';
 var currentUuid = '';
+var ACQUISITION_NUMBER = '0020,0012';
+var IMAGES_IN_ACQUISITION = '0020,1002';
+var IMAGE_ORIENTATION_PATIENT = '0020,0037';
+var IMAGE_POSITION_PATIENT = '0020,0032';
+var INSTANCE_CREATION_DATE = '0008,0012';
+var INSTANCE_CREATION_TIME = '0008,0013';
+var INSTANCE_NUMBER = '0020,0013';
+var MANUFACTURER = '0008,0070';
+var OTHER_PATIENT_IDS = '0010,1000';
+var PATIENT_BIRTH_DATE = '0010,0030';
+var PATIENT_NAME = '0010,0010';
+var SERIES_DATE = '0008,0021';
+var SERIES_DESCRIPTION = '0008,103e';
+var SERIES_INSTANCE_UID = '0020,000e';
+var SERIES_TIME = '0008,0031';
+var SOP_INSTANCE_UID = '0008,0018';
+var STUDY_DATE = '0008,0020';
+var STUDY_DESCRIPTION = '0008,1030';
+var STUDY_INSTANCE_UID = '0020,000d';
+var STUDY_TIME = '0008,0030';
+var ANONYMIZED_FROM = 'AnonymizedFrom';
+var MODIFIED_FROM = 'ModifiedFrom';
 function DeepCopy(obj)
 {
 return jQuery.extend(true, {}, obj);
 }
 headers : authorizationTokens
 }
 );
-function SplitLongUid(s)
-{
-return '<span>' + s.substr(0, s.length / 2) + '</span> <span>' + s.substr(s.length / 2, s.length - s.length / 2) + '</span>';
-}
 function ParseDicomDate(s)
 {
 y = parseInt(s.substr(0, 4), 10);
 m = parseInt(s.substr(4, 2), 10) - 1;
 d = parseInt(s.substr(6, 2), 10);
 return order;
 });
 }
+function GetMainDicomTag(mainDicomTags, tag)
+{
+if (tag in mainDicomTags) {
+return mainDicomTags[tag].Value;
+} else {
+return '';
+}
+}
 function SortOnDicomTag(arr, tag, isInteger, reverse)
 {
 return Sort(arr, function(a) {
-return a.MainDicomTags[tag];
+return GetMainDicomTag(a.MainDicomTags, tag);
 }, isInteger, reverse);
 }
 node = node.add($('<span>')
 .addClass('ui-li-count')
 .text(count));
 }
-if (link != null)
+if (link != null &&
+link)
 {
 node = $('<a>').attr('href', link).append(node);
 if (isReverse)
 node.attr('data-direction', 'reverse')
 for (var i in tags)
 {
 if (tagsToIgnore.indexOf(i) == -1)
 {
-v = tags[i];
+v = GetMainDicomTag(tags, i);
-if (i == "PatientBirthDate" ||
+if (i == PATIENT_BIRTH_DATE ||
-i == "StudyDate" ||
+i == STUDY_DATE ||
-i == "SeriesDate")
+i == SERIES_DATE ||
+i == INSTANCE_CREATION_DATE)
 {
 v = FormatDicomDate(v);
 }
-else if (i == "DicomStudyInstanceUID" ||
+else if (i == STUDY_INSTANCE_UID ||
-i == "DicomSeriesInstanceUID")
+i == SERIES_INSTANCE_UID ||
+i == SOP_INSTANCE_UID)
 {
-v = SplitLongUid(v);
+// Possibly split a long UID
-}
+// v = '<span>' + s.substr(0, s.length / 2) + '</span><span>' + s.substr(s.length / 2, s.length - s.length / 2) + '</span>';
-else if (i == "ImagePositionPatient" ||
+}
-i == "ImageOrientationPatient")
+else if (i == IMAGE_POSITION_PATIENT ||
+i == IMAGE_ORIENTATION_PATIENT)
 {
 v = FormatFloatSequence(v);
 }
 target.append($('<p>')
-.text(i + ': ')
+.text(tags[i].Name + ': ')
-.append($('<strong>').text(v)));
+.append($('<strong>').html(v)));
 }
 }
 }
 function FormatPatient(patient, link, isReverse)
 {
-var node = $('<div>').append($('<h3>').text(patient.MainDicomTags.PatientName));
+var node = $('<div>').append($('<h3>').text(GetMainDicomTag(patient.MainDicomTags, PATIENT_NAME)));
 FormatMainDicomTags(node, patient.MainDicomTags, [
-"PatientName"
+PATIENT_NAME
-// "OtherPatientIDs"
+//,  OTHER_PATIENT_IDS
 ]);
 return CompleteFormatting(node, link, isReverse, patient.Studies.length);
 }
 var node;
 if (includePatient) {
 label = study.Label;
 } else {
-label = study.MainDicomTags.StudyDescription;
+label = GetMainDicomTag(study.MainDicomTags, STUDY_DESCRIPTION);
 }
 node = $('<div>').append($('<h3>').text(label));
 if (includePatient) {
 FormatMainDicomTags(node, study.PatientMainDicomTags, [
-'PatientName'
+PATIENT_NAME
 ]);
 }
 FormatMainDicomTags(node, study.MainDicomTags, [
-'StudyDescription',
+STUDY_DESCRIPTION,
-'StudyTime'
+STUDY_TIME
 ]);
 return CompleteFormatting(node, link, isReverse, study.Series.length);
 }
 {
 c = series.Instances.length + '/' + series.ExpectedNumberOfInstances;
 }
 node = $('<div>')
-.append($('<h3>').text(series.MainDicomTags.SeriesDescription))
+.append($('<h3>').text(GetMainDicomTag(series.MainDicomTags, SERIES_DESCRIPTION)))
 .append($('<p>').append($('<em>')
 .text('Status: ')
 .append($('<strong>').text(series.Status))));
 FormatMainDicomTags(node, series.MainDicomTags, [
-"SeriesDescription",
+SERIES_DESCRIPTION,
-"SeriesTime",
+SERIES_TIME,
-"Manufacturer",
+MANUFACTURER,
-"ImagesInAcquisition",
+IMAGES_IN_ACQUISITION,
-"SeriesDate",
+SERIES_DATE,
-"ImageOrientationPatient"
+IMAGE_ORIENTATION_PATIENT
 ]);
 return CompleteFormatting(node, link, isReverse, c);
 }
 function FormatInstance(instance, link, isReverse)
 {
 var node = $('<div>').append($('<h3>').text('Instance: ' + instance.IndexInSeries));
 FormatMainDicomTags(node, instance.MainDicomTags, [
-"AcquisitionNumber",
+ACQUISITION_NUMBER,
-"InstanceNumber",
+INSTANCE_NUMBER,
-"InstanceCreationDate",
+INSTANCE_CREATION_DATE,
-"InstanceCreationTime"
+INSTANCE_CREATION_TIME,
 ]);
 return CompleteFormatting(node, link, isReverse);
 }
 return false;
 });
 $('#find-patients').live('pagebeforeshow', function() {
-GetResource('/patients?expand&since=0&limit=' + (LIMIT_RESOURCES + 1), function(patients) {
+GetResource('/patients?expand&since=0&limit=' + (LIMIT_RESOURCES + 1) + '&full', function(patients) {
 var target = $('#all-patients');
 var count, showAlert, p;
 $('li', target).remove();
-SortOnDicomTag(patients, 'PatientName', false, false);
+SortOnDicomTag(patients, PATIENT_NAME, false, false);
 if (patients.length <= LIMIT_RESOURCES) {
 count = patients.length;
 showAlert = false;
 }
 var count, showAlert;
 $('li', target).remove();
 for (var i = 0; i < studies.length; i++) {
-patient = studies[i].PatientMainDicomTags.PatientName;
+patient = GetMainDicomTag(studies[i].PatientMainDicomTags, PATIENT_NAME);
-study = studies[i].MainDicomTags.StudyDescription;
+study = GetMainDicomTag(studies[i].MainDicomTags, STUDY_DESCRIPTION);
 s = "";
 if (typeof patient === 'string') {
 s = patient;
 }
 }
 }
 $('#find-studies').live('pagebeforeshow', function() {
-GetResource('/studies?expand&since=0&limit=' + (LIMIT_RESOURCES + 1), function(studies) {
+GetResource('/studies?expand&since=0&limit=' + (LIMIT_RESOURCES + 1) + '&full', function(studies) {
 FormatListOfStudies('#all-studies', '#alert-studies', '#count-studies', studies);
 });
 });
 var pageData, target, v;
 if ($.mobile.pageData) {
 pageData = DeepCopy($.mobile.pageData);
-GetResource('/patients/' + pageData.uuid, function(patient) {
+GetResource('/patients/' + pageData.uuid + '?full', function(patient) {
-GetResource('/patients/' + pageData.uuid + '/studies', function(studies) {
+GetResource('/patients/' + pageData.uuid + '/studies?full', function(studies) {
-SortOnDicomTag(studies, 'StudyDate', false, true);
+SortOnDicomTag(studies, STUDY_DATE, false, true);
 $('#patient-info li').remove();
 $('#patient-info')
 .append('<li data-role="list-divider">Patient</li>')
 .append(FormatPatient(patient))
 target = $('#list-studies');
 $('li', target).remove();
 for (var i = 0; i < studies.length; i++) {
-if (i == 0 || studies[i].MainDicomTags.StudyDate != studies[i - 1].MainDicomTags.StudyDate)
+if (i == 0 ||
+GetMainDicomTag(studies[i].MainDicomTags, STUDY_DATE) !=
+GetMainDicomTag(studies[i - 1].MainDicomTags, STUDY_DATE))
 {
 target.append($('<li>')
 .attr('data-role', 'list-divider')
-.text(FormatDicomDate(studies[i].MainDicomTags.StudyDate)));
+.text(FormatDicomDate(GetMainDicomTag(studies[i].MainDicomTags, STUDY_DATE))));
 }
 target.append(FormatStudy(studies[i], '#study?uuid=' + studies[i].ID));
 }
-SetupAnonymizedOrModifiedFrom('#patient-anonymized-from', patient, 'patient', 'AnonymizedFrom');
+SetupAnonymizedOrModifiedFrom('#patient-anonymized-from', patient, 'patient', ANONYMIZED_FROM);
-SetupAnonymizedOrModifiedFrom('#patient-modified-from', patient, 'patient', 'ModifiedFrom');
+SetupAnonymizedOrModifiedFrom('#patient-modified-from', patient, 'patient', MODIFIED_FROM);
 target.listview('refresh');
 // Check whether this patient is protected
 $.ajax({
 var pageData, target;
 if ($.mobile.pageData) {
 pageData = DeepCopy($.mobile.pageData);
-GetResource('/studies/' + pageData.uuid, function(study) {
+GetResource('/studies/' + pageData.uuid + '?full', function(study) {
-GetResource('/patients/' + study.ParentPatient, function(patient) {
+GetResource('/patients/' + study.ParentPatient + '?full', function(patient) {
-GetResource('/studies/' + pageData.uuid + '/series', function(series) {
+GetResource('/studies/' + pageData.uuid + '/series?full', function(series) {
-SortOnDicomTag(series, 'SeriesDate', false, true);
+SortOnDicomTag(series, SERIES_DATE, false, true);
 $('#study .patient-link').attr('href', '#patient?uuid=' + patient.ID);
 $('#study-info li').remove();
 $('#study-info')
 .append('<li data-role="list-divider">Patient</li>')
 .append(FormatPatient(patient, '#patient?uuid=' + patient.ID, true))
 .append('<li data-role="list-divider">Study</li>')
 .append(FormatStudy(study))
 .listview('refresh');
-SetupAnonymizedOrModifiedFrom('#study-anonymized-from', study, 'study', 'AnonymizedFrom');
+SetupAnonymizedOrModifiedFrom('#study-anonymized-from', study, 'study', ANONYMIZED_FROM);
-SetupAnonymizedOrModifiedFrom('#study-modified-from', study, 'study', 'ModifiedFrom');
+SetupAnonymizedOrModifiedFrom('#study-modified-from', study, 'study', MODIFIED_FROM);
 target = $('#list-series');
 $('li', target).remove();
 for (var i = 0; i < series.length; i++) {
-if (i == 0 || series[i].MainDicomTags.SeriesDate != series[i - 1].MainDicomTags.SeriesDate)
+if (i == 0 ||
+GetMainDicomTag(series[i].MainDicomTags, SERIES_DATE) !=
+GetMainDicomTag(series[i - 1].MainDicomTags, SERIES_DATE))
 {
 target.append($('<li>')
 .attr('data-role', 'list-divider')
-.text(FormatDicomDate(series[i].MainDicomTags.SeriesDate)));
+.text(FormatDicomDate(GetMainDicomTag(series[i].MainDicomTags, SERIES_DATE))));
 }
 target.append(FormatSeries(series[i], '#series?uuid=' + series[i].ID));
 }
 target.listview('refresh');
 var pageData, target;
 if ($.mobile.pageData) {
 pageData = DeepCopy($.mobile.pageData);
-GetResource('/series/' + pageData.uuid, function(series) {
+GetResource('/series/' + pageData.uuid + '?full', function(series) {
-GetResource('/studies/' + series.ParentStudy, function(study) {
+GetResource('/studies/' + series.ParentStudy + '?full', function(study) {
-GetResource('/patients/' + study.ParentPatient, function(patient) {
+GetResource('/patients/' + study.ParentPatient + '?full', function(patient) {
-GetResource('/series/' + pageData.uuid + '/instances', function(instances) {
+GetResource('/series/' + pageData.uuid + '/instances?full', function(instances) {
 Sort(instances, function(x) { return x.IndexInSeries; }, true, false);
 $('#series .patient-link').attr('href', '#patient?uuid=' + patient.ID);
 $('#series .study-link').attr('href', '#study?uuid=' + study.ID);
 .append(FormatStudy(study, '#study?uuid=' + study.ID, true))
 .append('<li data-role="list-divider">Series</li>')
 .append(FormatSeries(series))
 .listview('refresh');
-SetupAnonymizedOrModifiedFrom('#series-anonymized-from', series, 'series', 'AnonymizedFrom');
+SetupAnonymizedOrModifiedFrom('#series-anonymized-from', series, 'series', ANONYMIZED_FROM);
-SetupAnonymizedOrModifiedFrom('#series-modified-from', series, 'series', 'ModifiedFrom');
+SetupAnonymizedOrModifiedFrom('#series-modified-from', series, 'series', MODIFIED_FROM);
 target = $('#list-instances');
 $('li', target).remove();
 for (var i = 0; i < instances.length; i++) {
 target.append(FormatInstance(instances[i], '#instance?uuid=' + instances[i].ID));
 var pageData;
 if ($.mobile.pageData) {
 pageData = DeepCopy($.mobile.pageData);
-GetResource('/instances/' + pageData.uuid, function(instance) {
+GetResource('/instances/' + pageData.uuid + '?full', function(instance) {
-GetResource('/series/' + instance.ParentSeries, function(series) {
+GetResource('/series/' + instance.ParentSeries + '?full', function(series) {
-GetResource('/studies/' + series.ParentStudy, function(study) {
+GetResource('/studies/' + series.ParentStudy + '?full', function(study) {
-GetResource('/patients/' + study.ParentPatient, function(patient) {
+GetResource('/patients/' + study.ParentPatient + '?full', function(patient) {
 $('#instance .patient-link').attr('href', '#patient?uuid=' + patient.ID);
 $('#instance .study-link').attr('href', '#study?uuid=' + study.ID);
 $('#instance .series-link').attr('href', '#series?uuid=' + series.ID);
 $('#transfer-syntax').show();
 $('#transfer-syntax-text').text(transferSyntax);
 }
 });
-SetupAnonymizedOrModifiedFrom('#instance-anonymized-from', instance, 'instance', 'AnonymizedFrom');
+SetupAnonymizedOrModifiedFrom('#instance-anonymized-from', instance, 'instance', ANONYMIZED_FROM);
-SetupAnonymizedOrModifiedFrom('#instance-modified-from', instance, 'instance', 'ModifiedFrom');
+SetupAnonymizedOrModifiedFrom('#instance-modified-from', instance, 'instance', MODIFIED_FROM);
 currentPage = 'instance';
 currentUuid = pageData.uuid;
 });
 });