Commit Graph

4324 Commits

Author SHA1 Message Date
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 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
Jane Tournois f1f480d95c add feature_range() as input for detect_features 2023-01-12 14:48:38 +01:00
Jane Tournois 399945f27d is_infinite(seed_cell) cannot be called when tr.dimension() < 3
and looking for the subdomain index is a nonsense
2023-01-05 14:26:57 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Mael Rouxel-Labbé 94c6c7a1f0 MeshDomain_3::Subdomain is not part of the concept 2023-01-02 13:57:53 +01:00
Mael Rouxel-Labbé a7e1668812 Do not use the concept name as template parameter (this confuses Doxygen) 2023-01-02 13:53:34 +01:00
Jane Tournois fe5c2caf79 fix conversion warning 2022-12-20 09:17:14 +01:00
Sébastien Loriot 95ca78b02c "link" with Eigen 2022-12-16 09:27:22 +01:00
Sébastien Loriot d7843a23ea remove useless const 2022-12-15 16:01:41 +01:00
Jane Tournois cc051878fb revert removing _t unintentionally 2022-12-15 15:57:10 +01:00
Sébastien Loriot fef1a43d35 remove internal from generated doc 2022-12-15 10:43:27 +01:00
Sébastien Loriot ea2a80347f rnd is taken by non-const reference 2022-12-14 17:10:42 +01:00
Laurent Rineau ae3ae6e8d6 Merge pull request #7083 from afabri/Demo-readBMP-GF
3d Demo: Try to read bmp files
2022-12-14 10:39:53 +01:00
Laurent Rineau 1b6d590125 Merge pull request #7110 from sloriot/TR-remove_verbose_flag
Mesh_3, dump_c3t3: remove verbose flag
2022-12-14 10:18:16 +01:00
Laurent Rineau 7959549cff Merge pull request #7110 from sloriot/TR-remove_verbose_flag
Mesh_3, dump_c3t3: remove verbose flag
2022-12-14 10:16:58 +01:00
Jane Tournois 5830d9a9ee minor improvements of tests 2022-12-13 11:51:43 +01:00
Jane Tournois efcebf2294 seed the far points generator
to make parallel Mesh_3 with 1 thread deterministic
2022-12-13 11:32:21 +01:00
Sébastien Loriot 71e452a6b8 be verbose if the macro is defined 2022-12-12 17:55:41 +01:00
Laurent Rineau d7defaf669 Revert "WIP: debug issue with CGAL/Mesh_3/config.h"
This reverts commit 46894fdecd.
2022-12-12 12:08:52 +01:00
Laurent Rineau 46894fdecd WIP: debug issue with CGAL/Mesh_3/config.h 2022-12-12 10:50:59 +01:00
Mael 038ae9cf0c
Remove useless ref 2022-12-09 10:22:23 +01:00
Sebastien Loriot f5c41bd712
Merge pull request #7022 from MaelRL/Weights-v2.0-GF-master
Weights fixes (master)
2022-12-08 15:22:19 +01:00
Sebastien Loriot fa72ad2ad0
Merge pull request #6977 from MaelRL/Weights-v2.0-GF
Weights fixes (5.4.x)
2022-12-08 15:21:43 +01:00
Sébastien Loriot 7466cfc383 add verbose option to dump c3t3 2022-12-07 17:11:09 +01:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Jane Tournois e8e13f730c add a test for facet_min_size and cell_min_size meshing criteria 2022-12-06 17:52:29 +01:00
Jane Tournois ada4b93f26 fix lower bound criteria and add protected debug code
is_lower_bound() was not taken into account in mesh_standard_cell_criteria
2022-12-06 17:50:14 +01:00
Mael Rouxel-Labbé 1cf4b1b19f Remove unused variable 2022-12-06 11:38:15 +01:00
Mael Rouxel-Labbé 06d272169f Fix sometimes creating holes in the C3T3
Example here: https://stackoverflow.com/questions/74403892/missing-elements-in-periodic-c3t3-mesh

