songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
103,038 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

4133 Commits

Author SHA1 Message Date
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 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
Laurent Rineau a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF 
Some CMakeLists.txts cleaning
 2023-02-16 10:52:29 +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 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
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
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +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 2ad69c9942 make parameters use uniform in examples 2023-01-24 11:07:30 +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 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 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 2c2abe668e fix indentation 2023-01-23 11:39:17 +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 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