Commit Graph

44364 Commits

Author SHA1 Message Date
Laurent Rineau 9a9493322b Better using of svn keyword: autotest_cgal should announce its version (and
in the log file as well).
2010-06-18 08:38:43 +00:00
Laurent Rineau 1aa1d66cd9 Fix the use of $Id $ in a shell line 2010-06-18 08:15:11 +00:00
Laurent Rineau 39cfd48ebf Fix svn:keywords, and use it! 2010-06-18 08:14:07 +00:00
Stéphane Tayeb 660d56a9b1 Mesh_3_optimization_plugin
+ Add an error window if selected object is not a scene_c3t3_item
2010-06-18 07:47:02 +00:00
Andreas Fabri 90c4a4f0e2 Rotate the min ellipse correctly 2010-06-17 16:09:07 +00:00
Stéphane Tayeb 3d48c6d945 Change default colors for new Scene_c3t3_item (created by meshing or optimization). 2010-06-17 15:43:05 +00:00
Andreas Fabri 039c5add9d Added min ellipse 2010-06-17 15:32:37 +00:00
Andreas Fabri 7e1700df42 An Ellipse for Dummies 2010-06-17 15:30:57 +00:00
Stéphane Tayeb 2db8efab58 Remove buggy #include. 2010-06-17 14:09:07 +00:00
Stéphane Tayeb 08e6269f08 Second step towards run of mesh optimization process in a separated thread:
+ A message box pops up when optimizer is launched.
  + Optimization can be stop using 'stop' button of this message box

  + todo: add (dynamic) information in message box about status of running optimizer
2010-06-17 14:02:02 +00:00
Sébastien Loriot fb29cad175 svn tag clean up 2010-06-17 11:56:17 +00:00
Laurent Rineau 18f49da592 Merged revisions 56833 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56833 | lrineau | 2010-06-17 12:02:47 +0200 (Thu, 17 Jun 2010) | 4 lines
  
  Move the message "CGAL_Core needs GMP, cannot be configured." to the place
  where CGAL_NO_CORE is set. That is more compatible with the disabling of
  Core under 64 bits (on the trunk).
........
2010-06-17 10:04:25 +00:00
Laurent Rineau 6405de3c08 Merged revisions 56829 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56829 | lrineau | 2010-06-17 11:13:20 +0200 (Thu, 17 Jun 2010) | 2 lines
  
  Argl!! Important error in auto_link.h for MSVC 2010!
........
2010-06-17 09:43:01 +00:00
Laurent Rineau 034ced5cc3 Incorrect use of the function log(). 2010-06-17 09:39:06 +00:00
Laurent Rineau 680ae36873 More check of the lock file in autotest_cgal: the lock file will now
contain the PID of the running autotest_cgal process. That PID can be
checked and displayed if the lock cannot be acquired.
2010-06-17 09:33:00 +00:00
Andreas Fabri 0603ea69f7 Add PointsGraphicsItem 2010-06-17 06:29:45 +00:00
Sébastien Loriot c2d7f69b94 find(ESBTL) after include( ${CGAL_USE_FILE} ) to override
CGAL-I-REF config file (now should have r instead of w/n in test-suite)
2010-06-17 06:05:20 +00:00
Andreas Fabri c33b848256 Add rectangular 3-center 2010-06-16 21:10:02 +00:00
Andreas Fabri a4f8cfc32a Add rectangular 3-center 2010-06-16 21:03:06 +00:00
Andreas Fabri ac6c1170a8 Un-hardwire the kernel 2010-06-16 20:42:04 +00:00
Fernando Cacciola 20b7f183ee Misc compiler fixes and doc updates 2010-06-16 20:00:43 +00:00
Andreas Fabri 5395f91445 Use typedef instead of derivation for the Kernel 2010-06-16 19:47:35 +00:00
Andreas Fabri e970b1789b Correct the fix for std::max and VC++ 2010-06-16 19:44:04 +00:00
Sébastien Loriot d12d8eb3bf missing include file 2010-06-16 17:24:58 +00:00
Laurent Rineau c965a4d2bb Merged revisions 56724,56795-56798,56808 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56724 | stayeb | 2010-06-14 09:01:34 +0200 (Mon, 14 Jun 2010) | 14 lines
  
  Backport from trunk:
  
    | New Revision: 56647
    | Author: stayeb
    | Date: 2010-06-08 17:28:21 +0200 (Tue, 08 Jun 2010)
    | Log message:
    | Try another workaround for VC++ and Intel compiler (CGAL::centroid). Add a call of overloaded CGAL::centroid function in test-suite.
  
    | New Revision: 56702
    | Author: stayeb
    | Date: 2010-06-11 09:41:10 +0200 (Fri, 11 Jun 2010)
    | Log message:
    | Fix VC++ workaround (tested with MSVS2005)
