Commit Graph

188 Commits

Author SHA1 Message Date
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Sébastien Loriot 5918a14f69 Arrangement demo requires Core 2016-05-02 15:21:59 +02:00
Clement Jamin f2c68b25cd Update CMakeLists.txt of all demos for header-only mode 2016-03-09 17:23:20 +01:00
Efi Fogel cbc98e62e0 replaced {begin,end}_{points,subcurvs} with {points,subcurvs}_{begin,end} 2016-01-19 15:48:12 +01:00
Sébastien Loriot b482662b46 fix the removal of hand.xpm 2015-10-05 16:38:23 +02:00
Sébastien Loriot 8e62e05519 remove remaining Qt3 demos 2015-10-05 14:29:50 +02: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
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
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +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
Sebastien Loriot faee08becd Merge pull request #56 from efifogel/Aos-Polycurve_tests-wkhan
Aos polycurve tests wkhan
2015-04-22 18:00:03 +02:00
Laurent Rineau 1c70f5ec49 Fix `make demos`
The Arr_2 and Polyline_simplification_2 demos were not referenced in
CGAL_EXECUTABLE_TARGETS.
2015-04-03 13:07:00 +02:00
Maxime Gimeno 60b47f0978 Succesfully upgraded to Qt5 2015-04-01 12:18:59 +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
Efi Fogel 5cd223a40e Enabled compiling without CORE 2015-03-21 12:35:36 +02:00
Efi Fogel 0e1716a7eb polycurve 2015-02-16 11:26:39 +02:00
Andreas Fabri 1094f26dd5 comment unused parameters 2015-01-08 09:47:09 +01:00
Aurélien Vialon 6e7abcdade Correction of flag problem into Arrangement_on_surface_2_demonstration. 2014-08-16 14:34:11 +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 f1f6218ca7 Fix of some bugs with Arrangement on surface 2 and others demonstrations.
Improvement of some comentaries.

Change of findQt5.cmake flags using.
2014-08-14 02:15:02 +02:00
Aurélien Vialon 2d65524aea All last demonstrations ported to Qt4or5. Need to check working of it on Linux. 2014-08-12 22:12:42 +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 ff94f3bf39 Arrangement_on_surface_2 ported. 2014-07-04 17:57:12 +02:00
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +02:00
Efi Fogel 6af55c4978 Resolved min/max issue with msvc 2013-12-06 13:15:13 +02:00
Efi Fogel d86ec409a3 commented out unused vars. 2013-11-17 08:54:42 +02:00
Dror Atariah 2d7cb01fba Removed unused reference to a deprecated type 2013-11-11 09:34:52 +01:00
Dror Atariah 00def304a2 Removed white spaces at the end of some lines 2013-11-10 13:28:32 +01:00
Dror Atariah b254bdf2f0 construction functor instead of direct construction
in mousePressEvent
2013-11-10 13:28:01 +01:00
Dror Atariah 219eeb036b Segments iteration instead of points iterations
in paintFace
2013-11-10 13:10:01 +01:00
Dror Atariah bd4a4cddbf Reverted to iterat on seg's
in Compute_squared_distance_2
2013-11-10 11:37:25 +01:00
Dror Atariah 8154dba9b0 Initial clean of deprecated function in polylines case 2013-10-25 11:52:20 +02:00
Dror Atariah dd24d24128 Reverted to construction functor of polylines in demo 2013-10-25 11:35:26 +02:00
Efi Fogel 564a6c794d Synchronized with a recent version of master 2013-10-22 10:00:18 +03:00
Laurent Rineau 2286ad89ab Remove the executable bit of .h and .cpp files 2013-08-27 14:58:04 +02:00
Efi Fogel a898b561f9 fixed min/max calls to pacify msvc 2013-08-10 15:12:38 +03:00
Efi Fogel 548dc1aa24 commented out unused variable 2013-08-07 22:59:25 +03:00
Efi Fogel d019b2da3b pacified MSVC 2013-08-07 22:58:34 +03:00
Efi Fogel fb26cd3756 commented out unused variable 2013-08-07 22:57:41 +03:00
Efi Fogel 7adf488d2e commented out unused variable 2013-08-07 22:55:47 +03:00
Dror Atariah f008466061 Removed white spaces at EOL 2013-07-02 16:29:49 +02:00
Efi Fogel fe6e9b860d Apply fixes to compile the arrangement demo with VC 10 2013-06-11 18:27:33 +03:00
Alex Tsui 0b52b8bcf3 Addressed some issues in Aos_2-demo.
* Removed stray debug messages.
* Removed unused 'Traits' and 'Testing' menus.
* Fixed the mix up of lower and upper envelopes.
* Draw user-specified points when using circular arc traits.
* Fixed a memory error when demo is closed.
2013-03-23 17:22:21 -07:00
Andreas Fabri 50c4c6e494 bug fix for clang / Most_vexing_parse 2013-03-01 09:15:17 +01:00
Alex Tsui de5f238a71 Removed large .arr files from Aos_2 demo. 2013-02-22 07:42:52 -08:00
Andreas Fabri c029f702a3 use more types 2013-02-07 11:02:14 +01:00
Efi Fogel 1bb3428af1 Skip compilation if Qt4 is missing 2012-11-23 01:23:15 +02:00