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

Weighted straight skeleton API update

This commit is contained in:
Fernando Cacciola 2010-05-03 18:25:25 +00:00
parent 5b8efd2fdb
commit de48d61720
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.cpp
View File

@ -36,7 +36,7 @@
#include <qmessagebox.h> #include <qmessagebox.h>
#include <qpopupmenu.h> #include <qpopupmenu.h>
#include <qmenubar.h> #include <qmenubar.h>
#include <qtoolbutton.h> #include <qtoolbutton.h>
#include <qtoolbar.h> #include <qtoolbar.h>
#include <qfiledialog.h> #include <qfiledialog.h>
#include <qtimer.h> #include <qtimer.h>

2
Straight_skeleton_2/examples/Straight_skeleton_2/Create_offset_polygons_2.cpp
View File

@ -6,7 +6,7 @@
#include<CGAL/Polygon_2.h> #include<CGAL/Polygon_2.h>
#include<CGAL/create_offset_polygons_2.h> #include<CGAL/create_offset_polygons_2.h>
#include "print.h" #include "print.h"
typedef CGAL::Exact_predicates_inexact_constructions_kernel K ; typedef CGAL::Exact_predicates_inexact_constructions_kernel K ;

9
Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
View File

@ -1114,10 +1114,10 @@ public:
return *this ; return *this ;
} }
template<class InputPointIterator, class NT> template<class InputPointIterator>
Straight_skeleton_builder_2& enter_contour ( InputPointIterator aBegin Straight_skeleton_builder_2& enter_contour ( InputPointIterator aBegin
, InputPointIterator aEnd , InputPointIterator aEnd
, NT aWeight = 1.0 , double aWeight = 1.0
, bool aIsClosed = true , bool aIsClosed = true
, bool aCheckValidity = true , bool aCheckValidity = true
) )
@ -1125,17 +1125,16 @@ public:
return enter_contour(aBegin, aEnd, aWeight, aIsClosed, Cartesian_converter<K,K>(), aCheckValidity); return enter_contour(aBegin, aEnd, aWeight, aIsClosed, Cartesian_converter<K,K>(), aCheckValidity);
} }
template<class InputPointIterator, class InputWeightIterator, class NT> template<class InputPointIterator, class InputWeightIterator>
Straight_skeleton_builder_2& enter_contour ( InputPointIterator aPBegin Straight_skeleton_builder_2& enter_contour ( InputPointIterator aPBegin
, InputPointIterator aPEnd , InputPointIterator aPEnd
, InputWeightIterator aWBegin , InputWeightIterator aWBegin
, InputWeightIterator aWEnd , InputWeightIterator aWEnd
, NT aWeight = 1.0
, bool aIsClosed = true , bool aIsClosed = true
, bool aCheckValidity = true , bool aCheckValidity = true
) )
{ {
return enter_contour(aPBegin, aPEnd, aWBegin, aWEnd, aWeight, aIsClosed, Cartesian_converter<K,K>(), aCheckValidity ) ; return enter_contour(aPBegin, aPEnd, aWBegin, aWEnd, aIsClosed, Cartesian_converter<K,K>(), aCheckValidity ) ;
} }
} ; } ;