Laurent Rineau
eb59cc6105
Merge remote-tracking branch 'cgal/master' into Installation-ITK-jtournois
2023-11-24 10:50:26 +01:00
Laurent Rineau
9262c6a8b6
Re-add CGAL_ITK_support.cmake
...
That will allow to be compatible with ITK version 4.13 and 5.x.
2023-11-23 17:25:18 +01:00
Jane Tournois
0b73361226
remove CGAL_ITK_support.cmake
...
and adapt the CMakeLists that were using it
2023-11-13 12:47:39 +01:00
Laurent Rineau
51627e3505
Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF
...
# Conflicts:
# GraphicsView/demo/Bounding_volumes/CMakeLists.txt
2023-11-01 20:59:44 +01:00
Laurent Rineau
ebdfddbf5b
add a link to TBB
2023-09-25 16:30:47 +02:00
Laurent Rineau
b05e1e9e46
Remove UseCGAL.cmake
...
and our old CMake macros `use_lib` and `use_component`.
2023-09-14 17:32:55 +02:00
Sébastien Loriot
eada3ee8ca
Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl'
2023-08-14 14:19:25 +02:00
Sébastien Loriot
efd8b2d38b
add more missing tests
2023-06-27 11:18:20 +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
604dcdc435
boost::optional => std::optional
2023-06-15 10:57:09 +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
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
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
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
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
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
Jane Tournois
2fd9194a25
add an example
2023-03-07 13:52:44 +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
bbb5e1b874
On Fedora, IKT is in the cmake/InsightToolkit directory
2023-02-23 14:44:55 +01:00
Jane Tournois
2d1fb95155
remove with_features named parameter
2023-02-23 14:41:52 +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
Laurent Rineau
9a03ce57d2
Add a comment about std::cref
2023-02-23 12:44:58 +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
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
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
Sébastien Loriot
9e137bca24
Merge 'cgal/master'
2023-01-31 12:26:55 +01:00
Mael
153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2023-01-27 22:09:02 +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
2ad69c9942
make parameters use uniform in examples
2023-01-24 11:07:30 +01:00
Jane Tournois
bdba5a5483
make params consistent
2023-01-23 12:43:40 +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
fca18230e7
user manual
2023-01-20 16:11:40 +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
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
Mael
6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2022-12-05 16:03:41 +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
Jane Tournois
f21b8819bc
rename header to match struct capitals
2022-11-14 15:48:47 +01:00
Jane Tournois
468dd2dccc
document named parameter
2022-11-14 11:39:02 +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
Laurent Rineau
d24b180293
Merge branch 'master' into gsoc2022-boost_np
2022-10-28 15:39:36 +02:00