Mael Rouxel-Labbé
282166307c
Misc minor changes
2022-12-07 12:20:39 +01:00
Mael Rouxel-Labbé
f3ec4653e9
List the main item above its volume plane in item list
2022-12-07 12:20:22 +01:00
Mael Rouxel-Labbé
f7925fdd1a
Reposition DCM / BMP underneath "Load..." (instead of the bottom of "Files")
2022-12-07 12:19:50 +01:00
Mael Rouxel-Labbé
1c04eea703
Refactor DCM / BMP to avoid code duplication + add smoothing selection to GUI
2022-12-07 12:19:24 +01:00
Mael Rouxel-Labbé
c36c54c139
Fix "Planes for unnamed"
2022-12-07 11:42:30 +01:00
Andreas Fabri
c7fb2f56ae
Three: Add an #include#
2022-12-07 09:47:41 +00:00
Andreas Fabri
9159816fb4
PMP: Fix for a -Wmaybe-uninitialized
2022-12-07 08:02:35 +00:00
Mael Rouxel-Labbé
d90d47fb79
Fix indentation (no real changes)
2022-12-06 22:57:42 +01:00
Mael Rouxel-Labbé
9a607498be
Avoid some code duplication
2022-12-06 22:43:05 +01:00
Mael
0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113
2022-12-06 22:21:06 +01:00
Mael
db81e4a3fb
Further clarify doc
2022-12-06 22:13:05 +01:00
Andreas Fabri
1adb13edc8
Do not use deprecated functions
2022-12-06 12:34:26 +00:00
Sébastien Loriot
d3b13fb11c
Merge branch 'cgal/5.5.x-branch'
2022-12-05 19:00:39 +01:00
Sebastien Loriot
887e175361
Merge pull request #6984 from janetournois/PSP-fix_has_normal_map-GF
...
Point_set_3 - `NP_helper::has_normal_map()` should not always return true
2022-12-05 18:59:42 +01:00
Mael
6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2022-12-05 16:03:41 +01:00
Andreas Fabri
64333c5b06
More changes after Jane's review
2022-12-05 15:02:59 +00:00
Laurent Rineau
72d590ef44
Merge pull request #6866 from lrineau/Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
...
fix undefined
2022-12-05 16:00:00 +01:00
Andreas Fabri
c2a16fa9b8
Apply suggestions from code review
...
Co-authored-by: Jane Tournois <janetournois@users.noreply.github.com>
2022-12-05 15:49:39 +01:00
Laurent Rineau
079993d0c6
updated crontab (automated commit)
2022-12-05 15:18:03 +01:00
Laurent Rineau
e8ec440859
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
...
# Conflicts:
# STL_Extension/doc/STL_Extension/CGAL/Concurrent_compact_container.h
2022-12-05 14:51:31 +01:00
Laurent Rineau
aea26d0843
Merge branch '5.5.x-branch'
2022-12-05 13:50:30 +01:00
Laurent Rineau
90f6546d77
Merge pull request #7069 from sloriot/PMP-split_repair_5.5
...
Split repair
2022-12-05 13:50:25 +01:00
Laurent Rineau
93e278fe1d
Merge branch '5.5.x-branch'
2022-12-05 13:47:03 +01:00
Laurent Rineau
77f7b3ec8a
Merge branch '5.4.x-branch' into 5.5.x-branch
2022-12-05 13:46:52 +01:00
Laurent Rineau
57de525060
Merge pull request #7093 from afabri/Spatial_searching-Weighted_Minkowski_doc_fix-GF
...
Spatial_searching: Fix doc
2022-12-05 13:46:20 +01:00
Laurent Rineau
21b086d166
Merge branch '5.5.x-branch'
2022-12-05 13:42:10 +01:00
Laurent Rineau
05b446eb3e
Merge pull request #6992 from janetournois/Tet_remeshing-selection_pmap-jtournois
...
Tet remeshing - `cell_is_selected_map` should be a property map
# Conflicts:
# Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/compute_c3t3_statistics.h
# Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h
2022-12-05 12:38:31 +01:00
Laurent Rineau
42c8c4f9e1
Merge pull request #7070 from sloriot/PMP-split_repair
...
Split repair (master version)
2022-12-05 12:23:19 +01:00
Laurent Rineau
dbe12c20ee
Merge pull request #7072 from afabri/CGAL-cmake-3_25-GF
...
CGAL: Fixes for cmake 3.25
# Conflicts:
# Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
# Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
# Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
# Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
# Shape_regularization/examples/Shape_regularization/CMakeLists.txt
# Shape_regularization/test/Shape_regularization/CMakeLists.txt
# Weights/examples/Weights/CMakeLists.txt
# Weights/test/Weights/CMakeLists.txt
2022-12-05 12:22:44 +01:00
Laurent Rineau
041df61a70
Merge pull request #7074 from sloriot/PMP-compatible_orientation_missing_option
...
CGAL::PMP::compatible_orientations: add missing option
2022-12-05 12:22:09 +01:00
Laurent Rineau
67b5c791e9
Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
...
Update some links + https
2022-12-05 12:22:06 +01:00
Laurent Rineau
d66a296fd8
Merge pull request #7077 from MaelRL/CGAL-Translate_French_error_msgs-GF
...
Translate some French error messages / comments
2022-12-05 12:22:03 +01:00
Laurent Rineau
861ce1deed
Merge pull request #7078 from MaelRL/Kernel_23-Fix_missing_CP3_overload-GF
...
Fix the Kernel concept being weaker than TriangulationTraits_23 requirements
2022-12-05 12:22:01 +01:00
Laurent Rineau
b3ba4bcfee
Merge pull request #7079 from afabri/Polyfit-fix_path-GF
...
Polyfit: Fix path in example
2022-12-05 12:21:58 +01:00
Laurent Rineau
2f92fdded4
Merge pull request #7082 from MaelRL/Intersections_3-L3_bug-GF
...
Fix Line_3-Tet_3 intersection test
2022-12-05 12:21:56 +01:00
Laurent Rineau
7f1486ffb3
Merge pull request #7089 from janetournois/Polyhedron_demo-fix_available_features_for_gray_images-jtournois
...
Polyhedron demo for Mesh_3 - disable features detection for gray level images
2022-12-05 12:21:53 +01:00
Laurent Rineau
17fd74e432
Merge pull request #7090 from afabri/PMP-assertion_bug-GF
...
Polygon Mesh Processing: Fix CGAL_assertion_msg
2022-12-05 12:21:51 +01:00
Laurent Rineau
ec8262d58c
Merge pull request #7091 from afabri/Demo3D-unamed-GF
...
Polyhedron Demo: unamed
2022-12-05 12:21:48 +01:00
Laurent Rineau
34e1157159
Merge pull request #7093 from afabri/Spatial_searching-Weighted_Minkowski_doc_fix-GF
...
Spatial_searching: Fix doc
2022-12-05 12:21:46 +01:00
Laurent Rineau
e9ef4277fc
Merge pull request #7095 from afabri/STL_extension-dereferenceable-GF
...
STL Extensions: Correct spelling
2022-12-05 12:21:43 +01:00
Laurent Rineau
55ad242913
Merge branch '5.4.x-branch' into 5.5.x-branch
2022-12-05 12:20:55 +01:00
Laurent Rineau
4b87443efc
Merge pull request #6992 from janetournois/Tet_remeshing-selection_pmap-jtournois
...
Tet remeshing - `cell_is_selected_map` should be a property map
# Conflicts:
# Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h
2022-12-05 12:20:06 +01:00
Laurent Rineau
f0d4d975dd
Merge pull request #7072 from afabri/CGAL-cmake-3_25-GF
...
CGAL: Fixes for cmake 3.25
# Conflicts:
# Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
# Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
# Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
# Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
# Shape_regularization/examples/Shape_regularization/CMakeLists.txt
# Shape_regularization/test/Shape_regularization/CMakeLists.txt
# Weights/examples/Weights/CMakeLists.txt
# Weights/test/Weights/CMakeLists.txt
2022-12-05 12:03:21 +01:00
Laurent Rineau
33cffd9c26
Merge pull request #7074 from sloriot/PMP-compatible_orientation_missing_option
...
CGAL::PMP::compatible_orientations: add missing option
2022-12-05 11:57:16 +01:00
Laurent Rineau
802d648f04
Merge pull request #7078 from MaelRL/Kernel_23-Fix_missing_CP3_overload-GF
...
Fix the Kernel concept being weaker than TriangulationTraits_23 requirements
2022-12-05 11:57:14 +01:00
Laurent Rineau
3135821001
Merge pull request #7082 from MaelRL/Intersections_3-L3_bug-GF
...
Fix Line_3-Tet_3 intersection test
2022-12-05 11:57:11 +01:00
Laurent Rineau
2e2d001d61
Merge pull request #7089 from janetournois/Polyhedron_demo-fix_available_features_for_gray_images-jtournois
...
Polyhedron demo for Mesh_3 - disable features detection for gray level images
2022-12-05 11:57:09 +01:00
Laurent Rineau
ead1795d85
Merge pull request #7090 from afabri/PMP-assertion_bug-GF
...
Polygon Mesh Processing: Fix CGAL_assertion_msg
2022-12-05 11:57:06 +01:00
Laurent Rineau
50f8c40142
Merge pull request #7091 from afabri/Demo3D-unamed-GF
...
Polyhedron Demo: unamed
2022-12-05 11:57:04 +01:00
Laurent Rineau
a59c56239f
Merge pull request #7093 from afabri/Spatial_searching-Weighted_Minkowski_doc_fix-GF
...
Spatial_searching: Fix doc
2022-12-05 11:57:01 +01:00