diff --git a/.gitattributes b/.gitattributes index a74ffee4bb8..58122fe6484 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2605,6 +2605,34 @@ Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h -text Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui -text Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneH.xyz -text Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneK.xyz -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/ball.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/camera.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clipping.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clippingOff.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/conflict.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover1.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover27.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/fileOpen.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init0.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init1.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initGrid.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRand.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRandPlanar.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointBall.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointRandom.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/license.txt -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/locate.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multiple.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multipleOff.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/pause.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/planar.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/play.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/twoColorClipping.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframe.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframeOff.png -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/CGAL.gif -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about.html -text +Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about_CGAL.html -text Periodic_3_triangulation_3/doc_tex/Periodic_3_triangulation_3/offsets.eps -text Periodic_3_triangulation_3/doc_tex/Periodic_3_triangulation_3/offsets.gif -text Periodic_3_triangulation_3/doc_tex/Periodic_3_triangulation_3/offsets.pdf -text diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt index 520520a9745..912fbe39146 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt @@ -34,8 +34,13 @@ if (CGAL_FOUND AND OPENGL_FOUND AND QT4_FOUND AND QGLVIEWER_FOUND) include_directories( ${QGLVIEWER_INCLUDE_DIR} ) + # UI files (Qt Designer files) qt4_wrap_ui ( UI_FILES MainWindow.ui ) + # qrc files (resource files) + qt4_add_resources( RESOURCE_FILES ./Periodic_3_triangulation_3.qrc ) + + # use the Qt MOC preprocessor on classes that derive from QObject qt4_generate_moc ( Scene.h moc_Scene.cpp ) qt4_generate_moc ( MainWindow.h moc_MainWindow.cpp ) @@ -44,10 +49,12 @@ if (CGAL_FOUND AND OPENGL_FOUND AND QT4_FOUND AND QGLVIEWER_FOUND) include_directories( ${QT_INCLUDE_DIR} ) include_directories( ../../include ) + # The executable itself add_executable ( periodic_3_triangulation_3_demo Scene.cpp moc_Scene.cpp periodic_3_triangulation_3_demo.cpp - MainWindow.ui moc_MainWindow.cpp ) + MainWindow.ui moc_MainWindow.cpp + ${UI_FILES} ${RESOURCE_FILES}) # Link the executable to CGAL and third-party libraries target_link_libraries(periodic_3_triangulation_3_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h index 3442ea3cd31..fce302bf2c0 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h @@ -1,5 +1,7 @@ #include #include +#include +#include #include "Scene.h" class MainWindow : public QMainWindow @@ -86,6 +88,8 @@ public: // Help menu: connect(ui->actionDemo_Help, SIGNAL(triggered()), this, SLOT(help())); + connect(ui->actionAbout_CGAL, SIGNAL(triggered()), + this, SLOT(about_CGAL())); connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(about())); @@ -102,25 +106,22 @@ public slots: } void about() { + QFile about("resources/about.html"); + about.open(QIODevice::ReadOnly); QMessageBox mb(QMessageBox::NoIcon, "About the demo...", - "\n\ - \n\ -

3D Periodic Triangulations

\n\ -

Copyright ©2008-2009
\n\ - \ - INRIA Sophia Antipolis - Mediterranee\ - \n\ -

\n\ -

This application illustrates the 3D Periodic Delaunay\ - Triangulations of CGAL.\ -

\n\ -

See also the package manual:
\n\ - \ - 3D Periodic Triangulations\ -

