From fccf6d244a4d60c3138afa81266e22ac65adddbc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:20:21 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kig/objects/polygon_imp.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'kig/objects') diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc index 08215bfb..5c001df6 100644 --- a/kig/objects/polygon_imp.cc +++ b/kig/objects/polygon_imp.cc @@ -498,34 +498,34 @@ std::vector computeConvexHull( const std::vector& points */ if ( points.size() < 3 ) return points; - std::vector worklist = points; + std::vector wortdelist = points; std::vector result; - double ymin = worklist[0].y; + double ymin = wortdelist[0].y; uint imin = 0; - for ( uint i = 1; i < worklist.size(); ++i ) + for ( uint i = 1; i < wortdelist.size(); ++i ) { - if ( worklist[i].y < ymin ) + if ( wortdelist[i].y < ymin ) { - ymin = worklist[i].y; + ymin = wortdelist[i].y; imin = i; } } - // worklist[imin] is definitely on the convex hull, let's start from there - result.push_back( worklist[imin] ); - Coordinate startpoint = worklist[imin]; - Coordinate apoint = worklist[imin]; + // wortdelist[imin] is definitely on the convex hull, let's start from there + result.push_back( wortdelist[imin] ); + Coordinate startpoint = wortdelist[imin]; + Coordinate apoint = wortdelist[imin]; double aangle = 0.0; - while ( ! worklist.empty() ) + while ( ! wortdelist.empty() ) { int besti = -1; double anglemin = 10000.0; - for ( uint i = 0; i < worklist.size(); ++i ) + for ( uint i = 0; i < wortdelist.size(); ++i ) { - if ( worklist[i] == apoint ) continue; - Coordinate v = worklist[i] - apoint; + if ( wortdelist[i] == apoint ) continue; + Coordinate v = wortdelist[i] - apoint; double angle = std::atan2( v.y, v.x ); while ( angle < aangle ) angle += 2*M_PI; if ( angle < anglemin ) @@ -536,14 +536,14 @@ std::vector computeConvexHull( const std::vector& points } if ( besti < 0 ) return result; // this happens, e.g. if all points coincide - apoint = worklist[besti]; + apoint = wortdelist[besti]; aangle = anglemin; if ( apoint == startpoint ) { return result; } result.push_back( apoint ); - worklist.erase( worklist.begin() + besti, worklist.begin() + besti + 1 ); + wortdelist.erase( wortdelist.begin() + besti, wortdelist.begin() + besti + 1 ); } assert( false ); return result; -- cgit v1.2.1