@kitware/vtk.js 28.10.1 → 28.11.0

package/IO/Core/ImageStream/DefaultProtocol.js

@@ -1,66 +1,52 @@
 function createMethods(session) {
   return {
-    subscribeToImageStream: function subscribeToImageStream(callback) {
-      return session.subscribe('viewport.image.push.subscription', callback);
-    },
-    unsubscribeToImageStream: function unsubscribeToImageStream(subscription) {
-      return session.unsubscribe(subscription);
-    },
-    registerView: function registerView(viewId) {
-      return session.call('viewport.image.push.observer.add', [viewId]);
-    },
-    unregisterView: function unregisterView(viewId) {
-      return session.call('viewport.image.push.observer.remove', [viewId]);
-    },
-    enableView: function enableView(viewId, enabled) {
-      return session.call('viewport.image.push.enabled', [viewId, enabled]);
-    },
-    render: function render() {
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+    subscribeToImageStream: callback => session.subscribe('viewport.image.push.subscription', callback),
+    unsubscribeToImageStream: subscription => session.unsubscribe(subscription),
+    registerView: viewId => session.call('viewport.image.push.observer.add', [viewId]),
+    unregisterView: viewId => session.call('viewport.image.push.observer.remove', [viewId]),
+    enableView: (viewId, enabled) => session.call('viewport.image.push.enabled', [viewId, enabled]),
+    render: function () {
+      let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
         size: [400, 400],
         view: -1
       };
       return session.call('viewport.image.push', [options]);
     },
-    resetCamera: function resetCamera() {
-      var view = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+    resetCamera: function () {
+      let view = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
       return session.call('viewport.camera.reset', [view]);
     },
-    invalidateCache: function invalidateCache(viewId) {
-      return session.call('viewport.image.push.invalidate.cache', [viewId]);
-    },
-    setQuality: function setQuality(viewId, quality) {
-      var ratio = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+    invalidateCache: viewId => session.call('viewport.image.push.invalidate.cache', [viewId]),
+    setQuality: function (viewId, quality) {
+      let ratio = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
       return session.call('viewport.image.push.quality', [viewId, quality, ratio]);
     },
-    setSize: function setSize(viewId) {
-      var width = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 400;
-      var height = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 400;
+    setSize: function (viewId) {
+      let width = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 400;
+      let height = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 400;
       return session.call('viewport.image.push.original.size', [viewId, width, height]);
     },
-    setServerAnimationFPS: function setServerAnimationFPS() {
-      var fps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 30;
+    setServerAnimationFPS: function () {
+      let fps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 30;
       return session.call('viewport.image.animation.fps.max', [fps]);
     },
-    getServerAnimationFPS: function getServerAnimationFPS() {
-      return session.call('viewport.image.animation.fps.get', []);
-    },
-    startAnimation: function startAnimation() {
-      var viewId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+    getServerAnimationFPS: () => session.call('viewport.image.animation.fps.get', []),
+    startAnimation: function () {
+      let viewId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
       return session.call('viewport.image.animation.start', [viewId]);
     },
-    stopAnimation: function stopAnimation() {
-      var viewId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+    stopAnimation: function () {
+      let viewId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
       return session.call('viewport.image.animation.stop', [viewId]);
     },
-    updateCamera: function updateCamera(viewId, focalPoint, viewUp, position) {
-      var forceUpdate = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
-      return session.call('viewport.camera.update', [viewId !== null && viewId !== void 0 ? viewId : -1, focalPoint, viewUp, position, forceUpdate]);
+    updateCamera: function (viewId, focalPoint, viewUp, position) {
+      let forceUpdate = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+      return session.call('viewport.camera.update', [viewId ?? -1, focalPoint, viewUp, position, forceUpdate]);
     },
-    updateCameraParameters: function updateCameraParameters() {
-      var viewId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
-      var parameters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var forceUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    updateCameraParameters: function () {
+      let viewId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+      let parameters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      let forceUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       return session.call('viewport.camera.update.params', [viewId, parameters, forceUpdate]);
     }
   };

package/IO/Core/ImageStream/ViewStream.js

@@ -1,9 +1,10 @@
-import macro from '../../../macros.js';
+import { m as macro } from '../../../macros2.js';
 
 function vtkViewStream(publicAPI, model) {
   // Set our className
-  model.classHierarchy.push('vtkViewStream'); // Internal variables
+  model.classHierarchy.push('vtkViewStream');
 
+  // Internal variables
   model.imageDecodingPool = [new Image(), new Image()];
   model.eventPool = [];
   model.nextPoolImageIndex = 0;
@@ -11,135 +12,126 @@ function vtkViewStream(publicAPI, model) {
   model.activeURL = null;
   model.fps = [];
   model.lastTime = Date.now();
-  model.lastImageEvent = null; // --------------------------------------------------------------------------
+  model.lastImageEvent = null;
+
+  // --------------------------------------------------------------------------
   // Internal methods
   // --------------------------------------------------------------------------
 
   function imageLoaded(e) {
-    var id = Number(this.dataset.id);
+    const id = Number(this.dataset.id);
     publicAPI.invokeImageReady(model.eventPool[id]);
-  } // --------------------------------------------------------------------------
+  }
 
+  // --------------------------------------------------------------------------
 
   function prepareDecodingPool() {
-    var size = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2;
-
+    let size = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2;
     while (model.imageDecodingPool.length < size) {
       model.imageDecodingPool.push(new Image());
     }
-
-    for (var i = 0; i < model.imageDecodingPool.length; i++) {
+    for (let i = 0; i < model.imageDecodingPool.length; i++) {
       model.imageDecodingPool[i].dataset.id = i;
       model.imageDecodingPool[i].onload = imageLoaded;
     }
-  } // --------------------------------------------------------------------------
+  }
 
+  // --------------------------------------------------------------------------
 
   function decodeImage(event) {
     model.eventPool[model.nextPoolImageIndex] = event;
     event.image = model.imageDecodingPool[model.nextPoolImageIndex++];
     model.nextPoolImageIndex %= model.imageDecodingPool.length;
     event.image.src = event.url;
-  } // --------------------------------------------------------------------------
+  }
 
+  // --------------------------------------------------------------------------
 
-  publicAPI.pushCamera = function () {
-    var focalPoint = model.camera.getReferenceByName('focalPoint');
-    var viewUp = model.camera.getReferenceByName('viewUp');
-    var position = model.camera.getReferenceByName('position');
-    var parallelProjection = model.camera.getParallelProjection();
-    var viewAngle = model.camera.getViewAngle();
-    var parallelScale = model.camera.getParallelScale();
-    var promise = null;
-
+  publicAPI.pushCamera = () => {
+    const focalPoint = model.camera.getReferenceByName('focalPoint');
+    const viewUp = model.camera.getReferenceByName('viewUp');
+    const position = model.camera.getReferenceByName('position');
+    const parallelProjection = model.camera.getParallelProjection();
+    const viewAngle = model.camera.getViewAngle();
+    const parallelScale = model.camera.getParallelScale();
+    let promise = null;
     if (model.useCameraParameters) {
       promise = model.protocol.updateCameraParameters(model.viewId, {
-        focalPoint: focalPoint,
-        viewUp: viewUp,
-        position: position,
-        parallelProjection: parallelProjection,
-        viewAngle: viewAngle,
-        parallelScale: parallelScale
+        focalPoint,
+        viewUp,
+        position,
+        parallelProjection,
+        viewAngle,
+        parallelScale
       }, false);
     } else {
       promise = model.protocol.updateCamera(model.viewId, focalPoint, viewUp, position, false);
     }
-
     if (model.isAnimating) {
       setTimeout(publicAPI.pushCamera, 1000 / model.cameraUpdateRate);
     }
-
     return promise;
-  }; // --------------------------------------------------------------------------
+  };
 
-
-  publicAPI.invalidateCache = function () {
-    return model.protocol.invalidateCache(model.viewId);
-  }; // --------------------------------------------------------------------------
-  // PublicAPI
   // --------------------------------------------------------------------------
 
+  publicAPI.invalidateCache = () => model.protocol.invalidateCache(model.viewId);
 
-  publicAPI.render = function () {
-    return model.protocol.render({
-      view: model.viewId,
-      size: model.size
-    });
-  }; // --------------------------------------------------------------------------
+  // --------------------------------------------------------------------------
+  // PublicAPI
+  // --------------------------------------------------------------------------
 
+  publicAPI.render = () => model.protocol.render({
+    view: model.viewId,
+    size: model.size
+  });
 
-  publicAPI.resetCamera = function () {
-    return model.protocol.resetCamera(model.viewId);
-  }; // --------------------------------------------------------------------------
+  // --------------------------------------------------------------------------
 
+  publicAPI.resetCamera = () => model.protocol.resetCamera(model.viewId);
 
-  publicAPI.startAnimation = function () {
-    return model.protocol.startAnimation(model.viewId);
-  }; // --------------------------------------------------------------------------
+  // --------------------------------------------------------------------------
 
+  publicAPI.startAnimation = () => model.protocol.startAnimation(model.viewId);
 
-  publicAPI.stopAnimation = function () {
-    return model.protocol.stopAnimation(model.viewId);
-  }; // --------------------------------------------------------------------------
+  // --------------------------------------------------------------------------
 
+  publicAPI.stopAnimation = () => model.protocol.stopAnimation(model.viewId);
 
-  publicAPI.setSize = function (width, height) {
-    var changeDetected = false;
+  // --------------------------------------------------------------------------
 
+  publicAPI.setSize = (width, height) => {
+    let changeDetected = false;
     if (model.size[0] !== width || model.size[1] !== height) {
       model.size = [width, height];
       changeDetected = true;
     }
-
     if (changeDetected) {
       publicAPI.modified();
-
       if (model.protocol) {
         return model.protocol.setSize(model.viewId, width, height);
       }
     }
-
     return Promise.resolve(false);
-  }; // --------------------------------------------------------------------------
-
+  };
 
-  publicAPI.startInteraction = function () {
-    var promises = [model.protocol.setQuality(model.viewId, model.interactiveQuality, model.interactiveRatio)];
+  // --------------------------------------------------------------------------
 
+  publicAPI.startInteraction = () => {
+    const promises = [model.protocol.setQuality(model.viewId, model.interactiveQuality, model.interactiveRatio)];
     if (model.camera) {
       promises.push(publicAPI.startAnimation());
       model.isAnimating = true;
       promises.push(publicAPI.pushCamera());
     }
-
     return Promise.all(promises);
-  }; // --------------------------------------------------------------------------
+  };
 
+  // --------------------------------------------------------------------------
 
-  publicAPI.endInteraction = function () {
-    var promises = [];
+  publicAPI.endInteraction = () => {
+    const promises = [];
     promises.push(model.protocol.setQuality(model.viewId, model.stillQuality, model.stillRatio));
-
     if (model.camera) {
       promises.push(publicAPI.stopAnimation());
       model.isAnimating = false;
@@ -147,63 +139,57 @@ function vtkViewStream(publicAPI, model) {
     } else {
       promises.push(publicAPI.render());
     }
-
     return Promise.all(promises);
-  }; // --------------------------------------------------------------------------
+  };
 
+  // --------------------------------------------------------------------------
 
-  publicAPI.setViewId = function (id) {
+  publicAPI.setViewId = id => {
     if (model.viewId === id || !model.protocol) {
       return false;
     }
-
     if (model.viewId) {
       model.protocol.unregisterView(model.viewId);
     }
-
     model.viewId = id;
-
     if (model.viewId) {
-      model.protocol.registerView(model.viewId).then(function (_ref) {
-        var viewId = _ref.viewId;
+      model.protocol.registerView(model.viewId).then(_ref => {
+        let {
+          viewId
+        } = _ref;
         model.viewId = viewId;
       });
     }
-
     return true;
-  }; // --------------------------------------------------------------------------
+  };
 
+  // --------------------------------------------------------------------------
 
-  publicAPI.processMessage = function (msg) {
+  publicAPI.processMessage = msg => {
     /* eslint-disable eqeqeq */
     if (msg.id != model.viewId) {
       return;
     }
     /* eslint-enable eqeqeq */
-
-
-    var imgBlob = new Blob([msg.image], {
+    const imgBlob = new Blob([msg.image], {
       type: model.mimeType
     });
-
     if (model.activeURL) {
       model.urlToRevoke.push(model.activeURL);
       model.activeURL = null;
-
       while (model.urlToRevoke.length > 60) {
-        var url = model.urlToRevoke.shift();
+        const url = model.urlToRevoke.shift();
         window.URL.revokeObjectURL(url);
       }
     }
-
     model.activeURL = URL.createObjectURL(imgBlob);
-    var time = Date.now();
-    var fps = Math.floor(10000 / (time - model.lastTime)) / 10;
+    const time = Date.now();
+    const fps = Math.floor(10000 / (time - model.lastTime)) / 10;
     model.fps.push(fps);
     model.lastTime = time;
     model.lastImageEvent = {
       url: model.activeURL,
-      fps: fps,
+      fps,
       metadata: {
         size: msg.size,
         id: msg.id,
@@ -211,38 +197,40 @@ function vtkViewStream(publicAPI, model) {
         workTime: msg.workTime
       }
     };
-
     if (model.decodeImage) {
       decodeImage(model.lastImageEvent);
     } else {
       publicAPI.invokeImageReady(model.lastImageEvent);
-    } // GC fps
-
+    }
 
+    // GC fps
     while (model.fps.length > model.fpsWindowSize) {
       model.fps.shift();
     }
-  }; // --------------------------------------------------------------------------
+  };
 
+  // --------------------------------------------------------------------------
 
-  publicAPI.delete = macro.chain(function () {
+  publicAPI.delete = macro.chain(() => {
     model.unregisterViewStream(publicAPI);
     publicAPI.setViewId(null);
-
     while (model.urlToRevoke.length) {
       window.URL.revokeObjectURL(model.urlToRevoke.pop());
     }
-  }, publicAPI.delete); // --------------------------------------------------------------------------
+  }, publicAPI.delete);
+
+  // --------------------------------------------------------------------------
   // Initialize object
   // --------------------------------------------------------------------------
 
   prepareDecodingPool();
-} // ----------------------------------------------------------------------------
+}
+
+// ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------
 
-
-var DEFAULT_VALUES = {
+const DEFAULT_VALUES = {
   // protocol: null,
   // api: null,
   cameraUpdateRate: 30,
@@ -257,27 +245,36 @@ var DEFAULT_VALUES = {
   stillRatio: 1,
   useCameraParameters: false,
   viewId: null
-}; // ----------------------------------------------------------------------------
+};
+
+// ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
-  var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, DEFAULT_VALUES, initialValues); // Object methods
+  let initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  Object.assign(model, DEFAULT_VALUES, initialValues);
 
+  // Object methods
   macro.obj(publicAPI, model);
   macro.event(publicAPI, model, 'ImageReady');
   macro.get(publicAPI, model, ['viewId', 'size', 'fps', 'lastImageEvent']);
-  macro.setGet(publicAPI, model, ['camera', 'cameraUpdateRate', 'decodeImage', 'fpsWindowSize', 'interactiveQuality', 'interactiveRatio', 'stillQuality', 'stillRatio', 'useCameraParameters']); // Object specific methods
+  macro.setGet(publicAPI, model, ['camera', 'cameraUpdateRate', 'decodeImage', 'fpsWindowSize', 'interactiveQuality', 'interactiveRatio', 'stillQuality', 'stillRatio', 'useCameraParameters']);
 
-  vtkViewStream(publicAPI, model); // Blend APIs
+  // Object specific methods
+  vtkViewStream(publicAPI, model);
 
+  // Blend APIs
   Object.assign(publicAPI, model.sharedAPI);
-} // ----------------------------------------------------------------------------
+}
 
-var newInstance = macro.newInstance(extend, 'vtkViewStream'); // ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+const newInstance = macro.newInstance(extend, 'vtkViewStream');
+
+// ----------------------------------------------------------------------------
 
 var ViewStream = {
-  newInstance: newInstance,
-  extend: extend
+  newInstance,
+  extend
 };
 
 export { ViewStream as default, extend, newInstance };