........
  r56795 | lrineau | 2010-06-16 15:05:02 +0200 (Wed, 16 Jun 2010) | 35 lines
  
  Backport fixes for VC10 from trunk:
    | ------------------------------------------------------------------------
    | r56726 | afabri | 2010-06-14 09:11:59 +0200 (Mon, 14 Jun 2010) | 1 line
    | Changed paths:
    |    M /trunk/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h
    | 
    | For VC-10 we have to change FT* to cpp0x<>::const_iterator
    | ------------------------------------------------------------------------
  
    | ------------------------------------------------------------------------
    | r56758 | lrineau | 2010-06-14 22:29:51 +0200 (Mon, 14 Jun 2010) | 11 lines
    | Changed paths:
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
    | 
    | Remove extra typename (broken testsuite) after revision 56725:
    |   | ------------------------------------------------------------------------
    |   | r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
    |   | Changed paths:
    |   |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
    |   |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
    |   |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
    |   | 
    |   | For VC-10 we have to change FT* to cpp0x<>::const_iterator
    |   | ------------------------------------------------------------------------
  
    | ------------------------------------------------------------------------
    | r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
    | Changed paths:
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
    |    M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
    | 
    | For VC-10 we have to change FT* to cpp0x<>::const_iterator
    | ------------------------------------------------------------------------
........
  r56796 | lrineau | 2010-06-16 15:10:30 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Commit CHANGES for support of VC10.
........
  r56797 | lrineau | 2010-06-16 15:14:49 +0200 (Wed, 16 Jun 2010) | 1 line
  
  Commit mergeinfo stuff.
