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

Be more precise in case of degenerate polyline constraints (length 0,1; identical points)

This commit is contained in:
Andreas Fabri 2014-11-05 17:13:19 +01:00
parent d1e66808d9
commit c593ee59ba
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_plus_2.h
View File

@ -213,7 +213,9 @@ size_type
insert(PointIterator first, PointIterator last);
/*!
Inserts the constraint segment `ab` in the triangulation.
Inserts the constraint segment `ab` in the triangulation.
If the two points are equal the point is inserted but no constraint,
and `Constrained_id(NULL)`is returned.
*/
Constraint_id insert_constraint(Point a, Point b);
@ -224,14 +226,20 @@ Inserts the constraint `c`.
/*!
Inserts a constraint whose endpoints are the vertices
pointed by `va` and `vb` in the triangulation.
pointed by `va` and `vb` in the triangulation.
If the two vertex handles are equal no constraint is inserted,
and `Constrained_id(NULL)`is returned.
*/
Constraint_id insert_constraint(Vertex_handle va, Vertex_handle vb);
/*!
Inserts a polyline defined by the points in the range `[first,last)`.
Returns the constraint id.
The polyline is considered as a polygon if the first and last points are equal or if `close = true`. This allows for example to pass the vertex range of a `Polygon_2`.
Inserts a polyline defined by the points in the range `[first,last)`
and returns the constraint id.
The polyline is considered as a closed curve if the first and last point are equal or if `close == true`. This allows for example to pass the vertex range of a `Polygon_2`.
When enumerating the vertices of a closed polyline constraint with a `Vertices_in_constraint_iterator` the first and last vertex are the same.
In case the range is empty `Constrained_id(NULL)`is returned.
In case all points are equal the point is inserted but no constraint,
and `Constrained_id(NULL)`is returned.
\tparam PointIterator must be an `InputIterator` with the value type `Point`.
*/
template < class PointIterator>

4
Triangulation_2/include/CGAL/Polyline_constrained_triangulation_2.h
View File

@ -508,7 +508,7 @@ public:
private:
template < class InputIterator>
Constraint_id insert_constraint_seq_impl(InputIterator first, InputIterator last, bool is_polygon)
{
{<
Face_handle hint;
std::vector<Vertex_handle> vertices;
for(;first!= last; first++){
@ -519,7 +519,7 @@ private:
vertices.push_back(vh);
}
}
if(is_polygon) {
if(is_polygon && (vertices.size()>1) && (vertices.front() != vertices.back())){
vertices.push_back(vertices.front());
}