datatype of vtkPoints changed to double + tests revised

Author: zippy84

Contact.cxx

@@ -125,8 +125,7 @@ Contact::Contact (vtkPolyData *newPdA, vtkPolyData *newPdB) : newPdA(newPdA), ne
     assert(newPdA->GetCellData()->GetScalars("OrigCellIds") != nullptr);
     assert(newPdB->GetCellData()->GetScalars("OrigCellIds") != nullptr);
 
-    pts = vtkSmartPointer<vtkPoints>::New();
-    pts->SetDataTypeToDouble();
+    pts = vtkSmartPointer<vtkPoints>::New(VTK_DOUBLE);
 
     lines = vtkSmartPointer<vtkPolyData>::New();
     lines->SetPoints(pts);

Merger.cxx

@@ -172,7 +172,7 @@ void Merger::MergeGroup (const GroupType &group, PolysType &merged) {
         return;
     }
 
-    auto pts = vtkSmartPointer<vtkPoints>::New();
+    auto pts = vtkSmartPointer<vtkPoints>::New(VTK_DOUBLE);
 
     IndexedPolysType indexedPolys;
 
@@ -493,7 +493,7 @@ void Merger::MergeGroup (const GroupType &group, PolysType &merged) {
                             pts->GetPoint(conn.i, ptA);
                             pts->GetPoint(conn.j, ptB);
 
-                            auto intersPts = vtkSmartPointer<vtkPoints>::New();
+                            auto intersPts = vtkSmartPointer<vtkPoints>::New(VTK_DOUBLE);
 
                             auto c = bspTreeB->IntersectWithLine(ptA, ptB, 1e-5, intersPts, nullptr);
 

Optimize.cxx

@@ -84,7 +84,8 @@ void PreventEqualCaptPoints::Find (vtkPolyData *pd, vtkPolyData *other, [[maybe_
     tree->SetDataSet(other);
     tree->BuildLocator();
 
-    auto pts = vtkSmartPointer<vtkPoints>::New();
+    auto pts = vtkSmartPointer<vtkPoints>::New(VTK_DOUBLE);
+
     auto cells = vtkSmartPointer<vtkIdList>::New();
 
     double pA[3], pB[3];
@@ -97,7 +98,7 @@ void PreventEqualCaptPoints::Find (vtkPolyData *pd, vtkPolyData *other, [[maybe_
     auto pdVerts = vtkSmartPointer<vtkPolyData>::New();
     pdVerts->Allocate(1);
 
-    auto ptsVerts = vtkSmartPointer<vtkPoints>::New();
+    auto ptsVerts = vtkSmartPointer<vtkPoints>::New(VTK_DOUBLE);
 #endif
 
     std::map<vtkIdType, std::vector<SnapPoint>> pointSnaps;
@@ -291,7 +292,7 @@ void PreventEqualCaptPoints::Find (vtkPolyData *pd, vtkPolyData *other, [[maybe_
             const auto &snapA = snaps[0];
             const auto &snapB = snaps[1];
 
-            if (Point3d::GetDist(snapA.inter, snapB.inter) > 1e-10) {
+            {
                 Pair edge(snapA.edge);
 
                 if (edge.f > edge.g) {

README.md

@@ -229,11 +229,11 @@ from vtkbool.vtkbool import vtkPolyDataBooleanFilter
 
 - *Contact failed with ...*
 
-  At least one cell has a bad shape. For a cell with more than three points: not all points lie on the plane defined by the calculated surface normal.
+  tbd
 
 - *Cannot prevent equal capture points.*
 
-  ???
+  tbd
 
 - *There is no contact.*
 
@@ -245,10 +245,7 @@ from vtkbool.vtkbool import vtkPolyDataBooleanFilter
 
 - *Strips are invalid.*
 
-  There are two reasons for that kind of error:
-
-  1. at least two intersection lines intersect each other - the input, one of them, contains an assembly
-  2. there are different intersection points with the same capturing point - normally a capturing point will be used by only one point of the intersection lines
+  tbd
 
 - *CutCells failed.*
 

Utilities.cxx

@@ -197,7 +197,7 @@ bool PointInPoly (const Poly &poly, const Point3d &p) {
 
 #ifdef DEBUG
 void WritePolys (const char *name, const PolysType &polys) {
-    auto pts = vtkSmartPointer<vtkPoints>::New();
+    auto pts = vtkSmartPointer<vtkPoints>::New(VTK_DOUBLE);
 
     auto pd = vtkSmartPointer<vtkPolyData>::New();
     pd->SetPoints(pts);
@@ -328,8 +328,7 @@ void ProjOnLine (vtkPolyData *pd, const Pair &line, const Point3d &p, std::share
 }
 
 vtkSmartPointer<vtkPolyData> CreatePolyData (const PolysType &polys) {
-    auto pts = vtkSmartPointer<vtkPoints>::New();
-    pts->SetDataTypeToDouble();
+    auto pts = vtkSmartPointer<vtkPoints>::New(VTK_DOUBLE);
 
     auto pd = vtkSmartPointer<vtkPolyData>::New();
     pd->SetPoints(pts);

testing/data/complex.vtk

@@ -0,0 +1,29 @@
+# vtk DataFile Version 5.1
+vtk output
+ASCII
+DATASET POLYDATA
+POINTS 24 double
+-0.4 0 0.5 -0.4 0 -0.5 0 -0.4 0.5 
+0 -0.4 -0.5 0.4 0 0.5 0.4 0 -0.5 
+0 0.4 0.5 0 0.4 -0.5 -0.25 0 0.5 
+-0.25 0 -0.5 -0.15 -0.1 0.5 -0.15 -0.1 -0.5 
+-0.05 0 0.5 -0.05 0 -0.5 -0.15 0.1 0.5 
+-0.15 0.1 -0.5 0.05 0 0.5 0.05 0 -0.5 
+0.15 -0.1 0.5 0.15 -0.1 -0.5 0.25 0 0.5 
+0.25 0 -0.5 0.15 0.1 0.5 0.15 0.1 -0.5 
+
+POLYGONS 17 84
+OFFSETS vtktypeint64
+0 9 18 27 36 40 44 48 52 
+56 60 64 68 72 76 80 84 
+CONNECTIVITY vtktypeint64
+0 2 4 20 18 16 12 10 8 
+4 6 0 8 14 12 16 22 20 
+5 3 1 9 11 13 17 19 21 
+1 7 5 21 23 17 13 15 9 
+0 1 3 2 2 3 5 4 4 
+5 7 6 6 7 1 0 8 10 
+11 9 10 12 13 11 12 14 15 
+13 14 8 9 15 16 18 19 17 
+18 20 21 19 20 22 23 21 22 
+16 17 23 

testing/data/merger.vtk

@@ -45,7 +45,8 @@ def extrude(pts, h, z=0):
     _pts = vtkPoints()
     _pts.SetDataTypeToDouble()
 
-    [ (_pts.InsertNextPoint(pt[0], pt[1], z), cell.InsertNextId(i)) for i, pt in enumerate(pts) ]
+    for pt in pts:
+        cell.InsertNextId(_pts.InsertNextPoint(pt[0], pt[1], z))
 
     pd = vtkPolyData()
     pd.Allocate(1)
@@ -402,7 +403,7 @@ def export(self, name):
     os.makedirs('einzeln', exist_ok=True)
     os.makedirs('stl', exist_ok=True)
 
-    cell_counts = [524, 98, 576, 264, 1274, 1866, 582, 98, 472, 194, 1048, 272, 56, 284, 284]
+    cell_counts = [524, 98, 576, 264, 1274, 1867, 582, 98, 472, 194, 1048, 272, 56, 284, 284]
 
     for i, cfg in enumerate(cfgs):
         print(f'~~ {i} ~~')