orthanc-stone: Applications/StoneWebViewer/WebApplication/app.js comparison

comparison Applications/StoneWebViewer/WebApplication/app.js @ 1865:4d83d27a955e

merge

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 24 Nov 2021 12:25:32 +0100
parents	63587fdeec69
children	3889ae96d2e9

comparison

equal deleted inserted replaced

-:35ac2be493e2
+:4d83d27a955e
 cineTimeoutId: null,
 cineLoadingFrame: false,
 videoUri: '',
 windowingCenter: 0,
 windowingWidth: 0,
-instanceNumber: 0
+instanceNumber: 0,
+contentDate: '',
+contentTime: '',
 }
 },
 watch: {
 currentFrame: function(newVal, oldVal) {
 /**
 this.cineLoadingFrame = false;
 this.cineRate = 30;   // Default value
 this.windowingCenter = 0;
 this.windowingWidth = 0;
 this.instanceNumber = 0;
+this.contentDate = '';
+this.contentTime = ''
 if (this.cineTimeoutId !== null) {
 clearTimeout(this.cineTimeoutId);
 this.cineTimeoutId = null;
 }
 if (args.detail.canvasId == that.canvasId) {
 that.currentFrame = (args.detail.currentFrame + 1);
 that.numberOfFrames = args.detail.numberOfFrames;
 that.quality = args.detail.quality;
 that.instanceNumber = args.detail.instanceNumber;
+that.contentDate = args.detail.contentDate;
+that.contentTime = args.detail.contentTime;
 }
 });
 window.addEventListener('SeriesDetailsReady', function(args) {
 if (args.detail.canvasId == that.canvasId) {
 var indexStudies = {};
 var studies = [];
 var posColor = 0;
+// order series by SeriesNumber
+sourceSeries.sort((a, b) => {return a[SERIES_NUMBER] - b[SERIES_NUMBER];})
 for (var i = 0; i < sourceStudies.length; i++) {
 var studyInstanceUid = sourceStudies[i][STUDY_INSTANCE_UID];
 if (studyInstanceUid !== undefined) {
 if (studyInstanceUid in indexStudies) {
 console.error('Twice the same study: ' + studyInstanceUid);
 else {
 var year = date.replace(/^([0-9]{4})([0-9]{2})([0-9]{2})$/, '$1');
 var month = date.replace(/^([0-9]{4})([0-9]{2})([0-9]{2})$/, '$2');
 var day = date.replace(/^([0-9]{4})([0-9]{2})([0-9]{2})$/, '$3');
 return format.replace(/YYYY/g, year).replace(/MM/g, month).replace(/DD/g, day);
+}
+}
+},
+FormatTime: function(time)
+{
+if (time === undefined ||
+time.length == 0) {
+return '';
+}
+else {
+var format = this.globalConfiguration['TimeFormat'];
+if (format === undefined) {
+// No configuration for the date format, use the DICOM tag as such
+return time;
+}
+else {
+var timeRegexHMS = /([0-9]{2})([0-9]{2})([0-9]{2})/;
+var timeRegexHMSms = /([0-9]{2})([0-9]{2})([0-9]{2}).([0-9]*)/
+var m = time.match(timeRegexHMSms);
+if (m) {
+format = format.replace(/hh/g, m[1]).replace(/mm/g, m[2]).replace(/ss/g, m[3]);
+if (format.indexOf('f') != -1) { // format expects ms
+return format.replace(/f/g, m[4])
+} else {
+return format;
+}
+}
+var m = time.match(timeRegexHMS);
+if (m) {
+format = format.replace(/hh/g, m[1]).replace(/mm/g, m[2]).replace(/ss/g, m[3]);
+if (format.indexOf('f') != -1) { // format expects ms but we could not capture one
+return format.replace(/.f/g, '')
+}
+}
+return time;
 }
 }
 },
 DownloadJpeg: function()
 if ('DicomCacheSize' in app.globalConfiguration) {
 stone.SetDicomCacheSize(app.globalConfiguration.DicomCacheSize);
 }
+if ('SkipSeriesFromModalities' in app.globalConfiguration) {
+stone.SetSkipSeriesFromModalities(JSON.stringify(app.globalConfiguration.SkipSeriesFromModalities));
+}
 // Bearer token is new in Stone Web viewer 2.0
 var token = getParameterFromUrl('token');
 if (token !== undefined)
 {
 stone.AddHttpHeader('Authorization', 'Bearer ' + token);
 }
 });
 window.addEventListener('ResourcesLoaded', function() {
-console.log('resources loaded');
+console.log('resources loaded: ', stone.GetStudiesCount(), 'studies &', stone.GetSeriesCount(), 'series');
 var studies = [];
 for (var i = 0; i < stone.GetStudiesCount(); i++) {
 stone.LoadStudyTags(i);
 studies.push(JSON.parse(stone.GetStringBuffer()));