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

comparison Applications/StoneWebViewer/WebApplication/app.js @ 1704:902d13889ae4

LoadMultipartInstanceInViewport() in C++

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 27 Nov 2020 17:15:09 +0100
parents	76c590a62755
children	3d62634d442f

comparison

equal deleted inserted replaced

-:76c590a62755
+:902d13889ae4
 }
 Vue.component('viewport', {
-props: [ 'left', 'top', 'width', 'height', 'canvasId', 'active', 'series', 'viewportIndex',
+props: [ 'left', 'top', 'width', 'height', 'canvasId', 'active', 'content', 'viewportIndex',
 'showInfo' ],
 template: '#viewport-template',
 data: function () {
 return {
 stone: stone,  // To access global object "stone" from "index.html"
 * that the schedule frame has been displayed: The cine loop can
 * proceed to the next frame (check out "CineCallback()").
 **/
 this.cineLoadingFrame = false;
 },
-series: function(newVal, oldVal) {
+content: function(newVal, oldVal) {
 this.status = 'loading';
 this.cineControls = false;
 this.cineMode = '';
 this.cineLoadingFrame = false;
 this.cineRate = 30;   // Default value
 var studyInstanceUid = args.detail.studyInstanceUid;
 var seriesInstanceUid = args.detail.seriesInstanceUid;
 var pdfPointer = args.detail.pdfPointer;
 var pdfSize = args.detail.pdfSize;
-if ('tags' in that.series &&
+if ('tags' in that.content &&
-that.series.tags[STUDY_INSTANCE_UID] == studyInstanceUid &&
+that.content.tags[STUDY_INSTANCE_UID] == studyInstanceUid &&
-that.series.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
+that.content.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
 that.status = 'pdf';
 var pdf = new Uint8Array(HEAPU8.subarray(pdfPointer, pdfPointer + pdfSize));
 /**
 methods: {
 DragDrop: function(event) {
 event.preventDefault();
 // The "parseInt()" is because of Microsoft Edge Legacy (*)
-this.$emit('updated-series', parseInt(event.dataTransfer.getData('seriesIndex'), 10));
+this.$emit('updated-series', {
+seriesIndex: parseInt(event.dataTransfer.getData('seriesIndex'), 10),
+sopInstanceUid: event.dataTransfer.getData('sopInstanceUid')
+});
 },
 MakeActive: function() {
 this.$emit('selected-viewport');
 },
 DecrementFrame: function(isCircular) {
 viewport1Width: '100%',
 viewport1Height: '100%',
 viewport1Left: '0%',
 viewport1Top: '0%',
 viewport1Visible: true,
-viewport1Series: {},
+viewport1Content: {},
 viewport2Width: '100%',
 viewport2Height: '100%',
 viewport2Left: '0%',
 viewport2Top: '0%',
 viewport2Visible: false,
-viewport2Series: {},
+viewport2Content: {},
 viewport3Width: '100%',
 viewport3Height: '100%',
 viewport3Left: '0%',
 viewport3Top: '0%',
 viewport3Visible: false,
-viewport3Series: {},
+viewport3Content: {},
 viewport4Width: '100%',
 viewport4Height: '100%',
 viewport4Left: '0%',
 viewport4Top: '0%',
 viewport4Visible: false,
-viewport4Series: {},
+viewport4Content: {},
 showWindowing: false,
 windowingPresets: [],
 selectedStudies: [],
 },
 GetActiveSeries: function() {
 var s = [];
-if ('tags' in this.viewport1Series)
+if ('tags' in this.viewport1Content)
-s.push(this.viewport1Series.tags[SERIES_INSTANCE_UID]);
+s.push(this.viewport1Content.tags[SERIES_INSTANCE_UID]);
-if ('tags' in this.viewport2Series)
+if ('tags' in this.viewport2Content)
-s.push(this.viewport2Series.tags[SERIES_INSTANCE_UID]);
+s.push(this.viewport2Content.tags[SERIES_INSTANCE_UID]);
-if ('tags' in this.viewport3Series)
+if ('tags' in this.viewport3Content)
-s.push(this.viewport3Series.tags[SERIES_INSTANCE_UID]);
+s.push(this.viewport3Content.tags[SERIES_INSTANCE_UID]);
-if ('tags' in this.viewport4Series)
+if ('tags' in this.viewport4Content)
-s.push(this.viewport4Series.tags[SERIES_INSTANCE_UID]);
+s.push(this.viewport4Content.tags[SERIES_INSTANCE_UID]);
 return s;
 },
 GetActiveCanvas: function() {
 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) {
+event.dataTransfer.setData('seriesIndex', seriesIndex.toString());
+event.dataTransfer.setData('sopInstanceUid', sopInstanceUid.toString());
+},
 SetViewportSeriesInstanceUid: function(viewportIndex, seriesInstanceUid) {
 if (seriesInstanceUid in this.seriesIndex) {
-this.SetViewportSeries(viewportIndex, this.seriesIndex[seriesInstanceUid]);
+this.SetViewportSeries(viewportIndex, {
-}
+seriesIndex: this.seriesIndex[seriesInstanceUid]
-},
+});
+}
-SetViewportSeries: function(viewportIndex, seriesIndex) {
+},
-var series = this.series[seriesIndex];
+SetViewportSeries: function(viewportIndex, info) {
+var series = this.series[info.seriesIndex];
 if (viewportIndex == 1) {
-this.viewport1Series = series;
+this.viewport1Content = series;
 }
 else if (viewportIndex == 2) {
-this.viewport2Series = series;
+this.viewport2Content = series;
 }
 else if (viewportIndex == 3) {
-this.viewport3Series = series;
+this.viewport3Content = series;
 }
 else if (viewportIndex == 4) {
-this.viewport4Series = series;
+this.viewport4Content = series;
 }
 },
 ClickSeries: function(seriesIndex) {
-this.SetViewportSeries(this.activeViewport, seriesIndex);
+this.SetViewportSeries(this.activeViewport, {
+seriesIndex: seriesIndex
+});
 },
 HideViewport: function(index) {
 if (index == 1) {
 this.viewport1Visible = false;
 }
 // https://fr.vuejs.org/2016/02/06/common-gotchas/#Why-isn%E2%80%99t-the-DOM-updating
 this.$set(this.series, index, series);
-if ('tags' in this.viewport1Series &&
+if ('tags' in this.viewport1Content &&
-this.viewport1Series.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
+this.viewport1Content.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
-this.$set(this.viewport1Series, series);
+this.$set(this.viewport1Content, series);
 }
-if ('tags' in this.viewport2Series &&
+if ('tags' in this.viewport2Content &&
-this.viewport2Series.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
+this.viewport2Content.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
-this.$set(this.viewport2Series, series);
+this.$set(this.viewport2Content, series);
 }
-if ('tags' in this.viewport3Series &&
+if ('tags' in this.viewport3Content &&
-this.viewport3Series.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
+this.viewport3Content.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
-this.$set(this.viewport3Series, series);
+this.$set(this.viewport3Content, series);
 }
-if ('tags' in this.viewport4Series &&
+if ('tags' in this.viewport4Content &&
-this.viewport4Series.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
+this.viewport4Content.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
-this.$set(this.viewport4Series, series);
+this.$set(this.viewport4Content, series);
 }
 }
 },
 SetWindowing: function(center, width) {