From d4d4f8a857efbfd41f72f3d3a131429c5e29ae68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 18 Sep 2014 19:55:22 +0200 Subject: [PATCH] add a method number_of_points() --- .../Scale_space_surface_reconstruction_3.h | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h b/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h index 1eb1af151f9..f9cfbb8b993 100644 --- a/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h +++ b/Scale_space_reconstruction_3/include/CGAL/Scale_space_surface_reconstruction_3.h @@ -287,7 +287,6 @@ public: * it was previously estimated. * * \sa `insert(const Point& p)`. - * \sa `construct_scale_space(InputIterator begin, InputIterator end, unsigned int iterations)`. * \sa `reconstruct_surface(InputIterator begin, InputIterator end, unsigned int iterations)`. */ template < class InputIterator > @@ -362,8 +361,7 @@ public: /// gives the squared radius of the neighborhood. /** The neighborhood radius is used by - * [increase_scale(...)](\ref increase_scale) and - * [construct_scale_space(...)](\ref construct_scale_space) to + * [increase_scale(...)](\ref increase_scale) to * compute the point set at the desired scale and by * [reconstruct_surface(...)](\ref reconstruct_surface) to * construct a surface from the point set at the current scale. @@ -372,7 +370,6 @@ public: * neighborhood radius has not yet been set. * * \sa `increase_scale(unsigned int iterations)`. - * \sa `construct_scale_space(InputIterator begin, InputIterator end, unsigned int iterations)`. * \sa `reconstruct_surface(unsigned int iterations)`. * \sa `reconstruct_surface(InputIterator begin, InputIterator end, unsigned int iterations)`. */ @@ -417,8 +414,7 @@ public: /// sets the squared radius of the neighborhood. /** The neighborhood radius is used by - * [increase_scale(...)](\ref increase_scale) and - * [construct_scale_space(...)](\ref construct_scale_space) to + * [increase_scale(...)](\ref increase_scale) to * compute the point set at the desired scale and by * [reconstruct_surface(...)](\ref reconstruct_surface) to * construct a surface from the point set at the current scale. @@ -435,7 +431,6 @@ public: * \sa `neighborhood_squared_radius()`. * \sa `has_neighborhood_radius()`. * \sa `increase_scale(unsigned int iterations)`. - * \sa `construct_scale_space(InputIterator begin, InputIterator end, unsigned int iterations)`. * \sa `reconstruct_surface(unsigned int iterations)`. * \sa `reconstruct_surface(InputIterator begin, InputIterator end, unsigned int iterations)`. */ @@ -556,7 +551,6 @@ public: * \sa `estimate_neighborhood_radius(InputIterator begin, InputIterator end, unsigned int neighbors, unsigned int samples)`. * \sa `estimate_neighborhood_radius()`. * \sa `insert(InputIterator begin, InputIterator end)`. - * \sa `construct_scale_space(InputIterator begin, InputIterator end, unsigned int iterations)`. * \sa `reconstruct_surface(InputIterator begin, InputIterator end, unsigned int iterations)`. */ template < class InputIterator > @@ -624,12 +618,12 @@ public: * \note If the surface was already constructed, increasing the scale * will not automatically adjust the surface. * - * \sa `construct_scale_space(InputIterator begin, InputIterator end, unsigned int iterations)`. * \sa `estimate_neighborhood_radius()`. * \sa `reconstruct_surface(unsigned int iterations)`. */ void increase_scale( unsigned int iterations = 1 ); - + +#ifndef DOXYGEN_RUNNING /// constructs a scale-space of a collection of points. /** If the neighborhood radius has not been set before, it is automatically * estimated using `estimate_neighborhood_radius()`. @@ -653,16 +647,13 @@ public: * \sa `reconstruct_surface(InputIterator begin, InputIterator end, unsigned int iterations)`. */ template < class InputIterator > -#ifdef DOXYGEN_RUNNING - void construct_scale_space( InputIterator begin, InputIterator end, unsigned int iterations = 1 ) { -#else // DOXYGEN_RUNNING void construct_scale_space( InputIterator begin, InputIterator end, unsigned int iterations = 1, typename boost::enable_if< CGAL::is_iterator >::type* = NULL ) { -#endif // DOXYGEN_RUNNING clear(); insert( begin, end ); increase_scale( iterations ); } +#endif // DOXYGEN_RUNNING /// \} private: @@ -746,6 +737,10 @@ public: /// gives the number of triangles of the surface. std::size_t number_of_triangles() const { return _surface.size(); } + /// gives the number of points of the surface. + std::size_t number_of_points() const { return _tree.size(); } + + /// gives the number of shells of the surface. std::size_t number_of_shells() const { CGAL_assertion( Sh::value == true );