Merge branch 'master' of github:dcmjs-org/dicom-microscopy-viewer

Author: hackermd

examples/basic/index.html

@@ -48,9 +48,13 @@
       return(Promise.all(promises));
     }).then(metadata => {
       metadata = metadata.filter(m => m);
+
+      // Note: We are using retrieveRendered: false because dcm4chee does not yet
+      // support this functionality. See https://github.com/dcm4che/dcm4chee-arc-light/issues/1617
       const viewer = new DICOMMicroscopyViewer.api.VLWholeSlideMicroscopyImageViewer({
         client,
-        metadata
+        metadata,
+        retrieveRendered: false
       });
 
       var container = document.getElementById('root');

examples/events/index.html

@@ -218,7 +218,13 @@ <h4 class="list-group-item-heading">${Object.keys(content.payload.properties)[0]
         })
         .then(metadata => {
           metadata = metadata.filter(m => m);
-          const viewer = new DICOMMicroscopyViewer.api.VLWholeSlideMicroscopyImageViewer({client,metadata});
+
+          // Note: We are using retrieveRendered: false because dcm4chee does not yet
+          // support this functionality. See https://github.com/dcm4che/dcm4chee-arc-light/issues/1617
+          const viewer = new DICOMMicroscopyViewer.api.VLWholeSlideMicroscopyImageViewer({client,
+            metadata,
+            retrieveRendered: false
+          });
 
           const container = document.getElementById("dicomImage");
           viewer.render({ container });

examples/simple_viewer/index.html

@@ -300,11 +300,14 @@
           metadata = metadata.filter(m => m);
           const controls = [];
           try {
+            // Note: We are using retrieveRendered: false because dcm4chee does not yet
+            // support this functionality. See https://github.com/dcm4che/dcm4chee-arc-light/issues/1617
             const viewer = new DICOMMicroscopyViewer.api.VLWholeSlideMicroscopyImageViewer({
               client,
               metadata,
               controls,
-              useWebGL: true
+              useWebGL: true,
+              retrieveRendered: false
             });
             viewer.render({container: 'activeViewport'});
           } catch(err) {

src/api.js

@@ -41,7 +41,6 @@ import {
 
 import DICOMwebClient from 'dicomweb-client/build/dicomweb-client.js'
 
-
 function _getPixelSpacing(metadata) {
   const functionalGroup = metadata.SharedFunctionalGroupsSequence[0];
   const pixelMeasures = functionalGroup.PixelMeasuresSequence[0];
@@ -248,7 +247,7 @@ class VLWholeSlideMicroscopyImageViewer {
    * options:
    *   - client (instance of DICOMwebClient)
    *   - metadata (array of DICOM JSON metadata for each image instance)
-   *   - retrieveRendered (whether frames should be retrieved using DICOMweb RetrieveRenderedTransaction)
+   *   - retrieveRendered (whether frames should be retrieved using DICOMweb RetrieveRenderedTransaction; default: true)
    *   - useWebGL (whether WebGL renderer should be used; default: true)
    */
   constructor(options) {
@@ -260,7 +259,7 @@ class VLWholeSlideMicroscopyImageViewer {
     this[_client] = options.client;
 
     if (!('retrieveRendered' in options)) {
-      options.retrieveRendered = false;
+      options.retrieveRendered = true;
     }
 
     if (!('controls' in options)) {
@@ -490,12 +489,13 @@ class VLWholeSlideMicroscopyImageViewer {
         } else {
           // TODO: support "image/jp2" and "image/jls"
           const mimeType = 'image/jpeg';
+
           const retrieveOptions = {
             studyInstanceUID,
             seriesInstanceUID,
             sopInstanceUID,
             frameNumbers,
-            mimeType
+            mimeType: `${mimeType}; transfer-syntax=1.2.840.10008.1.2.4.50`
           };
           options.client.retrieveInstanceFrames(retrieveOptions).then((rawFrames) => {
             const blob = new Blob(rawFrames, {type: mimeType});
@@ -698,6 +698,11 @@ class VLWholeSlideMicroscopyImageViewer {
 
   }
 
+  resize(){
+    this[_map].updateSize();
+  }
+  
+
   /* Renders the images.
    */
   render(options) {