Commit Graph

220 Commits

Author SHA1 Message Date
Christian Gagneraud 2dcf80c99a [WIP] GraphicsView: Add General_polygon_2 to QPainterPath converter. Closes #2021 2017-04-16 16:13:27 +12:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Andreas Fabri 76d751be01 Use CGAL_FALLTHROUGH 2016-10-17 13:45:42 +02:00
Andreas Fabri 335a87df79 Fix package GraphicsView: include headers 2016-09-30 15:23:14 +02:00
Laurent Rineau 2bb72c7f26 Compatibility with QT_NO_KEYWORDS 2016-03-09 17:02:59 +01:00
Maxime Gimeno b9856fe1a7 - fix MESA
Restoring the memory leak in order to keep the demo running on Mesa.
2016-02-17 15:18:11 +01:00
Sebastien Loriot 69ba6238a3 Merge pull request #764 from maxGimeno/Fix_For_761
Fix for 761
2016-02-16 16:21:56 +01:00
Maxime Gimeno 507fdc9f58 Fix the MemoryLeak 2016-02-12 09:26:32 +01:00
Laurent Rineau 8b22743b06 Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF
Removal of the MSAA in LCC

Conflicts:
	GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
	Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
2016-02-11 15:13:18 +01:00
Maxime Gimeno 9da8afe1f1 Removal of the MSAA in LCC 2016-02-11 14:27:44 +01:00
Maxime Gimeno 0a37521263 Revert "Fix for the context"
This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +01:00
Sebastien Loriot ed557b907d Merge pull request #735 from maxGimeno/Surface_mesher_demo-Glu_removal-GF
Surface_mesher : Glu removal
2016-02-10 10:40:51 +01:00
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Maxime Gimeno 453708380b Fix for windows 2016-02-09 11:41:28 +01:00
Maxime Gimeno 49e5043f09 Replacing GL/gl.h by CGAL/gl.h 2016-02-08 08:53:45 +01:00
Maxime Gimeno b99c616c23 Re-implementation of opengl_check_errors 2016-02-05 08:36:54 +01:00
Sébastien Loriot e211843b4f Merge pull request #654 from maxGimeno/FixForMac-GF
Demo fix for OS X (fix for #437)
2016-02-03 14:39:48 +01:00
Maxime Gimeno 9f9e127aaa Addition of a QPen in SegmentGraphicsItem 2016-01-25 14:12:19 +01:00
Maxime Gimeno eb867bb810 Addition of a specific function for the MSAA in LCC 2016-01-20 14:35:00 +01:00
Maxime Gimeno 517ff8321a Fix for LCC_demo
- The setSamples(16) was causing a segfault. I moved it in the createOpenGLContext(). If the other demos performances are affected by this, a new function will have to be created.
2016-01-19 17:13:06 +01:00
Maxime Gimeno 0547f19d58 WIP A fix for mac
- repared the demo
- Disabled the splatting.
2016-01-19 10:28:05 +01:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Maxime Gimeno 7d220d3da8 Context 3.3 Core changed into 2.1 2015-08-10 08:59:54 +02:00
Andreas Fabri f864b0a8e8 fix line width in demos using GraphicsView 2015-07-28 15:46:11 +02:00
Maxime Gimeno a571e1db8d Clean-up 2015-07-16 08:26:41 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Andreas Fabri 27024787be QGraphicsItem is no longer an interface 2015-07-08 13:07:35 +02:00
Maxime Gimeno 278e9d9829 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
Conflicts:
	Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
2015-07-08 12:40:14 +02:00
Maxime Gimeno c29b3cb700 Inline function used to define an OpenGL context for openGL 3.3. 2015-07-08 12:18:15 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 0d431e39ab remove qt4 specific code 2015-07-07 18:00:43 +02:00
Sandeep Kumar Dey 134ca52fea license header 2015-07-03 13:31:22 +02:00
Panagiotis Cheilaris 4eabd4c09c remove sdglinf painter, widget warnings 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris b4236a0f1f renames to be like formal CGAL repository
I have only kept in an include directory at the root
the change in arrangement point location.

This change also requires to use some special local
includes in CMakeLists.txt files. I will do it in a
subsequent commit.
2015-06-30 10:31:01 +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
Sébastien Loriot ce8806b19b Merge remote-tracking branch 'cgal-dev/CGAL-Qt_no_keywords-GF' into Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
2015-05-19 09:07:08 +02:00
Andreas Fabri 693db86912 Add typenames; reorder member initialization; add this-> 2015-05-19 09:04:27 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
2015-05-19 09:01:20 +02:00
Jane Tournois 717e795c1a make the specification of DelaunayMeshFaceBase_2 complete
+ change access functions names to make them conform to CGAL
+ add preconditions in the code
2015-05-19 08:54:33 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
2015-05-19 08:54:33 +02:00
Andreas Fabri 8e393c792c Graphicsview demos 2015-05-06 17:11:04 +02:00
Andreas Fabri 85e409f413 Polyline simplification demo 2015-05-06 16:06:33 +02:00
Andreas Fabri 2f27db0234 changes such that the Mesh_3 demo works with -DQT_NO_KEYWORDS 2015-05-05 12:32:49 +02:00
Maxime Gimeno 1e058d3c85 missing include fix 2015-04-03 13:42:53 +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 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
Guillaume Damiand cca136c131 Wip 2015-03-16 18:06:53 +01:00
Clement Jamin 3b7bca1920 Missing function 2015-03-16 17:02:05 +01:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00