songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
109,881 Commits 3 Branches 156 Tags 966 MiB
Commit Graph

4581 Commits

Author SHA1 Message Date
albert-github ad41766454 issue #7395 Improvement of layout of model relations 
Corrected `cgalModels` to `cgalHasModes` inside `cgalHasNodelsBegin` / `cgalHasModelsEnd`
 2023-07-18 13:23:37 +02:00
albert-github de3ba0f47c Merge remote-tracking branch 'upstream/master' into feature/issue_7395 2023-07-17 10:17:34 +02:00
albert-github 4e5578d469 issue #7395 Improvement of layout of model relations 
- based on review
 2023-07-15 13:12:15 +02:00
Laurent Rineau d10e9387c2 Merge branch 'master' into CGAL-add_missing_test 
# Conflicts:
#	STL_Extension/test/STL_Extension/test_skiplist.cpp
 2023-07-12 15:48:42 +02:00
Mael Rouxel-Labbé 0d3458504b Add some debug code 2023-07-12 10:47:17 +02:00
Mael Rouxel-Labbé 49bb14b6d2 Fix not rescaling some balls in 2D protection with non-zero minimal weight 
The code break'd but did not restart if a special ball was encountered
 2023-07-12 10:03:14 +02:00
Mael Rouxel-Labbé 6f65ecf246 Check the cached Boolean before doing more complex geometrical checks 2023-07-12 09:44:03 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations 
- Completed the cgalModels part
 2023-07-09 12:43:36 +02:00
albert-github ee2a55279d issue #7395 Improvement of layout of model relations 
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
 2023-07-06 17:35:34 +02:00
Sébastien Loriot b66afab814 Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD 2023-07-05 11:29:35 +02:00
Sébastien Loriot 68813c5c63 Merge pull request #7403 from sloriot/CGAL-replace_boost_by_std 
Replace boost by std
 2023-07-05 11:08:36 +02:00
Andreas Fabri 7a26a6af58 Remove files in test that are also in examples (and compiled there) 2023-06-29 10:14:48 +01:00
Sébastien Loriot 62f22e9a6c use oformat for optional 2023-06-29 10:43:56 +02:00
Sébastien Loriot efd8b2d38b add more missing tests 2023-06-27 11:18:20 +02:00
Mael Rouxel-Labbé 39c0a9fb33 Fix returning no intersection for a ray with spawn in a triangle 2023-06-26 17:15:49 +02:00
Mael Rouxel-Labbé 308ee5c967 Minor debug readability improvements 2023-06-26 17:10:58 +02:00
Mael Rouxel-Labbé fbecb18f49 Fix bad comparison 2023-06-26 17:10:06 +02:00
Andreas Fabri 28dbd6b8ee allow -> enable 2023-06-24 10:37:39 +01:00
Andreas Fabri 0f4f903f60 merge cgal/master 2023-06-24 10:24:15 +01:00
Ange Clement 99e78ec13a more fixes 2023-06-23 10:58:11 +02:00
Ange Clement f0fdc5cbfa fixes 2023-06-23 10:44:48 +02:00
Ange Clement f3f1069ee7 Added example to the documentation + Corrected edge_distance documentation 2023-06-23 10:34:32 +02:00
Ange Clement 447eace7d2 Added testing for edge_distance : - Modified test_mesh_criteria_creation.cpp to test the creation with or without a SizingField - Modified test_meshing_determinism.cpp to test determinism of mesh creation - Added test_max_edge_distance.cpp that estimate number of vertices and facets and test that it is greater than without the parameter 2023-06-22 17:43:07 +02:00
Sébastien Loriot dfc386d65b Merge branch 'master' into HEAD 2023-06-22 14:05:45 +02:00
Ange Clement 8998f459b1 Added a undocumented test 2023-06-22 13:03:27 +02:00
Laurent Rineau 70ac38bed0 Merge pull request #7523 from nmnobre/doc_segmentation 
Fix typos in multiple manuals
 2023-06-22 11:59:32 +02:00
Laurent Rineau 4afd96e95d Merge pull request #7527 from janetournois/Mesh_3-fix_weighted_image_oracle-jtournois 
Mesh_3 for weighted images - fix translated labeled image case
 2023-06-22 11:59:29 +02:00
Laurent Rineau 6e5070c302 Merge pull request #7523 from nmnobre/doc_segmentation 
Fix typos in multiple manuals
 2023-06-22 11:58:48 +02:00
Laurent Rineau 63398aa5a0 Merge pull request #7527 from janetournois/Mesh_3-fix_weighted_image_oracle-jtournois 
Mesh_3 for weighted images - fix translated labeled image case
 2023-06-22 11:58:45 +02:00
