Commit Graph

6306 Commits

Author SHA1 Message Date
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 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 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
Sébastien Loriot 7945ffeea2 update surf plugin 2019-04-12 19:11:04 +02:00
Sébastien Loriot 03ec0dfbe1 update demo plugin 2019-04-12 19:09:25 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Laurent Rineau c14308f300 Merge pull request #3788 from maxGimeno/VTU_output-Add-attribute-GF
Mesh_3: New Attributes Type for VTU Output
2019-04-08 15:58:40 +02:00
Laurent Rineau 68f321c58d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-04-08 15:58:27 +02:00
Laurent Rineau 65ebf7d386 Merge branch 'Mesh_3-fix_output_to_vtu-GF' into VTU_output-Add-attribute-GF 2019-04-03 19:57:36 +02:00
Laurent Rineau eb769f13fd Fix the error message 2019-04-03 14:10:57 +02:00
Laurent Rineau bba76c20f3 Fix that find_path in case of cross-compilation 2019-04-03 14:10:42 +02:00
Laurent Rineau aed5a55354 Fix the syntax of find_path 2019-04-03 14:10:27 +02:00
Maxime Gimeno 4542a2a808 Be careful to not select a infinite face in the process. 2019-03-29 16:24:28 +01:00
Laurent Rineau d27c222e54 Merge pull request #3799 from maxGimeno/Demo-Select_only_in_clipped_zone-GF
Polyhedron Demo: Only Select in the clipped zone
2019-03-27 18:05:12 +01:00
Simon Giraudot 71dc567566 Integrate clipping test in selection functor 2019-03-27 10:18:02 +01:00
Maxime Gimeno 38709a737e Fix c3t3 reload 2019-03-27 09:49:46 +01:00
Maxime Gimeno 1bd785ae44 Don't select clipped points 2019-03-26 15:30:34 +01:00