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

Add typenames; reorder member initialization; add this->

This commit is contained in:
Andreas Fabri 2015-04-29 12:27:55 +02:00 committed by Sébastien Loriot
parent 74c817fe7f
commit 693db86912
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
View File

@ -103,7 +103,7 @@ discoverComponents(const CDT & ct,
return; return;
// tag all faces inside // tag all faces inside
for(CDT::All_faces_iterator fit = ct.all_faces_begin(); for(typename CDT::All_faces_iterator fit = ct.all_faces_begin();
fit != ct.all_faces_end(); fit != ct.all_faces_end();
++fit) ++fit)
fit->set_in_domain(true); fit->set_in_domain(true);
@ -112,28 +112,28 @@ discoverComponents(const CDT & ct,
discoverInfiniteComponent(ct); discoverInfiniteComponent(ct);
// mark "outside" components with a seed // mark "outside" components with a seed
for(SeedList::const_iterator sit = seeds.begin(); for(typename SeedList::const_iterator sit = seeds.begin();
sit != seeds.end(); sit != seeds.end();
++sit) ++sit)
{ {
CDT::Face_handle fh_loc = ct.locate(*sit); typename CDT::Face_handle fh_loc = ct.locate(*sit);
if(fh_loc == NULL || !fh_loc->is_in_domain()) if(fh_loc == NULL || !fh_loc->is_in_domain())
continue; continue;
std::list<CDT::Face_handle> queue; std::list<typename CDT::Face_handle> queue;
queue.push_back(fh_loc); queue.push_back(fh_loc);
while(!queue.empty()) while(!queue.empty())
{ {
CDT::Face_handle f = queue.front(); typename CDT::Face_handle f = queue.front();
queue.pop_front(); queue.pop_front();
f->set_in_domain(false); f->set_in_domain(false);
for(int i = 0; i < 3; ++i) for(int i = 0; i < 3; ++i)
{ {
CDT::Face_handle ni = f->neighbor(i); typename CDT::Face_handle ni = f->neighbor(i);
if(ni->is_in_domain() if(ni->is_in_domain()
&& !ct.is_constrained(CDT::Edge(f,i))) //same component && !ct.is_constrained(typename CDT::Edge(f,i))) //same component
{ {
queue.push_back(ni); queue.push_back(ni);
} }
@ -171,7 +171,7 @@ private:
void insert_polyline(Iterator b, Iterator e) void insert_polyline(Iterator b, Iterator e)
{ {
Point_2 p, q; Point_2 p, q;
CDT::Vertex_handle vh, wh; typename CDT::Vertex_handle vh, wh;
Iterator it = b; Iterator it = b;
vh = cdt.insert(*it); vh = cdt.insert(*it);
p = *it; p = *it;

22
GraphicsView/include/CGAL/Qt/DelaunayMeshTriangulationGraphicsItem.h
View File

@ -41,16 +41,16 @@ class DelaunayMeshTriangulationGraphicsItem
public: public:
DelaunayMeshTriangulationGraphicsItem(T * t_) DelaunayMeshTriangulationGraphicsItem(T * t_)
: Base(t_), : Base(t_)
visible_in_domain(true), , visible_in_domain(true)
visible_blind_faces(false), , visible_blind_faces(false)
in_domain_brush(::Qt::blue) , visible_voronoi(false)
, blind_brush(::Qt::gray) , visible_seeds(false)
, visible_voronoi(false) , visible_inside_edges(false)
, seeds_begin() , seeds_begin()
, seeds_end() , seeds_end()
, visible_seeds(false) , in_domain_brush(::Qt::blue)
, visible_inside_edges(false) , blind_brush(::Qt::gray)
{ {
setSeedsPen(QPen(::Qt::black, 10.)); setSeedsPen(QPen(::Qt::black, 10.));
} }
@ -153,7 +153,7 @@ public:
void setVisibleInsideEdges(const bool b) void setVisibleInsideEdges(const bool b)
{ {
visible_inside_edges = b; visible_inside_edges = b;
update(); this->update();
} }