diff --git a/Sources/Interaction/Manipulators/MouseRangeManipulator/index.d.ts b/Sources/Interaction/Manipulators/MouseRangeManipulator/index.d.ts index 3f8c8a1879c..c3b4ed9510b 100644 --- a/Sources/Interaction/Manipulators/MouseRangeManipulator/index.d.ts +++ b/Sources/Interaction/Manipulators/MouseRangeManipulator/index.d.ts @@ -1,11 +1,14 @@ import vtkCompositeMouseManipulator, { ICompositeMouseManipulatorInitialValues, } from '../../../Interaction/Manipulators/CompositeMouseManipulator'; +import { vtkObject } from '../../../interfaces'; export interface IMouseRangeManipulatorInitialValues extends ICompositeMouseManipulatorInitialValues {} -export interface vtkMouseRangeManipulator extends vtkCompositeMouseManipulator { +export interface vtkMouseRangeManipulator + extends vtkCompositeMouseManipulator, + vtkObject { setHorizontalListener( min: number, max: number, diff --git a/Sources/Interaction/Widgets/OrientationMarkerWidget/Constants.js b/Sources/Interaction/Widgets/OrientationMarkerWidget/Constants.js index 75fe538e6c1..238344cfe26 100644 --- a/Sources/Interaction/Widgets/OrientationMarkerWidget/Constants.js +++ b/Sources/Interaction/Widgets/OrientationMarkerWidget/Constants.js @@ -1,4 +1,4 @@ -const Corners = { +export const Corners = { TOP_LEFT: 'TOP_LEFT', TOP_RIGHT: 'TOP_RIGHT', BOTTOM_LEFT: 'BOTTOM_LEFT', diff --git a/Sources/Interaction/Widgets/OrientationMarkerWidget/index.d.ts b/Sources/Interaction/Widgets/OrientationMarkerWidget/index.d.ts index de7d4d37748..c28fe6e0125 100644 --- a/Sources/Interaction/Widgets/OrientationMarkerWidget/index.d.ts +++ b/Sources/Interaction/Widgets/OrientationMarkerWidget/index.d.ts @@ -1,6 +1,5 @@ import { vtkObject } from "../../../interfaces"; -import vtkAnnotatedCubeActor from "../../../Rendering/Core/AnnotatedCubeActor"; -import vtkAxesActor from "../../../Rendering/Core/AxesActor"; +import vtkActor from "../../../Rendering/Core/Actor"; import vtkRenderer from "../../../Rendering/Core/Renderer"; import vtkRenderWindowInteractor from "../../../Rendering/Core/RenderWindowInteractor"; import { Nullable } from "../../../types"; @@ -11,7 +10,7 @@ import { Corners } from "./Constants"; * */ export interface IOrientationMarkerWidgetInitialValues { - actor?: vtkAnnotatedCubeActor | vtkAxesActor, + actor?: vtkActor, interactor?: vtkRenderWindowInteractor, parentRenderer?: vtkRenderer, viewportCorner?: Corners, @@ -39,7 +38,7 @@ export interface vtkOrientationMarkerWidget extends vtkObject { /** * */ - getActor(): vtkAnnotatedCubeActor | vtkAxesActor; + getActor(): vtkActor; /** * Gets the parent renderer, if any. @@ -85,9 +84,9 @@ export interface vtkOrientationMarkerWidget extends vtkObject { /** * Get the actor associated with the widget. - * @param {vtkAnnotatedCubeActor | vtkAxesActor} actor The actor instance. + * @param {vtkActor} actor The actor instance. */ - setActor(actor: vtkAnnotatedCubeActor | vtkAxesActor): void; + setActor(actor: vtkActor): void; /** * Sets the parent renderer diff --git a/Sources/Rendering/Core/RenderWindowInteractor/index.d.ts b/Sources/Rendering/Core/RenderWindowInteractor/index.d.ts index b0ebbe49cf9..5404690aef4 100755 --- a/Sources/Rendering/Core/RenderWindowInteractor/index.d.ts +++ b/Sources/Rendering/Core/RenderWindowInteractor/index.d.ts @@ -396,6 +396,11 @@ export interface vtkRenderWindowInteractor extends vtkObject { */ invokeEndInteractionEvent(callData: IRenderWindowInteractorEvent): void; + /** + * + */ + invokeRenderEvent(): void; + /** * * @param cb The callback to be called @@ -659,6 +664,13 @@ export interface vtkRenderWindowInteractor extends vtkObject { */ onEndInteractionEvent(cb: InteractorEventCallback, priority?: number): Readonly; + /** + * + * @param {Function} cb The callback to be called. + * @param {Number} [priority] The priority of the event. + */ + onRenderEvent(cb: () => void, priority?: number): Readonly; + /** * * @param args diff --git a/Sources/Rendering/Core/VolumeProperty/index.d.ts b/Sources/Rendering/Core/VolumeProperty/index.d.ts index c563c1484b0..7b59809974d 100755 --- a/Sources/Rendering/Core/VolumeProperty/index.d.ts +++ b/Sources/Rendering/Core/VolumeProperty/index.d.ts @@ -279,14 +279,14 @@ export interface vtkVolumeProperty extends vtkObject { * @param {Number} index * @param {vtkColorTransferFunction} func */ - setRGBTransferFunction(index: number, func: vtkColorTransferFunction): boolean; + setRGBTransferFunction(index: number, func?: vtkColorTransferFunction | null): boolean; /** * Set the scalar opacity of a volume to a transfer function * @param {Number} index * @param {vtkPiecewiseFunction} func */ - setScalarOpacity(index: number, func: vtkPiecewiseFunction): boolean; + setScalarOpacity(index: number, func?: vtkPiecewiseFunction | null): boolean; /** * Set the scalar component weights. diff --git a/Sources/Rendering/OpenGL/RenderWindow/index.d.ts b/Sources/Rendering/OpenGL/RenderWindow/index.d.ts index c89987f1428..c63b8c812bb 100644 --- a/Sources/Rendering/OpenGL/RenderWindow/index.d.ts +++ b/Sources/Rendering/OpenGL/RenderWindow/index.d.ts @@ -80,7 +80,7 @@ export interface vtkOpenGLRenderWindow extends vtkOpenGLRenderWindowBase { * * @param {HTMLElement} el The container element. */ - setContainer(el: HTMLElement): void; + setContainer(el: Nullable): void; /** * Get the container element.