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

3045 Commits

Author SHA1 Message Date
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
Jane Tournois 4be918b51b it's forbidden to compare (size_t < 0) 2023-04-18 17:10:41 +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
Sébastien Loriot 9f33e64643 avoid warning 2023-04-12 09:00:24 +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 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 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
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 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 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
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 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
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
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
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 be3574fb6d fix warning: moving a temporary object prevents copy elision 2023-02-07 11:23:17 +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 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 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 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 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 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
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 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 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 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
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
Jane Tournois 07fb42117c add named parameters and doc 2022-12-05 15:56:56 +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 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
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
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
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 a46c9b1a4e move doc to its right place 2022-11-15 16:27:25 +01:00
albert-github 3674c937f7 spelling corrections 
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
 2022-11-15 15:21:01 +01:00
albert-github 45478184de spelling corrections 
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
 2022-11-15 13:39:40 +01:00
Jane Tournois f21b8819bc rename header to match struct capitals 2022-11-14 15:48:47 +01:00
Jane Tournois 19d4ae4fa6 more doc 2022-11-14 13:30:34 +01:00
Jane Tournois 33499c482a doc 2022-11-14 13:20:15 +01:00
Jane Tournois 7fa1d70b69 weights and features do not work together yet 
weights get priority
 2022-11-14 11:40:42 +01:00
Jane Tournois 468dd2dccc document named parameter 2022-11-14 11:39:02 +01:00
Jane Tournois 98abdce06e change return type to auto for auxiliary functions 
create_labeled_image_mesh_domain(const CGAL::Image_3& image_, const CGAL_NP_CLASS& np)
returns a std::conditional_t<
    CGAL::parameters::is_default_parameter<CGAL_NP_CLASS, internal_np::detect_features_param_t>::value,
    Labeled_mesh_domain_3,
    Mesh_domain_with_polyline_features_3<Labeled_mesh_domain_3>
  >

we need to either copy-paste this std::conditional_t for each instance of
create_labeled_image_mesh_domain, or use auto, to avoid
loosing the Mesh_domain_with_polyline_features_3 wrapper when applicable
 2022-11-10 16:12:17 +01:00
Jane Tournois 0ebcbec3c5 comment on Return_type 2022-11-10 11:51:29 +01:00
Jane Tournois a17a83ea34 factorize to avoid code duplication 2022-11-08 21:32:16 +01:00
Jane Tournois 4905ff7e49 change domain type depending on whether detect_features_param is provided 2022-11-08 19:54:07 +01:00
Jane Tournois 4ebbe922bd Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF 
# Conflicts:
#	BGL/include/CGAL/boost/parameter.h
#	Installation/CHANGES.md
#	Mesh_3/doc/Mesh_3/CGAL/Labeled_mesh_domain_3.h
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h

+ fix compilation
+ prepare for using detect_features
 2022-11-08 16:17:33 +01:00
Laurent Rineau 92d8d1c805 Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF 
# Conflicts:
#	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
 2022-11-08 12:11:06 +01:00
Mael Rouxel-Labbé 83b0b0bdef Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-07 14:23:29 +01:00
Mael Rouxel-Labbé 7564b761ac Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-07 14:11:10 +01:00
Laurent Rineau 8c9281f440 Merge pull request #6642 from sloriot/gsoc2022-boost_np 
Replace usage of Boost parameters with CGAL named function parameters
 2022-11-07 10:08:38 +01:00
Laurent Rineau 3b90060529 Merge pull request #6978 from janetournois/Mesh_3-detect_cc_in_labeled_images-GF 
Mesh 3 for labeled images - avoid vertex clusters on surfaces
 2022-11-07 10:08:30 +01:00
Laurent Rineau 714e4445a2 Merge pull request #6978 from janetournois/Mesh_3-detect_cc_in_labeled_images-GF 
Mesh 3 for labeled images - avoid vertex clusters on surfaces
 2022-11-07 10:06:42 +01:00
Jane Tournois 3816d8c2af boost::optional has_value() is available only since boost 1.68 
and CGAL supports boost >= 1.66
 2022-11-03 14:27:54 +01:00
