diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt index 0f4fff94847..1f285d32568 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt @@ -14,7 +14,7 @@ include(${CGAL_USE_FILE}) set( QT_USE_QTMAIN TRUE ) -find_package(Qt5 QUIET COMPONENTS Widgets Script) +find_package(Qt5 QUIET COMPONENTS Widgets Script Svg) include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../include ) include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR}) @@ -33,7 +33,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND CGAL_Core_FOUND ) # The executable itself. add_executable ( boolean_operations_2 ${CMAKE_CURRENT_SOURCE_DIR}/boolean_operations_2.cpp boolean_operations_2.moc ${CDT_UI_FILES} ${CDT_RESOURCE_FILES} ) - qt5_use_modules(boolean_operations_2 Widgets Script) + qt5_use_modules(boolean_operations_2 Widgets Script Svg) # Link with Qt libraries target_link_libraries( boolean_operations_2 ${QT_LIBRARIES} ) diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp index 5a505d8fa2b..06a938dce0d 100644 --- a/GraphicsView/demo/Polygon/Polygon_2.cpp +++ b/GraphicsView/demo/Polygon/Polygon_2.cpp @@ -127,7 +127,6 @@ MainWindow::MainWindow() QObject::connect(this, SIGNAL(changed()), pgi, SLOT(modelChanged())); - pgi->setVerticesPen(QPen(Qt::red, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); scene.addItem(pgi); kgongi = new CGAL::Qt::PolygonGraphicsItem(&kgon); diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp index e6ccd1859e8..0eacdf84e05 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp @@ -123,8 +123,8 @@ MainWindow::MainWindow() QColor segmentColor(::Qt::blue); QColor voronoiColor(::Qt::black); segmentColor.setAlpha(150); - sdggi->setSegmentPen(segmentColor); - sdggi->setVoronoiPen(voronoiColor); + sdggi->setSegmentPen(QPen(segmentColor,0)); + sdggi->setVoronoiPen(QPen(voronoiColor,0)); QObject::connect(this, SIGNAL(changed()), sdggi, SLOT(modelChanged())); diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.ui b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.ui index 1c459706848..f360aa5b206 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.ui +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.ui @@ -1,8 +1,9 @@ - + + GeometryFactory Segment_voronoi_2 - - + + 0 0 @@ -10,240 +11,233 @@ 600 - + CGAL Segment Voronoi Diagram - - + + :/cgal/logos/cgal_icon:/cgal/logos/cgal_icon - - - - - + + + + + Qt::StrongFocus - + Qt::ScrollBarAlwaysOn - + Qt::ScrollBarAlwaysOn - + QGraphicsView::NoAnchor - - - + + + File Tools - + TopToolBarArea - + false - - - + + + - - + + Visualization Tools - + TopToolBarArea - + false - - - - - - + + + + + - - + + 0 0 800 - 19 + 26 - - + + &File - - - - - - + + + + + + - - + + &Edit - - + + &Tools - - - - - - + + + + + - - - + + + - - + + &About - - + + About &CGAL - - + + &Quit - + Ctrl+Q - - - + + true - + false - - + + :/cgal/Input/inputPolyline.png:/cgal/Input/inputPolyline.png - + &Insert Polyline - + Insert Point or Polyline - + Left: Insert vtx | Right: Final vtx | Del: Delete vtx - - - + + + :/cgal/fileToolbar/fileNew.png:/cgal/fileToolbar/fileNew.png - + &Clear - + Ctrl+C - - + + true - + false - - + + :/cgal/Triangulation_2/Voronoi_diagram_2.png:/cgal/Triangulation_2/Voronoi_diagram_2.png - + Show &Voronoi Diagram - + Ctrl+V - + false - - - - + + + :/cgal/fileToolbar/fileOpen.png:/cgal/fileToolbar/fileOpen.png - + &Load... - + Ctrl+L - - - + + + :/cgal/fileToolbar/fileSave.png:/cgal/fileToolbar/fileSave.png - + &Save... - + Ctrl+S - - - - + + + :/cgal/Input/zoom-best-fit:/cgal/Input/zoom-best-fit - + Re&center the viewport - + Ctrl+R - - - + + true - - + + :/cgal/Actions/icons/constrained_triangulation_show_constraints.png:/cgal/Actions/icons/constrained_triangulation_show_constraints.png - + Show &constraints - + Ctrl+C - - - - - - + + + + + diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/about_Segment_voronoi_2.html b/GraphicsView/demo/Segment_Delaunay_graph_2/about_Segment_voronoi_2.html index 51dbfb1c7c7..bfee885ab18 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/about_Segment_voronoi_2.html +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/about_Segment_voronoi_2.html @@ -1,10 +1,10 @@ -

