db30aa8c06
Added Svg to the CMakeLists.txt
2015-12-03 09:30:42 +01:00
7b4267c162
Replacement of cgalRequires
...
-fix for #291
2015-11-23 22:06:06 +01:00
6c08f59919
VTK support is ON on user request only
2015-10-23 16:05:40 +02:00
258ef34006
vtk version 6 and greater are supported by surface_mesher and polyhedron demos
...
vtk is strict and only the patch version can differ
(that is 6.1 is not compatible with 6.0)
2015-10-22 16:38:21 +02:00
c54bcbb47c
request version of VTK
2015-10-22 12:08:06 +02:00
d6b3353d61
add "open directory" menu for dcm images
2015-10-09 16:32:41 +02:00
e4c5546996
fix unreferenced variable warning
2015-10-09 16:12:54 +02:00
928bf68718
update cmakelists to work with recent versions of vtk (>= 6.0)
2015-10-09 16:12:33 +02:00
d83f534ef2
define CGAL_USE_VTK macro
2015-10-09 16:11:57 +02:00
12b13e0b23
remove comments
2015-10-09 15:34:09 +02:00
5dc5864139
fix compilation for VTK >= 6.0 and Qt5
2015-10-09 14:31:20 +02:00
784b6781d5
avoid warning in cmake by indicating minimum version (same as Surface_mesher demo)
2015-10-09 11:25:56 +02:00
6692f993ce
Add/Remove some cgalPkgDependsOn
...
Move Visibility package from Arrangements to Polygons
Add some `` in the Visibility package
Add the keyword 'Geodesic' to the Shortest Path package.
2015-09-09 12:09:57 +02:00
f130b2183a
Add missing std headers
2015-08-17 12:26:34 +04:00
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
6b15ec643c
Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF
...
Conflicts:
Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-07-16 16:52:53 +02:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
f9917c487e
CMake 2.8.11
2015-07-13 12:36:43 +02:00
c616df7196
Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Installation/changes.html
2015-07-13 08:16:59 +02:00
6d892480be
Merge branch 'lrineau/CGAL_ImageIO-fix_VTK_6_support-lrineau' into CGAL-Qt5_support-GF
...
Conflicts:
CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt
Installation/changes.html
2015-07-10 18:05:25 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
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
6b24740299
Update the VTK support to VTK 6.x
2015-07-09 14:44:02 +02:00
3a0ea1bea5
Fix a warning in CMake
2015-07-08 16:06:34 +02:00
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
0d431e39ab
remove qt4 specific code
2015-07-07 18:00:43 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
9e57211916
add missing check on dependancies
2015-07-07 11:23:46 +02:00
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
20c1b1a1f6
Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
...
Conflicts:
BGL/include/CGAL/boost/graph/Euler_operations.h
BGL/include/CGAL/boost/graph/iterator.h
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
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
3fbc191693
Revert parts of "On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh"
...
This reverts commit eb23730432aaeeef35b85feb013942175ae504f8, reversing
changes made to 1f0191190bcd9dfce903cf5af155ee114d00ac4b.
Only undo the permission changes
Conflicts:
Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_OM.cpp
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Weights.h
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/fair_impl.h
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
2015-06-17 17:59:42 +02:00
6c4785a29c
On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh
2015-05-13 16:10:21 +02:00
1537613726
BOOST_FOREACH -> Q_FFOREACH
2015-05-08 19:15:25 +02:00
c5d196f78c
remaining demos
2015-05-06 18:53:44 +02:00
baac7e673a
Instead of a BOOST_STATIC_WARNING use a deprecated attribute
2015-04-13 16:58:00 +02:00
fdf425b21e
Successfully upgraded to Qt5.
2015-04-01 13:57:23 +02:00
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
b9f9c95623
move header to proper package
2015-01-06 14:18:59 +01:00
515ff77960
Merge branch 'Surface_mesher-fix_a_warning-lrineau'
...
Fix a warning.
Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
2014-12-17 17:10:37 +01:00
ba51958a35
Remove a warning in Surface_mesher
2014-11-28 12:14:25 +01:00
9026aa6122
fix warnings in surface mesher demo
2014-11-25 17:39:29 +01:00
4c6de9ab46
fix conversion warnings
2014-11-24 15:57:51 +01:00
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
2d65524aea
All last demonstrations ported to Qt4or5. Need to check working of it on Linux.
2014-08-12 22:12:42 +02:00
36d8b5bd18
Convert source files encoding to utf-8
...
All non-ASCII files should be encoded in UTF-8. So far, the ZSH script
`Scripts/developer_scripts/detect_wrong_encoding` detects wrong encoding
in source/header files of include/, src/, and doc/.
2014-08-01 11:20:13 +02:00
2826df7237
Correction of Windows platforms bug about CGAL libraries not considered.
2014-07-22 19:07:34 +02:00
ab909badb9
Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3.
2014-07-03 15:07:00 +02:00
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
956bdabe0e
Addition of find_package(Qt5) file and command into CMakeList of LCC, Triangulation_3 and Surface_mensher demonstrations.
2014-06-12 21:46:52 +02:00
Maxime Gimeno
Sébastien Loriot
Jane Tournois
Andreas Fabri
mpkh
Laurent Rineau
Philipp Möller
Aurélien Vialon