Ange Clement d8f9ea3162 Clean whitespace in Protect_edges_sizing_field.h 2023-06-21 12:28:52 +02:00
Ange Clement 732fe69f83 edge_distance now works on images domains too 2023-06-21 11:36:51 +02:00
Ange Clement 53704ac50f edge_distance changed from a value to a scalar field 2023-06-20 14:40:58 +02:00
Nuno Miguel Nobre 0469f46105 Fix plurals in a number of manuals 2023-06-20 13:29:44 +01:00
Ange Clement f5b1deb12d Removed non necessary check 2023-06-20 09:58:02 +02:00
Ange Clement 5e6b4b9db6 First result with method that look at geodesic distance of the midpoint. Only works for domain Polyhedral_mesh_domain_with_features_3 2023-06-20 09:26:16 +02:00
Sébastien Loriot 0ee31a5d4f remove extra parenthesis 2023-06-19 19:17:49 +02:00
Ange Clement d2b8627fba framework for edge_distance criterium 2023-06-19 12:46:17 +02:00
Sébastien Loriot f936680600 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 18:48:39 +02:00
Jane Tournois c9b04ebc97 apply input image translation to image with weights wrapper 2023-06-15 15:05:39 +02:00
Sébastien Loriot bdfa15c08f fixes after merge 2023-06-15 11:34:14 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot bbc48b2c7e more fixes 
use Mesh_3::internal::get_index
std::dynamic_point_cast
std::get_if
 2023-06-15 10:57:10 +02:00
Sébastien Loriot 56499e017d do not use API that did not go into the standard 2023-06-15 10:57:10 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Sébastien Loriot bbc4d08ee0 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 10:47:07 +02:00
Sébastien Loriot c8a88b9014 remove CGAL_static_assertion* 2023-06-15 10:42:10 +02:00
Sébastien Loriot e54408370b remove CGAL_CXX17 macro 
... and no longer used macros
 2023-06-15 10:41:56 +02:00
