Commit Graph

102355 Commits

Author SHA1 Message Date
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 3e4619f545 use GT function 2023-01-23 12:11:06 +01:00
Jane Tournois 6dc4aa95a9 there are 2 named parameters now 2023-01-23 11:45:31 +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 f8cfa30070 fix bib entry 2023-01-23 11:39:36 +01:00
Jane Tournois 2c2abe668e fix indentation 2023-01-23 11:39:17 +01:00
Jane Tournois b7cd0f8538 doc
we keep vertices of dimension 0 and 1,
that may have a meaning for the user
2023-01-20 16:14:49 +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 3490fdd0c0 do not remove vertices of features (dimension 1 and 0) even if isolated
if the user has asked to insert these vertices, they should not be removed
2023-01-20 14:17:47 +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 0441e0b817 add test for Detect_features_on_image_bbox 2022-11-17 16:44:02 +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
Jane Tournois 29f18ed7a7 update changes 2022-11-15 15:38:14 +01:00
Jane Tournois 0198c8c17c fix path 2022-11-15 11:18:45 +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 c42166814b create_labeled_image_mesh_domain_with_features has been removed 2022-11-08 18:32:30 +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 01f8f1bc1d
Merge pull request #7027 from afabri/Polyhdron_demo-grid_generator-GF 2022-11-08 14:04:35 +01:00
Andreas Fabri 06417e14de Polyhedron Demo: Fix upper right corner 2022-11-08 12:17:02 +00:00
Laurent Rineau fbcf90c5b7 Merge branch '5.5.x-branch' 2022-11-07 10:09:13 +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 987391d8ee Merge pull request #6930 from MaelRL/BGL-Use_is_valid_descriptor-GF
BGL graph validity improvements
2022-11-07 10:08:34 +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 6dc19b11e0 Merge pull request #6985 from sloriot/scripts-extra_spaces
fix indentation
2022-11-07 10:08:23 +01:00