See details in the comments (diff)
2022-12-06 11:37:41 +01:00
Mael Rouxel-Labbé 0e6137bed7 Increase stream precision of facet / cells' debug_info_element_impl() 2022-12-06 10:57:47 +01:00
Mael Rouxel-Labbé b115a680bf Merge remote-tracking branch 'cgal/master' into P3M3-Undocumented_polyhedral_domain_example-GF 2022-12-06 09:47:46 +01:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Andreas Fabri 64333c5b06 More changes after Jane's review 2022-12-05 15:02:59 +00:00
Jane Tournois 07fb42117c add named parameters and doc 2022-12-05 15:56:56 +01:00
Andreas Fabri c2a16fa9b8
Apply suggestions from code review
Co-authored-by: Jane Tournois <janetournois@users.noreply.github.com>
2022-12-05 15:49:39 +01:00
Jane Tournois 9fd54baee2 Merge remote-tracking branch 'cgal/master' into Mesh_3-add_minimal_size_criterion_new-jtournois
# Conflicts:
#	Installation/include/CGAL/config.h
#	Mesh_3/doc/Mesh_3/CGAL/Mesh_criteria_3.h
#	Mesh_3/include/CGAL/Mesh_cell_criteria_3.h
#	Mesh_3/include/CGAL/Mesh_criteria_3.h
2022-12-05 15:33:08 +01:00
Mael Rouxel-Labbé a8ffa74ab3 Revert "Do not put into RT3 functions that are very specific to Mesh_3"
This reverts commit bfefd164c3.

dual(Cell_handle, int) now uses dual_ray() / dual_segment(), so just
leave everything in RT3...
2022-12-05 15:19:39 +01:00
Jane Tournois e4e6cadc24 update test_mesh_criteria_creation 2022-12-05 14:28:21 +01:00
Jane Tournois 644dab2300 documentation for cell_min_size and facet_min_size 2022-12-05 11:55:16 +00:00
Jane Tournois dc51b74f2b add facet_min_size and cell_min_size to named parameters 2022-12-05 11:55:16 +00:00
Jane Tournois 8bc115eda0 implement visitors "with radius lower bound" 2022-12-05 11:55:16 +00:00
Mael Rouxel-Labbé e7c6406640 Fix assertions 2022-12-01 12:44:20 +01:00
Mael Rouxel-Labbé 7910d82c6c Misc minor changes 2022-12-01 12:34:50 +01:00
Mael Rouxel-Labbé bfefd164c3 Do not put into RT3 functions that are very specific to Mesh_3 2022-12-01 12:23:40 +01:00
Andreas Fabri 7e9885e046 Mesh_3: Add test for determinism when not checking for features 2022-11-30 09:16:13 +00:00
Mael Rouxel-Labbé cdc3bd22cf Fix project_on_surface's projection direction
See also https://github.com/CGAL/cgal/pull/5209
2022-11-29 12:31:44 +01:00
Mael Rouxel-Labbé 0f0bd3ff6d WIP bmp reading 2022-11-25 01:04:45 +01:00
Mael Rouxel-Labbé b5c21e1f5d Http -> https + update some dead links 2022-11-23 18:54:37 +01:00
Laurent Rineau 1e6ff1b986 Fix a warning about uninitialized value 2022-11-22 16:24:06 +01:00
Laurent Rineau 6ef0a847b4 Revert previous change 2022-11-22 16:23:49 +01:00
Mael Rouxel-Labbé b10b84fb7f Merge remote-tracking branch 'cgal/master' into P3M3-Undocumented_polyhedral_domain_example-GF 2022-11-18 16:47:07 +01:00
Mael Rouxel-Labbé 6e7282ec1d Print corners in Mesh_3 debug info 2022-11-18 00:35:19 +01:00
Mael Rouxel-Labbé c682f8dc20 Add some comments 2022-11-18 00:17:22 +01:00
Jane Tournois 0441e0b817 add test for Detect_features_on_image_bbox 2022-11-17 16:44:02 +01:00
albert-github eed54a0ae5 spelling corrections
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
Jane Tournois a2c95ecd40 update test 2022-11-15 17:36:44 +01:00
Jane Tournois a46c9b1a4e move doc to its right place 2022-11-15 16:27:25 +01:00
Jane Tournois 6ea26bf7c0 add example in user manual 2022-11-15 16:04:28 +01:00