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

comparison Applications/StoneWebViewer/WebApplication/app.js @ 1849:023cce3d7844

introduction of the concept of "virtual series"

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 29 Jun 2021 12:12:46 +0200
parents	251d7f7a6c4e
children	58681a5c727b

comparison

equal deleted inserted replaced

-:3751485f1b2e
+:023cce3d7844
 newVal.series.complete) {
 this.status = 'ready';
 var that = this;
 Vue.nextTick(function() {
-if (newVal.sopInstanceUid !== undefined &&
+if (newVal.virtualSeriesId !== undefined &&
-newVal.sopInstanceUid.length > 0) {
+newVal.virtualSeriesId.length > 0) {
-stone.LoadMultipartInstanceInViewport(
+stone.LoadVirtualSeriesInViewport(that.canvasId, newVal.virtualSeriesId);
-that.canvasId, seriesInstanceUid, newVal.sopInstanceUid);
 }
 else {
 stone.LoadSeriesInViewport(that.canvasId, seriesInstanceUid);
 }
 });
 event.preventDefault();
 // The "parseInt()" is because of Microsoft Edge Legacy (*)
 this.$emit('updated-series', {
 seriesIndex: parseInt(event.dataTransfer.getData('seriesIndex'), 10),
-sopInstanceUid: event.dataTransfer.getData('sopInstanceUid')
+virtualSeriesId: event.dataTransfer.getData('virtualSeriesId')
 });
 },
 MakeActive: function() {
 this.$emit('selected-viewport');
 },
 selectedStudies: [],
 series: [],
 studies: [],
 seriesIndex: {},  // Maps "SeriesInstanceUID" to "index in this.series"
-multiframeInstanceThumbnails: {}
+virtualSeriesThumbnails: {}
 }
 },
 computed: {
 getSelectedStudies() {
 var s = '';
 s.push(this.viewport4Content.series.tags[SERIES_INSTANCE_UID]);
 return s;
 },
-GetActiveMultiframeInstances: function() {
+GetActiveVirtualSeries: function() {
 var s = [];
-if ('sopInstanceUid' in this.viewport1Content)
+if ('virtualSeriesId' in this.viewport1Content)
-s.push(this.viewport1Content.sopInstanceUid);
+s.push(this.viewport1Content.virtualSeriesId);
-if ('sopInstanceUid' in this.viewport2Content)
+if ('virtualSeriesId' in this.viewport2Content)
-s.push(this.viewport2Content.sopInstanceUid);
+s.push(this.viewport2Content.virtualSeriesId);
-if ('sopInstanceUid' in this.viewport3Content)
+if ('virtualSeriesId' in this.viewport3Content)
-s.push(this.viewport3Content.sopInstanceUid);
+s.push(this.viewport3Content.virtualSeriesId);
-if ('sopInstanceUid' in this.viewport4Content)
+if ('virtualSeriesId' in this.viewport4Content)
-s.push(this.viewport4Content.sopInstanceUid);
+s.push(this.viewport4Content.virtualSeriesId);
 return s;
 },
 GetActiveCanvas: function() {
 'numberOfFrames' : 0,
 'complete' : false,
 'type' : stone.ThumbnailType.LOADING,
 'color': study.color,
 'tags': sourceSeries[i],
-'multiframeInstances': null
+'virtualSeries': null
 });
 }
 }
 }
 SeriesDragStart: function(event, seriesIndex) {
 // It is necessary to use ".toString()" for Microsoft Edge Legacy (*)
 event.dataTransfer.setData('seriesIndex', seriesIndex.toString());
 },
-MultiframeInstanceDragStart: function(event, seriesIndex, sopInstanceUid) {
+VirtualSeriesDragStart: function(event, seriesIndex, virtualSeriesId) {
 event.dataTransfer.setData('seriesIndex', seriesIndex.toString());
-event.dataTransfer.setData('sopInstanceUid', sopInstanceUid.toString());
+event.dataTransfer.setData('virtualSeriesId', virtualSeriesId.toString());
 },
 SetViewportSeriesInstanceUid: function(viewportIndex, seriesInstanceUid) {
 if (seriesInstanceUid in this.seriesIndex) {
 this.SetViewportSeries(viewportIndex, {
 var series = this.series[info.seriesIndex];
 if (viewportIndex == 1) {
 this.viewport1Content = {
 series: series,
-sopInstanceUid: info.sopInstanceUid
+virtualSeriesId: info.virtualSeriesId
 };
 }
 else if (viewportIndex == 2) {
 this.viewport2Content = {
 series: series,
-sopInstanceUid: info.sopInstanceUid
+virtualSeriesId: info.virtualSeriesId
 };
 }
 else if (viewportIndex == 3) {
 this.viewport3Content = {
 series: series,
-sopInstanceUid: info.sopInstanceUid
+virtualSeriesId: info.virtualSeriesId
 };
 }
 else if (viewportIndex == 4) {
 this.viewport4Content = {
 series: series,
-sopInstanceUid: info.sopInstanceUid
+virtualSeriesId: info.virtualSeriesId
 };
 }
 },
 ClickSeries: function(seriesIndex) {
 this.SetViewportSeries(this.activeViewport, {
 seriesIndex: seriesIndex
 });
 },
-ClickMultiframeInstance: function(seriesIndex, sopInstanceUid) {
+ClickVirtualSeries: function(seriesIndex, virtualSeriesId) {
 this.SetViewportSeries(this.activeViewport, {
 seriesIndex: seriesIndex,
-sopInstanceUid: sopInstanceUid
+virtualSeriesId: virtualSeriesId
 });
 },
 HideViewport: function(index) {
 if (index == 1) {
 if (seriesInstanceUid in pendingSeriesPdf_) {
 stone.FetchPdf(studyInstanceUid, seriesInstanceUid);
 delete pendingSeriesPdf_[seriesInstanceUid];
 }
-if (stone.LoadMultiframeInstancesFromSeries(seriesInstanceUid)) {
+if (stone.LookupVirtualSeries(seriesInstanceUid)) {
-series.multiframeInstances = JSON.parse(stone.GetStringBuffer());
+series.virtualSeries = JSON.parse(stone.GetStringBuffer());
 }
 }
 // https://fr.vuejs.org/2016/02/06/common-gotchas/#Why-isn%E2%80%99t-the-DOM-updating
 this.$set(this.series, index, series);
 this.modalNotDiagnostic = this.settingNotDiagnostic;
 var that = this;
-window.addEventListener('MultiframeInstanceThumbnailLoaded', function(args) {
+window.addEventListener('VirtualSeriesThumbnailLoaded', function(args) {
-that.$set(that.multiframeInstanceThumbnails, args.detail.sopInstanceUid, args.detail.thumbnail);
+that.$set(that.virtualSeriesThumbnails, args.detail.virtualSeriesId, args.detail.thumbnail);
 });
 window.addEventListener('ThumbnailLoaded', function(args) {
 //var studyInstanceUid = args.detail.studyInstanceUid;
 var seriesInstanceUid = args.detail.seriesInstanceUid;