Commit Graph

6320 Commits

Author SHA1 Message Date
Laurent Rineau 7ae8386da9
Merge pull request #4242 from sgiraudot/Demo-Fix_classification_unresized_ranges-GF
Demo/classif: Fix unresized ranges
2019-09-23 17:30:43 +02:00
Simon Giraudot 58b73c04a1 Fix unresized ranges 2019-09-23 11:47:49 +02:00
Laurent Rineau 9abee11ee8 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-09 16:43:29 +02:00
Laurent Rineau d00369432b
PMP: Fix ctestsuite (#4128)
PMP: Fix ctestsuite
2019-09-09 16:36:53 +02:00
Maxime Gimeno 0d2f7a7204 More time for test_items 2019-09-06 11:53:44 +02:00
Laurent Rineau 94d654b9ab Fill CGAL_EXECUTABLE_TARGETS wherever that was missing 2019-09-04 14:19:54 +02:00
Maxime Gimeno e2299db864 Add a target depending on all the items, and make every plugin test depend on it.
This way we hope to prevent multiple ans simultaneous compilation of the same target, which leads to the "truncated file" bug.
2019-09-04 09:51:48 +02:00
Maxime Gimeno 3513016dcf Updates for ctest with visual generator 2019-08-16 12:22:11 +02:00
Maxime Gimeno a4b171d77f Add a compilation_test for demo_framework in the Polyhedorn_Demo and make everythink else depend on it, to try and fix the truncated file errors in the testsuite 2019-08-14 13:04:29 +02:00
Sebastien Loriot 05e894cd04
Merge pull request #4118 from sloriot/CGAL-named_function_parameters-4.14
Named function parameters (4.14)
2019-08-08 10:05:41 +02:00
Sebastien Loriot fb8fa48950
Merge pull request #4083 from sloriot/CGAL-named_function_parameters
Named function parameters
2019-08-08 10:03:38 +02:00
Maxime Gimeno 69e5072cc1 Get rid of the two fake lines in ctest_testsuite 2019-07-29 13:35:19 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sebastien Loriot 8e7b9a67ff
Merge pull request #4064 from maxGimeno/CGAL_Qt-Fix_deprecation_warnings-GF
Fix Qt deprecation warnings
2019-07-18 16:58:35 +02:00
Sebastien Loriot 6bf04f51e5
Merge pull request #4073 from maxGimeno/CGAL_Qt-Fix_deprecation_warnings-4.14-GF
Fix Qt deprecation warnings for 4.14
2019-07-18 16:58:05 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot cebf0657d8 Use a full CGAL version of named function parameters
no longer rely on boost
2019-07-14 22:45:47 +02:00
Maxime Gimeno b4c2af80fd Fix indentation 2019-07-10 15:18:44 +02:00
Maxime Gimeno bc94f04f9f fix indentation 2019-07-10 15:18:13 +02:00
Maxime Gimeno 261c596cfc Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-10 14:04:34 +02:00
Maxime Gimeno 1184530530 More warnings fixed 2019-07-10 14:02:06 +02:00
Laurent Rineau 1e4ce95f35 Fix PR #3987 with "mesh surface only" 2019-07-05 14:56:13 +02:00
Laurent Rineau 4435f93aaa Compatibility with VTK 9 (VTK master)
Fix issue #3789
2019-06-26 13:17:14 +02:00
Laurent Rineau 69a4241d5e Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:20:08 +02:00
Laurent Rineau c64c40491b Merge pull request #4003 from maxGimeno/Demo-Fix_clip_plus_point_selection-GF
3D Demo: Fix Points Selection when Clipping
2019-06-20 14:09:15 +02:00
Laurent Rineau 8089f7c33c Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF
[Classification] Make cluster lightweight to copy + fix bbox computation
2019-06-17 14:15:20 +02:00
Laurent Rineau 37839b3e88 Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF
[Classification] Make cluster lightweight to copy + fix bbox computation
2019-06-17 14:14:50 +02:00
Laurent Rineau 22fb28d57e Modify the name when multiple source items 2019-06-17 13:47:05 +02:00
Maxime Gimeno 3f76dfb056 take the offset into account in the test is_clipped() of the Selection functor. 2019-06-14 14:39:41 +02:00
Simon Giraudot b981f25e84 Fix classification plugin 2019-06-12 09:46:47 +02:00
Laurent Rineau 2ad4bf8c6f Mesh_3_plugin: clean `applicable()` and allow to mesh multiple surfaces 2019-06-07 12:10:38 +02:00
Laurent Rineau 31dd4f11fb Merge pull request #3969 from lrineau/Polyhedron-demo__fix_segfault_of_load_plugin-GF
Polyhedron demo:  fix the menu entry 'Load plugin'
2019-06-05 10:44:27 +02:00
Laurent Rineau 926067967a Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-05 10:43:44 +02:00
Laurent Rineau 44cfe8d2eb
Do not use `REQUIRED OPTIONAL_COMPONENTS` with FindBoost
The CMake module `FindBoost.cmake` only supports `OPTIONAL_COMPONENTS` since CMake-3.11. Previously they were treated like required components.
2019-06-03 10:44:01 +02:00
Laurent Rineau ecaa138761 Do not block load_plugin from loading plugins
Since the adoption of the "keywords" feature, the 'Load plugin' menu
was not able to load a plugin with other keywords. That defeats the
purpose of that feature.
2019-05-29 11:44:08 +02:00
Laurent Rineau cdb72b9f34 Avoid a segfault in `load_plugin`
Before that patch `accepted_keywords` was a dangling reference to an
object that was destroyed at the end of the constructor of the class
`Polyhedron_demo`.

Now, that `QStringList` is copied, but it is a short list of short
strings.
2019-05-29 11:42:35 +02:00
Laurent Rineau cd22917e3d Remove the need for Boost libraries at the top level CMakeLists.txt
The 3D demo does not directly requires Boost libraries. Then are
pulled as a `PUBLIC` dependency of `CGAL::CGAL`. Only two plugins
really need Boost libraries:

- Classification needs Boost iostreams and serialization,
- Mesh_3 `io_image_plugin` needs Boost filesystem for multi-files 3D
  images.
2019-05-29 11:18:13 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau d04a5a24c1 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
2019-05-14 16:26:16 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau 6cff0987ad Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:47:59 +02:00
Laurent Rineau 89c7edec55 Fix PR #3843 2019-05-07 13:45:46 +02:00
Laurent Rineau f3371ad311 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-07 13:29:42 +02:00
Maxime Gimeno 356f105902 Fix CMake Error 2019-05-07 13:27:18 +02:00
Laurent Rineau 130c766d1e Merge branch 'releases/CGAL-4.14-branch' into Mesh_3-stop_during_protection-lrineau 2019-05-06 16:21:52 +02:00
Laurent Rineau df8d3a5817 Fix Polyhedron demo with Boost 1.70 2019-05-06 14:33:28 +02:00
Laurent Rineau 1b1f0a6ac3 Test the feature in the 3D demo, and fix the code 2019-05-03 16:24:50 +02:00
Sebastien Loriot 6c2427e615
Merge pull request #3815 from maxGimeno/Demo-Fix_zoom_on_id-GF
Polyhedron_demo: Fix zoom to Id
2019-04-23 09:45:52 +02:00
Sebastien Loriot fdc8d79a69
Merge pull request #3843 from sloriot/PMP-speed_orient_soup
Speed-up polygon soup orientation
2019-04-23 09:43:55 +02:00