Commit Graph

44530 Commits

Author SHA1 Message Date
Luis Peñaranda caebea77fa avoid some VC10 warnings in Gmpfr_type.h 2010-06-21 09:50:46 +00:00
Sébastien Loriot 26dcdbcba2 removed non-need copy constructor added to drop_or_dispatch_output_iterator
in revision 56902
2010-06-21 09:48:18 +00:00
Sébastien Loriot d9a4f82a66 add copy constructor to Dispatch and drop output iterators (needed by MSVC10)
(only in the non-variadic case for the moment)
2010-06-21 09:19:41 +00:00
Stéphane Tayeb a6e8964676 Add item name in Scene_c3t3_item tooltip. 2010-06-21 07:38:28 +00:00
Laurent Rineau 8679a3911e Merged revisions 56835,56864-56870,56876,56895-56897 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r56835 | lrineau | 2010-06-17 12:56:52 +0200 (Thu, 17 Jun 2010) | 6 lines
  
  Remove the constructor Gmpfr(long double) on Microsoft Visual C++. A big
  comment in the source code explains why.
  
  The testsuite will check that the construction of Gmpfr from a long double
  on MSVC still works and produces the right Gmpfr.
........
  r56864 | afabri | 2010-06-18 11:04:47 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use tie from boost::
........
  r56865 | afabri | 2010-06-18 11:11:49 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use bind from boost::
........
  r56866 | afabri | 2010-06-18 11:38:50 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use bind from boost:: (detected in Mesh_3 VC10 testsuite)
........
  r56867 | lrineau | 2010-06-18 11:39:24 +0200 (Fri, 18 Jun 2010) | 3 lines
  
  cmake-2.8.2rc2 is out.
  /bigobj is necessary
........
  r56868 | afabri | 2010-06-18 11:52:37 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Add #include <fstream>
........
  r56869 | afabri | 2010-06-18 11:55:33 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Shorten filename as with path it exceeds easily 256 letters which poor Visual C++ can't handle
........
  r56870 | afabri | 2010-06-18 12:24:30 +0200 (Fri, 18 Jun 2010) | 1 line
  
  Use tie from boost::
........
  r56876 | lrineau | 2010-06-18 16:40:36 +0200 (Fri, 18 Jun 2010) | 3 lines
  
  New try to fix the issue of Gmpfr(long double) with MSVC and libmpfr-1.dll
  compiled by Mingw.
........
  r56895 | lrineau | 2010-06-20 23:16:40 +0200 (Sun, 20 Jun 2010) | 3 lines
  
  Using boost::bind is not sufficient" "bind" without qualifier was
  ambiguous, according to MSVC2010, with std::bind (from C++0x).
........
  r56896 | lrineau | 2010-06-20 23:18:29 +0200 (Sun, 20 Jun 2010) | 3 lines
  
  Qualify "bind" with "boost::", to avoid the ambiguity (according to
  MSVC2010), with std::bind (C++0x).
........
  r56897 | lrineau | 2010-06-20 23:19:17 +0200 (Sun, 20 Jun 2010) | 2 lines
  
  Stupid typo!
........
2010-06-20 21:48:20 +00:00
Andreas Fabri d1b7a574a8 Added missing typename 2010-06-20 21:10:04 +00:00
Laurent Saboret 994fe4fc55 Automatic documentation by generate_reference_manual 1.3.1 2010-06-20 17:58:28 +00:00
Laurent Saboret 80771679b3 Updated Poisson_reconstruction_function documentation with generate_reference_manual 1.3.1 2010-06-20 17:43:29 +00:00
Laurent Saboret c76930c46a generate_reference_manual version 1.3.1:
* Fixed incompatibility with variants of grep that do not support -P option (e.g. MacOS X)
* Fixed bug when processing "&&" string
* Fixed bug when a template class nested type is declared with template keyword
* Fixed bug in @commentheading
* Fixed bug in parameters parsing
* Fixed template declaration of nested template classes in \ccParameters section
* In the \ccParameters section, template parameters are now on a unique line to workaround a bug with typedef parameters types
* Added support of `' and '''' to emphasize words (besides "")
2010-06-20 17:41:44 +00:00
Stéphane Tayeb cc820c185e Mesh_3_demo:
+ Add status report in meshing MessageBox
  + Fix a bug which could happened if user stops meshing process early: cells should be scanned to have tets in the mesh and not only facets
2010-06-18 16:16:50 +00:00
Michael Kerber 4377bda5fe Introduced cast-to-void to avoid compiler warnings 2010-06-18 15:10:29 +00:00
Michael Kerber f39ad3b38e Make pedantics happy 2010-06-18 15:00:20 +00:00
Fernando Cacciola 91317fb1d0 refeeeerence manual changes 2010-06-18 14:56:10 +00:00
Luis Peñaranda 003aeddad1 fixed bug in expensive assertion code 2010-06-18 13:38:59 +00:00
Stéphane Tayeb 8e01b3cd32 Mesh_3_demo:
+ A window now pops-up during meshing (with a 'stop' button)
2010-06-18 13:06:08 +00:00
Laurent Rineau cb510c9856 Cosmetic change: do not display the Date, and remove "revision", which is
already in the keyword substitution of $Revision$.
2010-06-18 08:50:09 +00:00
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