@cornerstonejs/tools 0.56.7 → 0.57.1

package/src/tools/displayTools/Contour/utils.ts

@@ -0,0 +1,117 @@
+import { Enums, Types } from '@cornerstonejs/core';
+import vtkCellArray from '@kitware/vtk.js/Common/Core/CellArray';
+import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
+import vtkPoints from '@kitware/vtk.js/Common/Core/Points';
+import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData';
+import { ToolGroupSpecificContourRepresentation } from '../../../types';
+
+/**
+ * If the segment specific config exists for the given segment id, it returns
+ * the segment specific config. Otherwise, it looks for the segment specific
+ * config for the given index. If it doesn't exist, it returns null.
+ *
+ * @param contourRepresentation -  The representation object that is passed
+ * to the tool.
+ * @param segmentId -  The id of the segment.
+ * @param index -  The index of the segment in the list of segments.
+ * @returns the segment specific config for the given segment id.
+ *
+ */
+export function getSegmentSpecificConfig(
+  contourRepresentation: ToolGroupSpecificContourRepresentation,
+  segmentId: string,
+  index: number
+) {
+  let segmentSpecificConfig =
+    contourRepresentation.segmentSpecificConfig?.[segmentId];
+
+  if (!segmentSpecificConfig) {
+    // try the index
+    segmentSpecificConfig =
+      contourRepresentation.segmentSpecificConfig?.[index];
+  }
+
+  if (!segmentSpecificConfig) {
+    return null;
+  }
+
+  return segmentSpecificConfig.CONTOUR;
+}
+
+/**
+ * takes a geometry object as an argument
+ * and throws an error if the geometry object is not a contour
+ * @param geometry -  The geometry object to be rendered.
+ */
+export function validateGeometry(geometry: Types.IGeometry): void {
+  if (!geometry) {
+    throw new Error(`No contours found for geometryId ${geometry.id}`);
+  }
+
+  const geometryId = geometry.id;
+
+  if (geometry.type !== Enums.GeometryType.CONTOUR) {
+    throw new Error(
+      `Geometry type ${geometry.type} not supported for rendering.`
+    );
+  }
+
+  if (!geometry.data) {
+    console.warn(
+      `No contours found for geometryId ${geometryId}. Skipping render.`
+    );
+    return;
+  }
+}
+
+/**
+ * It takes a contourSet and returns a vtkPolyData for that contourSet. A contour set
+ * is a collection of contours. Each contour is a collection of points. Each point
+ * is x,y,z in the world coordinate system.
+ *
+ * @param contourSet -  the contour set that you want to convert to polyData
+ * @returns A vtkPolyData object
+ */
+export function getPolyData(contourSet: Types.IContourSet) {
+  const pointArray = [];
+
+  const points = vtkPoints.newInstance();
+  const lines = vtkCellArray.newInstance();
+
+  // this variable will indicate the index of the first point in the current line
+  // so we can correctly generate the point index list to add in the cellArray
+  let pointIndex = 0;
+  contourSet.getContours().forEach((contour: Types.IContour) => {
+    const pointList = contour.getPoints();
+    const flatPoints = contour.getFlatPointsArray();
+    const type = contour.getType();
+
+    // creating a point index list that defines a line
+    const pointIndexes = pointList.map(
+      (_, pointListIndex) => pointListIndex + pointIndex
+    );
+
+    // if close planar, add the first point index to the list
+    if (type === Enums.ContourType.CLOSED_PLANAR) {
+      pointIndexes.push(pointIndexes[0]);
+    }
+
+    const linePoints = Float32Array.from(flatPoints);
+    // add the current points into the point list
+    pointArray.push(...linePoints);
+    // add the point indexes into the cell array
+    lines.insertNextCell([...pointIndexes]);
+    // update the first point index
+    pointIndex = pointIndex + pointList.length;
+  });
+
+  // converts the pointArray into vtkPoints
+  points.setData(pointArray, 3);
+
+  // creates the polyData
+  const polygon = vtkPolyData.newInstance();
+  polygon.setPoints(points);
+  polygon.setLines(lines);
+
+  return polygon;
+}

