refactor(filters): factorize requestData() check for deletion

finetjul · finetjul · commit aa3138f0c8a4 · 2025-08-29T16:35:28.000Z
Check for deletion is now performed before calling requestData().
diff --git a/Sources/Filters/Sources/ArrowSource/index.js b/Sources/Filters/Sources/ArrowSource/index.js
@@ -12,11 +12,7 @@ function vtkArrowSource(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkArrowSource');
 
-  function requestData(inData, outData) {
-    if (model.deleted) {
-      return;
-    }
-
+  publicAPI.requestData = (inData, outData) => {
     const cylinder = vtkCylinderSource.newInstance({ capping: true });
     cylinder.setResolution(model.shaftResolution);
     cylinder.setRadius(model.shaftRadius);
@@ -80,10 +76,7 @@ function vtkArrowSource(publicAPI, model) {
       // Update output
       outData[0] = append.getOutputData();
     }
-  }
-
-  // Expose methods
-  publicAPI.requestData = requestData;
+  };
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Sources/Filters/Sources/CircleSource/index.js b/Sources/Filters/Sources/CircleSource/index.js
@@ -11,11 +11,7 @@ function vtkCircleSource(publicAPI, model) {
   // Set our classname
   model.classHierarchy.push('vtkCircleSource');
 
-  function requestData(inData, outData) {
-    if (model.deleted) {
-      return;
-    }
-
+  publicAPI.requestData = (inData, outData) => {
     const dataset = outData[0] || vtkPolyData.newInstance();
 
     // Points
@@ -57,10 +53,7 @@ function vtkCircleSource(publicAPI, model) {
 
     // Update output
     outData[0] = dataset;
-  }
-
-  // Expose methods
-  publicAPI.requestData = requestData;
+  };
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Sources/Filters/Sources/ConcentricCylinderSource/index.js b/Sources/Filters/Sources/ConcentricCylinderSource/index.js
@@ -72,8 +72,9 @@ function vtkConcentricCylinderSource(publicAPI, model) {
   publicAPI.getMaskLayer = (index) =>
     index === undefined ? model.mask : model.mask[index];
 
-  function requestData(inData, outData) {
-    if (model.deleted || !model.radius.length) {
+  publicAPI.requestData = (inData, outData) => {
+    if (!model.radius.length) {
+      macro.vtkErrorMacro('No radius defined');
       return;
     }
 
@@ -391,10 +392,7 @@ function vtkConcentricCylinderSource(publicAPI, model) {
 
     // Update output
     outData[0] = dataset;
-  }
-
-  // Expose methods
-  publicAPI.requestData = requestData;
+  };
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Sources/Filters/Sources/ConeSource/index.js b/Sources/Filters/Sources/ConeSource/index.js
@@ -10,11 +10,7 @@ function vtkConeSource(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkConeSource');
 
-  function requestData(inData, outData) {
-    if (model.deleted) {
-      return;
-    }
-
+  publicAPI.requestData = (inData, outData) => {
     const angle = (2 * Math.PI) / model.resolution;
     const xbot = -model.height / 2.0;
     const numberOfPoints = model.resolution + 1;
@@ -72,10 +68,7 @@ function vtkConeSource(publicAPI, model) {
 
     // Update output
     outData[0] = dataset;
-  }
-
-  // Expose methods
-  publicAPI.requestData = requestData;
+  };
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Sources/Filters/Sources/CubeSource/index.js b/Sources/Filters/Sources/CubeSource/index.js
@@ -38,11 +38,7 @@ function vtkCubeSource(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkCubeSource');
 
-  function requestData(inData, outData) {
-    if (model.deleted) {
-      return;
-    }
-
+  publicAPI.requestData = (inData, outData) => {
     const polyData = outData[0] || vtkPolyData.newInstance();
     outData[0] = polyData;
 
@@ -249,7 +245,7 @@ function vtkCubeSource(publicAPI, model) {
       polyData.getLines().initialize();
     }
     polyData.modified();
-  }
+  };
 
   publicAPI.setBounds = (...bounds) => {
     let boundsArray = [];
@@ -275,9 +271,6 @@ function vtkCubeSource(publicAPI, model) {
       (boundsArray[4] + boundsArray[5]) / 2.0,
     ]);
   };
-
-  // Expose methods
-  publicAPI.requestData = requestData;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Sources/Filters/Sources/Cursor3D/index.js b/Sources/Filters/Sources/Cursor3D/index.js
@@ -94,9 +94,6 @@ function vtkCursor3D(publicAPI, model) {
   };
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
     let numPts = 0;
     let numLines = 0;
     // Check bounding box and origin
diff --git a/Sources/Filters/Sources/CylinderSource/index.js b/Sources/Filters/Sources/CylinderSource/index.js
@@ -11,11 +11,7 @@ function vtkCylinderSource(publicAPI, model) {
   // Set our classname
   model.classHierarchy.push('vtkCylinderSource');
 
-  function requestData(inData, outData) {
-    if (model.deleted) {
-      return;
-    }
-
+  publicAPI.requestData = (inData, outData) => {
     const angle = (2.0 * Math.PI) / model.resolution;
     let numberOfPoints = 2 * model.resolution;
     let numberOfPolys = 5 * model.resolution;
@@ -166,10 +162,7 @@ function vtkCylinderSource(publicAPI, model) {
 
     // Update output
     outData[0] = dataset;
-  }
-
-  // Expose methods
-  publicAPI.requestData = requestData;
+  };
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Sources/Filters/Sources/DiskSource/index.js b/Sources/Filters/Sources/DiskSource/index.js
@@ -25,12 +25,6 @@ function vtkDiskSource(publicAPI, model) {
       pointType,
     } = model;
 
-    if (model.deleted) {
-      return;
-    }
-
-    let dataset = outData[0];
-
     // Points
     const points = vtkPoints.newInstance({
       dataType: pointType,
@@ -114,7 +108,7 @@ function vtkDiskSource(publicAPI, model) {
     }
     polys.setData(cellData, cellCount, 1);
 
-    dataset = vtkPolyData.newInstance();
+    const dataset = outData[0] || vtkPolyData.newInstance();
     dataset.setPoints(points);
     dataset.setPolys(polys);
 
diff --git a/Sources/Filters/Sources/ImageGridSource/index.js b/Sources/Filters/Sources/ImageGridSource/index.js
@@ -11,10 +11,6 @@ function vtkImageGridSource(publicAPI, model) {
   model.classHierarchy.push('vtkImageGridSource');
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const state = {};
     const dataset = {
       type: 'vtkImageData',
diff --git a/Sources/Filters/Sources/LineSource/index.js b/Sources/Filters/Sources/LineSource/index.js
@@ -13,10 +13,6 @@ function vtkLineSource(publicAPI, model) {
   model.classHierarchy.push('vtkLineSource');
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const dataset = outData[0];
 
     // Check input
diff --git a/Sources/Filters/Sources/PlaneSource/index.js b/Sources/Filters/Sources/PlaneSource/index.js
@@ -19,10 +19,6 @@ function vtkPlaneSource(publicAPI, model) {
   model.classHierarchy.push('vtkPlaneSource');
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const dataset = outData[0];
 
     // Check input
diff --git a/Sources/Filters/Sources/PointSource/index.js b/Sources/Filters/Sources/PointSource/index.js
@@ -11,10 +11,6 @@ function vtkPointSource(publicAPI, model) {
   model.classHierarchy.push('vtkPointSource');
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const dataset = outData[0];
 
     // Check input
diff --git a/Sources/Filters/Sources/RTAnalyticSource/index.js b/Sources/Filters/Sources/RTAnalyticSource/index.js
@@ -9,10 +9,6 @@ function vtkRTAnalyticSource(publicAPI, model) {
   model.classHierarchy.push('vtkRTAnalyticSource');
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const state = {};
     const dataset = {
       type: 'vtkImageData',
diff --git a/Sources/Filters/Sources/SLICSource/index.js b/Sources/Filters/Sources/SLICSource/index.js
@@ -95,10 +95,6 @@ function vtkSLICSource(publicAPI, model) {
   publicAPI.getNumberOfClusters = () => model.clusters.length;
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const dataSize =
       model.dimensions[0] * model.dimensions[1] * model.dimensions[2];
 
diff --git a/Sources/Filters/Sources/SphereSource/index.js b/Sources/Filters/Sources/SphereSource/index.js
@@ -11,10 +11,6 @@ function vtkSphereSource(publicAPI, model) {
   model.classHierarchy.push('vtkSphereSource');
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     let dataset = outData[0];
     const pointDataType = dataset
       ? dataset.getPoints().getDataType()
diff --git a/Sources/Filters/Texture/TextureMapToPlane/index.js b/Sources/Filters/Texture/TextureMapToPlane/index.js
@@ -98,9 +98,6 @@ function vtkTextureMapToPlane(publicAPI, model) {
   }
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
     const input = inData[0];
     const nbPoints = input.getPoints().getNumberOfPoints();
     if (nbPoints < 3 && model.automaticPlaneGeneration) {
diff --git a/Sources/Filters/Texture/TextureMapToSphere/index.js b/Sources/Filters/Texture/TextureMapToSphere/index.js
@@ -14,9 +14,6 @@ function vtkTextureMapToSphere(publicAPI, model) {
   model.classHierarchy.push('vtkTextureMapToSphere');
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
     const input = inData[0];
 
     const nbPoints = input.getPoints().getNumberOfPoints();
diff --git a/Sources/Testing/testAlgorithm.js b/Sources/Testing/testAlgorithm.js
@@ -33,6 +33,7 @@ publicAPI.requestData = (inData, outData) => {
 };
 
 test('Macro methods algo tests', (t) => {
+  macro.obj(publicAPI, model);
   macro.algo(publicAPI, model, numInputs, numOutputs);
 
   // Override shouldUpdate to prevent the need of getMTime()
diff --git a/Sources/Widgets/Representations/RectangleContextRepresentation/index.js b/Sources/Widgets/Representations/RectangleContextRepresentation/index.js
@@ -39,10 +39,6 @@ function vtkRectangleContextRepresentation(publicAPI, model) {
   // --------------------------------------------------------------------------
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const list = publicAPI.getRepresentationStates(inData[0]);
     // FIXME: support list > 1.
     const state = list[0];
diff --git a/Sources/Widgets/Representations/SplineContextRepresentation/index.js b/Sources/Widgets/Representations/SplineContextRepresentation/index.js
@@ -58,10 +58,6 @@ function vtkSplineContextRepresentation(publicAPI, model) {
     );
 
   publicAPI.requestData = (inData, outData) => {
-    if (model.deleted) {
-      return;
-    }
-
     const widgetState = inData[0];
     const closed = widgetState.getSplineClosed();
 
diff --git a/Sources/macros.js b/Sources/macros.js
@@ -916,7 +916,11 @@ export function algo(publicAPI, model, numberOfInputs, numberOfOutputs) {
         count++;
       }
     }
-    if (publicAPI.requestData && publicAPI.shouldUpdate()) {
+    if (
+      publicAPI.requestData &&
+      !publicAPI.isDeleted() &&
+      publicAPI.shouldUpdate()
+    ) {
       publicAPI.requestData(ins, model.output);
     }
   };
