Commit Graph

23 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 d19915a794 fix the #include 2015-01-08 10:24:19 +01:00
Andreas Fabri 44b9ce0c70 remove open streetmap data 2014-12-22 13:45:28 +01:00
Jane Tournois d29268032f fix compilation 2014-12-11 15:35:58 +01:00
Andreas Fabri 5edcf96e13 work around symbols defined by windows headers; add .cmd and data 2014-11-30 18:43:38 +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 80c0a72682 Fix warnings 2014-11-07 17:57:38 +01:00
Andreas Fabri 7074432e56 draw vertices smaller and in black 2014-11-06 14:41:00 +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 ff3ad888c3 Polyline_simplification uses Constrained_triangulation_plus_2 2014-05-21 20:27:17 +02:00
Andreas Fabri 9c2bea6308 fixes in polyline simplification 2014-05-15 17:52:44 +02:00
Andreas Fabri e4306a0d3d fixed -> unremovable; fixed is no longer used in Polyline_constrained_trioangulation 2013-04-16 16:01:09 +02:00
Andreas Fabri 94567d8745 wip 2013-04-16 15:09:05 +02:00
Andreas Fabri e3c468dd38 Write the entered polygon into a file 2013-04-09 12:07:08 +02:00
Andreas Fabri ebabf11579 fix eol 2013-01-28 14:02:14 +01:00
Philipp Möller 56092fc482 Fixed line-endings in norway.poly 2012-05-11 15:02:34 +00:00
Philipp Möller a6d55f9c46 Adapted the demo and two Leftover costs to changes in the iterators
value_type.
2012-05-11 08:48:27 +00:00
Philipp Möller 2ab6d66698 Move the experimental package into the feature branch. They are
coupled tightly enough to have them in one branch.
2012-05-04 13:47:08 +00:00