Commit Graph

137 Commits

Author SHA1 Message Date
Alex Tsui f27e1c2c7f Circular_arc_traits example compiles and runs, but just barely.
* Currently errors out on attempting to insert intersecting arcs.
2012-08-02 21:00:08 +00:00
Alex Tsui 09857e2e74 Used sfinae to use circular and non-circular kernels with Converter. 2012-07-30 21:03:25 +00:00
Alex Tsui 7ba8b08c4d Implemented insertion and removal of segments to arrangements. 2012-06-15 05:28:38 +00:00
Laurent Rineau 79f41a6c2f Add a license header 2012-01-16 10:54:58 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot 8ae6131f2e opti 2011-12-30 15:11:21 +00:00
Sébastien Loriot c564dfe82a fix drawing of degenerate parabola segment (source, target and center are collinear) 2011-12-30 15:00:46 +00:00
Laurent Rineau 98eccea610 Patch so that Qt's MOC can parse our headers, with Boost-1.48
UPDATE: fix the previous commit. I applied the patch stupidly.

  | The patch is adapted from this bug report:
  | 
  | From: Mark Brand < mabrand@mabrand.nl>
  | To: cgal-discuss@lists-sop.inria.fr
  | Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN
  | 
  | See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
2011-11-21 17:06:17 +00:00
Laurent Rineau f5ec3f260c Patch so that Qt's MOC can parse our headers, with Boost-1.48
The patch is adapted from this bug report:

From: Mark Brand < mabrand@mabrand.nl>
To: cgal-discuss@lists-sop.inria.fr
Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN

See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
2011-11-21 16:42:18 +00:00
Andreas Fabri f15a4f9957 more export statements 2011-10-12 10:26:21 +00:00
Laurent Rineau dfba14f23c Rename <CGAL/$LIB/export.h> to <CGAL/export/$LIB.h> 2011-10-12 09:43:19 +00:00
Laurent Rineau 87148361ff Rename CGAL_BUILD_SHARED_LIB to CGAL_BUILD_SHARED_LIBS
Better name, and more coherent with CMake variable name:
  BUILD_SHARED_LIBS
2011-10-11 13:52:25 +00:00
Laurent Rineau 88ef561715 Fix the call to Q_INIT_RESOURCE
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
2011-10-11 09:51:29 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Laurent Rineau b4bf4af75d One must include <CGAL/config.h> to use the macro CGAL_BUILD_SHARED_LIB 2011-10-10 11:49:39 +00:00
Laurent Rineau aa00f78883 Also support the compilation of CGAL libraries as static libs, with MSVC. 2011-10-06 16:01:16 +00:00
Andreas Fabri ebc4f53646 Add declspecs for Visual C++ so that we can build dlls 2011-10-06 13:14:17 +00:00
Andreas Fabri 18f16c77ba Add declspecs for Visual C++ so that we can build dlls 2011-10-06 12:20:14 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch.
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
Laurent Rineau acc2ae58a6 If CGAL_Qt4 is not a DLL, declspec must not be used. 2011-06-14 10:13:51 +00:00
Laurent Rineau 28bc7ca5c0 Add some decl spec (import|export) to CGAL_Qt4
That allows to build libCGAL_Qt4 and the Polyhedron demo with
-fvisibility-ms-compat on Linux.

That may allow to build CGAL_Qt4 as a DLL on Windows, one day.
2011-06-10 17:14:27 +00:00
Sébastien Loriot ed73c849d1 remove unused variable warning 2011-06-09 10:16:29 +00:00
Sébastien Loriot 69b97b4ad2 remove unsed var warnings 2011-06-08 09:56:42 +00:00
Sébastien Loriot 75980ac1c0 remove unused var warnings 2011-06-08 09:53:06 +00:00
Sébastien Loriot 4fdb182b99 BUGFIX: Even if a polyline is closed, it needs at least 3 points to be a polygon. 2011-06-08 09:31:44 +00:00
Sébastien Loriot ae62b2ae4d remove warnings 2011-02-24 16:36:04 +00:00
Andreas Fabri 7520c27371 ItemUsesExtendedStyleOption is available only starting from Qt 4.6 2010-12-13 19:28:34 +00:00
Laurent Rineau f1549b69ba PainterOstream can now paint bboxes 2010-11-09 09:12:58 +00:00
Andreas Fabri caf090bfff Conditional use of more recent Qt feature 2010-09-27 11:45:15 +00:00
Andreas Fabri 8ecb2bd1f2 Draw points on the fly in an output iterator without first collecting them into a container 2010-09-23 11:35:09 +00:00
Andreas Fabri 2b8df41cdb cleanup 2010-09-23 07:52:35 +00:00
Andreas Fabri 4306b967ee cleanup 2010-09-23 07:32:53 +00:00
Andreas Fabri 476713ca97 Add a graphics item for a point set in a kd-tree 2010-09-22 20:22:58 +00:00
Andreas Fabri e42710f1d2 cleanup 2010-09-22 20:22:00 +00:00
Andreas Fabri 569850f2f3 Access value type of iterator of container instead of value type of container 2010-09-22 14:34:35 +00:00
Andreas Fabri 17fca99269 Set a pen 2010-09-22 06:16:09 +00:00
Andreas Fabri b7f4ea49b6 Add typename 2010-09-22 06:15:46 +00:00
Andreas Fabri 5a4f57be05 Add #include file 2010-09-22 06:15:29 +00:00
Andreas Fabri 2d9beb8ef3 Add function to resive the grid 2010-09-21 13:26:25 +00:00
Andreas Fabri 106fe433e0 the item must not itself decide to hide or show 2010-09-21 10:43:22 +00:00
Andreas Fabri e7003b45ca intial version of Qt4 based Snaprounding demo 2010-09-20 20:24:27 +00:00
Andreas Fabri d1ea6a8cb7 Rename vector field graphics item 2010-09-20 12:19:14 +00:00
Andreas Fabri e04ca077c1 Add a GraphicsItem for the vector field 2010-09-17 20:57:27 +00:00
Andreas Fabri 4d58757564 Fix name of file protection variable 2010-09-17 14:20:59 +00:00
Andreas Fabri c1ede1357a Change site and edge color 2010-09-07 11:28:32 +00:00
Andreas Fabri 1a7b49eca6 weight is the radius 2010-09-07 10:14:16 +00:00
Andreas Fabri 3a9132778d Qt4 based streamlines demo 2010-09-03 14:20:48 +00:00
Andreas Fabri 6208b71aaf Towards a Qt4 based Apollonius_graph_2 demo 2010-08-25 15:04:34 +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