albert-github
93001308f4
Merge branch 'master' into feature/issue_7395
...
# Conflicts:
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot
28f904f4e2
Merge remote-tracking branch 'cgal/master'
2023-08-15 07:16:14 +02:00
Sébastien Loriot
eada3ee8ca
Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl'
2023-08-14 14:19:25 +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
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
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
Mael Rouxel-Labbé
cab9751987
Merge remote-tracking branch 'cgal/master' into Mesh_3-doc_fixes-GF
2023-05-31 11:30:19 +02:00
Mael Rouxel-Labbé
97097f1f04
misc fixes
2023-05-26 13:19:19 +02:00
Andreas Fabri
585dc0f424
various
2023-05-22 13:36:24 +01:00
Mael
532b82cb9b
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF
2023-05-04 17:28:47 +02:00
Sébastien Loriot
e0eac4f388
Merge remote-tracking branch 'cgal/master' into HEAD
2023-05-03 18:37:09 +02:00
Jane Tournois
e34cd8d938
doc
2023-04-07 14:54:29 +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
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
Jane Tournois
d79493bd62
allow to give empty weights image and just ignore it
2023-02-27 16:02:14 +01:00
Jane Tournois
d1e79542f2
wip
2023-02-23 16:10:06 +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
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
917cfe3f83
fix doc and constness for features_detector operator()
2023-02-23 11:57:00 +01:00
Jane Tournois
b25dba99e8
doc
2023-02-23 10:40:49 +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
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
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
0a3322004c
doc
2023-01-24 11:24:12 +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
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
Mael Rouxel-Labbé
e7c6406640
Fix assertions
2022-12-01 12:44:20 +01:00
Jane Tournois
19d4ae4fa6
more doc
2022-11-14 13:30:34 +01:00
Jane Tournois
7fa1d70b69
weights and features do not work together yet
...
weights get priority
2022-11-14 11:40:42 +01:00