Jane Tournois 7f70d48ab9 seed_cell cannot be infinite 2022-11-03 14:27:53 +01:00
Sebastien Loriot 168825a7f1 fix warning 2022-11-03 14:27:53 +01:00
Jane Tournois a8877c5a44 add struct Seed for better readability 
and avoid using boost::none to be ready for std::optional (C++17)
 2022-11-03 14:27:53 +01:00
Jane Tournois 7faa73bb27 locate of seed that is outside affine hull returns Cell_handle() 
accessing the circumcenter was then failing
 2022-11-03 14:27:52 +01:00
Jane Tournois 8b76b55b82 remove useless include 2022-11-03 14:27:52 +01:00
Jane Tournois 28a6946070 do not run random shooting in connected components that already are represented 
during feature protection, most of the connected components, in particular on
the bbox boundary, are already represented and ready to start/hint Delaunay
refinement

if the chosen seed lies in a cell that already belongs (wrt Is_in_domain(cc))
to the right connected component, random shooting is canceled and
the loop continues to next seed
 2022-11-03 14:27:52 +01:00
Jane Tournois db6b051973 on image boundaries, construct point away from the surface 
this avoids creating point clusters on surfaces
 2022-11-03 14:27:51 +01:00
Laurent Rineau 8e8153c0ac Merge pull request #6871 from afabri/CGAL_assertions-GF 
CGAL: No longer per package assertions
 2022-11-03 09:44:48 +01:00
Laurent Rineau 56453b7e9f Merge pull request #6953 from afabri/CGAL-Wunused-but-set-variable-GF 
Address -Wunused-but-set-variable
 2022-11-03 09:44:45 +01:00
Laurent Rineau 0c36f00f71
Update Mesh_3/include/CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h 2022-11-02 16:03:30 +01:00
Sébastien Loriot a9162809c4 fields should be taken by const ref 2022-10-31 10:18:39 +01:00
Laurent Rineau d24b180293 Merge branch 'master' into gsoc2022-boost_np 2022-10-28 15:39:36 +02:00
Mael Rouxel-Labbé 1c4be0356d Harmonize some #ifdefs / #ifs 2022-10-27 17:38:18 +02:00
Jane Tournois f5480e6006 fix more float/double conversions 
code that uses eigen can use doubles when needed
 2022-10-26 18:19:46 +02:00
Mael Rouxel-Labbé bd52dc631a Misc code cleaning 2022-10-26 10:20:44 +02:00
Mael Rouxel-Labbé 9e40d88a29 Rename C3T3_helpers function to clarify its purpose, and fix it for P3M3 2022-10-26 10:20:44 +02:00
Sébastien Loriot 0dac9f4c27 fix warnings 2022-10-25 16:04:56 +02:00
Sébastien Loriot 9179a2d41b fix conversion warning 2022-10-24 09:17:40 +02:00
Mael Rouxel-Labbé 9ab7e1ed7f Misc minor code cleaning 2022-10-20 17:21:43 +02:00
Sébastien Loriot 645e33aa56 fix warnings 2022-10-19 17:00:03 +02:00
Sébastien Loriot dcc4e6ade4 disable for all MSVC 2022-10-19 16:59:47 +02:00
Sébastien Loriot 40c1fdc03d use MSVC overload for everybody 
clang master also have issue with the generic variadic versions
 2022-10-18 06:05:13 +02:00
Andreas Fabri c04dceb71d Merge master 2022-10-14 14:40:58 +01:00
Andreas Fabri f52444425e Mesh_3 2022-10-14 10:25:42 +01:00
Andreas Fabri a4c6df514a Mesh_3 2022-10-14 10:21:44 +01:00
Jane Tournois 48011b4bb2 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 2022-10-13 16:11:59 +01:00
Jane Tournois 45c8d0ef99 add missing template parameters 2022-10-13 17:11:39 +02:00
Jane Tournois 090456b4a5 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
 2022-10-13 17:10:27 +02:00
Jane Tournois 536c35fac5 remove unused parameters 2022-10-13 16:31:15 +02:00
Jane Tournois 6304ce7d8e fix compilation when no feature detection functor is given 2022-10-13 16:17:20 +02:00
Laurent Rineau 2454bf45c3 Merge pull request #6864 from janetournois/Mesh_3-fix_weighted_images-GF 
Mesh 3 - fix construction of weights image for labeled image input
 2022-10-13 15:17:48 +02:00
