Commit Graph

514 Commits

Author SHA1 Message Date
Sébastien Loriot a9b369650a Merge remote-tracking branch 'cgal/6.0.x-branch' into 'cgal/6.1.x-branch' 2025-11-06 10:04:46 +01:00
Sven Oesau 9e36c6744b adding support for Eigen3 5.0.0
moving the Eigen3 version check into CGAL_Eigen3_support.cmake
2025-11-06 10:01:01 +01:00
Laurent Rineau bdd7988a4a remove CMake warnings about CMP0167
The issue was when VTK/ITK was searched. The
variable `CMAKE_POLICY_DEFAULT_CMP0167` can be
used to workaround that.
2025-05-27 13:02:04 +02:00
Jane Tournois a2f6030f55 update example and user manual 2025-03-24 15:30:42 +01:00
Jane Tournois 3a94fcb68a add surface_only() as a named parameter to make_mesh_3()
to completely skip the "refine_cells" part of Mesh_3
2025-03-11 16:58:28 +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
albert-github 26c3e9cd21 Spelling correction
Spelling correction
2025-02-05 10:28:46 +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 1a4cc658f3 wip apply Laurent's reviews 2024-12-19 16:53:49 +01:00
Jane Tournois 7f4e5b7e84 make doc more clear 2024-12-19 12:45:29 +01:00
Jane Tournois 740863cb02 doc review 2024-12-19 11:50:10 +01:00
Laurent Rineau 9ef32fb832 remove memory leaks with VTK objects 2024-12-18 18:25:55 +01:00
Laurent Rineau 820762da52 proposal for a rewrite using a lamba expression as the point generator 2024-12-18 11:00:55 +01:00
Jane Tournois 18a0f69ca2 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Installation/CHANGES.md
2024-12-05 10:17:14 +01:00
Sebastien Loriot 13328c335e
fix warning
Co-authored-by: Andreas Fabri <andreas.fabri@geometryfactory.com>
2024-11-06 13:34:52 +01:00
Sébastien Loriot 335f9b381e less or more for the interior 2024-11-05 17:30:02 +01:00
Jane Tournois f3abf598ed Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Mesh_3/examples/Mesh_3/CMakeLists.txt
2024-11-04 12:42:37 +01:00
Sébastien Loriot aef524f09f remove extra -D 2024-10-23 11:44:27 +02:00
Sébastien Loriot fb605cdd39 remove -D that is not compatible with "older" cmake versions 2024-10-22 08:19:49 +02:00
Andreas Fabri 9e75ab340d Use add_compile_definitions 2024-10-09 11:58:52 +01:00
Andreas Fabri 527569346e CGAL: Modernize CMakeLists.txt 2024-10-08 17:02:41 +01:00
Jane Tournois c1f2236ee3 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Installation/CHANGES.md
2024-09-30 14:02:09 +02:00
Jane Tournois 32f147f6e2 cleaning 2024-09-30 13:06:47 +02:00
Jane Tournois f3b9a5ac84 doc (Mael's review) 2024-09-30 12:46:29 +02:00
Laurent Rineau 01bc8fec37 Merge pull request #8373 from janetournois/Mesh_3-document_example-jtournois
Mesh_3 - document example Weighted image + triple lines
2024-09-27 10:59:55 +02:00
Jane Tournois b5740393b2 compilation of examples fixed 2024-09-20 13:58:24 +02:00
Jane Tournois ce9cd9e596 wip PR https://github.com/CGAL/cgal/pull/7798 2024-09-17 18:04:40 +02:00
Sebastien Loriot 862a3b6539
Update CMakeLists.txt for recent VTK to fix CMake Warning (#8279)
## Summary of Changes

Versions >= 9 of VTK trigger the following CMake warning using CGAL's
CMakeLists
```
CMake Deprecation Warning at C:/dev/VTK-9.2.2/build/lib/cmake/vtk-9.2/vtk-use-file-deprecated.cmake:1 (message):
  The `VTK_USE_FILE` is no longer used starting with 8.90.
Call Stack (most recent call first):
  CMakeLists.txt:32 (include)
```

I suggest this modification of the CMakeLists of Mesh_3 examples, that
also requires moving to VTK 9 (9.0 was released in 2020).
If this modification and new requirement are validated, I can apply the
change everywhere.

## Release Management

* Affected package(s): Mesh_3 for now
* License and copyright ownership: unchanged
2024-08-19 11:14:31 +02:00
Jane Tournois 5771547e36 replace typedef's by using's 2024-07-23 10:56:46 +02:00
Jane Tournois a93f78d8ad remove debug macros 2024-07-23 10:18:40 +02:00
Laurent Rineau f3b409a807 require VTK version 9.0 or later 2024-06-11 15:57:25 +02:00
Jane Tournois 05c3fc9e94 update CMakeLists.txt for recent VTK 2024-06-11 10:00:36 +02:00
Laurent Rineau 3a223ebd1e cmake_minimum_required(VERSION 3.12...3.29) 2024-06-06 20:19:44 +02:00
Sebastien Loriot d06a57a292
Mesh_3 edge_distance criterion : an upper bound for the distances of the feature edge to the input feature (#7532)
## Summary of Changes

Fixes issue #5110.
Adds a edge_distance criteria to the mesh generation process.
This criteria is an upper bound for the distance from the edge to the 1D
feature.

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): fix #5110
* Link to small feature page :
[Mesh_3_edge_distance_criteria](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Mesh_3_edge_distance_criteria)
* Link to compiled documentation
[*here*](https://cgal.github.io/7532/v1/Manual/index.html):
*
[Mesh_edge_criteria_3](https://cgal.github.io/7532/v1/Mesh_3/classCGAL_1_1Mesh__edge__criteria__3.html)
  * [Mesh_criteria_3](https://cgal.github.io/7532/v1/Mesh_3)
2024-05-27 10:58:15 +02:00
Sebastien Loriot afe7f90a73
Mesh_3::Add handling of *.nii files in one example (#7823)
## Summary of Changes

While the Polyhedron demo can read `*.nii` files there is no example in
`examples/Mesh_3/`.
This PR adds the functionality to the example that uses vtk to read
DICOM data.

This is triggered by [this
question](https://stackoverflow.com/questions/77331075/is-there-an-easy-way-to-convert-from-nifti-nii-image-format-to-inr)
on stackoverflow.

- [ ] Support of `*.nrrd` format
- [ ] example for segmented images
- [ ] Add example data for the file formats.

## Release Management

* Affected package(s): Mesh_3
* License and copyright ownership: unchanged
2024-05-26 17:45:48 +02:00
ange-clement 8575f53583 Doc upgrades + simplified initial_points_generator parameter + fixed memory leaks 2024-05-02 17:29:23 +02:00
ange-clement 3cb583ade7 Added nii image "squircle.nii" +
Updated example to work with a default dataset.
2024-04-12 12:16:25 +02:00
Sébastien Loriot 2701314055 fix warnings 2024-04-09 13:53:47 +02:00
ange-clement 5b0f1fc4c2 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-rework-make-mesh-point-initialization-2-aclement 2024-03-29 16:46:24 +01:00
ange-clement e64e28d5ef Made initial_point parameter work with any Range
With doc and example (
 example "mesh_3D_image_with_initial_points.cpp" has been renamed to  "mesh_3D_image_with_image_initialization.cpp")
2024-03-29 16:29:07 +01:00
ange-clement 70fd9113e7 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-edge-distance-criterium-aclement 2024-03-28 11:36:39 +01:00
Laurent Rineau eb59cc6105 Merge remote-tracking branch 'cgal/master' into Installation-ITK-jtournois 2023-11-24 10:50:26 +01:00
Laurent Rineau 9262c6a8b6 Re-add CGAL_ITK_support.cmake
That will allow to be compatible with ITK version 4.13 and 5.x.
2023-11-23 17:25:18 +01:00
Laurent Rineau 7b8c90ec3b
Merge branch 'master' into Mesh-3-edge-distance-criterium-aclement 2023-11-16 14:53:25 +01:00
Jane Tournois 0b73361226 remove CGAL_ITK_support.cmake
and adapt the CMakeLists that were using it
2023-11-13 12:47:39 +01:00
ange-clement ca7548b341 Removed example +
Modified example mesh_3D_image_with_custom_initialization to use new API
+ Changed InitialPointsGenerator concept : outputs
std::tuple<Weighted_point_3, int, Index> instead of
std::tuple<Point_3, int, Index>
+ custom initialization will be called even if a feature detector is set
2023-11-07 15:25:50 +01:00
ange-clement 48a8796248 Corrected changes.md +
Removed word "distancing" +
Renamed distance_bound_field to distance_field +
Commented example output +
Removed use of sizing_field_param for edge_distance +
Renamed SizingField2 to DistanceField +
Added function query_size
2023-11-03 12:38:05 +01:00
Laurent Rineau 51627e3505 Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF
# Conflicts:
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
2023-11-01 20:59:44 +01:00
ange-clement d7f110e428 Changed InitialPointsGenerator concept :
The points' dimensions are also outputed by the initialisation.
2023-10-31 15:34:42 +01:00
ange-clement 9d22242b63 Removed useless initialization files
Removed initialize_triangulation_from_labeled_image
Removed initialize_triangulation_from_gray_image
2023-10-31 12:21:52 +01:00