diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp index 191c7f20181..be52bcb4596 100644 --- a/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp @@ -126,7 +126,6 @@ MainWindow::MainWindow() // and the input they generate is passed to the triangulation with // the signal/slot mechanism pt_pi = new CGAL::Qt::TriangulationPointInputAndConflictZone(&scene, &triang, this ); - QObject::connect(pt_pi, SIGNAL(generate(CGAL::Object)), this, SLOT(processInput(CGAL::Object))); @@ -146,6 +145,7 @@ MainWindow::MainWindow() this, SIGNAL(changed())); pt_cc = new CGAL::Qt::TriangulationCircumcircle(&scene, &triang, this); + pt_cc ->setPen(QPen(::Qt::black, .01)); QObject::connect(pt_cc, SIGNAL(modelChanged()), this, SIGNAL(changed())); diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationConflictZone.h b/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationConflictZone.h index ed61883a6e4..be48917b863 100644 --- a/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationConflictZone.h +++ b/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationConflictZone.h @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -81,9 +82,10 @@ TriangulationConflictZone::localize_and_insert_point(QPointF qt_point) ++it){ if(! m_tr->is_infinite(*it)){ QGraphicsPolygonItem *item = new QGraphicsPolygonItem(m_convert(m_tr->triangle(*it))); - QColor color(::Qt::blue); + QColor color = ::Qt::blue; color.setAlpha(150); - item->setBrush(color); + item->setBrush(QBrush(color)); + item->setPen(QPen(::Qt::black, .01)); m_scene->addItem(item); qfaces.push_back(item); } diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationPointInputAndConflictZone.h b/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationPointInputAndConflictZone.h index b7e3f8dcaaf..529bee81f89 100644 --- a/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationPointInputAndConflictZone.h +++ b/GraphicsView/demo/Periodic_2_triangulation_2/TriangulationPointInputAndConflictZone.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -71,9 +72,10 @@ TriangulationPointInputAndConflictZone::mousePressEvent(QGraphicsSceneMouseEv it != faces.end(); ++it) { QGraphicsPolygonItem *item = new QGraphicsPolygonItem(convert(dt->triangle(*it))); - QColor color(::Qt::blue); + QColor color = ::Qt::blue; color.setAlpha(150); - item->setBrush(color); + item->setBrush(QBrush(color)); + item->setPen(QPen(::Qt::black, .01)); scene_->addItem(item); qfaces.push_back(item); } diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h b/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h index 1c135993c88..5c2648a5284 100644 --- a/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h +++ b/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h @@ -154,9 +154,10 @@ namespace CGAL { visible_edges(true), visible_vertices(true), type(NONE) { - setVerticesPen(QPen(::Qt::red, 1.)); + setVerticesPen(QPen(::Qt::red, 1.)); setFacesPen(QPen(QColor(100,100,100))); setDomainPen(QPen(::Qt::blue, .01)); + setEdgesPen(QPen(::Qt::black, .01)); if(t->number_of_vertices() == 0){ this->hide(); }