Laurent Rineau 1a8e03cc85 Merge pull request #6864 from janetournois/Mesh_3-fix_weighted_images-GF 
Mesh 3 - fix construction of weights image for labeled image input
 2022-10-13 15:15:22 +02:00
Laurent Rineau adc5bd4677 Merge pull request #6864 from janetournois/Mesh_3-fix_weighted_images-GF 
Mesh 3 - fix construction of weights image for labeled image input
 2022-10-13 15:14:11 +02:00
Sébastien Loriot 4f347919f2 fix CI 2022-10-11 16:31:19 +02:00
Sébastien Loriot c56198f176 fix copy/paste error + improve doc 2022-10-11 16:01:07 +02:00
Sébastien Loriot 142190007d uniform within a call 2022-10-11 15:30:10 +02:00
Sébastien Loriot 775409dfd8 remove useless links 2022-10-11 14:58:12 +02:00
Sébastien Loriot 6145499ec7 nullptr 2022-10-11 14:54:03 +02:00
Sébastien Loriot 56eb3c59e1 apply suggestions from review 2022-10-11 14:50:50 +02:00
Jane Tournois 63f6c9de77 avoid usage of min(double, float) 2022-10-11 10:56:48 +02:00
Jane Tournois b499178f7b dump_after_refine_surface must happen after scan_triangulation() 
to have c3t3 cells selected as they should
 2022-10-11 09:58:47 +02:00
Jane Tournois badfc7d5de add VERY_VERBOSE macro for global optimizers 
VERBOSE should not cout all the moves, the log is too long
 2022-10-11 09:58:02 +02:00
Sébastien Loriot 1937d74578 the workaround seems to be required for all MSVC versions 2022-10-10 17:02:05 +02:00
Laurent Rineau 0e823324c9 Allow to use an Epick-like kernel with float as FT 2022-10-10 15:49:17 +02:00
Laurent Rineau d18af6e369 Merge pull request #6927 from lrineau/Mesh_3-fix_leaks-GF 
Mesh_3: Fix a memory leak in the parallel code
 2022-10-07 15:46:34 +02:00
Laurent Rineau 4a26b482a7 Merge pull request #6927 from lrineau/Mesh_3-fix_leaks-GF 
Mesh_3: Fix a memory leak in the parallel code
 2022-10-07 15:46:34 +02:00
Laurent Rineau 7db002804c Merge pull request #6927 from lrineau/Mesh_3-fix_leaks-GF 
Mesh_3: Fix a memory leak in the parallel code
 2022-10-07 15:46:06 +02:00
Jane Tournois b5ff78e7f9 reorder includes 2022-10-07 10:37:36 +02:00
Jane Tournois a2d6d792b1 add author 2022-10-07 10:37:15 +02:00
Jane Tournois 1b11faaf00 add missing std:: 2022-10-06 16:02:06 +02:00
Jane Tournois 9bb4fb4d15 protect debug code with macro 
and remove default filename ""
 2022-10-06 15:10:37 +02:00
Jane Tournois c64a0d8648 add more details about how to choose sigma 2022-10-06 10:44:26 +02:00
Sebastien Loriot 50938b98bc Add missing dot 
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2022-10-05 21:52:27 +02:00
Sébastien Loriot 5a02248907 remove disable as enable was removed 2022-10-05 21:50:39 +02:00
Sébastien Loriot c0ff903d21 fix default values 2022-10-05 21:41:20 +02:00
Sébastien Loriot d6d2188cc7 fix warning 2022-10-05 19:33:00 +02:00
Sébastien Loriot daf9add03a fix after review 2022-10-05 16:40:33 +02:00
Sebastien Loriot cbfeb98b38 Apply suggestions from review 
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
 2022-10-05 15:39:04 +02:00
Sébastien Loriot 8c7a1d756f use backticks instead of \c 2022-10-04 19:24:30 +02:00
Sebastien Loriot a61e6bc346 Apply review from Jane 
Co-authored-by: Jane Tournois <janetournois@users.noreply.github.com>
 2022-10-04 18:56:34 +02:00
