Merge pull request #2532 from DavidBerger98/vtkClipClosedSurface

Add vtkClipClosedSurface

Author: finetjul

Sources/Common/Core/CellArray/index.d.ts

@@ -1,13 +1,12 @@
 import { TypedArray } from "../../../types";
-import vtkDataArray from "../../Core/DataArray";
+import vtkDataArray, { IDataArrayInitialValues } from "../../Core/DataArray";
 
 
 /**
- *
+ * The inital values of a vtkCellArray.
  */
-export interface ICellArrayInitialValues {
+export interface ICellArrayInitialValues extends IDataArrayInitialValues {
 	empty?: boolean;
-	numberOfComponents?: number;
 }
 
 export interface vtkCellArray extends vtkDataArray {
@@ -19,22 +18,35 @@ export interface vtkCellArray extends vtkDataArray {
 	getNumberOfCells(recompute?: boolean): number;
 
 	/**
-	 *
+	 * Get the sizes of the cells in this array.
 	 * @param {Boolean} [recompute] Recompute the cell sizes.
 	 */
 	getCellSizes(recompute?: boolean): any;
 
 	/**
-	 *
-	 * @param {TypedArray} typedArray The typedArray value.
+	 * Set the data of this array.
+	 * @param {TypedArray} typedArray The Array value.
 	 */
 	setData(typedArray: TypedArray): void;
 
 	/**
-	 * Returns the point indexes at the given location as a subarray.
+	 * Returns the point indices at the given location as a subarray.
 	 * @param loc
 	 */
 	getCell(loc: any): void;
+
+	/**
+	 * Reset the cell array by setting the number of cells to 0.
+	 * NOTE: This won't touch the actual memory of the underlying typedArray.
+	 */
+	initialize(): void;
+
+	/**
+	 * Insert a cell to this array in the next available slot.
+	 * @param {Number[]} cellPointIds The list of point ids (NOT prefixed with the number of points)
+	 * @returns {Number} Idx of where the cell was inserted
+	 */
+	insertNextCell(cellPointIds: number[]): number;
 }
 
 /**

Sources/Common/Core/CellArray/index.js

@@ -51,7 +51,7 @@ function vtkCellArray(publicAPI, model) {
     if (model.cellSizes) {
       model.numberOfCells = model.cellSizes.length;
     } else {
-      model.numberOfCells = getNumberOfCells(model.values);
+      model.numberOfCells = getNumberOfCells(publicAPI.getData());
     }
     return model.numberOfCells;
   };
@@ -61,7 +61,7 @@ function vtkCellArray(publicAPI, model) {
       return model.cellSizes;
     }
 
-    model.cellSizes = extractCellSizes(model.values);
+    model.cellSizes = extractCellSizes(publicAPI.getData());
     return model.cellSizes;
   };
 
@@ -72,14 +72,30 @@ function vtkCellArray(publicAPI, model) {
     model.cellSizes = undefined;
   };
 
-  /**
-   * Returns the point indexes at the given location as a subarray.
-   */
   publicAPI.getCell = (loc) => {
     let cellLoc = loc;
     const numberOfPoints = model.values[cellLoc++];
     return model.values.subarray(cellLoc, cellLoc + numberOfPoints);
   };
+
+  const superInitialize = publicAPI.initialize;
+  publicAPI.initialize = () => {
+    superInitialize();
+    // Set to undefined to ensure insertNextCell works correctly
+    model.numberOfCells = undefined;
+    model.cellSizes = undefined;
+  };
+
+  publicAPI.insertNextCell = (cellPointIds) => {
+    const cellId = publicAPI.getNumberOfCells();
+    publicAPI.insertNextTuples([cellPointIds.length, ...cellPointIds]);
+    // By computing the number of cells earlier, we made sure that numberOfCells is defined
+    ++model.numberOfCells;
+    if (model.cellSizes != null) {
+      model.cellSizes.push(cellPointIds.length);
+    }
+    return cellId;
+  };
 }
 
 // ----------------------------------------------------------------------------

Sources/Common/Core/CellArray/test/testCellArray.js

@@ -34,3 +34,34 @@ test('Test cell array constructor', (t) => {
 
   t.end();
 });
+
+test('Test vtkCellArray insertNextCell', (t) => {
+  const cellArray = vtkCellArray.newInstance({
+    dataType: 'Uint16Array',
+    empty: true,
+    numberOfComponents: 1,
+  });
+  cellArray.insertNextCell([0, 1, 2]);
+  t.equal(
+    cellArray.getNumberOfCells(),
+    1,
+    'number of cells after first insertNextCell'
+  );
+  t.deepEqual(
+    cellArray.getData(),
+    Uint16Array.from([3, 0, 1, 2]),
+    'getData after first insertNextCell'
+  );
+  cellArray.insertNextCell([3, 4, 5, 6]);
+  t.equal(
+    cellArray.getNumberOfCells(),
+    2,
+    'number of cells after second insertNextCell'
+  );
+  t.deepEqual(
+    cellArray.getData(),
+    Uint16Array.from([3, 0, 1, 2, 4, 3, 4, 5, 6]),
+    'getData after second insertNextCell'
+  );
+  t.end();
+});