From 9f2384e77d9cdf21c255b0c4e7d0fdbcbb830e44 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 4 Jul 2008 13:10:02 +0000 Subject: [PATCH] - Remove demo/icons/Logos.qrc, replaced by demo/resources/CGAL.qrc, that also contains :/cgal/help/about_CGAL.html - Add include/CGAL/Qt/debug.h and src/CGALQt/debug.cpp, that will contain debug tools/functions. For the moment, they just define: void traverse_resources(const QString& name); that must be used like that: CGAL::Qt:traverse_resources(":/cgal"); // view CGAL resources or CGAL::Qt:traverse_resources(":"); // view all resources and displays the resources tree on std::cerr. --- .gitattributes | 6 ++-- .../Constrained_Delaunay_triangulation_2.cpp | 2 +- .../Delaunay_triangulation_2.cpp | 2 +- .../{icons/Logos.qrc => resources/CGAL.qrc} | 5 ++- .../cgal_large_FAF8E8.gif | Bin .../demo/{icons => resources}/cgal_logo.xpm | 0 GraphicsView/include/CGAL/Qt/debug.h | 24 +++++++++++++ GraphicsView/src/CGALQt4/CMakeLists.txt | 4 +-- GraphicsView/src/CGALQt4/debug.cpp | 32 ++++++++++++++++++ 9 files changed, 67 insertions(+), 8 deletions(-) rename GraphicsView/demo/{icons/Logos.qrc => resources/CGAL.qrc} (51%) rename GraphicsView/demo/{icons => resources}/cgal_large_FAF8E8.gif (100%) rename GraphicsView/demo/{icons => resources}/cgal_logo.xpm (100%) create mode 100644 GraphicsView/include/CGAL/Qt/debug.h create mode 100644 GraphicsView/src/CGALQt4/debug.cpp diff --git a/.gitattributes b/.gitattributes index 5edda6fcd40..ad05177f02a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1922,11 +1922,8 @@ GraphicsView/demo/Triangulation_2/icons/movingPoint.png -text GraphicsView/demo/icons/Delaunay_triangulation_2.png -text GraphicsView/demo/icons/File.qrc -text GraphicsView/demo/icons/Input.qrc -text -GraphicsView/demo/icons/Logos.qrc -text GraphicsView/demo/icons/Triangulation_2.qrc -text GraphicsView/demo/icons/Voronoi_diagram_2.png -text -GraphicsView/demo/icons/cgal_large_FAF8E8.gif -text svneol=unset#image/gif -GraphicsView/demo/icons/cgal_logo.xpm -text GraphicsView/demo/icons/fileNew.png -text GraphicsView/demo/icons/fileOpen.png -text GraphicsView/demo/icons/fileSave.png -text @@ -1934,7 +1931,10 @@ GraphicsView/demo/icons/inputPoint.png -text svneol=unset#image/png GraphicsView/demo/icons/inputPolyline.png -text GraphicsView/demo/icons/zoom-best-fit.png -text svneol=unset#image/png GraphicsView/demo/icons/zoom-best-fit.svg -text +GraphicsView/demo/resources/CGAL.qrc -text GraphicsView/demo/resources/about_CGAL.html svneol=native#text/html +GraphicsView/demo/resources/cgal_large_FAF8E8.gif -text svneol=unset#image/gif +GraphicsView/demo/resources/cgal_logo.xpm -text GraphicsView/doc_tex/GraphicsView/uml-design.eps -text GraphicsView/doc_tex/GraphicsView/uml-design.graphml -text GraphicsView/doc_tex/GraphicsView/uml-design.pdf -text diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 875fcd54a62..ca7d891dc77 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -346,7 +346,7 @@ int main(int argc, char **argv) Q_INIT_RESOURCE(File); Q_INIT_RESOURCE(Triangulation_2); Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(Logos); + Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp index acc3edc6c32..6f207112ee1 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp @@ -321,7 +321,7 @@ int main(int argc, char **argv) Q_INIT_RESOURCE(File); Q_INIT_RESOURCE(Triangulation_2); Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(Logos); + Q_INIT_RESOURCE(CGAL); MainWindow mainWindow; mainWindow.show(); diff --git a/GraphicsView/demo/icons/Logos.qrc b/GraphicsView/demo/resources/CGAL.qrc similarity index 51% rename from GraphicsView/demo/icons/Logos.qrc rename to GraphicsView/demo/resources/CGAL.qrc index 8107836f532..456ba1d3617 100644 --- a/GraphicsView/demo/icons/Logos.qrc +++ b/GraphicsView/demo/resources/CGAL.qrc @@ -1,5 +1,8 @@ - + + about_CGAL.html + + cgal_large_FAF8E8.gif cgal_logo.xpm diff --git a/GraphicsView/demo/icons/cgal_large_FAF8E8.gif b/GraphicsView/demo/resources/cgal_large_FAF8E8.gif similarity index 100% rename from GraphicsView/demo/icons/cgal_large_FAF8E8.gif rename to GraphicsView/demo/resources/cgal_large_FAF8E8.gif diff --git a/GraphicsView/demo/icons/cgal_logo.xpm b/GraphicsView/demo/resources/cgal_logo.xpm similarity index 100% rename from GraphicsView/demo/icons/cgal_logo.xpm rename to GraphicsView/demo/resources/cgal_logo.xpm diff --git a/GraphicsView/include/CGAL/Qt/debug.h b/GraphicsView/include/CGAL/Qt/debug.h new file mode 100644 index 00000000000..e947f728654 --- /dev/null +++ b/GraphicsView/include/CGAL/Qt/debug.h @@ -0,0 +1,24 @@ +#ifndef CGAL_QT_DEBUG_H +#define CGAL_QT_DEBUG_H + +#include + +namespace CGAL { +namespace Qt { + +/** + * Must be used like that: + * CGAL::Qt:traverse_resources(":/cgal"); // view CGAL resources + * or + * CGAL::Qt:traverse_resources(":"); // view all resources + * and displays the resources tree on std::cerr. + */ +void traverse_resources(const QString& name, + const QString& dirname = QString(), + int indent = 0); + +} // namespace Qt +} // namespace CGAL + + +#endif // CGAL_QT_DEBUG_H diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt index 9ba50993ca7..8383a517b03 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGALQt4/CMakeLists.txt @@ -39,11 +39,11 @@ if(QT4_FOUND) qt4_generate_moc( ../../include/CGAL/Qt/GraphicsViewInput.h GraphicsViewInput_moc.cpp ) # qrc files (resources files, that contain icons, at least) - qt4_add_resources ( RESOURCE_FILES ../../demo/icons/Input.qrc ../../demo/icons/File.qrc ../../demo/icons/Logos.qrc ../../demo/icons/Triangulation_2.qrc) + qt4_add_resources ( RESOURCE_FILES ../../demo/resources/CGAL.qrc ../../demo/icons/Input.qrc ../../demo/icons/File.qrc ../../demo/icons/Triangulation_2.qrc) set( CGAL_QT4_BASENAME CGAL-Qt4 ) - add_library( CGAL_QT4 GraphicsViewInput_moc.cpp GraphicsViewNavigation.cpp GraphicsViewNavigation_moc.cpp GraphicsItem_moc.cpp GraphicsViewPolylineInput.cpp DemosMainWindow.cpp DemosMainWindow_moc.cpp ${RESOURCE_FILES} ) + add_library( CGAL_QT4 debug.cpp GraphicsViewInput_moc.cpp GraphicsViewNavigation.cpp GraphicsViewNavigation_moc.cpp GraphicsItem_moc.cpp GraphicsViewPolylineInput.cpp DemosMainWindow.cpp DemosMainWindow_moc.cpp ${RESOURCE_FILES} ) target_link_libraries( CGAL_QT4 ${QT_LIBRARIES} ) if ( NOT AUTO_LINK_ENABLED ) # If auto-link is not enabled (on Linux for example), link with libCGAL explicitly. diff --git a/GraphicsView/src/CGALQt4/debug.cpp b/GraphicsView/src/CGALQt4/debug.cpp new file mode 100644 index 00000000000..9e712360368 --- /dev/null +++ b/GraphicsView/src/CGALQt4/debug.cpp @@ -0,0 +1,32 @@ +#include +#include + +#include + +namespace CGAL { +namespace Qt { + + +void traverse_resources(const QString& name, const QString& dirname, int indent) +{ + std::cerr << qPrintable(QString(indent, ' ')) + << qPrintable(name); + QString fullname = + dirname.isEmpty() ? + name : + dirname + "/" + name; + QDir dir(fullname); + if(dir.exists()) { + std::cerr << "/\n"; + Q_FOREACH(QString path, dir.entryList()) + { + traverse_resources(path, fullname, indent + 2); + } + } + else { + std::cerr << "\n"; + } +} + +} // namesapce Qt +} // namespace CGAL