fix: pass through original point/cell ids in surface extraction (#130)

Author: banesullivan

Filters/Geometry/vtkGeometryFilter.cxx

@@ -2050,44 +2050,67 @@ struct ExtractDS : public ExtractCellBoundaries<TInputIdType>
 // Helper class to record original point and cell ids. This is for copying
 // cell data, and also to produce output arrays indicating where output
 // cells originated from (typically used in picking).
+//
+// Width-relaxed storage: use vtkTypeInt32Array when the id count fits in
+// int32 (count <= 0x7FFFFFFF), otherwise vtkIdTypeArray.  This must match
+// the type produced by PassPointIds / PassCellIds so that vtkAppendPolyData
+// (used by PyVista's MultiBlock extract_surface) sees a consistent type
+// across all blocks and does not drop the array via IsSimilar().
 struct IdRecorder
 {
-  vtkSmartPointer<vtkIdTypeArray> Ids;
+  vtkSmartPointer<vtkDataArray> Ids;
 
   IdRecorder(
-    vtkTypeBool passThru, const char* name, vtkDataSetAttributes* attrD, vtkIdType allocSize)
+    vtkTypeBool passThru, const char* name, vtkDataSetAttributes* attrD, vtkIdType count)
   {
     if (passThru)
     {
-      this->Ids.TakeReference(vtkIdTypeArray::New());
-      this->Ids->SetName(name);
-      this->Ids->SetNumberOfComponents(1);
-      this->Ids->Allocate(allocSize);
+      if (count <= static_cast<vtkIdType>(0x7FFFFFFF))
+      {
+        auto* a = vtkTypeInt32Array::New();
+        a->SetName(name);
+        a->SetNumberOfComponents(1);
+        this->Ids.TakeReference(a);
+      }
+      else
+      {
+        auto* a = vtkIdTypeArray::New();
+        a->SetName(name);
+        a->SetNumberOfComponents(1);
+        this->Ids.TakeReference(a);
+      }
       attrD->AddArray(this->Ids.Get());
     }
   }
-  IdRecorder(vtkTypeBool passThru, const char* name, vtkDataSetAttributes* attrD)
+  void Insert(vtkIdType destId, vtkIdType origId)
   {
-    if (passThru)
-    {
-      this->Ids.TakeReference(vtkIdTypeArray::New());
-      this->Ids->SetName(name);
-      this->Ids->SetNumberOfComponents(1);
-      attrD->AddArray(this->Ids.Get());
-    }
-    else
+    if (this->Ids.Get() != nullptr)
     {
-      this->Ids = nullptr;
+      this->Ids->InsertTuple1(destId, static_cast<double>(origId));
     }
   }
-  void Insert(vtkIdType destId, vtkIdType origId)
+  // Fill [0, count) with identity values using a parallel SMP loop.
+  void FillIdentity(vtkIdType count)
   {
-    if (this->Ids.Get() != nullptr)
+    if (!this->Ids.Get())
+      return;
+    if (auto* a = vtkTypeInt32Array::SafeDownCast(this->Ids.Get()))
     {
-      this->Ids->InsertValue(destId, origId);
+      auto* ptr = a->GetPointer(0);
+      vtkSMPTools::For(0, count, [ptr](vtkIdType b, vtkIdType e) {
+        for (; b < e; ++b)
+          ptr[b] = static_cast<vtkTypeInt32>(b);
+      });
+    }
+    else if (auto* a = vtkIdTypeArray::SafeDownCast(this->Ids.Get()))
+    {
+      auto* ptr = a->GetPointer(0);
+      vtkSMPTools::For(0, count, [ptr](vtkIdType b, vtkIdType e) {
+        for (; b < e; ++b)
+          ptr[b] = b;
+      });
     }
   }
-  vtkIdType* GetPointer() { return this->Ids->GetPointer(0); }
   vtkTypeBool PassThru() { return this->Ids.Get() != nullptr; }
   void Allocate(vtkIdType num)
   {
@@ -2100,7 +2123,7 @@ struct IdRecorder
   {
     if (this->Ids.Get() != nullptr)
     {
-      this->Ids->SetNumberOfValues(num);
+      this->Ids->SetNumberOfTuples(num);
     }
   }
 }; // id recorder
@@ -2608,23 +2631,17 @@ int ExecutePolyData(vtkGeometryFilter* self, vtkDataSet* dataSetInput, vtkPolyDa
   }
 
   IdRecorder origCellIds(
-    self->GetPassThroughCellIds(), self->GetOriginalCellIdsName(), output->GetCellData());
+    self->GetPassThroughCellIds(), self->GetOriginalCellIdsName(), output->GetCellData(),
+    numCells);
   IdRecorder origPointIds(
-    self->GetPassThroughPointIds(), self->GetOriginalPointIdsName(), output->GetPointData());
+    self->GetPassThroughPointIds(), self->GetOriginalPointIdsName(), output->GetPointData(),
+    numPts);
 
   // vtkPolyData points are not culled
   if (origPointIds.PassThru())
   {
     origPointIds.SetNumberOfValues(numPts);
-    vtkIdType* origPointIdsPtr = origPointIds.GetPointer();
-    vtkSMPTools::For(0, numPts,
-      [&origPointIdsPtr](vtkIdType pId, vtkIdType endPId)
-      {
-        for (; pId < endPId; ++pId)
-        {
-          origPointIdsPtr[pId] = pId;
-        }
-      });
+    origPointIds.FillIdentity(numPts);
   }
 
   // Special case when data is just passed through
@@ -2637,15 +2654,7 @@ int ExecutePolyData(vtkGeometryFilter* self, vtkDataSet* dataSetInput, vtkPolyDa
     if (origCellIds.PassThru())
     {
       origCellIds.SetNumberOfValues(numCells);
-      vtkIdType* origCellIdsPtr = origCellIds.GetPointer();
-      vtkSMPTools::For(0, numCells,
-        [&origCellIdsPtr](vtkIdType cId, vtkIdType endCId)
-        {
-          for (; cId < endCId; ++cId)
-          {
-            origCellIdsPtr[cId] = cId;
-          }
-        });
+      origCellIds.FillIdentity(numCells);
     }
 
     return 1;

tests/pyvista/deselect.txt

@@ -20,8 +20,6 @@
 # These FAIL on fvtk but PASS on stock 9.6.2 on the same machine. Tracking
 # issues filed on pyvista/fvtk; fix each, then delete its line here.
 tests/core/test_pointset.py::test_delaunay_3d                                   # vtkDelaunay3D degenerate/under-populated output (#114)
-tests/core/test_dataobject_filters.py::test_extract_surface_datasets[True-geometry]  # vtkOriginalPointIds not passed through (#115)
-tests/core/test_dataobject_filters.py::test_extract_surface_datasets[True-None]      # vtkOriginalPointIds not passed through (#115)
 tests/core/test_dataobject.py::test_save_compression                            # XML writer compression weaker than stock (#117)
 tests/core/test_helpers.py::test_to_from_trimesh_points_faces                   # regular_faces not zero-copy (#118)
 tests/plotting/test_texture.py::test_skybox_example                            # vtkSkybox not overridden to vtkOpenGLSkybox (#120)