Commit Graph

743 Commits

Author SHA1 Message Date
Maxime Gimeno 65061d2c4a Upgrade to Qt5 2015-04-01 14:54:24 +02:00
Laurent Rineau 6f075de186 AUTOMOC cannot be used for CGAL_Qt5
because of all_files.cpp
2015-03-31 11:50:06 +02:00
Laurent Rineau 4c4598f612 Add destructor for DemosMainWindow (virtual class) 2015-03-31 11:49:08 +02:00
Maxime Gimeno fa430e5fc0 WORK IN PROGRESS 2015-03-31 11:05:17 +02:00
Maxime Gimeno 8b3cca50a0 Modifying to Qt5 2015-03-31 10:22:21 +02:00
Maxime Gimeno 52dc3b265d Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.

Conflicts:
	GraphicsView/demo/Polygon/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in
	Installation/cmake/modules/CGAL_Macros.cmake
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
Maxime Gimeno 040458d248 Update of all the CMakeList and .cmake files for Qt5
Reasy for merging the cpp files from clone qt5
2015-03-30 15:34:17 +02:00
Andreas Fabri 5f4a47e13b fix links to Qt and escape some links 2015-02-23 13:20:05 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Sébastien Loriot e270de4b67 remove warning 2015-01-06 16:53:48 +01:00
Remy Thomasse b5047c9bb8 try to fix some warnings 2015-01-06 16:53:48 +01:00
Remy Thomasse b3514854de compatibility old version of boost 2015-01-06 16:53:48 +01:00
Remy Thomasse 57d4dbbb2a Add Traits, clean the code 2015-01-06 16:50:14 +01:00
Remy Thomasse 03ef4e6789 modifications OutputIterator 2015-01-06 16:50:14 +01:00
Remy Thomasse 616178e80f name change, typos 2015-01-06 16:50:13 +01:00
Remy Thomasse 86cf507775 add size_t, FT instead of long and double, ifndef Q_MOC_RUN trick to compile the demo without trouble (pb with boost headers and Qt) 2015-01-06 16:50:13 +01:00
Remy Thomasse 1d82acee46 demo generator 2015-01-06 16:50:13 +01:00
Andreas Fabri 0f92048c4d changes after Efi's review (and color changes in the demo) 2014-11-10 18:00:02 +01:00
Laurent Rineau 29904d2f56 Other example with the Polygon demo 2014-11-07 17:06:41 +01:00
Laurent Rineau 9889f95768 Example of using of exportSVG 2014-11-07 16:57:28 +01:00
Laurent Rineau a35858a293 Move exportSVG to the DemosMainWindow base class 2014-11-07 16:57:04 +01:00
Laurent Rineau 94803a6a96 Implement export to SVG for the CDT_2 demo 2014-11-07 16:09:09 +01:00
Aurélien Vialon df9e315536 Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake. 2014-08-15 02:57:48 +02:00
Aurélien Vialon 7a0e8f545d Bugs correction about STREQUAL into findQt5. 2014-08-05 10:05:15 -07:00
Aurélien Vialon 6df9530094 All GraphicView demonstrations ported to the new Qt inclusion way.
Change of Qt4or5 variables names.

Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
     USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
     QT_VERSION_USED => number of Qt version wanted (4 or 5).
     QT4 => TRUE if Qt4 chosen.
     QT5 => TRUE if Qt5 chosen.
2014-08-05 18:13:39 +02:00
Aurélien Vialon 0a457c4b03 Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support. 2014-08-02 14:59:49 -07:00
Aurélien Vialon 46c8926854 New way to chose Qt version for projects configuration.
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).

Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.

Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)

During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)

Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
2014-08-02 01:37:41 +02:00
Aurélien Vialon 6784800dd1 Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt. 2014-07-31 22:41:44 +02:00
Aurelien Vialon 548bba0637 Mesh_3_export_plugin Windows modification. 2014-07-17 19:16:18 +02:00
Aurelien Vialon 4c85bee791 Add of Apollonius_graph_2 demonstration of GraphicView and all GraphicView demonstrations works on Windows. 2014-07-17 13:03:23 +02:00
Aurelien Vialon c3aaf0bffe Some modification of CGAL Graphic view to a better compatibility of Windows with the Qt5 version of CGAL (especially about dll import and export stuff). 2014-07-17 01:55:07 +02:00
Aurélien Vialon 520e791a99 GraphicView demonstrations porting. 2014-07-09 16:31:29 +02:00
Laurent Rineau 59d3dd8793 Do not require GMP explicitly 2014-07-02 12:58:50 +02:00
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +02:00
Aurélien Vialon 08685b683e Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	GraphicsView/src/CGAL_Qt5/resources.cpp
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
2014-06-02 00:55:05 +02:00
Aurélien Vialon 5f09ccde1a Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3. 2014-06-01 22:46:14 +02:00
Aurélien Vialon 1f669ad498 Update Support for Qt5 project. 2014-05-29 12:07:42 +02:00
Laurent Rineau 685dffc636 Fix PolylinesGraphicsItem
Bug reported on cgal-discuss:

  From: Bernhard Kornberger
  To:   cgal-discuss@inria.fr
  Date: 2014/03/25 Tue 11:30
2014-04-01 16:30:37 +02:00
Laurent Rineau 90936d8e30 Fix a warning
demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h:348: warning: passing `double' for converting 1 of `void QPainter::drawRect(int, int, int, int)'
2014-03-11 18:23:11 +01:00
Laurent Rineau 2c1f436ed4 Fix another compilation error 2014-03-11 18:18:55 +01:00
Laurent Rineau e50a1c6374 Fix a warning 2014-03-06 17:03:47 +01:00
Laurent Rineau 1910e7151e Fix a compilation error on Windows
The min/max macro issue.
2014-03-06 17:03:28 +01:00
Laurent Rineau aaa5e020d4 Rename Periodic_2_triangulation_2.cpp to the name of the target
Rename Periodic_2_triangulation_2.cpp
Periodic_2_Delaunay_triangulation_2.cpp so that is named like the CMake
target. The default cgal_test script requires that. Before that
renaming, the Periodic_2_Delaunay_triangulation_2 demo was not compiled
by testsuites.
2014-03-04 14:21:40 +01:00
Laurent Rineau 89ad21df97 Use a new CGAL logo 2014-02-25 18:11:31 +01:00
Sébastien Loriot a64b317ba7 trivial bugfix in cdt2 demo
mark faces in the domain also when reading a polygon from a file
2014-02-17 08:48:02 +01:00
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot b2ef3b8673 Merge branch 'doc-remove_gif-local'
Successfully test in CGAL-4.3-Ic-102

This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.

Approved by the interim release manager

xplain why this merge is necessary,
2013-07-26 17:50:07 +02:00
Sébastien Loriot 2dfe8a3d73 workaround for a doxygen bug: remove space after /!* to avoid a verbatim env
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
2013-07-25 14:58:53 +02:00