Merge pull request #2704 from Julesdevops/various-typescript-fixes

Miscellaneous typescript def fixes: vtkSelectionNode, vtkMapper, vtkColorTransferFunction, vtkOpenGLRenderWindow

Author: floryst

Sources/Common/DataModel/SelectionNode/Constants.d.ts

@@ -0,0 +1,27 @@
+export declare enum SelectionContent {
+    GLOBALIDS = 0,
+    PEDIGREEIDS = 1,
+    VALUES = 2,
+    INDICES = 3,
+    FRUSTUM = 4,
+    LOCATIONS = 5,
+    THRESHOLDS = 6,
+    BLOCKS = 7,
+    QUERY = 8,
+}
+
+export declare enum SelectionField {
+    CELL = 0,
+    POINT = 1,
+    FIELD = 2,
+    VERTEX = 3,
+    EDGE = 4,
+    ROW = 5,
+}
+
+declare const _default: {
+    SelectionContent: typeof SelectionContent;
+    SelectionField: typeof SelectionField;
+}
+
+export default _default;

Sources/Common/DataModel/SelectionNode/index.d.ts

@@ -1,35 +1,70 @@
 import { vtkObject } from "../../../interfaces" ;
 import { Bounds } from "../../../types";
+import { SelectionContent, SelectionField } from "./Constants";
+import vtkProp from "../../../Rendering/Core/Prop";
 
-export enum SelectionContent {
-	GLOBALIDS,
-	PEDIGREEIDS,
-	VALUES,
-	INDICES,
-	FRUSTUM,
-	LOCATIONS,
-	THRESHOLDS,
-	BLOCKS,
-	QUERY,
+export interface ISelectionNodeInitialValues {
+	contentType?: SelectionContent;
+	fieldType?: SelectionField;
+	properties?: ISelectionNodeProperties;
+	selectionList?: number[];
 }
 
-export enum SelectionField {
-	CELL,
-	POINT,
-	FIELD,
-	VERTEX,
-	EDGE,
-	ROW,
+export interface ISelectionNodeProperties {
+	propID?: number;
+	prop?: vtkProp;
+	compositeID?: number;
+	attributeID?: number;
+	pixelCount?: number;
+	displayPosition?: [number, number, number];
+	worldPosition?: [number, number, number];
 }
 
-export interface ISelectionNodeInitialValues {}
-
 export interface vtkSelectionNode extends vtkObject {
-	
 	/**
-	 * 
+	 * Get the bounds of the selection points.
 	 */
 	getBounds(): Bounds;
+
+	/**
+	 * Returns -1 if not initialized.
+	 */
+	getContentType(): SelectionContent | -1;
+
+	/**
+	 * This functions is called internally by VTK.js and is not intended for public use.
+	 */
+	setContentType(contentType: SelectionContent): void;
+
+	/**
+	 * Returns -1 if not initialized.
+	 */
+	getFieldType(): SelectionField | -1;
+
+	/**
+	 * This functions is called internally by VTK.js and is not intended for public use.
+	 */
+	setFieldType(fieldType: SelectionField): void;
+
+	/**
+	 * Get the selection properties.
+	 */
+	getProperties(): ISelectionNodeProperties;
+
+	/**
+	 * This functions is called internally by VTK.js and is not intended for public use.
+	 */
+	setProperties(properties: ISelectionNodeProperties);
+	
+	/**
+	 * Get the list of the underlying selected attribute IDs.
+	 */
+	getSelectionList(): number[];
+
+	/**
+	 * This functions is called internally by VTK.js and is not intended for public use.
+	 */
+	setSelectionList(selectionAttributeIDs: ISelectionNodeProperties);
 }
 
 /**
@@ -57,5 +92,7 @@ export function newInstance(initialValues?: ISelectionNodeInitialValues): vtkSel
 export declare const vtkSelectionNode: {
 	newInstance: typeof newInstance,
 	extend: typeof extend;
+	SelectionContent: typeof SelectionContent;
+    SelectionField: typeof SelectionField;
 };
 export default vtkSelectionNode;

Sources/Rendering/Core/ColorTransferFunction/index.d.ts

@@ -1,10 +1,9 @@
 import vtkDataArray from '../../../Common/Core/DataArray';
-import { vtkObject } from '../../../interfaces';
+import vtkScalarsToColors from '../../../Common/Core/ScalarsToColors'
 import { ColorSpace, Scale } from "./Constants";
 
 
-/* TODO: use VtkScalarsToColors instead of VtkObject */
-export interface vtkColorTransferFunction extends vtkObject {
+export interface vtkColorTransferFunction extends vtkScalarsToColors {
   /**
    * Add a point defined in RGB
    * @param {Number} x The index of the point.
@@ -270,13 +269,6 @@ export interface vtkColorTransferFunction extends vtkObject {
    */
   fillFromDataPointer(nb: number, ptr: any): void;
 
-  /**
-   * Set the range of scalars being mapped.
-   * @param {Number} min
-   * @param {Number} max
-   */
-  setMappingRange(min: number, max: number): void;
-
   /**
    * Remove all points out of the new range, and make sure there is a point at
    * each end of that range.

Sources/Rendering/Core/Mapper/index.d.ts

@@ -485,6 +485,10 @@ export interface vtkMapper extends vtkAbstractMapper3D {
 	 *
 	 */
 	setInterpolateScalarsBeforeMapping(interpolateScalarsBeforeMapping: boolean): boolean;
+
+	setResolveCoincidentTopologyToPolygonOffset(): boolean;
+
+	setResolveCoincidentTopologyToOff(): boolean;
 }
 
 /**

Sources/Rendering/Core/Renderer/index.d.ts

@@ -628,6 +628,32 @@ export interface vtkRenderer extends vtkViewport {
 	 * Not Implemented yet
 	 */
 	visibleVolumeCount(): any;
+
+	/**
+     * Set the viewport background.
+	 *
+     * @param {Number} r Defines the red component (between 0 and 1).
+     * @param {Number} g Defines the green component (between 0 and 1).
+     * @param {Number} b Defines the blue component (between 0 and 1).
+     * @param {Number} b Defines the alpha component (between 0 and 1).
+     */
+	setBackground(r: number, g: number, b: number, a: number): boolean;
+
+	/**
+     * Set the viewport background.
+	 *
+     * @param {Number} r Defines the red component (between 0 and 1).
+     * @param {Number} g Defines the green component (between 0 and 1).
+     * @param {Number} b Defines the blue component (between 0 and 1).
+     */
+    setBackground(r: number, g: number, b: number): boolean;
+
+	/**
+     * Set the viewport background.
+	 *
+     * @param {Number[]} background The RGB color array.
+     */
+    setBackground(background: number[]): boolean;
 }
 
 /**

Sources/Rendering/OpenGL/RenderWindow/index.d.ts

@@ -34,9 +34,9 @@ export interface IOpenGLRenderWindowInitialValues {
 }
 
 export interface ICaptureOptions {
-	resetCamera: boolean;
-	size: Size;
-	scale: number
+	resetCamera?: boolean;
+	size?: Size;
+	scale?: number
 }
 
 export interface I3DContextOptions {
@@ -320,7 +320,7 @@ export interface vtkOpenGLRenderWindow extends vtkOpenGLRenderWindowBase {
 	 * @param {String} format
 	 * @param {ICaptureOptions} options
 	 */
-	captureNextImage(format: string, options: ICaptureOptions): Nullable<Promise<string>>;
+	captureNextImage(format: string, options?: ICaptureOptions): Nullable<Promise<string>>;
 
 	/**
 	 *