Constrained Delaunay Triangulation

+

2D Segment Voronoi Diagram

Copyright © 2008 GeometryFactory

-

This application illustrates the 2D Constrained Delaunay +

This application illustrates the 2D segment Voronoi diagram of CGAL.

-

See also the online +

See also the online manual.

diff --git a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp index 52bc6bbf623..ac3166880c1 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp @@ -131,8 +131,8 @@ MainWindow::MainWindow() QColor segmentColor(::Qt::blue); QColor voronoiColor(::Qt::black); segmentColor.setAlpha(150); - sdggi->setSegmentPen(segmentColor); - sdggi->setVoronoiPen(voronoiColor); + sdggi->setSegmentPen(QPen(segmentColor,0)); + sdggi->setVoronoiPen(QPen(voronoiColor,0)); QObject::connect(this, SIGNAL(changed()), sdggi, SLOT(modelChanged())); diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 63457b7b039..18f94ba18ec 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -271,9 +271,9 @@ qDebug()<<"setting des Pens"; dgi->setVerticesPen( QPen(Qt::red, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); dgi->setVoronoiPen( - QPen(Qt::darkGreen, 2, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin)); + QPen(Qt::darkGreen, 0, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin)); dgi->setSeedsPen( - QPen(Qt::darkBlue, 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + QPen(Qt::darkBlue, 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); dgi->setZValue(-1); scene.addItem(dgi); diff --git a/GraphicsView/demo/Triangulation_2/TriangulationPointInputAndConflictZone.h b/GraphicsView/demo/Triangulation_2/TriangulationPointInputAndConflictZone.h index 75b7c2eb66a..ded56c937f7 100644 --- a/GraphicsView/demo/Triangulation_2/TriangulationPointInputAndConflictZone.h +++ b/GraphicsView/demo/Triangulation_2/TriangulationPointInputAndConflictZone.h @@ -61,7 +61,7 @@ TriangulationPointInputAndConflictZone::mousePressEvent(QGraphicsSceneMouseEv return; } - + QPen blackPen(::Qt::black, 0, ::Qt::SolidLine, ::Qt::RoundCap, ::Qt::RoundJoin); dt->find_conflicts(p, faces); for(typename std::list::iterator it = faces.begin(); it != faces.end(); @@ -71,6 +71,7 @@ TriangulationPointInputAndConflictZone::mousePressEvent(QGraphicsSceneMouseEv QColor color(::Qt::blue); color.setAlpha(150); item->setBrush(color); + item->setPen(blackPen); scene_->addItem(item); qfaces.push_back(item); } diff --git a/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h b/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h index 95dec619ff0..b123ea01b06 100644 --- a/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h +++ b/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h @@ -115,6 +115,7 @@ PolygonGraphicsItem

::PolygonGraphicsItem(P * p_) draw_edges(true), draw_vertices(true) { setVerticesPen(QPen(::Qt::red, 3.)); + setEdgesPen(QPen(::Qt::black, 0)); updateBoundingBox(); setZValue(3); } diff --git a/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h b/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h index d258a5a0791..2a8b49a15b1 100644 --- a/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h +++ b/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h @@ -55,8 +55,8 @@ class SegmentDelaunayGraphGraphicsItem : public GraphicsItem public: SegmentDelaunayGraphGraphicsItem(T * t_) : t(t_), painterostream(0), - segment_pen(::Qt::blue), - voronoi_pen(::Qt::blue) + segment_pen(::Qt::blue, 0), + voronoi_pen(::Qt::blue, 0) { } diff --git a/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h b/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h index 8c0876ec80b..6bdf5cf37fb 100644 --- a/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h +++ b/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h @@ -134,6 +134,7 @@ TriangulationGraphicsItem::TriangulationGraphicsItem(T * t_) visible_edges(true), visible_vertices(true) { setVerticesPen(QPen(::Qt::red, 4.)); + setEdgesPen(QPen(::Qt::black, 0, ::Qt::SolidLine, ::Qt::RoundCap, ::Qt::RoundJoin)); if(t->number_of_vertices() == 0){ this->hide(); }