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

Rename file and add ::Qt

This commit is contained in:
Maxime Gimeno 2021-01-12 13:22:34 +01:00
parent 95192d6d4b
commit 04753381e5
21 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AABB_tree/demo/AABB_tree/AABB_demo.cpp
View File

@ -19,12 +19,12 @@
#include <QApplication> #include <QApplication>
#include <CGAL/Qt/resources.h> #include <CGAL/Qt/resources.h>
#include <QMimeData> #include <QMimeData>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
CGAL::init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
QApplication app(argc, argv); QApplication app(argc, argv);
app.setOrganizationDomain("inria.fr"); app.setOrganizationDomain("inria.fr");
app.setOrganizationName("INRIA"); app.setOrganizationName("INRIA");

4
Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp
View File

@ -5,11 +5,11 @@
#include <CGAL/Qt/resources.h> #include <CGAL/Qt/resources.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
CGAL::init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
QApplication application(argc,argv); QApplication application(argc,argv);
application.setOrganizationDomain("geometryfactory.com"); application.setOrganizationDomain("geometryfactory.com");

4
Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
View File

@ -1,9 +1,9 @@
#include "Viewer.h" #include "Viewer.h"
#include <qapplication.h> #include <qapplication.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
CGAL::init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
QApplication application(argc,argv); QApplication application(argc,argv);
// Instantiate the viewer. // Instantiate the viewer.
Viewer viewer; Viewer viewer;

6
GraphicsView/include/CGAL/Qt/Context_initialization.h → GraphicsView/include/CGAL/Qt/init_ogl_context.h
View File