\n\ - \n\ - ", + QTextStream(&about).readAll(), + QMessageBox::Ok, + this); + mb.exec(); + } + + void about_CGAL() { + QFile about("resources/about_CGAL.html"); + about.open(QIODevice::ReadOnly); + QMessageBox mb(QMessageBox::NoIcon, + "About CGAL...", + QTextStream(&about).readAll(), QMessageBox::Ok, this); mb.exec(); diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui index c54c0ac8ff0..39a812b1265 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui @@ -5,17 +5,30 @@ 0 0 - 415 - 389 + 1566 + 713 + + + 0 + 0 + + CGAL Periodic Delaunay Triangulation - + - + + + + 0 + 0 + + + @@ -24,7 +37,7 @@ 0 0 - 415 + 1566 22 @@ -92,6 +105,7 @@ + @@ -101,7 +115,44 @@ + + + toolBar + + + TopToolBarArea + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + :/cgal/Periodic_3_triangulation_3/icons/fileOpen.png:/cgal/Periodic_3_triangulation_3/icons/fileOpen.png + Load Points @@ -121,6 +172,11 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/wireframe.png + :/cgal/Periodic_3_triangulation_3/icons/wireframeOff.png:/cgal/Periodic_3_triangulation_3/icons/wireframe.png + Wireframe @@ -135,6 +191,10 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/planar.png:/cgal/Periodic_3_triangulation_3/icons/planar.png + Planar triangulation @@ -152,6 +212,11 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/cover1.png + :/cgal/Periodic_3_triangulation_3/icons/cover27.png:/cgal/Periodic_3_triangulation_3/icons/cover1.png + Draw 1-sheeted covering @@ -169,6 +234,11 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/multiple.png + :/cgal/Periodic_3_triangulation_3/icons/multipleOff.png:/cgal/Periodic_3_triangulation_3/icons/multiple.png + Draw bordering cells multiply @@ -183,6 +253,11 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/clipping.png + :/cgal/Periodic_3_triangulation_3/icons/clippingOff.png:/cgal/Periodic_3_triangulation_3/icons/clipping.png + Clip along the cube/square @@ -194,6 +269,10 @@ false + + + :/cgal/Periodic_3_triangulation_3/icons/twoColorClipping.png:/cgal/Periodic_3_triangulation_3/icons/twoColorClipping.png + 2-color clipping @@ -202,9 +281,16 @@ + + + :/cgal/Periodic_3_triangulation_3/icons/initGrid.png:/cgal/Periodic_3_triangulation_3/icons/initGrid.png + Point grid + + pg + A grid of 36 points that can be triangulated in 1-sheeted covering space @@ -213,6 +299,10 @@ + + + :/cgal/Periodic_3_triangulation_3/icons/init1.png:/cgal/Periodic_3_triangulation_3/icons/init1.png + Single point @@ -221,6 +311,10 @@ + + + :/cgal/Periodic_3_triangulation_3/icons/initRandPlanar.png:/cgal/Periodic_3_triangulation_3/icons/initRandPlanar.png + Random planar point set @@ -232,6 +326,10 @@ + + + :/cgal/Periodic_3_triangulation_3/icons/initRand.png:/cgal/Periodic_3_triangulation_3/icons/initRand.png + Random point set @@ -243,6 +341,10 @@ + + + :/cgal/Periodic_3_triangulation_3/icons/init0.png:/cgal/Periodic_3_triangulation_3/icons/init0.png + Empty scene @@ -250,17 +352,6 @@ F1 - - - true - - - Show flying ball - - - B - - true @@ -279,6 +370,10 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/locate.png:/cgal/Periodic_3_triangulation_3/icons/locate.png + Point location @@ -293,6 +388,10 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/conflict.png:/cgal/Periodic_3_triangulation_3/icons/conflict.png + Conflict region @@ -329,6 +428,10 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/ball.png:/cgal/Periodic_3_triangulation_3/icons/ball.png + Flying ball @@ -343,6 +446,11 @@ true + + + :/cgal/Periodic_3_triangulation_3/icons/pause.png + :/cgal/Periodic_3_triangulation_3/icons/play.png:/cgal/Periodic_3_triangulation_3/icons/pause.png + Pause @@ -418,6 +526,10 @@ false + + + :/cgal/Periodic_3_triangulation_3/icons/camera.png:/cgal/Periodic_3_triangulation_3/icons/camera.png + Grab image @@ -449,14 +561,9 @@ A - + - Hallo - - - - - Aboutt + About CGAL @@ -468,7 +575,9 @@
QGLViewer/qglviewer.h
- + + + actionClip_along_the_cube_square diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/ball.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/ball.png new file mode 100644 index 00000000000..78ea86c3acf Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/ball.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/camera.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/camera.png new file mode 100644 index 00000000000..0959e38cb56 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/camera.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clipping.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clipping.png new file mode 100644 index 00000000000..630cf9df5b4 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clipping.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clippingOff.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clippingOff.png new file mode 100644 index 00000000000..3f9031b4164 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/clippingOff.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/conflict.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/conflict.png new file mode 100644 index 00000000000..811130ba9bb Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/conflict.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover1.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover1.png new file mode 100644 index 00000000000..1a0d5fd4a8d Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover1.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover27.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover27.png new file mode 100644 index 00000000000..385d761ade9 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/cover27.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/fileOpen.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/fileOpen.png new file mode 100644 index 00000000000..fc6f17e9774 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/fileOpen.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init0.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init0.png new file mode 100644 index 00000000000..d2d3830fdde Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init0.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init1.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init1.png new file mode 100644 index 00000000000..dabc4fe2cb4 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/init1.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initGrid.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initGrid.png new file mode 100644 index 00000000000..3d01fea7364 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initGrid.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRand.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRand.png new file mode 100644 index 00000000000..a296047db38 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRand.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRandPlanar.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRandPlanar.png new file mode 100644 index 00000000000..abe3aaa5376 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/initRandPlanar.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointBall.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointBall.png new file mode 100644 index 00000000000..3cb7bc287d3 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointBall.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointRandom.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointRandom.png new file mode 100644 index 00000000000..07faf23a003 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/inputPointRandom.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/license.txt b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/license.txt new file mode 100644 index 00000000000..2cf4f5398aa --- /dev/null +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/license.txt @@ -0,0 +1,2 @@ +The following file has been copied from Qt Free Edition version 4.4: + fileOpen.png diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/locate.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/locate.png new file mode 100644 index 00000000000..ff83681783a Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/locate.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multiple.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multiple.png new file mode 100644 index 00000000000..d3ec74d8b35 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multiple.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multipleOff.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multipleOff.png new file mode 100644 index 00000000000..d03d1ea9ca5 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/multipleOff.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/pause.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/pause.png new file mode 100644 index 00000000000..80723a6f104 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/pause.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/planar.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/planar.png new file mode 100644 index 00000000000..d169abc3cdf Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/planar.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/play.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/play.png new file mode 100644 index 00000000000..72f969ec89b Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/play.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/twoColorClipping.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/twoColorClipping.png new file mode 100644 index 00000000000..25376eaea59 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/twoColorClipping.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframe.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframe.png new file mode 100644 index 00000000000..e48d6fc39a4 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframe.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframeOff.png b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframeOff.png new file mode 100644 index 00000000000..74788d10028 Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/icons/wireframeOff.png differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/CGAL.gif b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/CGAL.gif new file mode 100644 index 00000000000..06d7016762d Binary files /dev/null and b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/CGAL.gif differ diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about.html b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about.html new file mode 100644 index 00000000000..db688afe651 --- /dev/null +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about.html @@ -0,0 +1,13 @@ + + +

CGAL Periodic Delaunay Triangulation

+

Copyright ©2008-2009
+ INRIA Sophia Antipolis - Mediterranee

+

This application illustrates the 3D Periodic Delaunay Triangulation + of CGAL.

+

See also the package manual:
+ + 3D Periodic Triangulations +

+ + diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about_CGAL.html b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about_CGAL.html new file mode 100644 index 00000000000..76f6bce4d3f --- /dev/null +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/resources/about_CGAL.html @@ -0,0 +1,8 @@ + + +

+

Computational Geometry Algorithms Library

+

CGAL provides efficient and reliable geometric algorithms in the form of a C++ library.

+

For more information visit www.cgal.org

+ +