........
  r56798 | lrineau | 2010-06-16 15:31:05 +0200 (Wed, 16 Jun 2010) | 60 lines
  
  Backport from trunk the changes to the GMP/MPFR support on Windows:
  
    - autolink now depends on CMake options CGAL_AUTO_LINK_GMP and
      CGAL_AUTO_LINK_MPFR (default to ON).
  
    - the environment variables GMP_INC_DIR GMP_LIB_DIR MPFR_INC_DIR
      MPFR_LIB_DIR are used *before* searching into auxilary/gmp/.
  
    - search names for libraries now includes libmpfr-1 and libgmp-10 (names
      of Windows libraries obtained from the compilation of gmp-5.0.1 and
      mpfr-2.4.2).
  
  List of backported commits:
    | ------------------------------------------------------------------------
    | r56751 | lrineau | 2010-06-14 18:47:06 +0200 (Mon, 14 Jun 2010) | 6 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/CGALConfig_binary.cmake.in
    |    M /trunk/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
    |    M /trunk/Installation/cmake/modules/CGAL_SetupGMP.cmake
    |    M /trunk/Installation/cmake/modules/FindGMP.cmake
    |    M /trunk/Installation/cmake/modules/FindMPFR.cmake
    | 
    | Reintegrate the work of /branches/unsorted-branches/Test-no_autolink-for-gmp_mpfr-branch/Installation:
    | 
    | If(MSVC), create CMake variables CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_GMP
    | that can be set to OFF to disable the autolinking for GMP and MPFR. Those
    | variables are stored in the cache, and in CGALConfig.cmake
    | 
    | ------------------------------------------------------------------------
    | r56752 | lrineau | 2010-06-14 18:51:25 +0200 (Mon, 14 Jun 2010) | 1 line
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.fhs.in
    |    M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.source.in
    | 
    | Patch all CGALConfig*.in the same way.
    | ------------------------------------------------------------------------
    | r56775 | lrineau | 2010-06-15 19:25:37 +0200 (Tue, 15 Jun 2010) | 3 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/FindGMP.cmake
    |    M /trunk/Installation/cmake/modules/FindMPFR.cmake
    | 
    | Fix the library names hints of gmp and mpfr in FindMPFR.cmake and
    | FindGMP.cmake
    | 
    | ------------------------------------------------------------------------
    | r56777 | lrineau | 2010-06-15 20:10:23 +0200 (Tue, 15 Jun 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/FindGMP.cmake
    | 
    | The env variable must be searched *before* auxiliary/gmp/...
    | 
    | ------------------------------------------------------------------------
    | r56778 | lrineau | 2010-06-15 20:10:56 +0200 (Tue, 15 Jun 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Installation/cmake/modules/FindMPFR.cmake
    | 
    | Search the library also in auxiliary/gmp, even if autolink=OFF.
    | 
    | ------------------------------------------------------------------------
........
  r56808 | lrineau | 2010-06-16 18:10:11 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Set CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_MPFR defaults to FALSE if MSVC10
  (because GeometryFactory has not generated any autolink-enabled binaries
  of gmp and mpfr for msvc-2010).
........
2010-06-16 16:14:51 +00:00
Stéphane Tayeb 70ae043666 + Improve implicit function drawing efficiency (use display list stuff from base class)
+ Adjust Color_ramp
2010-06-16 16:12:32 +00:00
Andreas Fabri a5d085b67d Don't submit Qt3 demo 2010-06-16 15:25:53 +00:00
Andreas Fabri 881da8b0e9 Don't submit Qt3 demo 2010-06-16 15:24:44 +00:00
Andreas Fabri 7416f543a6 All 2D Bounding Volumes demo integrated in one 2010-06-16 15:23:52 +00:00
Andreas Fabri 6ed149c10b Don't submit Qt3 demo 2010-06-16 15:22:45 +00:00
Andreas Fabri 4a7b9a7573 Convex hull demo is part of the 2D Bounding Volumes demo 2010-06-16 15:20:44 +00:00
Andreas Fabri 5fa1b25916 Initial convex_hull/min_circle/min_rectangle/min_parallelogram demo 2010-06-16 15:10:07 +00:00
Stéphane Tayeb fdb69bc827 Mesh_3 demo: Replace Knot_3 function by Klein function. 2010-06-16 15:07:16 +00:00
Sébastien Loriot 4d0e30fd74 add comments 2010-06-16 15:04:30 +00:00
Andreas Fabri 6901b29c95 Remove frame and replace pdf/gif by png 2010-06-16 14:15:50 +00:00
Sébastien Loriot cf43255df7 Remove recursive call of create_star_3:
--create an internally used vector that can reserve its size when constructed
  --create an internally used class to store information required to emulated the call stack
  --the stack used to emulate the call stack is a static thread-safe vector of the function (thus a memory overhead) 
These choices have been made so that the running time of the triangulation is still the same.
2010-06-16 12:27:22 +00:00
Andreas Fabri 24d6b58c5d Add a Qt4 based demo for the Generator package 2010-06-16 09:47:31 +00:00
Andreas Fabri 169964dede Add a Qt4 based demo for the Generator package 2010-06-16 09:46:51 +00:00
Andreas Fabri e17399e9cd gif/pdf -> png 2010-06-16 09:43:35 +00:00
Andreas Fabri 91136222a1 Qt3 -> Qt4, gif/pdf -> png 2010-06-16 09:42:51 +00:00
Andreas Fabri a6f81584c1 Qt3 -> Qt4 2010-06-16 09:40:29 +00:00
Andreas Fabri 48d1623523 Replace gif/pdf with png 2010-06-16 09:13:24 +00:00
Andreas Fabri 1c66f93169 Remove frame of window 2010-06-16 09:12:14 +00:00
Sébastien Loriot 62c6b7d582 license bug 2010-06-16 08:42:21 +00:00
Sébastien Loriot b53e23c906 add forward declaration for Quotient 2010-06-16 08:22:01 +00:00
Laurent Rineau 32a08cb7f9 Search the library also in auxiliary/gmp, even if autolink=OFF. 2010-06-15 18:10:56 +00:00
Laurent Rineau f834218870 The env variable must be searched *before* auxiliary/gmp/... 2010-06-15 18:10:23 +00:00
Laurent Rineau fc33fbff26 Fix the library names hints of gmp and mpfr in FindMPFR.cmake and
FindGMP.cmake
2010-06-15 17:25:37 +00:00
Stéphane Tayeb b62635e181 First step towards run of mesh optimization process in a separated thread. 2010-06-15 16:40:57 +00:00
Olivier Devillers 35f93ec7fb new refs 2010-06-15 14:00:44 +00:00