songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
68,994 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

896 Commits

Author SHA1 Message Date
Laurent Rineau 278a28016a Merge branch 'CGAL-Qt5_support-GF' 
Fixes #265, fixes #254.
 2015-08-27 16:37:37 +02:00
Laurent Rineau 91bca286d3 Fix warnings with CGAL_USE 
All those variables were unused only if CGAL_NDEBUG was
defined. CGAL_USE can solve that.
 2015-08-19 17:37:46 +02:00
Maxime Gimeno 7d220d3da8 Context 3.3 Core changed into 2.1 2015-08-10 08:59:54 +02:00
Laurent Rineau d8e475d2c0 Merge pull request #241 from bo0ts/GraphicsView-better_dependency_check-pmoeller 
Provide a better dependency check in GraphicsView
 2015-08-05 11:27:57 +02:00
Laurent Rineau 9fc31e6093 Merge pull request #238 from lrineau/GraphicsView-fix_segment_delaunay_graph_demos-GF 
Graphics View demos: remove unwanted slots
 2015-08-04 18:03:04 +02:00
Philipp Möller 986a7ae77b Return early when missing dependencies 
This saves parsing time, indentation depth, keeps messages local and
reduces code complexity.
 2015-08-04 16:02:54 +02:00
Philipp Möller 57f97635c2 Report the exact missing dependencies 
Build a variable with missing dependencies and use that to produce and
error message. Pretty printing could still be improved.
 2015-08-04 16:01:35 +02:00
Laurent Rineau 21e6e8bcc1 Merge pull request #227 from lrineau/Testsuite-display_Qt5_version_in_results-GF 
Display Qt5 version in testsuite result pages (partially tested).
 2015-08-04 13:04:22 +02:00
Laurent Rineau 2a9c1c3843 Demote a slot, to a private function 
Should fix #234
 2015-08-03 17:43:02 +02:00
Laurent Rineau 39ab917ad8 Remove on_actionSaveConstraints_triggered 
The action was:
  - not implemented
  - not connected to any slot.
 2015-08-03 17:42:53 +02:00
Laurent Rineau 568179e8d6 Cleanup of c5940aab10 2015-08-03 16:41:43 +02:00
Laurent Rineau 93fb88b499 Display Qt5 version in testsuite result pages 2015-08-03 13:09:44 +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 bc0c30bbfd Better display of the Qt5 configuration 2015-07-15 15:53:52 +02:00
Maxime Gimeno c5940aab10 Use reserve to try to optimize the memory use 2015-07-15 13:53:13 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau ae6412fb96 Merge modifications made by Andreas to 'sdglinf-philaris' for Qt5 
Merge remote-tracking branch 'cgal-dev/sdglinf-philaris' into CGAL-Qt5_support-GF
 2015-07-10 17:28:44 +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
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 9550a41b67 Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller 
Add a CGALExports.cmake file

Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in

There was also a conceptual conflict in:
	Installation/src/CMakeLists.txt
 2015-07-10 14:03:20 +02:00
Andreas Fabri 2dfa5608c4 fix policy; remove button; fix about 2015-07-10 13:53:56 +02:00
Andreas Fabri 039860653a the demo now compiles with QT5 2015-07-10 13:20:09 +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
Laurent Rineau 59f7b09fae Fix remaining CMake warnings about CMP0043 2015-07-08 17:08:35 +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 44d4005d8a qt 4 -> qt 5 2015-07-08 09:49:46 +02:00
Sébastien Loriot 1d4358e052 update qt urls 2015-07-08 09:48:45 +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
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Andreas Fabri ad4a0169fb Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 11:26:47 +02:00
Sébastien Loriot 84dfabf3b4 remove REQUIRED keyword for CGAL_Qt5 in demos 
The handling should be with a status message
 2015-07-07 11:23:46 +02:00
Andreas Fabri c0149c727f static_casts 2015-07-07 11:00:37 +02:00
Andreas Fabri 74913d5cd8 static_casts 2015-07-07 10:32:45 +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
Andreas Fabri 1a3e0e001b add dependendency on svg 2015-07-06 16:31:56 +02:00
Sandeep Kumar Dey 134ca52fea license header 2015-07-03 13:31:22 +02:00
Philipp Möller 33a1fdbcbc Replace CGAL_LIBRARY with the actual CGAL target 
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
 2015-07-03 12:30:23 +02:00
Panagiotis Cheilaris 3e89ca702d sdglinf demo avoid Site_2 warning 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 3d8cc0637f sdglinf CMakeLists fixes from sdgl2 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 9d24a3e5c4 sdglinf demo Q_EMIT use etc. 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris 4eabd4c09c remove sdglinf painter, widget warnings 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris 498fd2cec1 rename demo program for sdglinf 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris bdcf40c753 remove sdglinf hv from GUI demo 
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
 2015-06-30 10:32:08 +02:00
