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

comparison Applications/StoneWebViewer/WebApplication/app.js @ 1657:66e5fcdf5597

pdf viewer is working

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 18 Nov 2020 11:19:09 +0100
parents	00674f3695f2
children	e4589378ad8b

comparison

equal deleted inserted replaced

-:4cdc297be5a6
+:66e5fcdf5597
 var SERIES_INSTANCE_UID = '0020,000e';
 var STUDY_INSTANCE_UID = '0020,000d';
 var STUDY_DESCRIPTION = '0008,1030';
 var STUDY_DATE = '0008,0020';
+// Registry of the PDF series for which the instance metadata is still waiting
+var pendingSeriesPdf_ = {};
 function getParameterFromUrl(key) {
 var url = window.location.search.substring(1);
 var args = url.split('&');
 for (var i = 0; i < args.length; i++) {
 var that = this;
 Vue.nextTick(function() {
 stone.LoadSeriesInViewport(that.canvasId, seriesInstanceUid);
 });
 }
-else if (newVal.type == stone.ThumbnailType.PDF ||
+else if (newVal.type == stone.ThumbnailType.PDF) {
-newVal.type == stone.ThumbnailType.VIDEO) {
+if (newVal.complete) {
+/**
+* Series is complete <=> One already knows about the
+* SOPInstanceUIDs that are available in this series. As a
+* consequence,
+* "OrthancStone::SeriesMetadataLoader::Accessor" will not
+* be empty in "ResourcesLoader::FetchPdf()" in C++ code.
+**/
+stone.FetchPdf(studyInstanceUid, seriesInstanceUid);
+} else {
+/**
+* The SOPInstanceUIDs in this series are not known
+* yet. Schedule an "stone.FetchPdf()" one the series
+* metadata is available.
+**/
+pendingSeriesPdf_[seriesInstanceUid] = true;
+}
+}
+else if (newVal.type == stone.ThumbnailType.VIDEO) {
 // TODO
-}
+console.warn('Videos are not supported yet by the Stone Web viewer');
 }
+}
+},
+mounted: function() {
+var that = this;
+window.addEventListener('PdfLoaded', function(args) {
+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 &&
+that.series.tags[STUDY_INSTANCE_UID] == studyInstanceUid &&
+that.series.tags[SERIES_INSTANCE_UID] == seriesInstanceUid) {
+that.status = 'pdf';
+var pdf = new Uint8Array(HEAPU8.subarray(pdfPointer, pdfPointer + pdfSize));
+/**
+* It is not possible to bind an "Uint8Array" to a "props"
+* in the "pdf-viewer" component. So we have to directly
+* call the method of a component. But, "$refs are only
+* populated after the component has been rendered", so we
+* wait for the next rendering.
+* https://vuejs.org/v2/guide/components-edge-cases.html#Accessing-Child-Component-Instances-amp-Child-Elements
+**/
+Vue.nextTick(function() {
+that.$refs.pdfViewer.LoadPdf(pdf);
+});
+}
+});
 },
 methods: {
 SeriesDragAccept: function(event) {
 event.preventDefault();
 },
 },
 SetViewportSeriesInstanceUid: function(viewportIndex, seriesInstanceUid) {
 if (seriesInstanceUid in this.seriesIndex) {
 this.SetViewportSeries(viewportIndex, this.seriesIndex[seriesInstanceUid]);
 }
 },
 SetViewportSeries: function(viewportIndex, seriesIndex) {
 var series = this.series[seriesIndex];
 // https://fr.vuejs.org/2016/02/06/common-gotchas/#Why-isn%E2%80%99t-the-DOM-updating
 this.$set(this.series, index, series);
 }
 },
-UpdateIsSeriesComplete: function(seriesInstanceUid) {
+UpdateIsSeriesComplete: function(studyInstanceUid, seriesInstanceUid) {
 if (seriesInstanceUid in this.seriesIndex) {
 var index = this.seriesIndex[seriesInstanceUid];
 var series = this.series[index];
+var oldComplete = series.complete;
 series.complete = stone.IsSeriesComplete(seriesInstanceUid);
+if (!oldComplete &&
+series.complete &&
+seriesInstanceUid in pendingSeriesPdf_) {
+stone.FetchPdf(studyInstanceUid, seriesInstanceUid);
+delete pendingSeriesPdf_[seriesInstanceUid];
+}
 // 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 &&
 }
 app.SetResources(studies, series);
 for (var i = 0; i < app.series.length; i++) {
+var studyInstanceUid = app.series[i].tags[STUDY_INSTANCE_UID];
 var seriesInstanceUid = app.series[i].tags[SERIES_INSTANCE_UID];
 app.UpdateSeriesThumbnail(seriesInstanceUid);
-app.UpdateIsSeriesComplete(seriesInstanceUid);
+app.UpdateIsSeriesComplete(studyInstanceUid, seriesInstanceUid);
 }
 });
 window.addEventListener('ThumbnailLoaded', function(args) {
 app.UpdateSeriesThumbnail(seriesInstanceUid);
 });
 window.addEventListener('MetadataLoaded', function(args) {
-//var studyInstanceUid = args.detail.studyInstanceUid;
+var studyInstanceUid = args.detail.studyInstanceUid;
 var seriesInstanceUid = args.detail.seriesInstanceUid;
-app.UpdateIsSeriesComplete(seriesInstanceUid);
+app.UpdateIsSeriesComplete(studyInstanceUid, seriesInstanceUid);
 });
 window.addEventListener('FrameUpdated', function(args) {
 var canvasId = args.detail.canvasId;