Laurent Rineau 187967559b Merge pull request #6796 from janetournois/Mesh_3-compare_distance_performance_issue-jtournois 
Mesh_3 speedup (filter failures in `Compare_distance_3(Point_3, Segment_3, Point_3)` )
 2022-10-04 13:53:31 +02:00
Laurent Rineau d345d93bbb Merge pull request #6796 from janetournois/Mesh_3-compare_distance_performance_issue-jtournois 
Mesh_3 speedup (filter failures in `Compare_distance_3(Point_3, Segment_3, Point_3)` )
 2022-10-04 13:50:27 +02:00
Sébastien Loriot 3de965f16d please MSVC 2015 
@lrineau do you know why only the constructor has this issue?
 2022-10-03 19:08:47 +02:00
Laurent Rineau 8fddaa6baa Mesh_3: Fix a memory leak in the parallel code 2022-10-03 17:15:27 +02:00
Sébastien Loriot fc4c86a491 try to work around MSVC 2015 bugs... 2022-09-30 15:54:30 +02:00
Jane Tournois 8d019c5622 consider bbox polylines as features for making weights "black" on features 2022-09-28 08:07:06 +02:00
Jane Tournois 13ef721ac0 remove trailing whitespace 2022-09-27 17:04:40 +02:00
Jane Tournois 521e4c123b fix protection macro 2022-09-27 16:54:01 +02:00
Jane Tournois bca99f4a18 add detect_features named parameter for create_labeled_image_mesh_domain_with_features 
todo : move it to create_labeled_image_mesh_domain and remove
create_labeled_image_mesh_domain_with_features as soon as PR on named
parameters is merged
 2022-09-27 16:17:25 +02:00
Jane Tournois fe590eecd2 remove outdated headers 2022-09-27 10:35:22 +02:00
Sébastien Loriot b0a144c6e7 update examples to the new API 2022-09-26 20:14:26 +02:00
Sébastien Loriot 54a6462273 move code so that we can reinject mesh_3 parameters functions into NFP class 2022-09-26 20:09:58 +02:00
Jane Tournois 1976710f9c add weights input to the labeled image + features domain 2022-09-23 17:21:01 +02:00
Jane Tournois 77a121c1a6 Merge branch 'Mesh_3-fix_weighted_images-GF' into Mesh_3-triple_line_extraction_and_weights-GF 2022-09-23 15:53:14 +01:00
Jane Tournois 6175050c90 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 
# Conflicts:
#	Mesh_3/examples/Mesh_3/mesh_3D_image_with_detection_of_features.cpp
 2022-09-23 16:26:49 +02:00
Sébastien Loriot db7a4e9945 add missing namespace 2022-09-23 15:21:25 +02:00
Mael Rouxel-Labbé 363d1daaef Some more conversions to non-package specific assertions 2022-09-23 15:20:24 +02:00
Andreas Fabri 6d09a886b2 Remove paragraph in the developer manual; Some fixes 2022-09-23 14:12:53 +01:00
Sébastien Loriot 5023cb90cf do no modify visibility and add macro to hide parts 2022-09-23 14:24:37 +02:00
Sébastien Loriot d191d4474a Revert "fix not documented warnings" 
This reverts commit 8d773c56348c4055d963c57426d60d118915d22b.
 2022-09-23 14:04:51 +02:00
Andreas Fabri d3fca65ae5 CGAL: No longer per package assertions 2022-09-23 12:49:40 +01:00
Sébastien Loriot 6397378bdc fix not documented warnings 2022-09-23 13:29:40 +02:00
Jane Tournois af908bea25 use ITK DiscreteGaussianImageFilter with variance = 1 voxel 
sigma parameter is difficult to use for end user
 2022-09-22 12:48:46 +02:00
Sébastien Loriot 56ee7b3deb add missing include directive 2022-09-21 18:36:00 +02:00
Sébastien Loriot d2cd6244ff clean up Periodic_3_mesh_3 doc 2022-09-21 17:20:29 +02:00
Laurent Rineau 2c6ab3ca51
Update Labeled_mesh_domain_3.h 
[skip ci]
 2022-09-21 15:49:19 +02:00