package/src/tools/displayTools/Labelmap/labelmapDisplay.ts

@@ -12,7 +12,10 @@ import Representations from '../../../enums/SegmentationRepresentations';
 import * as SegmentationConfig from '../../../stateManagement/segmentation/config/segmentationConfig';
 import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
 import { getToolGroup } from '../../../store/ToolGroupManager';
-import type { LabelmapConfig } from '../../../types/LabelmapTypes';
+import type {
+  LabelmapConfig,
+  LabelmapRenderingConfig,
+} from '../../../types/LabelmapTypes';
 import {
   RepresentationPublicInput,
   SegmentationRepresentationConfig,
@@ -179,7 +182,7 @@ async function render(
     actorEntry = viewport.getActor(segmentationRepresentationUID);
   }
 
-  const { cfun, ofun } = renderingConfig;
+  const { cfun, ofun } = renderingConfig as LabelmapRenderingConfig;
 
   const renderInactiveSegmentations =
     toolGroupConfig.renderInactiveSegmentations;

package/src/types/ContourTypes.ts

@@ -10,6 +10,8 @@ export type ContourConfig = {
   outlineOpacity?: number;
   /** alpha of outline for inactive segmentation */
   outlineOpacityInactive?: number;
+  /** outline visibility */
+  renderOutline?: boolean;
 };
 
 /**

package/src/types/SegmentationStateTypes.ts

@@ -1,5 +1,9 @@
 import * as Enums from '../enums';
-import { ContourConfig, ContourSegmentationData } from './ContourTypes';
+import {
+  ContourConfig,
+  ContourRenderingConfig,
+  ContourSegmentationData,
+} from './ContourTypes';
 import type {
   LabelmapConfig,
   LabelmapRenderingConfig,
@@ -18,11 +22,8 @@ export type Color = [number, number, number, number];
 export type ColorLUT = Array<Color>;
 
 export type SegmentSpecificRepresentationConfig = {
-  [key: number]: RepresentationConfig;
+  [key: number | string]: RepresentationConfig;
 };
-/**
- * Segmentation Config
- */
 
 export type RepresentationConfig = {
   /** labelmap configuration */
@@ -126,13 +127,14 @@ export type ToolGroupSpecificLabelmapRepresentation =
 
 export type ToolGroupSpecificContourRepresentation =
   ToolGroupSpecificRepresentationState & {
-    config: LabelmapRenderingConfig;
+    config: ContourRenderingConfig;
     segmentationRepresentationSpecificConfig?: RepresentationConfig;
     segmentSpecificConfig?: SegmentSpecificRepresentationConfig;
   };
 
 export type ToolGroupSpecificRepresentation =
-  ToolGroupSpecificLabelmapRepresentation; // | other ones
+  | ToolGroupSpecificLabelmapRepresentation
+  | ToolGroupSpecificContourRepresentation;
 
 export type ToolGroupSpecificRepresentations =
   Array<ToolGroupSpecificRepresentation>;
@@ -194,11 +196,23 @@ export type ToolGroupSpecificRepresentations =
  *           colorLUTIndex: 0,
  *           visibility: true,
  *           segmentsHidden: Set(),
- *           // LabelmapRenderingConfig
+ *           // rendering config
  *           config: {
  *             "cfun",
  *             "ofun",
  *           },
+ *           // segmentation representation specific config, has priority over the one in the outer scope
+ *           segmentationRepresentationSpecificConfig: {
+ *             LABELMAP: {
+ *               renderFill: true,
+ *             }
+ *           }
+ *           // segment specific config
+ *           segmentSpecificConfig: {
+ *             1: {
+ *              renderFill: false,
+ *              }
+ *           },
  *         },
  *       ],
  *       config: {

package/src/types/index.ts

@@ -36,6 +36,7 @@ import type {
   SegmentationRepresentationData,
   Segmentation,
   ToolGroupSpecificRepresentationState,
+  ToolGroupSpecificContourRepresentation,
   ToolGroupSpecificLabelmapRepresentation,
   ToolGroupSpecificRepresentation,
   SegmentationState,
@@ -91,6 +92,7 @@ export type {
   SegmentationRepresentationConfig,
   RepresentationConfig,
   ToolGroupSpecificRepresentationState,
+  ToolGroupSpecificContourRepresentation,
   ToolGroupSpecificLabelmapRepresentation,
   ToolGroupSpecificRepresentation,
   RepresentationPublicInput,

package/src/utilities/cine/playClip.ts

@@ -5,6 +5,7 @@ import {
   StackViewport,
   VolumeViewport,
   cache,
+  BaseVolumeViewport,
 } from '@cornerstonejs/core';
 
 import { Types } from '@cornerstonejs/core';
@@ -301,7 +302,7 @@ function _getVolumeFromViewport(viewport): Types.IImageVolume {
   const actorEntry = viewport.getDefaultActor();
 
   if (!actorEntry) {
-    console.warn('No actor found');
+    // This can happen during setup/teardown of viewports.
     return;
   }
 

package/src/utilities/planar/filterAnnotationsWithinSlice.ts

@@ -1,7 +1,8 @@
 import { vec3 } from 'gl-matrix';
-import { CONSTANTS } from '@cornerstonejs/core';
+import { CONSTANTS, metaData } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
 import { Annotations, Annotation } from '../../types';
+import { debug } from 'console';
 
 const { EPSILON } = CONSTANTS;
 
@@ -33,8 +34,33 @@ export default function filterAnnotationsWithinSlice(
   // logic down below.
   const annotationsWithParallelNormals = annotations.filter(
     (td: Annotation) => {
-      const annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
-
+      let annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
+
+      if (!annotationViewPlaneNormal) {
+        // This code is run to set the annotation view plane normal
+        // for historical data which was saved without the normal.
+        const { referencedImageId } = td.metadata;
+        const { imageOrientationPatient } = metaData.get(
+          'imagePlaneModule',
+          referencedImageId
+        );
+        const rowCosineVec = vec3.fromValues(
+          imageOrientationPatient[0],
+          imageOrientationPatient[1],
+          imageOrientationPatient[2]
+        );
+
+        const colCosineVec = vec3.fromValues(
+          imageOrientationPatient[3],
+          imageOrientationPatient[4],
+          imageOrientationPatient[5]
+        );
+
+        annotationViewPlaneNormal = vec3.create() as Types.Point3;
+
+        vec3.cross(annotationViewPlaneNormal, rowCosineVec, colCosineVec);
+        td.metadata.viewPlaneNormal = annotationViewPlaneNormal;
+      }
       const isParallel =
         Math.abs(vec3.dot(viewPlaneNormal, annotationViewPlaneNormal)) >
         PARALLEL_THRESHOLD;

package/dist/cjs/tools/displayTools/Contour/addContourToElement.d.ts

@@ -1,4 +0,0 @@
-import { Types } from '@cornerstonejs/core';
-declare function addContourToElement(element: HTMLDivElement, contour: Types.IContour, actorUID: string): void;
-declare function addContourSetToElement(element: HTMLDivElement, contourSet: Types.IContourSet, actorUID: string): void;
-export { addContourToElement, addContourSetToElement };

package/dist/cjs/tools/displayTools/Contour/addContourToElement.js

@@ -1,87 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addContourSetToElement = exports.addContourToElement = void 0;
-const core_1 = require("@cornerstonejs/core");
-const PolyData_1 = __importDefault(require("@kitware/vtk.js/Common/DataModel/PolyData"));
-const CellArray_1 = __importDefault(require("@kitware/vtk.js/Common/Core/CellArray"));
-const Points_1 = __importDefault(require("@kitware/vtk.js/Common/Core/Points"));
-const Mapper_1 = __importDefault(require("@kitware/vtk.js/Rendering/Core/Mapper"));
-const Actor_1 = __importDefault(require("@kitware/vtk.js/Rendering/Core/Actor"));
-function addContourToElement(element, contour, actorUID) {
-    const enabledElement = (0, core_1.getEnabledElement)(element);
-    const { renderingEngine, viewport } = enabledElement;
-    const { id: viewportId } = viewport;
-    const visibility = true;
-    const immediateRender = false;
-    const suppressEvents = true;
-    const pointList = contour.getPoints();
-    const flatPoints = contour.getFlatPointsArray();
-    const color = contour.getColor();
-    const type = contour.getType();
-    const p = pointList.map((_, i) => i);
-    if (type === core_1.Enums.ContourType.CLOSED_PLANAR) {
-        p.push(0);
-    }
-    const var1 = Float32Array.from(flatPoints);
-    const var2 = Uint32Array.from([p.length, ...p]);
-    const colorToUse = color.map((c) => c / 255);
-    const points = Points_1.default.newInstance();
-    points.setData(var1, 3);
-    const lines = CellArray_1.default.newInstance();
-    lines.setData(var2, 3);
-    const polygon = PolyData_1.default.newInstance();
-    polygon.setPoints(points);
-    polygon.setLines(lines);
-    const mapper1 = Mapper_1.default.newInstance();
-    mapper1.setInputData(polygon);
-    const actor1 = Actor_1.default.newInstance();
-    actor1.setMapper(mapper1);
-    actor1.getProperty().setLineWidth(4);
-    actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
-    viewport.addActor({ actor: actor1, uid: actorUID });
-}
-exports.addContourToElement = addContourToElement;
-function addContourSetToElement(element, contourSet, actorUID) {
-    const enabledElement = (0, core_1.getEnabledElement)(element);
-    const { renderingEngine, viewport } = enabledElement;
-    const { id: viewportId } = viewport;
-    const visibility = true;
-    const immediateRender = false;
-    const suppressEvents = true;
-    const actor1 = Actor_1.default.newInstance();
-    let color;
-    const pointArray = [];
-    const points = Points_1.default.newInstance();
-    const lines = CellArray_1.default.newInstance();
-    let pointIndex = 0;
-    contourSet.getContours().forEach((contour) => {
-        const pointList = contour.getPoints();
-        const flatPoints = contour.getFlatPointsArray();
-        color = contour.getColor();
-        const type = contour.getType();
-        const pointIndexes = pointList.map((_, i) => i + pointIndex);
-        if (type === core_1.Enums.ContourType.CLOSED_PLANAR) {
-            pointIndexes.push(pointIndexes[0]);
-        }
-        const linePoints = Float32Array.from(flatPoints);
-        pointArray.push(...linePoints);
-        lines.insertNextCell([...pointIndexes]);
-        pointIndex = pointIndex + pointList.length;
-    });
-    points.setData(pointArray, 3);
-    const polygon = PolyData_1.default.newInstance();
-    polygon.setPoints(points);
-    polygon.setLines(lines);
-    const mapper1 = Mapper_1.default.newInstance();
-    mapper1.setInputData(polygon);
-    actor1.setMapper(mapper1);
-    actor1.getProperty().setLineWidth(4);
-    const colorToUse = color.map((c) => c / 255);
-    actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
-    viewport.addActor({ actor: actor1, uid: actorUID });
-}
-exports.addContourSetToElement = addContourSetToElement;
-//# sourceMappingURL=addContourToElement.js.map

package/dist/cjs/tools/displayTools/Contour/addContourToElement.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"addContourToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourToElement.ts"],"names":[],"mappings":"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"}

package/dist/esm/tools/displayTools/Contour/addContourToElement.d.ts

@@ -1,4 +0,0 @@
-import { Types } from '@cornerstonejs/core';
-declare function addContourToElement(element: HTMLDivElement, contour: Types.IContour, actorUID: string): void;
-declare function addContourSetToElement(element: HTMLDivElement, contourSet: Types.IContourSet, actorUID: string): void;
-export { addContourToElement, addContourSetToElement };

package/dist/esm/tools/displayTools/Contour/addContourToElement.js

@@ -1,80 +0,0 @@
-import { getEnabledElement, Enums } from '@cornerstonejs/core';
-import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData';
-import vtkCellArray from '@kitware/vtk.js/Common/Core/CellArray';
-import vtkPoints from '@kitware/vtk.js/Common/Core/Points';
-import vtkMapper from '@kitware/vtk.js/Rendering/Core/Mapper';
-import vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
-function addContourToElement(element, contour, actorUID) {
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine, viewport } = enabledElement;
-    const { id: viewportId } = viewport;
-    const visibility = true;
-    const immediateRender = false;
-    const suppressEvents = true;
-    const pointList = contour.getPoints();
-    const flatPoints = contour.getFlatPointsArray();
-    const color = contour.getColor();
-    const type = contour.getType();
-    const p = pointList.map((_, i) => i);
-    if (type === Enums.ContourType.CLOSED_PLANAR) {
-        p.push(0);
-    }
-    const var1 = Float32Array.from(flatPoints);
-    const var2 = Uint32Array.from([p.length, ...p]);
-    const colorToUse = color.map((c) => c / 255);
-    const points = vtkPoints.newInstance();
-    points.setData(var1, 3);
-    const lines = vtkCellArray.newInstance();
-    lines.setData(var2, 3);
-    const polygon = vtkPolyData.newInstance();
-    polygon.setPoints(points);
-    polygon.setLines(lines);
-    const mapper1 = vtkMapper.newInstance();
-    mapper1.setInputData(polygon);
-    const actor1 = vtkActor.newInstance();
-    actor1.setMapper(mapper1);
-    actor1.getProperty().setLineWidth(4);
-    actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
-    viewport.addActor({ actor: actor1, uid: actorUID });
-}
-function addContourSetToElement(element, contourSet, actorUID) {
-    const enabledElement = getEnabledElement(element);
-    const { renderingEngine, viewport } = enabledElement;
-    const { id: viewportId } = viewport;
-    const visibility = true;
-    const immediateRender = false;
-    const suppressEvents = true;
-    const actor1 = vtkActor.newInstance();
-    let color;
-    const pointArray = [];
-    const points = vtkPoints.newInstance();
-    const lines = vtkCellArray.newInstance();
-    let pointIndex = 0;
-    contourSet.getContours().forEach((contour) => {
-        const pointList = contour.getPoints();
-        const flatPoints = contour.getFlatPointsArray();
-        color = contour.getColor();
-        const type = contour.getType();
-        const pointIndexes = pointList.map((_, i) => i + pointIndex);
-        if (type === Enums.ContourType.CLOSED_PLANAR) {
-            pointIndexes.push(pointIndexes[0]);
-        }
-        const linePoints = Float32Array.from(flatPoints);
-        pointArray.push(...linePoints);
-        lines.insertNextCell([...pointIndexes]);
-        pointIndex = pointIndex + pointList.length;
-    });
-    points.setData(pointArray, 3);
-    const polygon = vtkPolyData.newInstance();
-    polygon.setPoints(points);
-    polygon.setLines(lines);
-    const mapper1 = vtkMapper.newInstance();
-    mapper1.setInputData(polygon);
-    actor1.setMapper(mapper1);
-    actor1.getProperty().setLineWidth(4);
-    const colorToUse = color.map((c) => c / 255);
-    actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
-    viewport.addActor({ actor: actor1, uid: actorUID });
-}
-export { addContourToElement, addContourSetToElement };
-//# sourceMappingURL=addContourToElement.js.map

package/dist/esm/tools/displayTools/Contour/addContourToElement.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"addContourToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourToElement.ts"],"names":[],"mappings":"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"}

package/src/tools/displayTools/Contour/addContourToElement.ts

@@ -1,135 +0,0 @@
-import { getEnabledElement, Types, Enums } from '@cornerstonejs/core';
-import vtkPolyData from '@kitware/vtk.js/Common/DataModel/PolyData';
-import vtkCellArray from '@kitware/vtk.js/Common/Core/CellArray';
-import vtkPoints from '@kitware/vtk.js/Common/Core/Points';
-import vtkMapper from '@kitware/vtk.js/Rendering/Core/Mapper';
-import vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
-
-// Todo: this seems to have performance issues when there are many contours
-// Maybe we should not create one actor per contour, but rather one actor per
-// contourSet?
-function addContourToElement(
-  element: HTMLDivElement,
-  contour: Types.IContour,
-  actorUID: string
-): void {
-  const enabledElement = getEnabledElement(element);
-  const { renderingEngine, viewport } = enabledElement;
-  const { id: viewportId } = viewport;
-
-  // Default to true since we are setting a new segmentation, however,
-  // in the event listener, we will make other segmentations visible/invisible
-  // based on the config
-  const visibility = true;
-  const immediateRender = false;
-  const suppressEvents = true;
-
-  const pointList = contour.getPoints();
-  const flatPoints = contour.getFlatPointsArray();
-  const color = contour.getColor();
-  const type = contour.getType();
-
-  const p = pointList.map((_, i) => i);
-
-  if (type === Enums.ContourType.CLOSED_PLANAR) {
-    p.push(0);
-  }
-
-  const var1 = Float32Array.from(flatPoints);
-  const var2 = Uint32Array.from([p.length, ...p]);
-
-  const colorToUse = color.map((c) => c / 255);
-
-  const points = vtkPoints.newInstance();
-  points.setData(var1, 3);
-
-  const lines = vtkCellArray.newInstance();
-  // @ts-ignore
-  lines.setData(var2, 3);
-
-  const polygon = vtkPolyData.newInstance();
-  polygon.setPoints(points);
-  polygon.setLines(lines);
-
-  const mapper1 = vtkMapper.newInstance();
-  mapper1.setInputData(polygon);
-  const actor1 = vtkActor.newInstance();
-  actor1.setMapper(mapper1);
-  actor1.getProperty().setLineWidth(4);
-  actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
-
-  viewport.addActor({ actor: actor1, uid: actorUID });
-}
-
-function addContourSetToElement(
-  element: HTMLDivElement,
-  contourSet: Types.IContourSet,
-  actorUID: string
-): void {
-  const enabledElement = getEnabledElement(element);
-  const { renderingEngine, viewport } = enabledElement;
-  const { id: viewportId } = viewport;
-
-  // Default to true since we are setting a new segmentation, however,
-  // in the event listener, we will make other segmentations visible/invisible
-  // based on the config
-  const visibility = true;
-  const immediateRender = false;
-  const suppressEvents = true;
-
-  const actor1 = vtkActor.newInstance();
-  let color;
-
-  const pointArray = [];
-
-  const points = vtkPoints.newInstance();
-  const lines = vtkCellArray.newInstance();
-
-  // this variable will indicate the index of the first point in the current line
-  // so we can correctly generate the point index list to add in the cellArray
-  let pointIndex = 0;
-  contourSet.getContours().forEach((contour: Types.IContour) => {
-    const pointList = contour.getPoints();
-    const flatPoints = contour.getFlatPointsArray();
-    color = contour.getColor();
-    const type = contour.getType();
-
-    // creating a point index list that defines a line
-    const pointIndexes = pointList.map((_, i) => i + pointIndex);
-
-    // if close planar, add the first point index to the list
-    if (type === Enums.ContourType.CLOSED_PLANAR) {
-      pointIndexes.push(pointIndexes[0]);
-    }
-
-    const linePoints = Float32Array.from(flatPoints);
-    // add the curent points into the point list
-    pointArray.push(...linePoints);
-    // add the point indexes into the cell array
-    lines.insertNextCell([...pointIndexes]);
-    // update the first point index
-    pointIndex = pointIndex + pointList.length;
-  });
-
-  // converts the pointArray into vtkPoints
-  points.setData(pointArray, 3);
-
-  // creates the polydata
-  const polygon = vtkPolyData.newInstance();
-  polygon.setPoints(points);
-  polygon.setLines(lines);
-
-  const mapper1 = vtkMapper.newInstance();
-  mapper1.setInputData(polygon);
-  actor1.setMapper(mapper1);
-  actor1.getProperty().setLineWidth(4);
-
-  // despite each contour can have its own color, we assign the last color to
-  // all contours
-  const colorToUse = color.map((c) => c / 255);
-  actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
-
-  viewport.addActor({ actor: actor1, uid: actorUID });
-}
-
-export { addContourToElement, addContourSetToElement };