Mael Rouxel-Labbé
1378280c79
Revert "Simplified typedef"
...
This reverts commit fecfaacbaf .
Although this typedef is still useless, it's useful to check the sanity of
the names of template parameters of the periodic traits classes. If some
template paremeters are named like typedefs of the kernel (which is valid code,
but not ideal) some compilers will bug and fail to compile.
See also commit cbde108708
2017-12-13 11:29:12 +01:00
Laurent Rineau
3c6640bf59
Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
...
Renewal of CMake scripts: header-only, ctest, CMake>=3.1
# Conflicts:
# Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau
25dffa1710
Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED
2017-11-17 12:54:13 +01:00
Laurent Rineau
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
Laurent Rineau
a9365554c9
Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
...
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Sébastien Loriot
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
Laurent Rineau
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Mael Rouxel-Labbé
fecfaacbaf
Simplified typedef
2017-08-29 11:21:59 +02:00
Mael Rouxel-Labbé
b36154cb7c
Fixed P2DT2's traits class in demo
2017-08-24 15:08:28 +02:00
Maxime Gimeno
5ae96fc2aa
Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found.
2017-05-23 16:12:56 +02:00
Sébastien Loriot
e78bef8a9c
update project name of demos
2016-09-08 00:13:34 +02:00
Laurent Rineau
1cde972cdb
Remove whitespace at end of lines
2016-06-29 11:04:29 +02:00
Clement Jamin
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +01:00
Maxime Gimeno
e9e7ca0cf5
Fix for P2_T2
2016-02-03 16:03:11 +01:00
Laurent Rineau
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
Laurent Rineau
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
Laurent Rineau
3ec0c69f8f
We want 2.8.10 for all demos
...
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Laurent Rineau
59f7b09fae
Fix remaining CMake warnings about CMP0043
2015-07-08 17:08:35 +02:00
Sébastien Loriot
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
Sébastien Loriot
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
Sébastien Loriot
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
Andreas Fabri
ad4a0169fb
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 11:26:47 +02:00
Sébastien Loriot
84dfabf3b4
remove REQUIRED keyword for CGAL_Qt5 in demos
...
The handling should be with a status message
2015-07-07 11:23:46 +02:00
Andreas Fabri
c0149c727f
static_casts
2015-07-07 11:00:37 +02:00
Maxime Gimeno
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
Andreas Fabri
8e393c792c
Graphicsview demos
2015-05-06 17:11:04 +02:00
Maxime Gimeno
65061d2c4a
Upgrade to Qt5
2015-04-01 14:54:24 +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
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
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
520e791a99
GraphicView demonstrations porting.
2014-07-09 16:31:29 +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
73887c6927
Revert "Revert the merge of Periodic_2 into master. It was pushed by error."
...
This reverts commit b27c0a4efb .
2013-06-28 17:48:15 +02:00
Laurent Rineau
b27c0a4efb
Revert the merge of Periodic_2 into master. It was pushed by error.
...
Revert "Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal"
This reverts commit 5ac2c05249 , reversing
changes made to 93b77ce529 .
2013-06-24 12:50:27 +02:00
Nico Kruithof
bb9a733bd1
Updated the P2T2 demo.
2013-03-31 19:50:37 +02:00
Nico Kruithof
bc0a55ad1e
Improved demo with Iterator_type-ed simplices
2013-03-31 14:58:49 +02:00
Nico Kruithof
f5ba6b3ac0
Draw the bounding box around the middle cover if we have multiple covers
2013-03-26 15:07:44 +01:00
Nico Kruithof
f26692677f
Working on the demo, coloring the vertices of small triangulations
2013-03-24 09:19:52 +01:00
Nico Kruithof
1442e12512
Fixing compiler warnings with strict CXXFLAGS
2013-03-01 08:06:59 +01:00
Nico Kruithof
d1bb7d7bc8
remove debug log message
2013-02-28 20:40:36 +01:00
Nico Kruithof
c97a1a1fbb
Worked on the dual functions
2013-02-05 14:07:12 +01:00
Nico Kruithof
b11bdb4513
moved circumcircle from triangulation to delaunay triangulation
2013-01-28 08:05:48 +01:00
Nico Kruithof
27b2fb7054
Locating a point within the periodic domain
...
Using a hint for the face handle to speed up point location
Making sure that the chance is big that the face handle still exists
2013-01-28 07:57:19 +01:00
Nico Kruithof
b3e580c350
Implemented the Conflict zone in the demo
2013-01-26 22:08:54 +01:00
Nico Kruithof
fa1b7493f0
Fixing locating points outside the periodic domain
2013-01-25 17:37:11 +01:00
Nico Kruithof
b8babf5964
Adding conflict zone visuals to the single point insertion
2013-01-25 17:31:46 +01:00
Nico Kruithof
5487601ae1
Implemented the empty circumcircle button
2013-01-25 17:18:44 +01:00
Nico Kruithof
ae5565d912
Working on the P2T2 demo
2013-01-24 21:16:54 +01:00
Nico Kruithof
05f7dbc322
Working on the demo, adding more icons to the toolbar
2013-01-24 20:21:01 +01:00
Nico Kruithof
d23bb62118
Moved the Periodic demo to the graphicsview package. This makes it easier to find icons and other resources
2013-01-22 10:12:49 +01:00