diff --git a/GraphicsView/demo/Triangulation_2/Boolean_2.cpp b/GraphicsView/demo/Polygon_repair/Boolean_2.cpp similarity index 98% rename from GraphicsView/demo/Triangulation_2/Boolean_2.cpp rename to GraphicsView/demo/Polygon_repair/Boolean_2.cpp index 1b0c6c05d55..7caa9c0ce29 100644 --- a/GraphicsView/demo/Triangulation_2/Boolean_2.cpp +++ b/GraphicsView/demo/Polygon_repair/Boolean_2.cpp @@ -176,9 +176,7 @@ MainWindow::processInput(CGAL::Object o) } } if((! mpwhA.is_empty()) && (! mpwhB.is_empty())){ - Boolean boolean; - boolean.insert(mpwhA, mpwhB); - mpwhC = boolean([](bool a, bool b){ return a && b;}); + mpwhC = CGAL::Polygon_repair::join(mpwhA, mpwhB); } Q_EMIT( changed()); } diff --git a/GraphicsView/demo/Triangulation_2/Boolean_2.qrc b/GraphicsView/demo/Polygon_repair/Boolean_2.qrc similarity index 100% rename from GraphicsView/demo/Triangulation_2/Boolean_2.qrc rename to GraphicsView/demo/Polygon_repair/Boolean_2.qrc diff --git a/GraphicsView/demo/Triangulation_2/Boolean_2.ui b/GraphicsView/demo/Polygon_repair/Boolean_2.ui similarity index 100% rename from GraphicsView/demo/Triangulation_2/Boolean_2.ui rename to GraphicsView/demo/Polygon_repair/Boolean_2.ui diff --git a/GraphicsView/demo/Polygon_repair/CMakeLists.txt b/GraphicsView/demo/Polygon_repair/CMakeLists.txt new file mode 100644 index 00000000000..afdc5237e1c --- /dev/null +++ b/GraphicsView/demo/Polygon_repair/CMakeLists.txt @@ -0,0 +1,35 @@ +# Created by the script cgal_create_cmake_script +# This is the CMake script for compiling a CGAL application. + +cmake_minimum_required(VERSION 3.12...3.29) +project(Triangulation_2_Demo) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_INCLUDE_CURRENT_DIR TRUE) + +find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6) +find_package(Qt6 QUIET COMPONENTS Widgets) + +if(NOT CGAL_Qt6_FOUND OR NOT Qt6_FOUND) + message("NOTICE: This demo requires CGAL and Qt6, and will not be compiled.") + return() +endif() + +add_definitions(-DQT_NO_KEYWORDS) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + + +qt_add_executable( + Boolean_2 Boolean_2.cpp + Boolean_2.ui Boolean_2.qrc) +target_link_libraries(Boolean_2 PRIVATE CGAL::CGAL CGAL::CGAL_Qt6 + Qt6::Widgets) + +add_to_cached_list(CGAL_EXECUTABLE_TARGETS Boolean_2) + +include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) + +cgal_add_compilation_test(Boolean_2) + diff --git a/GraphicsView/demo/Triangulation_2/about_Boolean_2.html b/GraphicsView/demo/Polygon_repair/about_Boolean_2.html similarity index 100% rename from GraphicsView/demo/Triangulation_2/about_Boolean_2.html rename to GraphicsView/demo/Polygon_repair/about_Boolean_2.html diff --git a/GraphicsView/demo/Polygon_repair/icons/circumcenter.pdf b/GraphicsView/demo/Polygon_repair/icons/circumcenter.pdf new file mode 100644 index 00000000000..51a15a41082 --- /dev/null +++ b/GraphicsView/demo/Polygon_repair/icons/circumcenter.pdf @@ -0,0 +1,57 @@ +%PDF-1.3 +3 0 obj << +/Length 385 /Filter /FlateDecode >> +stream +x}SN1 +RSDNc  BPl$ZQ7~dྎ_}k \OSpFCS-LΝm8.mp\=?oH|]HڂSK&Q0TQ-v`*M2m>ggFZmM@A @0qJݘ2XLgh6,κ+ղiT)DZ4Dؿf;QMJ]T'g:O]j7~w¶w1Cqs]iSJ㭄+HP}M}lCk/ L> +/MediaBox [ 0 0 595 842] +/CropBox [204.765 238.4 261.6 291.541] +/ArtBox [204.765 238.4 261.6 291.541] +/Parent 2 0 R +>> endobj +1 0 obj << +/Type /Ipe +/Length 322 /Filter /FlateDecode >> +stream +xڵn0 <&|L])6j Qg@]vZ倉َlS0(i,C9+[_rf!jȹ QU8bHĂst}}+X#mA`Q60]yheC;ҸS l,{=ܨOKޞH7<1py©4B(ݘF6Φ5*1q:ÓT83Mc ]A,L݌;P3ucy'q:.5Vb!c SL4_-OR P +endstream endobj +2 0 obj << +/Type /Pages +/Count 1 +/Kids [ 4 0 R ] +>> endobj +5 0 obj << +/Type /Catalog +/Pages 2 0 R +>> endobj +6 0 obj << +/Creator (Ipe 6.0 preview 28) +/Producer (Ipe 6.0 preview 28) +/CreationDate (D:20080609193922) +/ModDate (D:20080609193922) +>> endobj +xref +0 7 +0000000000 00000 f +0000000671 00000 n +0000001076 00000 n +0000000009 00000 n +0000000466 00000 n +0000001135 00000 n +0000001184 00000 n +trailer +<< +/Size 7 +/Root 5 0 R +/Info 6 0 R +>> +startxref +1327 +%%EOF diff --git a/GraphicsView/demo/Polygon_repair/icons/circumcenter.png b/GraphicsView/demo/Polygon_repair/icons/circumcenter.png new file mode 100644 index 00000000000..f743b7a64ca Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/circumcenter.png differ diff --git a/GraphicsView/demo/Polygon_repair/icons/conflict_zone.pdf b/GraphicsView/demo/Polygon_repair/icons/conflict_zone.pdf new file mode 100644 index 00000000000..63ce6668f14 Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/conflict_zone.pdf differ diff --git a/GraphicsView/demo/Polygon_repair/icons/conflict_zone.png b/GraphicsView/demo/Polygon_repair/icons/conflict_zone.png new file mode 100644 index 00000000000..5fd4d5b4ce6 Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/conflict_zone.png differ diff --git a/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation.pdf b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation.pdf new file mode 100644 index 00000000000..5138901d497 Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation.pdf differ diff --git a/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation.png b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation.png new file mode 100644 index 00000000000..3a49172fa17 Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation.png differ diff --git a/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_constraints.pdf b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_constraints.pdf new file mode 100644 index 00000000000..7af386e2fda Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_constraints.pdf differ diff --git a/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_constraints.png b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_constraints.png new file mode 100644 index 00000000000..eb2e70fd593 Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_constraints.png differ diff --git a/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_in_domain.pdf b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_in_domain.pdf new file mode 100644 index 00000000000..586163b1ee5 Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_in_domain.pdf differ diff --git a/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_in_domain.png b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_in_domain.png new file mode 100644 index 00000000000..cd4be89b1ab Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/constrained_triangulation_show_in_domain.png differ diff --git a/GraphicsView/demo/Polygon_repair/icons/moving_point.pdf b/GraphicsView/demo/Polygon_repair/icons/moving_point.pdf new file mode 100644 index 00000000000..35d35064fcf Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/moving_point.pdf differ diff --git a/GraphicsView/demo/Polygon_repair/icons/moving_point.png b/GraphicsView/demo/Polygon_repair/icons/moving_point.png new file mode 100644 index 00000000000..44f431d9843 Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/moving_point.png differ diff --git a/GraphicsView/demo/Polygon_repair/icons/triangulation.pdf b/GraphicsView/demo/Polygon_repair/icons/triangulation.pdf new file mode 100644 index 00000000000..2ab91bd5aed Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/triangulation.pdf differ diff --git a/GraphicsView/demo/Polygon_repair/icons/triangulation.png b/GraphicsView/demo/Polygon_repair/icons/triangulation.png new file mode 100644 index 00000000000..ce082a6e08f Binary files /dev/null and b/GraphicsView/demo/Polygon_repair/icons/triangulation.png differ