songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip apply Laurent's reviews

This commit is contained in:
Jane Tournois 2024-12-19 16:53:49 +01:00
parent 7f4e5b7e84
commit 1a4cc658f3
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mesh_3/doc/Mesh_3/CGAL/Mesh_3/parameters.h
View File

@ -491,7 +491,8 @@ unspecified_type initial_points_generator(const InitialPointsGenerator& generato
* \ingroup PkgMesh3Parameters * \ingroup PkgMesh3Parameters
* *
* The function `parameters::initial_points()` enables the user to specify a container, model of `Range`, that contains * The function `parameters::initial_points()` enables the user to specify a container, model of `Range`, that contains
* initial points to be used in the `make_mesh_3()` function for mesh generation. Items in the container are * initial points constructed on surfaces,
* to be used in the `make_mesh_3()` function for mesh generation. Items in the container are
* tuple-like objects containing a `Weighted_point_3`, an `int`, and a `MeshDomain::Index`, * tuple-like objects containing a `Weighted_point_3`, an `int`, and a `MeshDomain::Index`,
* where `Weighted_point_3` represents the position and the weight of the point, * where `Weighted_point_3` represents the position and the weight of the point,
* `int` the dimension of the minimal subcomplex on which the point lies, * `int` the dimension of the minimal subcomplex on which the point lies,

6
Mesh_3/examples/Mesh_3/mesh_3D_image_with_image_initialization.cpp
View File

@ -11,7 +11,7 @@
#include <CGAL/make_mesh_3.h> #include <CGAL/make_mesh_3.h>
#include <CGAL/Image_3.h> #include <CGAL/Image_3.h>
#include <CGAL/SMDS_3/Dump_c3t3.h> #include <CGAL/IO/File_medit.h>
// Domain // Domain
typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
@ -56,7 +56,9 @@ int main()
/// [Meshing] /// [Meshing]
// Output // Output
CGAL::dump_c3t3(c3t3, "out"); std::ofstream medit_file("out.mesh");
CGAL::IO::write_MEDIT(medit_file, c3t3);
medit_file.close();
return 0; return 0;
} }

3
Mesh_3/include/CGAL/Mesh_3/Construct_initial_points_gray_image.h
View File

@ -51,6 +51,9 @@ struct Construct_initial_points_gray_image
const typename MeshDomain::R::FT iso_value_; const typename MeshDomain::R::FT iso_value_;
Functor image_values_to_subdomain_indices_; Functor image_values_to_subdomain_indices_;
/*!
* @todo
*/
Construct_initial_points_gray_image(const CGAL::Image_3 & image, Construct_initial_points_gray_image(const CGAL::Image_3 & image,
const MeshDomain& domain, const MeshDomain& domain,
const double iso_value, const double iso_value,

9
Mesh_3/include/CGAL/Mesh_3/Construct_initial_points_labeled_image.h
View File

@ -100,6 +100,9 @@ struct Construct_initial_points_labeled_image
const CGAL::Image_3& image_; const CGAL::Image_3& image_;
const MeshDomain& domain_; const MeshDomain& domain_;
/*!
* @todo
*/
Construct_initial_points_labeled_image(const CGAL::Image_3& image, Construct_initial_points_labeled_image(const CGAL::Image_3& image,
const MeshDomain& domain) const MeshDomain& domain)
: image_(image) : image_(image)
@ -122,7 +125,7 @@ struct Construct_initial_points_labeled_image
return pts; return pts;
} }
/*! /* //internal undocumented
* \brief Same as above, but a `TransformOperator` that transforms values of the image is used. * \brief Same as above, but a `TransformOperator` that transforms values of the image is used.
* *
* @tparam OutputIterator model of `OutputIterator` for * @tparam OutputIterator model of `OutputIterator` for
@ -306,9 +309,6 @@ struct Construct_initial_points_labeled_image
continue; continue;
// insert point in temporary triangulation // insert point in temporary triangulation
/// The following lines show how to insert initial points in the
/// `c3t3` object. [insert initial points]
Vertex_handle v = tr.insert(pi); Vertex_handle v = tr.insert(pi);
// `v` could be null if `pi` is hidden by other vertices of `tr`. // `v` could be null if `pi` is hidden by other vertices of `tr`.
@ -316,7 +316,6 @@ struct Construct_initial_points_labeled_image
c3t3.set_dimension(v, 2); // by construction, points are on surface c3t3.set_dimension(v, 2); // by construction, points are on surface
c3t3.set_index(v, intersect_index); c3t3.set_index(v, intersect_index);
/// [insert initial points]
*pts++ = std::make_pair(pi, intersect_index); // dimension 2 by construction, points are on surface *pts++ = std::make_pair(pi, intersect_index); // dimension 2 by construction, points are on surface
} }