Merge branch 'master' into ts-defs-update

Author: daker

Sources/Filters/General/TubeFilter/index.js

@@ -661,10 +661,7 @@ function vtkTubeFilter(publicAPI, model) {
       size: numNewPts * 3,
       numberOfComponents: 3,
     });
-    let numNormals = 3 * numNewPts;
-    if (model.capping) {
-      numNormals = 3 * (numNewPts + 2 * model.numberOfSides);
-    }
+    const numNormals = 3 * numNewPts;
     const newNormalsData = new Float32Array(numNormals);
     const newNormals = vtkDataArray.newInstance({
       numberOfComponents: 3,

Sources/Filters/General/TubeFilter/test/testTubeFilter.js

@@ -112,7 +112,7 @@ test('Test vtkTubeFilter execution', (t) => {
     'Make sure the output number of points is correct with capping.'
   );
   t.ok(
-    tubeOutput2.getPointData().getNormals().getNumberOfTuples() === 24,
+    tubeOutput2.getPointData().getNormals().getNumberOfTuples() === 18,
     'Make sure the output number of normals is correct with capping.'
   );
   t.end();

Sources/IO/Core/ImageStream/DefaultProtocol.d.ts

@@ -0,0 +1,25 @@
+import { Size, Vector3 } from '../../../types';
+
+declare function createMethods(session: any): {
+	subscribeToImageStream: (callback: any) => any;
+	unsubscribeToImageStream: (subscription: any) => any;
+	registerView: (viewId: number) => any;
+	unregisterView: (viewId: number) => any;
+	enableView: (viewId: number, enabled: boolean) => any;
+	render: (options?: {
+			size: Size;
+			view: number;
+	}) => any;
+	resetCamera: (view?: number) => any;
+	invalidateCache: (viewId: number) => any;
+	setQuality: (viewId: number, quality: number, ratio?: number) => any;
+	setSize: (viewId: number, width?: number, height?: number) => any;
+	setServerAnimationFPS: (fps?: number) => any;
+	getServerAnimationFPS: () => number;
+	startAnimation: (viewId?: number) => any;
+	stopAnimation: (viewId?: number) => any;
+	updateCamera: (viewId: number, focalPoint: Vector3, viewUp: Vector3, position: Vector3, forceUpdate?: boolean) => any;
+	updateCameraParameters: (viewId?: number, parameters?: {}, forceUpdate?: boolean) => any;
+}
+
+export default createMethods;

Sources/IO/Core/ImageStream/ViewStream.d.ts

@@ -0,0 +1,256 @@
+import { vtkObject } from '../../../interfaces';
+import { Size } from '../../../types';
+import vtkCamera from '../../../Rendering/Core/Camera';
+import DefaultProtocol from './DefaultProtocol';
+/**
+ *
+ */
+export interface IViewStreamInitialValues {
+  protocol?: typeof DefaultProtocol;
+  api?: any;
+  cameraUpdateRate?: number;
+  decodeImage?: boolean;
+  fpsWindowSize?: number;
+  interactiveQuality?: number;
+  interactiveRatio?: number;
+  isAnimating?: boolean;
+  mimeType?: string;
+  size?: Size;
+  stillQuality?: number;
+  stillRatio?: number;
+  useCameraParameters?: boolean;
+  viewId?: string;
+}
+
+interface IMetaData {
+  size: Size,
+  id: string,
+  memory: number,
+  workTime: number,
+}
+
+interface IEvent {
+  url: string,
+  fps: number[],
+  metadata: IMetaData,
+}
+
+export interface vtkViewStream extends vtkObject {
+  /**
+   *
+   * @param callback
+   */
+  onImageReady(callback: () => void): any;
+
+  /**
+   *
+   */
+  getViewId(): string;
+
+  /**
+   *
+   */
+  getSize(): Size;
+
+  /**
+   *
+   */
+  getFps(): number[];
+
+  /**
+   *
+   */
+  getLastImageEvent(): IEvent;
+
+  /**
+   *
+   */
+  getCamera(): vtkCamera;
+
+  /**
+   *
+   * @param camera
+   */
+  setCamera(camera: vtkCamera): boolean;
+
+  /**
+   *
+   */
+  getCameraUpdateRate(): number;
+
+  /**
+   *
+   * @param cameraUpdateRate
+   */
+  setCameraUpdateRate(cameraUpdateRate: number): boolean;
+
+  /**
+   *
+   */
+  getDecodeImage(): boolean;
+
+  /**
+   *
+   * @param decodeImage
+   */
+  setDecodeImage(decodeImage: boolean): boolean;
+
+  /**
+   *
+   */
+  getFpsWindowSize(): number;
+
+  /**
+   *
+   * @param fpsWindowSize
+   */
+  setFpsWindowSize(fpsWindowSize: number): boolean;
+
+  /**
+   *
+   */
+  getInteractiveQuality(): number;
+
+  /**
+   *
+   * @param interactiveQuality
+   */
+  setInteractiveQuality(interactiveQuality: number): boolean;
+
+  /**
+   *
+   */
+  getInteractiveRatio(): number;
+
+  /**
+   *
+   * @param interactiveRatio
+   */
+  setInteractiveRatio(interactiveRatio: number): boolean;
+
+  /**
+   *
+   */
+  getStillQuality(): number;
+
+  /**
+   *
+   * @param stillQuality
+   */
+  setStillQuality(stillQuality: number): boolean;
+
+  /**
+   *
+   */
+  getStillRatio(): number;
+
+  /**
+   *
+   * @param stillRatio
+   */
+  setStillRatio(stillRatio: number): boolean;
+
+  /**
+   *
+   */
+  getUseCameraParameters(): boolean;
+
+  /**
+   *
+   * @param useCameraParameters
+   */
+  setUseCameraParameters(useCameraParameters: boolean): boolean;
+
+  /**
+   *
+   */
+  pushCamera(): any;
+
+  /**
+   *
+   */
+  invalidateCache(): any;
+
+  /**
+   *
+   */
+  render(): any;
+
+  /**
+   *
+   */
+  resetCamera(): any;
+
+  /**
+   *
+   */
+  startAnimation(): any;
+
+  /**
+   *
+   */
+  stopAnimation(): any;
+
+  /**
+   *
+   * @param width
+   * @param height
+   */
+  setSize(width: number, height: number): any;
+
+  /**
+   *
+   */
+  startInteraction(): any;
+
+  /**
+   *
+   */
+  endInteraction(): any;
+
+  /**
+   *
+   * @param viewId
+   */
+  setViewId(viewId: string): boolean;
+
+  /**
+   *
+   * @param msg
+   */
+  processMessage(msg: any): void;
+
+  /**
+   *
+   */
+  delete(): void;
+}
+
+/**
+ * Method used to decorate a given object (publicAPI+model) with vtkViewStream characteristics.
+ * @param publicAPI
+ * @param model
+ * @param initialValues
+ */
+export function extend(
+  publicAPI: object,
+  model: object,
+  initialValues?: IViewStreamInitialValues
+): void;
+
+/**
+ * Method used to create a new instance of vtkViewStream
+ * @param {IViewStreamInitialValues} [initialValues] for pre-setting some of its content
+ */
+export function newInstance(
+  initialValues?: IViewStreamInitialValues
+): vtkViewStream;
+
+/**
+ * IViewStreamInitialValues provides a way to create a remote view.
+ */
+export declare const vtkViewStream: {
+  newInstance: typeof newInstance;
+  extend: typeof extend;
+};
+export default vtkViewStream;

Sources/IO/Core/WSLinkClient/index.d.ts

@@ -1,4 +1,4 @@
-import { vtkObject, vtkSubscription } from "../../../interfaces";
+import { vtkObject, vtkSubscription } from '../../../interfaces';
 
 /**
  * Bind optional dependency from WSLink to our current class.
@@ -15,7 +15,6 @@ import { vtkObject, vtkSubscription } from "../../../interfaces";
  */
 export function setSmartConnectClass(smartConnectClass: object): void;
 
-
 export interface vtkWSLinkClient extends vtkObject {
 
   /**
@@ -117,21 +116,45 @@ export interface vtkWSLinkClient extends vtkObject {
    */
   getConfigDecorator(): (config: object) => object;
 
-  getConnection(): object;
-  getCongig(): object;
+  /**
+   *
+   */
+  getConnection(): any;
+
+  /**
+   *
+   */
+  getConfig(): object;
+
+  /**
+   *
+   */
   getRemote(): object;
+
+  /**
+   *
+   */
   getImageStream(): object;
 
+  /**
+   *
+   * @param callback
+   * @param priority
+   */
   onBusyChange(callback: Function, priority: number): vtkSubscription;
+
+  /**
+   *
+   */
   invokeBusyChange(): void;
 
-  onConnectionReady(callback: () => void): vtkSubscription;
+  onConnectionReady(callback: (httpReq: any) => void): vtkSubscription;
   // invokeConnectionReady(): void
 
-  onConnectionError(callback: () => void): vtkSubscription;
+  onConnectionError(callback: (httpReq: any) => void): vtkSubscription;
   // invokeConnectionError(): void
 
-  onConnectionClose(callback: () => void): vtkSubscription;
+  onConnectionClose(callback: (httpReq: any) => void): vtkSubscription;
   // invokeConnectionClose(): void
 }