Commit Graph

167 Commits

Author SHA1 Message Date
Sébastien Loriot 3d2edeab55 Merge remote-tracking branch 'cgal/6.0.x-branch' 2025-04-24 20:45:32 +02:00
Sébastien Loriot cb747e8201 Merge pull request #8721 from sloriot/PMP-new_clip
Add refine_with_plane and new fast clip method
2025-04-24 20:43:26 +02:00
Sébastien Loriot 4863704023 workaround API change in QT 6.9 2025-04-22 20:49:10 +02:00
Sébastien Loriot c5ab9f9adc Merge remote-tracking branch 'cgal/6.0.x-branch' into cgal/master 2025-04-10 18:19:14 +02:00
Sébastien Loriot 3b07e3f027 deprecation starts in 6.7 2025-04-09 09:18:22 +02:00
Sébastien Loriot 18bf7051bd fix deprecation warning 2025-04-08 17:58:37 +02:00
Sven Oesau e65e2a0950 deleting selection item in OpenMesh plugin when there is no selection 2025-04-07 09:10:00 +02:00
Sébastien Loriot 7ff41a8950 Merge pull request #7837 from hoskillua/gsoc2023
GSoC2023 - ACVD for Simplification & Remeshing
2025-04-03 18:00:57 +02:00
Sebastien Loriot ede0864914
BGL - add `CGAL::dijkstra_shortest_path(vs, vt, mesh)` (#8724)
## Summary of Changes

computes the shortest path between two vertices, using Dijkstra
algorithm

Todo
- [x] write doc and integrate to 
- [x] add np
- [x] add measure to define what "shortest" means
- [x] add to ref manual top page
- [x] use in demo code

## Release Management

* Affected package(s): BGL
* [Small
feature](https://cgalwiki.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_CGAL::shortest_path(vs,_vt))
* Link to compiled documentation
[CGAL::shortest_path_between_two_vertices()](https://cgal.github.io/8724/v0/BGL/group__PkgBGLTraversal.html#ga5627dee8a6fe4d238cb5c91e123aa763)
* License and copyright ownership: unchanged
2025-04-03 16:07:02 +02:00
Mael Rouxel-Labbé adf8e5ad6a it's > its 2025-03-28 21:18:55 +01:00
Mael Rouxel-Labbé e38e29f279 dont > don't 2025-03-28 20:52:22 +01:00
Sébastien Loriot 5a83d07e6d Merge remote-tracking branch 'cgal/6.0.x-branch' into master 2025-03-28 18:16:42 +01:00
Sébastien Loriot a3db73dc68 Merge remote-tracking branch 'cgal/5.6.x-branch' into cgal/6.0.x-branch 2025-03-28 18:15:16 +01:00
Sébastien Loriot 9f98b28eff add do_not_triangulate_faces option in the plugin + fixes 2025-03-25 23:25:34 +01:00
Jane Tournois bcac630220 rename to dijkstra_shortest_path() 2025-03-18 17:11:00 +01:00
Mael Rouxel-Labbé 1c3ecfa2dd Update API from linear_subdivision to Loop/CatmullClark + NP 2025-03-17 17:14:51 +01:00
Sebastien Loriot 82bd9a01ff
fix an issue with the offset meshing plugin (#8779) 2025-03-14 20:09:22 +01:00
Sébastien Loriot 0ecfcb9962 typo 2025-03-12 14:40:09 +01:00
Laurent Rineau a3e64cffbc fix an issue with the offset meshing plugin 2025-03-10 17:21:08 +01:00
Sébastien Loriot ad7e4754aa Merge remote-tracking branch 'cgal/6.0.x-branch' into master 2025-03-07 17:26:54 +01:00
Jane Tournois d6018ee8ca open the ofstream in binary mode to be consistent with BINARY parameter in CGAL::IO::output_to_vtu() 2025-02-27 16:52:12 +01:00
Jane Tournois 2d4c17a088 deal with cells with subdomain_index 0 2025-02-27 15:13:20 +01:00
Mael Rouxel-Labbé ab082b29f1 Make it possible to enter target coordinates in Selection item's "Move Point" 2025-02-26 00:11:08 +01:00
Mael Rouxel-Labbé a1763eee4e Use linear mask/subdivision 2025-02-20 11:10:19 +01:00
Sébastien Loriot c8ccdc6908 rename function/file 2025-02-13 16:41:16 +01:00
Sébastien Loriot b949cc1eba fix compilation issues 2025-02-13 01:28:57 +01:00
Sébastien Loriot b589c88869 Merge remote-tracking branch 'cgal/master' into gsoc2023-hoskillua 2025-02-13 01:00:12 +01:00
Sébastien Loriot 837dfc45ab fix pmap for curvature based version 2025-02-13 00:43:58 +01:00
Sébastien Loriot 06b511cc65 Merge pull request #6088 from sloriot/PMP-add_discrete_curvature
Add functions to compute discrete curvatures
2025-02-12 21:22:40 +01:00
Sébastien Loriot 9c536ddae6 Merge pull request #8234 from MaelRL/BGL-Add_remove_deg_2_vertex-GF
Add an Euler operation to remove degree 2 vertices
2025-02-12 21:17:43 +01:00
Sébastien Loriot ae9d1bc7ad write the result in the input mesh 2025-02-12 20:00:15 +01:00
Sébastien Loriot 043becfe7f Merge pull request #8273 from lrineau/CGAL-followup_PR_8170-lrineau
Improvement backports from CDT_3 branch (Follow-up to PR #8170)
2025-02-12 19:43:35 +01:00
Sebastien Loriot 14b83f0d3e
boost::tie -> std::tie (#8715) 2025-02-12 19:36:19 +01:00
Sébastien Loriot e6961ef94c factorize qem metric and non qem metric impl 2025-02-10 21:33:46 +01:00
Sébastien Loriot 328230c40e warnings and TODOs 2025-02-10 19:50:43 +01:00
Sébastien Loriot 2060b222c5 remove leftover 2025-02-09 18:48:14 +01:00
Laurent Rineau 8eefb7f173 Merge branch 'master' into pr/lrineau/8273 2025-02-07 16:10:52 +01:00
Sebastien Loriot e871025f36
update our CMake supported versions to ...3.31 (#8727)
## Summary of Changes

Update our CMake supported versions to ...3.31. That will suppress the
warnings about `CMP0167` (from CMake 3.30):

```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
  Policy CMP0167 is not set: The FindBoost module is removed.  Run "cmake
  --help-policy CMP0167" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.
```

## Release Management

* Affected package(s): all cmake scripts
* License and copyright ownership: maintenance by GF
2025-02-07 14:03:47 +01:00
Sebastien Loriot 54bfdfe04d
Mesh 3 : initial_points_generator parameter for make_mesh_3 point initialization (#7798)
## Summary of Changes

Added a `initial_points_generator` parameter in make_mesh_3.
With this parameter, we can use a custom functor when initializing the
C3t3 complex.
This functor must follow the
[Initial_points_generator](https://cgal.github.io/7798/v0/Mesh_3/classInitialPointsGenerator.html)
concept.

Tasks:
 - [x] Add `initial_points_generator` parameter in `make_mesh_3`
 - [x] Make an example
 - [x] Write `Construct_initial_points_labeled_image` into a header
- [x] Make `initialize_triangulation_from_labeled_image` use
`Construct_initial_points_labeled_image`
- [x] Change definition of concept `InitialPointsGenerator` to output
`std::tuple<MeshDomain::Point_3, int dimension, MeshDomain::Index>`
(instead of `std::pair<MeshDomain::Point_3, MeshDomain::Index>`)
 - [x] Make it pass checks
 - [x] Document `initial_points_generator` parameter in `make_mesh_3`
 - [x] Document `Construct_initial_points_labeled_image` header
 - [x] Document example
- [x] Delete `initialize_triangulation_from_labeled_image` and
`initialize_triangulation_from_gray_image`
- [x] Make an example of labelled and gray image initialisation with the
parameter or the old custom initialization.
 - [x] Make small feature page
- [x] add `Construct_initial_points_gray_image.h`, similar to
`Construct_initial_points_labeled_image.h`
 - [x] Maybe add a test ?
- [x] announce in `CHANGES.md`, see
https://github.com/CGAL/cgal/pull/7798#issuecomment-2082701644

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): 
  * fix #922
  * fix #7469 
  * discussion #7537
  * previous closed PR #7757
* Feature/Small Feature (if any):
[Mesh_3_initial_points_generator_parameter](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Mesh_3_initial_points_generator_parameter)
* Link to compiled documentation
[*here*](https://cgal.github.io/7798/v4/Manual/index.html):
*
[make_mesh_3](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Functions.html#gac8599a0c967075f740bf8e2e92c4770e)
has been modified to receive the parameters :
*
[initial_points_generator](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gaf53777b83f1b2f3e7d49275dbab6e46b)
*
[initial_points](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gae94f38c6cd23cce45a55608e881a546a)
* The
[InitialPointsGenerator](https://cgal.github.io/7798/v4/Mesh_3/classInitialPointsGenerator.html)
concept that the functor must be a model of.
* A model of this concept :
[Construct_initial_points_labeled_image](https://cgal.github.io/7798/v4/Mesh_3/structCGAL_1_1Construct__initial__points__labeled__image.html)
* License and copyright ownership:
2025-02-05 08:29:06 +01:00
Laurent Rineau e5001d1a50 update our CMake version 3.18...3.31
That will suppress the warnings about `CMP0167` (from CMake 3.30):

```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
  Policy CMP0167 is not set: The FindBoost module is removed.  Run "cmake
  --help-policy CMP0167" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.
```
2025-02-04 14:32:37 +01:00
Jane Tournois dc3fabfb66 use shortest_path_between_two_vertices() in demo 2025-02-03 15:42:44 +01:00
Sébastien Loriot 4737f58130 do not use tie when not needed 2025-01-27 14:02:15 +01:00
Sébastien Loriot 107f3696dc boost::tie -> std::tie 2025-01-24 14:20:00 +01:00
Sébastien Loriot b19515e1f8 Merge remote-tracking branch 'cgal/6.0.x-branch' 2025-01-24 08:09:18 +01:00
Sébastien Loriot 7720caa9dc Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD 2025-01-24 08:08:33 +01:00
Laurent Rineau d4e6ffddf4 fix protection against min/max macros
The regular expression I used was:

```
((?!(?:^.*(\/\/|\/\*).*|^ *\* .*|^[^"]*"(?:"[^"]*"|[^"])*))^(?:.*[ ,\(]|))(\b(?:(?:[A-Za-z]+::)*)(?:max|min))\b *\(
```
2025-01-14 16:12:34 +01:00
Mael Rouxel-Labbé 76e47d40ed Fix header path 2025-01-10 13:51:57 +01:00
Mael Rouxel-Labbé 9e5dcbf548 Merge remote-tracking branch 'cgal/master' into BGL-Add_remove_deg_2_vertex-GF 2024-12-13 14:44:04 +01:00
Mael Rouxel-Labbé 1189356739 Add discrete curvatures to display plugin 2024-12-10 21:17:57 +01:00
Mael Rouxel-Labbé f7c36ea81d Make the bottom and top of the ramp not have same colors 2024-12-10 17:10:11 +01:00