Commit Graph

322 Commits

Author SHA1 Message Date
Laurent Rineau 7f7a8dc358 merge from trunk 2011-05-16 11:28:24 +00:00
Ophir Setter 83e1cfa332 Removing unnecesary comment 2011-05-06 05:58:11 +00:00
Laurent Rineau 704571e29d Fix cmake_minimum_required 2011-04-28 18:04:28 +00:00
Laurent Rineau 3c02e07b23 Try to fix my last revision about cmake_policy, with CMake-2.6.x
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part)
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Laurent Rineau 5a115a6792 Remove erroneous executable permission 2011-03-15 10:23:40 +00:00
Laurent Rineau 6036b7ca4b Typo: a resource was not found because its path was wrong. 2011-03-14 12:51:17 +00:00
Sébastien Loriot 3698d4528c use CGAL namespace 2011-02-28 07:40:38 +00:00
Sébastien Loriot ae62b2ae4d remove warnings 2011-02-24 16:36:04 +00:00
Ophir Setter 2f91e1af2e Changing name to L1_Voronoi_diagram_2 and removing .scm-urls files 2011-02-04 06:12:32 +00:00
Ophir Setter a5d3cbc877 Adding L1_voronoi_diagram_2 example for the Envelope_3 package 2011-02-03 05:31:34 +00:00
Eric Berberich 987c9bbcd5 added Minkowski sum with itself (AF has accepted this extension) 2010-12-20 14:15:46 +00:00
Andreas Fabri de2413466a Reorder initialization 2010-12-12 20:34:18 +00:00
Andreas Fabri 716d469af5 cleanup 2010-11-12 09:03:43 +00:00
Laurent Rineau 3af1511a79 A polygon with two vertices... well, that is not a polygon! Then do not
insert its single edge twice!
2010-11-10 18:50:19 +00:00
Laurent Rineau 11b8bf1ce9 Open files whose names/paths are given on the command line.
(Maybe that should go to CGAL::Qt::DemosMainWindow.)
2010-11-09 08:46:31 +00:00
Marc Glisse 4177858be9 Use types consistently to avoid warning. 2010-10-29 13:12:27 +00:00
Andreas Fabri 181646f64b Add some QT_USE_.. as this is the only difference I see to the Alpha shapes demo which finds Qt4 in the 3.8-I-39 testsuite 2010-09-27 11:28:10 +00:00
Andreas Fabri 818e9909f6 Add max area k-gon 2010-09-23 15:58:54 +00:00
Andreas Fabri 93712c46cd Add recenter and improve help 2010-09-23 14:42:13 +00:00
Andreas Fabri 20e83656cf cleanup and use of CrossCursor only in the GraphicsView 2010-09-23 12:22:24 +00:00
Andreas Fabri b8db07094a Draw points with line width 0, otherwise it is too slow when we have 1mio points 2010-09-23 09:25:29 +00:00
Andreas Fabri ef0c072342 Switch to PointsGraphicsItem that uses a kd-tree to quickly determine what points to redraw 2010-09-23 07:52:12 +00:00
Andreas Fabri 044dab1d6d Add typename 2010-09-23 07:30:03 +00:00
Andreas Fabri 086ce1423f First version of a Qt4 based 2D spatial searching demo 2010-09-22 14:31:13 +00:00
Andreas Fabri b8e5221f14 Add icons for snap rounding demo 2010-09-21 13:25:46 +00:00
Andreas Fabri 0239147049 Add icons for snap rounding demo 2010-09-21 13:25:29 +00:00
Andreas Fabri 78f805a6e2 Add IO and minor polish 2010-09-21 12:15:08 +00:00
Andreas Fabri 0ba646cb24 Add on/off for grid,input,output and allow to change delta 2010-09-21 10:42:11 +00:00
Andreas Fabri 7e26a61cf4 intial version of Qt4 based Snaprounding demo 2010-09-20 20:23:15 +00:00
Andreas Fabri 283ceae0b8 Rename vector field graphics item 2010-09-20 12:18:41 +00:00
Andreas Fabri 270081a303 cleanup 2010-09-20 09:44:32 +00:00
Andreas Fabri c04f9aa037 Recenter when loading 2010-09-19 19:32:17 +00:00
Andreas Fabri 779a234fab Add a GraphicsItem for the vector field 2010-09-17 20:56:59 +00:00
Andreas Fabri ed31acec91 Remove button 2010-09-07 11:29:44 +00:00
Andreas Fabri 14ea9ef8bc Change site and edge color 2010-09-07 11:28:04 +00:00
Andreas Fabri 31dcbec573 weight is the radius 2010-09-07 10:13:45 +00:00
Andreas Fabri 3b4a54546d Qt3 -> Qt3 2010-09-03 17:06:00 +00:00
Andreas Fabri 1545a1afe5 cleanup 2010-09-03 17:04:42 +00:00
Andreas Fabri ec956b4044 cleanup 2010-09-03 17:03:23 +00:00
Andreas Fabri f109e91c35 cleanup 2010-09-03 17:02:23 +00:00
Andreas Fabri 50617cdbeb cleanup of my mess 2010-09-03 16:59:29 +00:00
Andreas Fabri 57666e687c Qt4 based streamlines demo 2010-09-03 14:22:46 +00:00
Andreas Fabri c5818246ba cleanup 2010-08-31 12:59:10 +00:00
Andreas Fabri 82a6dfccd1 Towards a Qt4 based Apollonius_graph_2 demo 2010-08-25 15:02:06 +00:00
Andreas Fabri 4ff8be1faa Qt4 based largest empty iso rectangle demo 2010-08-24 17:11:41 +00:00
Andreas Fabri 3dc854d29c const QString& -> QString 2010-08-23 10:46:15 +00:00
Laurent Rineau 7606b93406 Merge last unmerged revision from the branch CGAL-3.7-branch:
| ------------------------------------------------------------------------
  | r57979 | lrineau | 2010-08-11 15:24:20 +0200 (Wed, 11 Aug 2010) | 1 line
  | 
  | Global fix of all uses of qt4_generate_moc: the destination file path must be absolute.
  | ------------------------------------------------------------------------
  | r58026 | stayeb | 2010-08-12 17:40:41 +0200 (Thu, 12 Aug 2010) | 2 lines
  | 
  | Bug fix: ensure that c3t3 contains no in complex cell when starting a new refinement process. We need this because the first refinement of the surface does not update the volume, so c3t3 can't know that in complex cells have been deleted.
  | 
  | ------------------------------------------------------------------------

