From 43be43d6903a047188473309581d9c2acfdde85b Mon Sep 17 00:00:00 2001 From: Pierre Alliez Date: Mon, 14 Jul 2008 13:53:42 +0000 Subject: [PATCH] rename self-intersect pca fit and self-intersect to red by default --- Polyhedron/demo/Polyhedron/MainWindow_pca.cpp | 4 ++-- .../demo/Polyhedron/MainWindow_self_intersection.cpp | 2 +- .../CGAL/{TMP-Self_intersect.h => self_intersect.h} | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) rename Polyhedron/demo/Polyhedron/include/CGAL/{TMP-Self_intersect.h => self_intersect.h} (99%) diff --git a/Polyhedron/demo/Polyhedron/MainWindow_pca.cpp b/Polyhedron/demo/Polyhedron/MainWindow_pca.cpp index 9c1e85dd983..daea219ed5a 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow_pca.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow_pca.cpp @@ -66,7 +66,7 @@ void MainWindow::on_actionFitPlane_triggered() scene->addPolyhedron(pFit, tr("%1 (plane fit)").arg(scene->polyhedronName(index)), - scene->polyhedronColor(index), // PA: to be changed to red + Qt::red, scene->isPolyhedronActivated(index), scene->polyhedronRenderingMode(index)); @@ -147,7 +147,7 @@ void MainWindow::on_actionFitLine_triggered() scene->addPolyhedron(pFit, tr("%1 (line fit)").arg(scene->polyhedronName(index)), - scene->polyhedronColor(index), // PA: to be changed to red + Qt::red, scene->isPolyhedronActivated(index), scene->polyhedronRenderingMode(index)); diff --git a/Polyhedron/demo/Polyhedron/MainWindow_self_intersection.cpp b/Polyhedron/demo/Polyhedron/MainWindow_self_intersection.cpp index cd6a76184eb..efa16933218 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow_self_intersection.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow_self_intersection.cpp @@ -35,7 +35,7 @@ void MainWindow::on_actionSelf_intersection_triggered() scene->addPolyhedron(pSoup, tr("%1 (intersecting triangles)").arg(scene->polyhedronName(index)), - scene->polyhedronColor(index), // PA: to be changed to red + Qt::red, scene->isPolyhedronActivated(index), scene->polyhedronRenderingMode(index)); diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/TMP-Self_intersect.h b/Polyhedron/demo/Polyhedron/include/CGAL/self_intersect.h similarity index 99% rename from Polyhedron/demo/Polyhedron/include/CGAL/TMP-Self_intersect.h rename to Polyhedron/demo/Polyhedron/include/CGAL/self_intersect.h index e4b424172c3..1c622f020cb 100644 --- a/Polyhedron/demo/Polyhedron/include/CGAL/TMP-Self_intersect.h +++ b/Polyhedron/demo/Polyhedron/include/CGAL/self_intersect.h @@ -1,5 +1,5 @@ // compute self-intersection of a CGAL triangle polyhedron mesh -// originally from Lutz Kettner +// original code from Lutz Kettner #ifndef _SELF_INTERSECT_H_ #define _SELF_INTERSECT_H_ @@ -155,11 +155,8 @@ template // compute self-intersections filtered out by boxes Intersect_facets intersect_facets(out); CGAL::box_self_intersection_d(box_ptr.begin(), box_ptr.end(),intersect_facets,2000); + } // end self_intersect #endif // _SELF_INTERSECT_H_ - - - -