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

Worked on the dual functions

This commit is contained in:
Nico Kruithof 2013-02-05 14:07:12 +01:00
parent a0e7fa3c5b
commit c97a1a1fbb
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
View File

@ -21,9 +21,6 @@ set( QT_USE_QTOPENGL TRUE )
find_package(Qt4) find_package(Qt4)
include_directories (BEFORE ../../../include) include_directories (BEFORE ../../../include)
include_directories (BEFORE ./include) include_directories (BEFORE ./include)
# NGHK: Remove
include_directories (BEFORE ../../../../GraphicsView/include/)
include_directories (${CMAKE_CURRENT_BINARY_DIR})
if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND ) if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND )
@ -49,18 +46,18 @@ SOURCE_GROUP("P2T2" FILES ${P2T2_headers})
SOURCE_GROUP("QT" FILES ${QT_headers}) SOURCE_GROUP("QT" FILES ${QT_headers})
# The executable itself. # The executable itself.
add_executable ( demo_Periodic_2_triangulation_2 add_executable ( Periodic_2_Delaunay_triangulation_2
Periodic_2_triangulation_2.cpp Periodic_2_triangulation_2.cpp
Periodic_2_triangulation_2.moc Periodic_2_triangulation_2.moc
${DT_UI_FILES} ${DT_RESOURCE_FILES} ${DT_UI_FILES} ${DT_RESOURCE_FILES}
${headers} ${QT_headers} ${P2T2_headers}) ${headers} ${QT_headers} ${P2T2_headers})
add_to_cached_list( CGAL_EXECUTABLE_TARGETS demo_Periodic_2_triangulation_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Periodic_2_Delaunay_triangulation_2 )
# Link with Qt libraries # Link with Qt libraries
target_link_libraries( demo_Periodic_2_triangulation_2 ${QT_LIBRARIES} ) target_link_libraries( Periodic_2_Delaunay_triangulation_2 ${QT_LIBRARIES} )
# Link with CGAL # Link with CGAL
target_link_libraries( demo_Periodic_2_triangulation_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}) target_link_libraries( Periodic_2_Delaunay_triangulation_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
else() else()
message(STATUS "NOTICE: This demo requires CGAL and Qt4, and will not be compiled.") message(STATUS "NOTICE: This demo requires CGAL and Qt4, and will not be compiled.")

1
GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_triangulation_2.cpp
View File

@ -399,6 +399,7 @@ MainWindow::on_actionSavePoints_triggered()
void void
MainWindow::on_actionRecenter_triggered() MainWindow::on_actionRecenter_triggered()
{ {
pt_gi->modelChanged();
this->graphicsView->setSceneRect(pt_gi->boundingRect()); this->graphicsView->setSceneRect(pt_gi->boundingRect());
this->graphicsView->fitInView(pt_gi->boundingRect(), Qt::KeepAspectRatio); this->graphicsView->fitInView(pt_gi->boundingRect(), Qt::KeepAspectRatio);
} }

2
GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicVoronoiGraphicsItem.h
View File

@ -99,7 +99,7 @@ PeriodicTriangulationVoronoiGraphicsItem<DT>::paint(QPainter *painter, const QSt
PainterOstream<typename DT::Geom_traits> pos(painter, rect); PainterOstream<typename DT::Geom_traits> pos(painter, rect);
painter->setPen(edgesPen()); painter->setPen(edgesPen());
//dt->draw_dual(pos); dt->draw_dual(pos);
// TODO(NGHK): Not yet implement // TODO(NGHK): Not yet implement
// for(typename DT::Finite_edges_iterator eit = dt->finite_edges_begin(); // for(typename DT::Finite_edges_iterator eit = dt->finite_edges_begin();
// eit != dt->finite_edges_end(); // eit != dt->finite_edges_end();