Update unit tests

ImagingDataCommons · Aug 15, 2018 · 17e04bf · 17e04bf
1 parent 20240dd
commit 17e04bf
Show file tree

Hide file tree

Showing 4 changed files with 2,271 additions and 37 deletions.
diff --git a/build/dicom-microscopy-viewer.js b/build/dicom-microscopy-viewer.js
@@ -50172,6 +50172,7 @@
 
   var DICOMwebClient = unwrapExports(dicomwebClient);
 
+  const _usewebgl = Symbol('usewebgl');
   const _map = Symbol('map');
   const _features = Symbol('features');
   const _drawingSource = Symbol('drawingSource');
@@ -50189,6 +50190,7 @@
      * options:
      *   - client (instance of DICOMwebClient)
      *   - metadata (array of DICOM JSON metadata for each image instance)
+     *   - useWebGL (whether WebGL renderer should be used; default: true)
      *   - onClickHandler (on-event handler function)
      *   - onSingleClickHandler (on-event handler function)
      *   - onDoubleClickHandler (on-event handler function)
@@ -50207,6 +50209,11 @@
      *   - pixel
      */
     constructor(options) {
+      if ('useWebGL' in options) {
+        this[_usewebgl] = options.useWebGL;
+      } else {
+        this[_usewebgl] = true;
+      }
       this[_client] = options.client;
 
       // Collection of Openlayers "VectorLayer" instances indexable by
@@ -50266,7 +50273,6 @@
           return 0;
         }
       });
-      console.log(this[_pyramid]);
 
       /*
        * Collect relevant information from DICOM metadata for each pyramid
@@ -50563,14 +50569,25 @@
        * Creates the map with the defined layers and view and renders it via
        * WebGL.
        */
-      this[_map] = new WebGLMap({
-        layers: [imageLayer, this[_drawingLayer]],
-        view: view,
-        controls: [],
-        loadTilesWhileAnimating: true,
-        loadTilesWhileInteracting: true,
-        logo: false
-      });
+      if (this[_usewebgl]) {
+        this[_map] = new WebGLMap({
+          layers: [imageLayer, this[_drawingLayer]],
+          view: view,
+          controls: [],
+          loadTilesWhileAnimating: true,
+          loadTilesWhileInteracting: true,
+          logo: false
+        });
+      } else {
+        this[_map] = new Map({
+          layers: [imageLayer, this[_drawingLayer]],
+          view: view,
+          controls: [],
+          loadTilesWhileAnimating: true,
+          loadTilesWhileInteracting: true,
+          logo: false
+        });
+      }
       for (let control in this[_controls]) {
         // options.controls
         // TODO: enable user to select controls and style them

diff --git a/src/api.js b/src/api.js
@@ -109,6 +109,7 @@ function _scoordCoordinates2geometryCoordinates(coordinates) {
 }
 
 
+const _usewebgl = Symbol('usewebgl');
 const _map = Symbol('map');
 const _features = Symbol('features');
 const _drawingSource = Symbol('drawingSource');
@@ -126,6 +127,7 @@ class VLWholeSlideMicroscopyImageViewer {
    * options:
    *   - client (instance of DICOMwebClient)
    *   - metadata (array of DICOM JSON metadata for each image instance)
+   *   - useWebGL (whether WebGL renderer should be used; default: true)
    *   - onClickHandler (on-event handler function)
    *   - onSingleClickHandler (on-event handler function)
    *   - onDoubleClickHandler (on-event handler function)
@@ -144,6 +146,11 @@ class VLWholeSlideMicroscopyImageViewer {
    *   - pixel
    */
   constructor(options) {
+    if ('useWebGL' in options) {
+      this[_usewebgl] = options.useWebGL;
+    } else {
+      this[_usewebgl] = true;
+    }
     this[_client] = options.client;
 
     // Collection of Openlayers "VectorLayer" instances indexable by
@@ -509,14 +516,25 @@ class VLWholeSlideMicroscopyImageViewer {
      * Creates the map with the defined layers and view and renders it via
      * WebGL.
      */
-    this[_map] = new WebGLMap({
-      layers: [imageLayer, this[_drawingLayer]],
-      view: view,
-      controls: [],
-      loadTilesWhileAnimating: true,
-      loadTilesWhileInteracting: true,
-      logo: false
-    });
+    if (this[_usewebgl]) {
+      this[_map] = new WebGLMap({
+        layers: [imageLayer, this[_drawingLayer]],
+        view: view,
+        controls: [],
+        loadTilesWhileAnimating: true,
+        loadTilesWhileInteracting: true,
+        logo: false
+      });
+    } else {
+      this[_map] = new Map({
+        layers: [imageLayer, this[_drawingLayer]],
+        view: view,
+        controls: [],
+        loadTilesWhileAnimating: true,
+        loadTilesWhileInteracting: true,
+        logo: false
+      });
+    }
     for (let control in this[_controls]) {
       // options.controls
       // TODO: enable user to select controls and style them