fallback of merger extended 2

zippy84 · Aug 20, 2023 · c5870fb · c5870fb
1 parent ad078e6
commit c5870fb
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 12,059 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,12 +107,6 @@ else()
 
  set_property(TEST "import_vtkbool" APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/${python_default_destination}/vtkbool")
 
- add_test(NAME "generate_frieze"
- COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/generate_frieze.py
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/testing)
-
- set_property(TEST "generate_frieze" APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/${python_default_destination}/vtkbool")
-
  add_test(NAME "test_filter"
  COMMAND ${Python3_EXECUTABLE} -m pytest
  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/testing)
@@ -131,6 +125,12 @@ else()
  COMMAND test_merger
  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/testing)
 
+ add_test(NAME "generate_frieze"
+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/generate_frieze.py
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/testing)
+
+ set_property(TEST "generate_frieze" APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/${python_default_destination}/vtkbool")
+
  endif()
 
  endif()

diff --git a/testing/data/milling/sphere1.vtk b/testing/data/milling/sphere1.vtk
diff --git a/testing/data/milling/tube1.vtk b/testing/data/milling/tube1.vtk
diff --git a/testing/milling/milling.py b/testing/milling/milling.py
diff --git a/testing/test_filter.py b/testing/test_filter.py
@@ -695,23 +695,6 @@ def test_non_manifolds():
 
  check_result(bf)
 
-def test_adjacent_pts(tmp_path):
- readerA = vtkPolyDataReader()
- readerA.SetFileName('data/milling/sphere1.vtk')
-
- readerB = vtkPolyDataReader()
- readerB.SetFileName('data/milling/tube1.vtk')
-
- bf = vtkPolyDataBooleanFilter()
- bf.SetInputConnection(0, readerA.GetOutputPort())
- bf.SetInputConnection(1, readerB.GetOutputPort())
- bf.SetOperModeToNone()
-
- bf.Update()
-
- write_result(bf, tmp_path)
- check_result(bf, [3, 3])
-
 def test_branched(tmp_path):
  reader = vtkPolyDataReader()
  reader.SetFileName('data/branched.vtk')

diff --git a/testing/test_merger.cxx b/testing/test_merger.cxx
@@ -14,6 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#include <string>
+#include <cmath>
+
 #include <vtkCellData.h>
 #include <vtkCellArrayIterator.h>
 #include <vtkIdTypeArray.h>
@@ -46,7 +49,12 @@ Poly Draw (double r, vtkIdType step, double x, double y, double rotate = 0) {
  return poly;
 }
 
-bool Test (PolysType &polys, vtkIdType numCells) {
+bool Test (PolysType &polys, vtkIdType numCells, const char *name) {
+ std::string fileName(name);
+ fileName.append(".vtk");
+
+ WritePolys(fileName.c_str(), polys);
+
  auto pts = vtkSmartPointer<vtkPoints>::New();
 
  auto pd = vtkSmartPointer<vtkPolyData>::New();
@@ -146,7 +154,10 @@ bool Test (PolysType &polys, vtkIdType numCells) {
  }
  }
 
- // WriteVTK("merged.vtk", pd);
+ std::string mergedFileName(name);
+ mergedFileName.append("_merged.vtk");
+
+ WriteVTK(mergedFileName.c_str(), pd);
 
  if (pd->GetNumberOfCells() != numCells) {
  return false;
@@ -167,8 +178,6 @@ int main() {
  Draw(.5, 6, 0, -1, 30)
  };
 
- WritePolys("polysA.vtk", polysA);
-
  Poly a = Draw(4, 18, 0, 0, 10),
  b = Draw(3, 18, 0, 0, 10);
 
@@ -180,13 +189,23 @@ int main() {
  a
  };
 
- WritePolys("polysB.vtk", polysB);
+ const double y = 7.5-1.5/std::cos (M_PI/6)-std::tan (M_PI/6)*4.5;
+
+ PolysType polysC {
+ Poly({{0, 0, 0}, {25, 0, 0}, {25, 25, 0}, {0, 25, 0}}),
+ Poly({{2, 5, 0}, {17, 5, 0}, {17, 20, 0}, {2, 20, 0}, {7.5/std::tan (M_PI/6)+2, 12.5, 0}}),
+ Poly({{6.5, 12.5-y, 0}, {y/std::tan (M_PI/6)+6.5, 12.5, 0}, {6.5, 12.5+y, 0}})
+ };
+
+ if (!Test(polysA, 10, "polysA")) {
+ return EXIT_FAILURE;
+ }
 
- if (!Test(polysA, 10)) {
+ if (!Test(polysB, 5, "polysB")) {
  return EXIT_FAILURE;
  }
 
- if (!Test(polysB, 5)) {
+ if (!Test(polysC, 5, "polysC")) {
  return EXIT_FAILURE;
  }