@ -15,6 +15,8 @@
namespace CGAL namespace CGAL
{ {
namespace Qt
{
inline void init_ogl_context(int major, int minor) { inline void init_ogl_context(int major, int minor) {
QSurfaceFormat fmt; QSurfaceFormat fmt;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -43,6 +45,6 @@ inline void init_ogl_context(int major, int minor) {
setlocale(LC_ALL, "C"); setlocale(LC_ALL, "C");
} }
} } //end Qt
} //end CGAL
#endif // CGAL_QT_CONTEXT_INITIALIZATION_H #endif // CGAL_QT_CONTEXT_INITIALIZATION_H

4
Linear_cell_complex/demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp
View File

@ -14,7 +14,7 @@
#include <QApplication> #include <QApplication>
#include <CGAL/Qt/resources.h> #include <CGAL/Qt/resources.h>
#include <CGAL/assertions_behaviour.h> #include <CGAL/assertions_behaviour.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
// Global random // Global random
CGAL::Random myrandom; CGAL::Random myrandom;
@ -24,7 +24,7 @@ int main(int argc, char** argv)
// std::cout<<"Size of dart: "<<sizeof(LCC::Dart)<<std::endl; // std::cout<<"Size of dart: "<<sizeof(LCC::Dart)<<std::endl;
CGAL::set_error_behaviour(CGAL::ABORT); CGAL::set_error_behaviour(CGAL::ABORT);
CGAL::init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
QApplication application(argc,argv); QApplication application(argc,argv);
application.setOrganizationDomain("cgal.org"); application.setOrganizationDomain("cgal.org");

4
Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
View File

@ -13,7 +13,7 @@
#define CGAL_DRAW_LCC_H #define CGAL_DRAW_LCC_H
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -405,7 +405,7 @@ void draw(const CGAL_LCC_TYPE& alcc,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"lccviewer","\0"}; const char* argv[2]={"lccviewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Nef_3/include/CGAL/draw_nef_3.h
View File

@ -15,7 +15,7 @@
#include <CGAL/license/Nef_3.h> #include <CGAL/license/Nef_3.h>
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -254,7 +254,7 @@ void draw(const CGAL_NEF3_TYPE &anef,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc = 1; int argc = 1;
const char *argv[2] = {"nef_polyhedron_viewer", "\0"}; const char *argv[2] = {"nef_polyhedron_viewer", "\0"};
QApplication app(argc, const_cast<char **>(argv)); QApplication app(argc, const_cast<char **>(argv));

4
Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Periodic_2_triangulation_2.h> #include <CGAL/license/Periodic_2_triangulation_2.h>
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -261,7 +261,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"p2t2_viewer","\0"}; const char* argv[2]={"p2t2_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/periodic_3_triangulation_3_demo.cpp
View File

@ -1,11 +1,11 @@
#include "MainWindow.h" #include "MainWindow.h"
#include <QApplication> #include <QApplication>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
init_ogl_context(2,1); CGAL::Qt::init_ogl_context(2,1);
QApplication a(argc, argv); QApplication a(argc, argv);
MainWindow w; MainWindow w;
//w.ui->setupUi(w); //w.ui->setupUi(w);

4
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp
View File

@ -1,12 +1,12 @@
#include "MainWindow.h" #include "MainWindow.h"
#include <QApplication> #include <QApplication>
#include <CGAL/Qt/resources.h> #include <CGAL/Qt/resources.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
CGAL::init_ogl_context(2, 1); CGAL::Qt::init_ogl_context(2, 1);
QApplication application(argc,argv); QApplication application(argc,argv);
application.setOrganizationDomain("inria.fr"); application.setOrganizationDomain("inria.fr");

4
Point_set_3/include/CGAL/draw_point_set_3.h
View File

@ -15,7 +15,7 @@
#include <CGAL/license/Point_set_3.h> #include <CGAL/license/Point_set_3.h>
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef DOXYGEN_RUNNING #ifdef DOXYGEN_RUNNING
namespace CGAL { namespace CGAL {
@ -101,7 +101,7 @@ void draw(const Point_set_3<P, V>& apointset,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"point_set_viewer","\0"}; const char* argv[2]={"point_set_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Polygon/include/CGAL/draw_polygon_2.h
View File

@ -18,7 +18,7 @@
#define CGAL_DRAW_POLYGON_2_H #define CGAL_DRAW_POLYGON_2_H
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef DOXYGEN_RUNNING #ifdef DOXYGEN_RUNNING
namespace CGAL { namespace CGAL {
@ -123,7 +123,7 @@ void draw(const CGAL::Polygon_2<T, C>& ap2,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"t2_viewer","\0"}; const char* argv[2]={"t2_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Polygon/include/CGAL/draw_polygon_with_holes_2.h
View File

@ -18,7 +18,7 @@
#define CGAL_DRAW_POLYGON_WITH_HOLES_2_H #define CGAL_DRAW_POLYGON_WITH_HOLES_2_H
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef DOXYGEN_RUNNING #ifdef DOXYGEN_RUNNING
namespace CGAL { namespace CGAL {
@ -139,7 +139,7 @@ void draw(const CGAL::Polygon_with_holes_2<T, C>& ap2,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"t2_viewer","\0"}; const char* argv[2]={"t2_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Polyhedron/include/CGAL/draw_polyhedron.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Polyhedron.h> #include <CGAL/license/Polyhedron.h>
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -209,7 +209,7 @@ void draw(const CGAL_POLY_TYPE& apoly,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"polyhedron_viewer","\0"}; const char* argv[2]={"polyhedron_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp
View File

@ -18,11 +18,11 @@
#include "MainWindow.h" #include "MainWindow.h"
#include <QApplication> #include <QApplication>
#include <CGAL/Qt/resources.h> #include <CGAL/Qt/resources.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
CGAL::init_ogl_context(2, 1); CGAL::Qt::init_ogl_context(2, 1);
QApplication app(argc, argv); QApplication app(argc, argv);
app.setOrganizationDomain("inria.fr"); app.setOrganizationDomain("inria.fr");

4
Surface_mesh/include/CGAL/draw_surface_mesh.h
View File

@ -29,7 +29,7 @@ void draw(const SM& asm);
#include <CGAL/license/Surface_mesh.h> #include <CGAL/license/Surface_mesh.h>
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -209,7 +209,7 @@ void draw(const Surface_mesh<K>& amesh,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"surface_mesh_viewer","\0"}; const char* argv[2]={"surface_mesh_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h
View File

@ -18,7 +18,7 @@
#include <initializer_list> #include <initializer_list>
#include <CGAL/draw_linear_cell_complex.h> #include <CGAL/draw_linear_cell_complex.h>
#include <CGAL/Path_on_surface.h> #include <CGAL/Path_on_surface.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -410,7 +410,7 @@ void draw(const Mesh& alcc,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"lccviewer","\0"}; const char* argv[2]={"lccviewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Triangulation_2/include/CGAL/draw_triangulation_2.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Triangulation_2.h> #include <CGAL/license/Triangulation_2.h>
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -145,7 +145,7 @@ void draw(const CGAL_T2_TYPE& at2,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"t2_viewer","\0"}; const char* argv[2]={"t2_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Triangulation_3/demo/Triangulation_3/T3_demo.cpp
View File

@ -13,11 +13,11 @@
#include "MainWindow.h" #include "MainWindow.h"
#include <QApplication> #include <QApplication>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
CGAL::init_ogl_context(2, 1); CGAL::Qt::init_ogl_context(2, 1);
QApplication app(argc, argv); QApplication app(argc, argv);

4
Triangulation_3/include/CGAL/draw_triangulation_3.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Triangulation_3.h> #include <CGAL/license/Triangulation_3.h>
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -151,7 +151,7 @@ void draw(const CGAL_T3_TYPE& at3,
if (!cgal_test_suite) if (!cgal_test_suite)
{ {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc=1; int argc=1;
const char* argv[2]={"t3_viewer","\0"}; const char* argv[2]={"t3_viewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));

4
Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h
View File

@ -14,7 +14,7 @@
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/license/Voronoi_diagram_2.h> #include <CGAL/license/Voronoi_diagram_2.h>
#include <CGAL/Qt/Context_initialization.h> #include <CGAL/Qt/init_ogl_context.h>
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
@ -317,7 +317,7 @@ void draw(const CGAL_VORONOI_TYPE &av2,
#endif #endif
if (!cgal_test_suite) { if (!cgal_test_suite) {
init_ogl_context(4,3); CGAL::Qt::init_ogl_context(4,3);
int argc = 1; int argc = 1;
const char *argv[2] = {"voronoi_2_viewer", "\0"}; const char *argv[2] = {"voronoi_2_viewer", "\0"};
QApplication app(argc, const_cast<char **>(argv)); QApplication app(argc, const_cast<char **>(argv));