Commit Graph

156 Commits

Author SHA1 Message Date
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
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 917cfe3f83 fix doc and constness for features_detector operator() 2023-02-23 11:57:00 +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
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
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
Sébastien Loriot 0dac9f4c27 fix warnings 2022-10-25 16:04:56 +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
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
Sébastien Loriot 142190007d uniform within a call 2022-10-11 15:30:10 +02:00
Sébastien Loriot 6145499ec7 nullptr 2022-10-11 14:54:03 +02:00
Sébastien Loriot 1937d74578 the workaround seems to be required for all MSVC versions 2022-10-10 17:02:05 +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
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
Sébastien Loriot fc4c86a491 try to work around MSVC 2015 bugs... 2022-09-30 15:54:30 +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
Sébastien Loriot db7a4e9945 add missing namespace 2022-09-23 15:21:25 +02:00
Sébastien Loriot 5023cb90cf do no modify visibility and add macro to hide parts 2022-09-23 14:24:37 +02:00
Laurent Rineau 2c6ab3ca51
Update Labeled_mesh_domain_3.h
[skip ci]
2022-09-21 15:49:19 +02:00