(That shows it is difficult to avoid to merge the release branch in the
trunk from time to time.)
2010-08-20 13:09:22 +00:00
Laurent Rineau 49c71b30ac Merge CGAL-3.7-branch:
| ------------------------------------------------------------------------
  | r58172 | lrineau | 2010-08-20 11:21:30 +0200 (Fri, 20 Aug 2010) | 3 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
  | 
  | Fix buggy CMake logic: the GMP_arithmetic_kernel.cpp must me configured
  | only once.
  | 
  | ------------------------------------------------------------------------
  | r58173 | lrineau | 2010-08-20 11:25:35 +0200 (Fri, 20 Aug 2010) | 2 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2
  |    M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2/dual.cpp
  |    M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2/primal.cpp
  | 
  | Fix warning about deprecated included headers.
  | 
  | ------------------------------------------------------------------------
  | r58174 | lrineau | 2010-08-20 11:39:25 +0200 (Fri, 20 Aug 2010) | 3 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp
  | 
  | Modify the test file so that the check function do not display warnings
  | that result in a 'w' in the testsuite.
  | 
  | ------------------------------------------------------------------------
  | r58175 | lrineau | 2010-08-20 11:45:26 +0200 (Fri, 20 Aug 2010) | 9 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp
  | 
  | Fix warnings:
  | 
  | test/Bounding_volumes_Demo/Bounding_volumes.cpp: In constructor `MainWindow::MainWindow()':
  | test/Bounding_volumes_Demo/Bounding_volumes.cpp:71: warning: `MainWindow::P' will be initialized after
  | test/Bounding_volumes_Demo/Bounding_volumes.cpp:120: warning:   base `CGAL::Qt::DemosMainWindow'
  | test/Bounding_volumes_Demo/Bounding_volumes.cpp:120: warning:   when initialized here
  | test/Bounding_volumes_Demo/Bounding_volumes.cpp: In member function `void MainWindow::update()':
  | test/Bounding_volumes_Demo/Bounding_volumes.cpp:247: warning: comparison between signed and unsigned integer expressions
  | 
  | ------------------------------------------------------------------------
  | r58177 | lrineau | 2010-08-20 11:47:06 +0200 (Fri, 20 Aug 2010) | 3 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Min_circle_2/include/CGAL/Min_circle_2.h
  | 
  | Fix warning:
  | include/CGAL/Min_circle_2.h:197: warning: comparison between signed and unsigned integer expressions
  | 
  | ------------------------------------------------------------------------
  | r58178 | lrineau | 2010-08-20 11:49:09 +0200 (Fri, 20 Aug 2010) | 4 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/STL_Extension/include/CGAL/assertions.h
  | 
  | Avoid a warning if NDEBUG and CGAL_NDEBUG are both defined:
  | 
  | include/CGAL/assertions.h:59:1: warning: "CGAL_NDEBUG" redefined
  | 
  | ------------------------------------------------------------------------
  | r58179 | lrineau | 2010-08-20 11:50:54 +0200 (Fri, 20 Aug 2010) | 8 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/GraphicsView/include/CGAL/Qt/GraphicsViewCircularArcInput.h
  | 
  | Fix a warning:
  | 
  | include/CGAL/Qt/GraphicsViewCircularArcInput.h: In constructor 'CGAL::Qt::GraphicsViewCircularArcInput<K>::GraphicsViewCircularArcInput(QObject*, QGraphicsScene*) [with K = CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > >]':
  | cmake/platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1/test/Circular_kernel_2_Demo/Circular_kernel_2.cpp:107:   instantiated from here
  | include/CGAL/Qt/GraphicsViewCircularArcInput.h:73: warning: 'CGAL::Qt::GraphicsViewCircularArcInput<CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > > >::scene_' will be initialized after
  | include/CGAL/Qt/GraphicsViewCircularArcInput.h:68: warning:   'int CGAL::Qt::GraphicsViewCircularArcInput<CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > > >::count'
  | include/CGAL/Qt/GraphicsViewCircularArcInput.h:79: warning:   when initialized here
  | 
  | ------------------------------------------------------------------------
  | r58180 | lrineau | 2010-08-20 11:56:19 +0200 (Fri, 20 Aug 2010) | 21 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Convex_hull_d/include/CGAL/Delaunay_d.h
  | 
  | Fix warnings:
  | 
  | include/CGAL/Delaunay_d.h: In member function 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator& CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::operator++() [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]':
  | include/CGAL/Delaunay_d.h:1011:   instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
  | cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:74:   instantiated from here
  | include/CGAL/Delaunay_d.h:229: warning: suggest parentheses around && within ||
  | include/CGAL/Delaunay_d.h: In member function 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator& CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::operator++() [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]':
  | include/CGAL/Delaunay_d.h:1011:   instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
  | cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:162:   instantiated from here
  | include/CGAL/Delaunay_d.h:229: warning: suggest parentheses around && within ||
  | include/CGAL/Delaunay_d.h: In constructor 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::Simplex_iterator(CGAL::Delaunay_d<R_, Lifted_R_>*, typename CGAL::Convex_hull_d<Lifted_R_>::Simplex_iterator, CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]':
  | include/CGAL/Delaunay_d.h:575:   instantiated from 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator CGAL::Delaunay_d<R_, Lifted_R_>::simplices_begin(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
  | include/CGAL/Delaunay_d.h:1011:   instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
  | cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:74:   instantiated from here
  | include/CGAL/Delaunay_d.h:213: warning: suggest parentheses around && within ||
  | include/CGAL/Delaunay_d.h: In constructor 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::Simplex_iterator(CGAL::Delaunay_d<R_, Lifted_R_>*, typename CGAL::Convex_hull_d<Lifted_R_>::Simplex_iterator, CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]':
  | include/CGAL/Delaunay_d.h:575:   instantiated from 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator CGAL::Delaunay_d<R_, Lifted_R_>::simplices_begin(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
  | include/CGAL/Delaunay_d.h:1011:   instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
  | cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:162:   instantiated from here
  | include/CGAL/Delaunay_d.h:213: warning: suggest parentheses around && within ||
  | 
  | ------------------------------------------------------------------------
  | r58181 | lrineau | 2010-08-20 12:11:35 +0200 (Fri, 20 Aug 2010) | 3 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Installation/test/Installation/link_to_CGAL_Qt4.cpp
  | 
  | Fix a warning:
  | test/Installation/link_to_CGAL_Qt4.cpp:11: warning: the address of 'f' will never be NULL
  | 
  | ------------------------------------------------------------------------
  | r58182 | lrineau | 2010-08-20 12:15:14 +0200 (Fri, 20 Aug 2010) | 3 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Jet_fitting_3/include/CGAL/Monge_via_jet_fitting.h
  | 
  | Fix a warning:
  | include/CGAL/Monge_via_jet_fitting.h:425: warning: comparison between signed and unsigned integer expressions
  | 
  | ------------------------------------------------------------------------
  | r58183 | lrineau | 2010-08-20 12:19:36 +0200 (Fri, 20 Aug 2010) | 4 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Min_circle_2/include/CGAL/Min_circle_2.h
  |    M /branches/CGAL-3.7-branch/Min_circle_2/test/Min_circle_2/test_Min_circle.cpp
  | 
  | Fix warnings:
  |     "comparison between signed and unsigned integer expressions"
  | and "unsigned is always >= 0"
  | 
  | ------------------------------------------------------------------------
  | r58184 | lrineau | 2010-08-20 12:22:35 +0200 (Fri, 20 Aug 2010) | 2 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cpp
  | 
  | Fix warnings about comparison between signed and unsigned.
  | 
  | ------------------------------------------------------------------------
2010-08-20 12:57:32 +00:00