Mael Rouxel-Labbé 21358ac490 Clean CMakelists.txt 2023-05-31 17:41:39 +02:00
Mael Rouxel-Labbé 8f0a9dd996 Fix two links 2023-05-31 11:34:37 +02:00
Mael Rouxel-Labbé cab9751987 Merge remote-tracking branch 'cgal/master' into Mesh_3-doc_fixes-GF 2023-05-31 11:30:19 +02:00
Sebastien Loriot b1b02d64fe
P3M3: Non-cubic domains, fixes, improvements (#7062) 
## Summary of Changes

- Add a dummy point generator that is agnostic to the periodic domain's
geometry, allowing P3M3 to handle non-cubic domain.
- Add an example of P3M3 running on polyhedral domains.
- Fix a few issues in SMDS_3's tet soup reading relating to
non-manifoldness + general IO code speed improvements.
- Fix a few issues in P3M3's medit output and always duplicate facets to
reduce the quantity of non-manifoldness occurences.
- Fix an issue with including Mesh_3 headers before P3M3's.
- Fix periodic point projection (for Mesh_3 optimizers) badly computing
the projection direction
- Robustify a handful of P3M3 functions that were using intermediate
constructions rather than the <Point, Offset> API (which uses filtered
predicates and thus yields proper robustness)
- Misc minor code cleaning / modernization

ToDo:
- [x] Check if some medit IO issues are fixed
- [x] Add non-manifoldness flag to read_MEDIT
- [x] Fix value of orthosphere_radius_threshold
- [x] Check calls of insert_dummy_points() (use generic)
- [x] Check doc of P3M3 about cubic domains requirement

Not done:
- [ ] Fix sharp features for periodic polyhedral domains (problems due
to changing weights creating cover change...). Code:
https://gist.github.com/MaelRL/357c52dc04e16a162f13a3c6860a1398; WIP
diff: https://gist.github.com/MaelRL/f98809964acffbacb6d3f42793e2654e

## Release Management

* Affected package(s): `Mesh_3`,  `P3M3`, `P3T3`, `SMDS3`
* Issue(s) solved (if any): Fix #6997, Fix #7214
* Feature/Small Feature (if any): TODO
* License and copyright ownership: no change
 2023-05-30 19:13:45 +02:00
Mael Rouxel-Labbé 7b91a3d972 Fix compilation 2023-05-26 13:47:20 +02:00
Mael Rouxel-Labbé b3fe07a51d Remove deprecated labeled mesh domains 2023-05-26 13:47:15 +02:00
Mael Rouxel-Labbé 97097f1f04 misc fixes 2023-05-26 13:19:19 +02:00
Mael Rouxel-Labbé 525338eec2 Haronize Gt/GT/etc. 2023-05-26 12:52:35 +02:00
Mael Rouxel-Labbé abad43a63d Add missing doc dependency 2023-05-25 15:19:36 +02:00
Mael Rouxel-Labbé 6d3d60c6e2 Do not document Mesh_3 classes' members that are not explicitely documented 2023-05-25 15:19:13 +02:00
Mael Rouxel-Labbé c3873374ce Carry the template parameter (as it should be if it were actually in use) 
It is in fact CGAL::Default and unused everywhere, but it's clearer
this way.
 2023-05-25 14:56:46 +02:00
Mael Rouxel-Labbé 13f8044027 Remove more (needless) doc appearances of TriangleAccessor 2023-05-25 14:56:16 +02:00
Mael Rouxel-Labbé bc45a00194 Undocument TriangleAccessor_3 and CGAL::Triangle_accessor_3 as they are unused 2023-05-25 12:08:01 +02:00
Andreas Fabri 0c29013c3d Polish 2023-05-23 09:58:41 +01:00
Andreas Fabri 79ce772e71 various 2023-05-22 18:46:09 +01:00
Sébastien Loriot 78ab4fab70 add special cases for header only packages 2023-05-22 18:24:06 +02:00
Andreas Fabri 95f150a16c various 2023-05-22 16:51:33 +01:00
Andreas Fabri 585dc0f424 various 2023-05-22 13:36:24 +01:00
Andreas Fabri 710219ed6d various 2023-05-22 13:12:46 +01:00
Andreas Fabri 1b4d4e0eb0 various 2023-05-22 12:49:33 +01:00
Andreas Fabri b1137e9d83 various 2023-05-22 12:19:44 +01:00
Andreas Fabri 9f241c89c5 rename template parameters 2023-05-19 18:42:56 +01:00
Andreas Fabri bf79ecd8ad fixes 2023-05-17 21:05:29 +01:00
Andreas Fabri a827d9ab67 fixes 2023-05-17 11:11:25 +01:00
Andreas Fabri 3ca05f4918 fixes 2023-05-17 09:28:25 +01:00
Andreas Fabri b6531a76d1 fixes 2023-05-16 16:22:48 +01:00
Andreas Fabri fdcdd1a9eb fixes 2023-05-16 12:50:07 +01:00
Andreas Fabri 90773e8806 fixes 2023-05-16 12:41:17 +01:00
Andreas Fabri e9583a69d0 fixes 2023-05-16 12:38:50 +01:00
Andreas Fabri 26369cb81b fixes 2023-05-16 12:33:14 +01:00
Andreas Fabri cec7c3dccc Fix some warnings 2023-05-16 11:57:32 +01:00
Andreas Fabri c97ce3ee55 Remove doc files 2023-05-16 10:30:03 +01:00
Andreas Fabri b3e2beddb4 merge cgal/master 2023-05-16 10:02:36 +01:00
Andreas Fabri f1780e39dd Mesh_3: Move doxygen into header file 2023-05-16 09:32:15 +01:00
Andreas Fabri 7171de7b03 Mesh_3: Move doxygen into header file 2023-05-15 21:59:09 +01:00
Andreas Fabri a940523882 Mesh_3: Move doxygen into header file 2023-05-15 15:52:35 +01:00
Sébastien Loriot fd847c2351 only test parallel if TBB is installed 2023-05-09 18:40:22 +02:00
Jane Tournois a6224c75b4 fix compilation of new test after merge of master 
and newly merged branch Mesh_3-sizing_field_with_aabb_tree-GF
 2023-05-05 10:21:58 +02:00
Jane Tournois 73a7d4ff09 Merge remote-tracking branch 'cgal/master' into Mesh_3-min_size-jtournois 
# Conflicts:
#	Installation/CHANGES.md
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
#	STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
 2023-05-05 09:17:33 +02:00
Mael 532b82cb9b
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-05-04 17:28:47 +02:00
Laurent Rineau 628d8ae43d Merge pull request #7307 from janetournois/Mesh_3-sizing_field_with_aabb_tree-GF 
Mesh_3 - Document Sizing_field_with_aabb_tree
 2023-05-04 17:22:59 +02:00
Laurent Rineau c2e24424d3 Merge pull request #7415 from janetournois/Mesh_3-triple_lines_with_sqrt-jtournois 
Mesh_3 triple lines detection robustness
 2023-05-04 17:22:46 +02:00
Laurent Rineau d2bc415a15 Merge pull request #6950 from lrineau/CGAL-allow_Epick_with_float-GF 
Simple_precision_epick: an Epick-like kernel with float as FT
 2023-05-04 16:37:17 +02:00
Laurent Rineau 1449281db9 Merge pull request #7264 from MaelRL/SLS-Weighted_skeleton-GF 
Weighted straight line skeletons
 2023-05-04 16:37:12 +02:00
Sébastien Loriot e0eac4f388 Merge remote-tracking branch 'cgal/master' into HEAD 2023-05-03 18:37:09 +02:00
Jane Tournois 75806c2497 add local macro for sqrt(17) 
and const split_point to make sure the same point is used twice
 2023-05-02 12:39:46 +02:00
Jane Tournois dad3407b11 add local macro for sqrt(65) 2023-05-02 11:40:47 +02:00
Jane Tournois 5d0adfda43 avoid conflict with max macro on msvc 2023-05-02 10:12:57 +02:00
Jane Tournois 2f88b29cda replace multiple std::sqrt by macros 
with more than 17 digits in case we have number types bigger than double
 2023-04-28 17:54:07 +02:00
Jane Tournois ce738685e1 replace approximate values for sqrt(2) and similar 2023-04-28 16:12:26 +02:00
Jane Tournois b014f5ab45 fix template parameter 
without that, the template parameter is 'int', deducted from third argument '0'
 2023-04-25 15:45:36 +02:00
Jane Tournois b76f640a41 Merge branch 'Mesh_3-edge_min_size-GF' into Mesh_3-min_size-jtournois 
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_dialog.ui
 2023-04-24 13:59:48 +02:00
Jane Tournois e30ccd2cc5 Merge branch 'Mesh_3-add_minimal_size_criterion_new-jtournois' into Mesh_3-min_size-jtournois 2023-04-24 12:56:40 +01:00
Sébastien Loriot 2f7d150531 boost::begin/end/empty/size -> std::begin/end/empty/size 2023-04-23 23:01:35 +02:00
Sébastien Loriot cf45dd3d5b boost::is_base_of -> std::is_base_of 2023-04-23 22:37:07 +02:00
Sébastien Loriot b039040f73 boost::is_convertible -> std::is_convertible 2023-04-23 22:37:07 +02:00
Sébastien Loriot a04035879d boost::is_const -> std::is_const 2023-04-23 22:37:07 +02:00
Sébastien Loriot 9ed6c7acdc remove useless include 2023-04-23 22:37:07 +02:00
Sébastien Loriot e82d970d19 boost::next -> std::next 2023-04-23 22:37:07 +02:00
Sébastien Loriot 99619dc634 boost::prior -> std::prev 2023-04-23 22:37:07 +02:00
Sébastien Loriot 8b3acae1c7 boost::remove_reference -> std::remove_reference 2023-04-23 22:36:59 +02:00
Sébastien Loriot fa301554ce boost::remove_v -> std::remove_cv_t 2023-04-23 19:13:56 +02:00
Sébastien Loriot 61834d5a26 boost::remove_const -> std::remove_const_t 2023-04-23 19:07:54 +02:00
Sébastien Loriot fc034c6a5d boost::unit -> std::uint 2023-04-23 18:40:39 +02:00
Laurent Rineau 205236832e Merge remote-tracking branch 'cgal/master' into CGAL-rename_ctest_test_names-GF 
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
 2023-04-21 10:47:17 +02:00
Jane Tournois 4be918b51b it's forbidden to compare (size_t < 0) 2023-04-18 17:10:41 +02:00
Jane Tournois 8e98895678 update concept MeshEdgeCriteria_3 2023-04-17 16:46:38 +02:00
Laurent Rineau 2559bb6778
Update Mesh_criteria_3.h (the note) 2023-04-17 16:35:01 +02:00
Jane Tournois 7e97a91a34 improve doc 
# Conflicts:
#	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
 2023-04-17 14:34:34 +02:00
Mael Rouxel-Labbé 1a5826f11a Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-04-17 12:48:30 +02:00
Laurent Rineau 824976a003 Merge pull request #7236 from albert-github/feature/issue_7231 
issue #7231 Improvement of layout of refines relations.
 2023-04-17 10:14:01 +02:00
Laurent Rineau 9e18cc6989
Unexpected backtick (#7378) 
In the file: Arrangement_on_surface_2/index.html
we see:
```
The example below shows how to construct the same arrangement of five line segments built incrementally in Arrangement_on_surface_2/incremental_insertion.cpp` depicted in Figure 34.9 using the aggregate insertion
```
i.e. an unexpected backtick.
 2023-04-12 09:55:42 +02:00
Sébastien Loriot 9f33e64643 avoid warning 2023-04-12 09:00:24 +02:00
albert-github 8a0b21461d Unexpected backtick 
- Corrected some more redundant / missing backticks
- correctes a spelling error (Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h)
 2023-04-11 17:38:37 +02:00
Laurent Rineau e5a2513921 Merge pull request #7359 from janetournois/Mesh_3-exude_mesh_3_np-jtournois 
Mesh_3 - fix default parameters of `CGAL::exude_mesh_3(c3t3)`
 2023-04-11 14:19:00 +02:00
Jane Tournois 662534e8f3 fix template type 
avoid using "0" type, int, that would make a data corruption inside
the modified image
 2023-04-07 15:52:47 +02:00
Jane Tournois 7eb9a5a0cc Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction_and_weights-GF 
# Conflicts:
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
 2023-04-07 15:11:30 +02:00
Jane Tournois e34cd8d938 doc 2023-04-07 14:54:29 +02:00
Laurent Rineau 1dce90ee79 Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF 2023-04-07 10:59:51 +02:00
Jane Tournois 3e3f66f75d Merge remote-tracking branch 'cgal/master' into Mesh_3-add_minimal_size_criterion_new-jtournois 
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
 2023-04-06 12:04:47 +02:00
Jane Tournois e4ec27fc5c doc review 2023-04-03 11:29:26 +02:00
Jane Tournois 789a4c337d add link and remove CGAL:: 2023-04-03 11:18:06 +02:00
Jane Tournois eb0fc7fa05 Merge remote-tracking branch 'cgal/master' into Mesh_3-sizing_field_with_aabb_tree-GF 
# Conflicts:
#	Mesh_3/include/CGAL/Sizing_field_with_aabb_tree.h
 2023-03-31 15:43:23 +02:00
Jane Tournois 327527d666
Apply suggestions from code review 
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2023-03-31 14:51:58 +02:00
Laurent Rineau 6cd65d23b4 Merge pull request #7275 from lrineau/Mesh_3-improve__Sizing_field_with_aabb_tree-GF 
Mesh_3: Improve Sizing_field_with_aabb_tree speed
 2023-03-31 11:10:56 +02:00
Laurent Rineau 281de129ed Merge pull request #7280 from janetournois/Mesh_3-improve_initialization-jtournois 
Mesh_3 - improve initialization when features are inserted
 2023-03-31 11:10:54 +02:00
Jane Tournois ed3a6f966f
Apply suggestions from code review 
Co-authored-by: Andreas Fabri <andreas.fabri@geometryfactory.com>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2023-03-30 11:34:50 +02:00
Jane Tournois 4b632c29ff remove NP template parameter where it's not necessary 
* add CGAL_DEPRECATED
* fix ambiguity between exude_mesh_3(c3t3) (one param) versions
by removing default time_limit
 2023-03-30 10:40:28 +02:00
Jane Tournois 522c04e9a3
doc 
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2023-03-27 11:09:40 +02:00
Jane Tournois 90ce49893c add cout 2023-03-24 14:25:02 +01:00
Jane Tournois 7f0087ee72 doc 2023-03-24 14:10:39 +01:00
Jane Tournois 03fc6bbdb2 doc 2023-03-24 11:00:26 +01:00
Mael Rouxel-Labbé f5fd746503 Fix stack-use-after-scope error 2023-03-23 17:30:54 +01:00
Jane Tournois ac5ccbd62f Merge remote-tracking branch 'cgal/master' into Mesh_3-sizing_field_with_aabb_tree-GF 
# Conflicts:
#	Mesh_3/doc/Mesh_3/PackageDescription.txt
 2023-03-23 13:53:48 +01:00
Laurent Rineau 693d166835 more debug information 2023-03-22 15:58:55 +01:00
Laurent Rineau 873d98fcbf "simplify" the 6 constructors by using delegating-cstr 2023-03-22 15:50:31 +01:00
Laurent Rineau 728e013cc5 bug-fix: a one-char typo 2023-03-22 15:39:43 +01:00
Jane Tournois b52913b6cc Merge remote-tracking branch 'cgal/master' into Mesh_3-edge_min_size-GF 
# Conflicts:
#	Mesh_3/doc/Mesh_3/Doxyfile.in
 2023-03-20 14:07:19 +01:00
Jane Tournois 2f591dedd9 doc 2023-03-20 13:03:12 +01:00
Jane Tournois 6ae2f004e7 doc in Mesh_criteria_3 2023-03-20 12:57:20 +01:00
Mael Rouxel-Labbé cd0c81a98a Merge remote-tracking branch 'cgal/master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-03-20 10:14:27 +01:00
Mael Rouxel-Labbé 85911f1b64 Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-20 10:06:38 +01:00
Andreas Fabri 0d320e48a8 Merge branch 'Number_types-fix_VC2017_boost_mp-GF' into CORE-boost_mp_number-GF 2023-03-17 08:28:10 +01:00
Laurent Rineau 2f0203be10 Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF 
CGAL CTest support: rename the test names

# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
 2023-03-15 14:23:32 +01:00
albert-github 2d60f46985 issue #7231 Improvement of layout of refines relations. 
- Adjusted cgalRefines according to reviews
- Implemented it in all files
 2023-03-14 17:37:50 +01:00
Jane Tournois 9f7eaca7af improve test 2023-03-14 16:39:08 +01:00
Laurent Rineau 35a1285a12 Merge pull request #6129 from janetournois/Mesh_3-triple_line_extraction-GF 
Mesh_3 - add detection of intersection lines from labeled images

# Conflicts:
#	Installation/CHANGES.md
 2023-03-13 16:46:07 +01:00
Jane Tournois 3ab8f7223d dragknob is better for testing edge_min_size 
there are 2 very close feature polylines
 2023-03-10 16:12:34 +01:00
Jane Tournois 818b08f331 add edge_min_size 
to constrain protecting balls placement to insert no feature smaller
than the given bound
 2023-03-09 15:57:08 +01:00
Jane Tournois 98754f2e21 move doc to header 2023-03-09 13:07:42 +00:00
Jane Tournois 7d6cc37a9f user manual 2023-03-07 14:36:53 +01:00
Jane Tournois 2fd9194a25 add an example 2023-03-07 13:52:44 +01:00
Jane Tournois 30016253ae doc 2023-03-07 13:19:18 +01:00
Jane Tournois 66636a68fc add namespace CGAL 2023-03-07 12:37:29 +01:00
Jane Tournois 09abe79562 typos 2023-03-07 09:15:23 +01:00
Jane Tournois 6bacd852bd doc 
and reorganize typedefs
 2023-03-06 17:23:42 +01:00
Jane Tournois 6e1dd6a4d7 reorganize header for documentation 2023-03-06 12:15:44 +01:00
Jane Tournois 9c85204d3a move doc to header and create new group for MeshDomainField_3 2023-03-03 18:05:54 +01:00
Jane Tournois 8b9c7afef7 move header 2023-03-03 15:12:56 +01:00
Jane Tournois d79493bd62 allow to give empty weights image and just ignore it 2023-02-27 16:02:14 +01:00
Jane Tournois c0b76f22ad merge postprocessing weights function in feature detection 
to avoid duplicating code

- clean example code
- remove all feature detection includes from generate_label_weights.h
- duplicate polylines_to_protect() to make its name more explicit
polylines_to_protect_on_bbox()
 2023-02-24 17:28:30 +01:00
Laurent Rineau 5a20fd8567 Merge pull request #7238 from albert-github/feature/bug_author_consistency 
Making description of author(s)  of a package consistent
 2023-02-24 16:14:43 +01:00
Jane Tournois 4c24841aaf insert postprocessing of weights in feature detection functors 2023-02-24 12:08:40 +01:00
Jane Tournois d1e79542f2 wip 2023-02-23 16:10:06 +01:00
Laurent Rineau 6c372eabcb fix typos 2023-02-23 15:15:11 +01:00
Laurent Rineau bbb5e1b874 On Fedora, IKT is in the cmake/InsightToolkit directory 2023-02-23 14:44:55 +01:00
Laurent Rineau b5cbd09708
Update Mesh_3/include/CGAL/Labeled_mesh_domain_3.h 
Co-authored-by: Jane Tournois <janetournois@users.noreply.github.com>
 2023-02-23 14:44:03 +01:00
Jane Tournois 2d1fb95155 remove with_features named parameter 2023-02-23 14:41:52 +01:00
Laurent Rineau 58c60f5625 add links to create_labeled_image_mesh_domain 2023-02-23 14:13:25 +01:00
Laurent Rineau 04a9f165b4 rephrase 2023-02-23 14:13:11 +01:00
Laurent Rineau 468d965989 simplify the code 2023-02-23 13:16:31 +01:00
Jane Tournois 9d38e85262 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 2023-02-23 12:11:37 +00:00
Jane Tournois 0d550a5938 Merge remote-tracking branch 'cgal/master' into pr/janetournois/7116 
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
 2023-02-23 13:06:59 +01:00
Laurent Rineau 9a03ce57d2 Add a comment about std::cref 2023-02-23 12:44:58 +01:00
Laurent Rineau b87a71cae4 fix the label of the image 2023-02-23 12:38:11 +01:00
Laurent Rineau b6221839f5 rephrasing 2023-02-23 12:11:05 +01:00
Jane Tournois 917cfe3f83 fix doc and constness for features_detector operator() 2023-02-23 11:57:00 +01:00
Jane Tournois 094f07ccfc trailing whitespaces 2023-02-23 10:46:40 +01:00
Jane Tournois b25dba99e8 doc 2023-02-23 10:40:49 +01:00
Laurent Rineau 8d2edc7825 Fix warning 
The warning was from MSVC:
``` CGAL/Mesh_3/experimental/Sizing_field_with_aabb_tree.h(236): warning C4267: 'argument': conversion from 'size_t' to 'const int', possible loss of data
```
 2023-02-23 10:20:02 +01:00
Jane Tournois e2296b581f fix the postprocessing weights function 
add a parameter to generate_label_weights() to postprocess weights

and fix example code
 2023-02-23 10:19:40 +01:00
Laurent Rineau 157b24876e compatibility with C++14 (previous code was C++20) 2023-02-22 14:29:31 +01:00
Jane Tournois 6a1977c2c2 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 
# Conflicts:
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp

and fix compilation of mesh_3D_image_with_detection_of_features.cpp
 2023-02-21 11:22:09 +01:00
Jane Tournois e8e3eaa7b4 Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF 
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
 2023-02-21 11:05:30 +01:00
Jane Tournois de1369d8ec improve initialization when features are inserted 
when the c3t3 contains no cells after initialization by features,
it may be needed to add more points for initialization, even when
the nb of facets in complex is > 0
It is the case for example when facets cover a very small part, or
too few connected components of the domain
 2023-02-21 09:28:48 +00:00
Sébastien Loriot 56c0618d79 more const missing 2023-02-20 15:30:42 +01:00
Sébastien Loriot 9e72361537 All packages depends now on CGAL_Core (like Kernel) 2023-02-20 15:24:16 +01:00
Sébastien Loriot e249f59f38 add missing const 2023-02-20 14:38:38 +01:00
Laurent Rineau a15c868d2c
Update Mesh_3/include/CGAL/Mesh_3/experimental/Sizing_field_with_aabb_tree.h 2023-02-17 19:44:39 +01:00
Laurent Rineau b8f5a4b0d4 Use per-patch kd-trees to speed up the sizing field 2023-02-17 18:51:20 +01:00
Laurent Rineau ded4daa4fe Fix spelling typos 2023-02-17 16:17:35 +01:00
Laurent Rineau f7aed432f7 Make Sizing_field_with_aabb_tree a lightweight object carrying a shared_ptr 2023-02-17 14:37:10 +01:00
Laurent Rineau a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF 
Some CMakeLists.txts cleaning
 2023-02-16 10:52:29 +01:00
Mael Rouxel-Labbé 68067c039f Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-02-14 12:26:50 +01:00
Mael Rouxel-Labbé 9d9a51731a Fix typo 2023-02-09 23:27:01 +01:00
Jane Tournois 520ecebf5b it seems that only msvc 2015 has an issue with "template" here 2023-02-07 12:43:46 +01:00
Jane Tournois 51675616ad attempt to fix a "maybe uninitialized" warning 2023-02-07 12:13:58 +01:00
Jane Tournois 9ef9fd0636 avoid possibly dangling reference to a temporary 2023-02-07 11:57:40 +01:00
Jane Tournois 967c6ab695 link with TBB 2023-02-07 11:51:04 +01:00
Jane Tournois e2c12cf8f9 fix return statements 2023-02-07 11:50:53 +01:00
Jane Tournois be3574fb6d fix warning: moving a temporary object prevents copy elision 2023-02-07 11:23:17 +01:00
Laurent Rineau 6df18b668c CGAL CTest support: rename the test names 
Now that CTest test names can contain whitespace, we can have
better looking names. That is also more practicle because we can now
copy-paste the target name in `compilation of  <target_name>`.
 2023-02-06 12:04:57 +01:00
albert-github 57e900b47c Making description of author(s) of a package consistent 
- use `\cgalPckAuthor` in case of one author
- use of `\cgalPckAuthors` in case of multiple authors
- using in case of multiple authors always `, and `
- in the 1.9.6 `BaseDoxyfile.in` let the `\cgalPckAuthors` point to `\cgalPckAuthor` to get consistent output (not done for other versions as in the past the `ALIASES` could not call one another).
 2023-02-02 18:40:44 +01:00
Laurent Rineau 5d4e0dd9b5 Merge pull request #6954 from janetournois/Mesh_3-minor_fixes_debug_code-jtournois 
Mesh 3 - minor fixes in debug code
 2023-02-02 10:58:27 +01:00
Sébastien Loriot 9e137bca24 Merge 'cgal/master' 2023-01-31 12:26:55 +01:00
Mael Rouxel-Labbé b270b3fa2b Add missing predicate/construction to MeshTriangulationTraits_3 2023-01-30 16:36:39 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Mael 8f703b54cb
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-01-27 21:48:32 +01:00
Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch' 
# Conflicts:
#	Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
#	Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
#	Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
 2023-01-27 21:16:14 +01:00
Laurent Rineau fc61b42864 Merge pull request #6858 from sloriot/Doc-exclude_internal 
Ignore internal directories
 2023-01-27 21:02:29 +01:00
Laurent Rineau 57b538e43a Merge pull request #7098 from afabri/Mesh_3-determinism_test-GF 
Mesh_3: Add test for determinism when not checking for features
 2023-01-27 21:02:21 +01:00
Laurent Rineau 49e6076f19 Merge pull request #7167 from janetournois/Mesh_3-detect_cc_fix_dim2-jtournois 
Mesh_3 - fix initialization of labeled images
 2023-01-27 20:52:07 +01:00
Jane Tournois 8b5238891d generate_label_weights() must be inline 
because it is not a template function
 2023-01-27 11:11:17 +01:00
Jane Tournois 5ad5ae563b attempt to fix doc 2023-01-24 17:44:17 +01:00
Jane Tournois 869cfd7309 add missing "template" 2023-01-24 14:33:12 +01:00
Jane Tournois 293f851f46 rename NP detect_features to features_detector 2023-01-24 12:18:17 +01:00
Jane Tournois dcf6589789 doc about example with std::cref 2023-01-24 11:49:31 +01:00
Jane Tournois 21f2411757 doc 2023-01-24 11:36:58 +01:00
Jane Tournois 0a3322004c doc 2023-01-24 11:24:12 +01:00
Jane Tournois 2ad69c9942 make parameters use uniform in examples 2023-01-24 11:07:30 +01:00
Jane Tournois 682a07a24f doc 2023-01-24 10:55:14 +01:00
Jane Tournois ed4acde2c1 remove domain from parameters 
it is not necessary anymore in detection functors
the named constructor performs domain.add_features()
 2023-01-24 10:53:26 +01:00
Jane Tournois dd4722caa7 mesh domain is now const 
and cleaning (add_input_features has become useless)
 2023-01-23 21:49:17 +01:00
Jane Tournois ef9f917395 Merge branch 'Mesh_3-triple_line_extraction-GF' of https://github.com/janetournois/cgal into Mesh_3-triple_line_extraction-GF 2023-01-23 13:28:54 +00:00
Jane Tournois b7dcf1c2e1
indentation 
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2023-01-23 14:28:12 +01:00
Jane Tournois 4e8011b347 make sure reference type is used as return type 2023-01-23 14:26:00 +01:00
Jane Tournois bdba5a5483 make params consistent 2023-01-23 12:43:40 +01:00
Jane Tournois a4a27f5626 Merge branch 'Mesh_3-triple_line_extraction-GF' of https://github.com/janetournois/cgal into Mesh_3-triple_line_extraction-GF 2023-01-23 11:17:06 +00:00
Jane Tournois 8670cc0a22 remove useless image (duplicate) 2023-01-23 12:16:44 +01:00
Jane Tournois 4a13b9385c
Apply suggestions from code review 
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2023-01-23 12:16:01 +01:00
Jane Tournois db51718727 fix target name 2023-01-23 11:45:15 +01:00
Jane Tournois 4fb0be26a9 merge image + features examples description in the user manual 2023-01-23 11:44:56 +01:00
Jane Tournois 2c2abe668e fix indentation 2023-01-23 11:39:17 +01:00
Jane Tournois fca18230e7 user manual 2023-01-20 16:11:40 +01:00
Jane Tournois 7bbe3b9d56 documentation 2023-01-20 14:40:03 +01:00
Jane Tournois 46808d4267 add a test for input_features + detect_features 2023-01-20 14:18:14 +01:00
Jane Tournois aeb1b73959 make create_labeled_image_mesh_domain return auto 
to avoid the need of keeping return type consistent with
code inside the named constructor
 2023-01-20 10:36:32 +01:00
Jane Tournois cf5979189c deal with input features + detected features in a valid feature graph 
+ remove Feature_range.h. A range of polylines can be given directly to
the named parameter `input_features`
+ fix the demo behaviour
 2023-01-19 15:15:42 +01:00
Jane Tournois f0c4fa1e01 add missing return 2023-01-17 17:01:55 +01:00
Jane Tournois 9bff52fb21 fix compilation for domain with no features 2023-01-17 16:38:35 +01:00
Jane Tournois a4fdd4ba5b separate detected features from user input features 
the functors now return a vector<vector<Point>> (vector of polylines)
that are added as features to the domain after being snapped together
 2023-01-17 14:58:26 +01:00
Jane Tournois 46617ad48f add input_features named parameter 
this way the user can
* detect features (on bbox and inside image),
AND
* provide his own features

WARNING : features MUST NOT overlap, or feature protection will endlessly loop
 2023-01-13 16:13:52 +01:00