Panagiotis Cheilaris 201de50a9b SDG Linf demo correct types 
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
 2015-06-30 10:31:56 +02:00
Panagiotis Cheilaris 8de904afd7 put CGAL_SDG_DEBUG definition in SDG Linf basic.h 
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
 2015-06-30 10:31:55 +02:00
Panagiotis Cheilaris 0053b81513 show command line argument file name in status bar 
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
 2015-06-30 10:31:49 +02:00
Panagiotis Cheilaris c4c5e451ab support input of one-point polygons in demo 
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
 2015-06-30 10:31:25 +02:00
Panagiotis Cheilaris 591e821e01 print mouse input points and segments 
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
 2015-06-30 10:31:16 +02:00
Panagiotis Cheilaris 507dc07909 set default to no verbose messages 
Here is a way to activate verbose debug messages from command line:

cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-DCGAL_SDG_VERBOSE" .

To go back to no verbose messages, use:

cmake -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="" .
 2015-06-30 10:31:02 +02:00
Panagiotis Cheilaris d067815b89 new CMakeLists.txt includes for ipelets and demos 2015-06-30 10:31:01 +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
Jane Tournois c4245df6cb end of merge 2015-05-19 09:07:53 +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
Jane Tournois 8e61cfdd49 new attempt to fix unused variables warning from boost with clang 
and add namespace CGAL for Lloyd 2D parameters
 2015-05-19 09:04:28 +02:00
Andreas Fabri 693db86912 Add typenames; reorder member initialization; add this-> 2015-05-19 09:04:27 +02:00
Andreas Fabri 74c817fe7f Add an include 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 df04359061 fix recenter when input changes 2015-05-19 08:54:36 +02:00
Jane Tournois dbad20cbba add message box to prevent delete mistakes 2015-05-19 08:54:35 +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
Maxime Gimeno 65061d2c4a Upgrade to Qt5 2015-04-01 14:54:24 +02:00
Laurent Rineau 6f075de186 AUTOMOC cannot be used for CGAL_Qt5 
because of all_files.cpp
 2015-03-31 11:50:06 +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 8b3cca50a0 Modifying to Qt5 2015-03-31 10:22:21 +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
Maxime Gimeno 040458d248 Update of all the CMakeList and .cmake files for Qt5 
Reasy for merging the cpp files from clone qt5
 2015-03-30 15:34:17 +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
Andreas Fabri 5f4a47e13b fix links to Qt and escape some links 2015-02-23 13:20:05 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF' 
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
 2015-01-12 11:44:32 +01:00
Sébastien Loriot e270de4b67 remove warning 2015-01-06 16:53:48 +01:00
Remy Thomasse b5047c9bb8 try to fix some warnings 2015-01-06 16:53:48 +01:00
Remy Thomasse b3514854de compatibility old version of boost 2015-01-06 16:53:48 +01:00
Remy Thomasse 57d4dbbb2a Add Traits, clean the code 2015-01-06 16:50:14 +01:00
Remy Thomasse 03ef4e6789 modifications OutputIterator 2015-01-06 16:50:14 +01:00
Remy Thomasse 616178e80f name change, typos 2015-01-06 16:50:13 +01:00
Remy Thomasse 86cf507775 add size_t, FT instead of long and double, ifndef Q_MOC_RUN trick to compile the demo without trouble (pb with boost headers and Qt) 2015-01-06 16:50:13 +01:00
Remy Thomasse 1d82acee46 demo generator 2015-01-06 16:50:13 +01:00
Jane Tournois 150c52200a add a menu to show/hide vertices 2014-11-28 13:06:44 +01:00
Jane Tournois b5ace14604 fix the use of the cancel button 2014-11-28 12:57:42 +01:00
Jane Tournois a8440d8eaa Add a submenu to view only inside edges 
the edges that triangulate the convex hull outside of the
domain "pollute" the image
 2014-11-28 11:36:06 +01:00
Jane Tournois 361fc6e3d0 fix clear function when show seeds is on 2014-11-28 10:26:44 +01:00
Jane Tournois fbccaadd4f add using namespace 2014-11-27 12:28:37 +01:00
Jane Tournois 6cc4ccc524 fix display of constrained Voronoi diagram 
there is still a problem with voronoiPen
 2014-11-24 14:46:27 +01:00
Jane Tournois 45f96a803c fix display of seeds 
when "display seeds" is active, seeds are displayed right away
when a new seed is inserted
 2014-11-24 14:24:09 +01:00
Jane Tournois 4b56a4abdd remove useless cout 2014-11-24 12:16:29 +01:00
Jane Tournois b40b37c760 paint seeds fixed 2014-11-24 12:03:13 +01:00
Jane Tournois 600a9bb192 handling of in_domain changed 
the parity of the number of constraints crossed is not used anymore.
The infinite component is tagged outside.
About finite components, inside/outside status is only based on seeds,
 that should be inserted manually.
 2014-11-21 13:10:47 +01:00