Commit Graph

93 Commits

Author SHA1 Message Date
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 85e409f413 Polyline simplification demo 2015-05-06 16:06:33 +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 1a605a9391 Upgrade of Polyline_simplification_2 to Qt5
- Updated of the CmakeLists
- Added an include for QGraphicsLineItem in Polyline_simplification_2.cpp
2015-04-03 11:58:45 +02:00
Andreas Fabri 04fdf00d76 Add 2D Polyline Simplification; fix the description of Surface_mesh 2015-02-25 11:40:36 +01:00
Andreas Fabri d19915a794 fix the #include 2015-01-08 10:24:19 +01:00
Andreas Fabri 11f52729e0 rename test file to avoid the same name as an example 2015-01-07 15:41:40 +01:00
Andreas Fabri d0438dae0c remove the word 'Figure' before \cgalFigureRef{} 2014-12-22 15:03:58 +01:00
Andreas Fabri 87db2e1163 add license header, description.txt 2014-12-22 15:00:38 +01:00
Andreas Fabri 44b9ce0c70 remove open streetmap data 2014-12-22 13:45:28 +01:00
Andreas Fabri 23af7d6d8d polish manual 2014-12-22 13:42:50 +01:00
Andreas Fabri c5aa594388 No need for PolylineSimplificationTraits_2 2014-12-22 12:28:08 +01:00
Laurent Rineau 4a8e911e38 Minor fixes 2014-12-18 16:48:44 +01:00
Andreas Fabri 8f23d8d07d remove doc_tex; chmod -x fig 2014-12-17 22:29:22 +01:00
Andreas Fabri 4924a7ef3f remove unused variables
they are really no longer needed, as they are now computed inside the cost fct
2014-12-13 08:51:20 +01:00
Jane Tournois d29268032f fix compilation 2014-12-11 15:35:58 +01:00
Andreas Fabri 16eb47b50c Add test 2014-12-11 15:32:13 +01:00
Sébastien Loriot 21ba20df0c remove exe flag 2014-12-11 10:03:25 +01:00
Andreas Fabri 136523b2d3 Make changes after Laurent's review 2014-12-08 09:27:08 +01:00
Andreas Fabri df19cb6cd8 first changes after Laurent's review 2014-12-08 09:27:07 +01:00
Andreas Fabri f21987104d use .cin files instead of .cmd files where possible 2014-12-02 12:42:22 +01:00
Andreas Fabri 5edcf96e13 work around symbols defined by windows headers; add .cmd and data 2014-11-30 18:43:38 +01:00
Sébastien Loriot 3b6cf0eb13 fix signature of functor 2014-11-14 15:10:58 +01:00
Sébastien Loriot 81611f015a remove warning 2014-11-14 11:55:26 +01:00
Sébastien Loriot d8d2152513 remove unused variable 2014-11-14 10:41:13 +01:00
Sébastien Loriot 086baf4d44 fix warning 2014-11-12 10:59:37 +01:00
Sébastien Loriot fde6417d19 fix reference 2014-11-12 10:59:24 +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 d572fac982 Cleanup the CMakeLists.txt 2014-11-07 18:19:44 +01:00
Laurent Rineau 1b215be4c8 Add exportSVG 2014-11-07 18:19:32 +01:00
Laurent Rineau 685a43f854 Fix a bug in Scaled_squared_distance_cost 2014-11-07 18:19:12 +01:00
Laurent Rineau 80c0a72682 Fix warnings 2014-11-07 17:57:38 +01:00
Laurent Rineau 112ef5c86c fix compilation errors 2014-11-07 17:45:27 +01:00
Andreas Fabri cae5e7417b better introduction and illustration, bibtex entry 2014-11-07 16:10:09 +01:00
Andreas Fabri 93ce24993b changes after Laurent's review: double-free, and PolylineSimplificationTraits_2 added 2014-11-07 14:29:36 +01:00
Laurent Rineau e2c97f13ba Fix the link to the demo zip file 2014-11-07 10:47:19 +01:00
Laurent Rineau 15ce20092d Minor improvements 2014-11-07 10:47:08 +01:00
Andreas Fabri 0e535324f0 cleanup 2014-11-06 15:50:05 +01:00
Andreas Fabri 7074432e56 draw vertices smaller and in black 2014-11-06 14:41:00 +01:00
Andreas Fabri e51838f71a improve package description 2014-11-05 11:30:49 +01:00
Andreas Fabri 45d24aed03 Complete the list of \param, as only documenting one gives a warning 2014-11-05 10:33:31 +01:00
Andreas Fabri 4fc6d7953a document setters and change wording of getters 2014-11-05 10:23:17 +01:00
Jane Tournois 225b174b80 fix typos 2014-11-04 19:43:24 +01:00
Jane Tournois 299391c770 minor fixes 2014-11-04 19:41:31 +01:00
Andreas Fabri 9b85ad7d97 typos 2014-11-04 12:34:24 +01:00
Andreas Fabri 42d04ea13f take into account Jane's review 2014-11-04 12:24:12 +01:00
Andreas Fabri 42b954e224 fixes in examples and the demo 2014-10-30 16:47:43 +01:00
Andreas Fabri 0bf0d13087 second pass after Jane's review 2014-10-30 16:23:41 +01:00
Andreas Fabri ad5fa2d93f first pass after Jane's review 2014-10-30 15:24:40 +01:00
Andreas Fabri 17e5d01052 Add a function that allows to simplify an iterator range of points 2014-08-25 16:27:19 +02:00