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

225 Commits

Author SHA1 Message Date
Aurélien Vialon 6df9530094 All GraphicView demonstrations ported to the new Qt inclusion way. 
Change of Qt4or5 variables names.

Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
     USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
     QT_VERSION_USED => number of Qt version wanted (4 or 5).
     QT4 => TRUE if Qt4 chosen.
     QT5 => TRUE if Qt5 chosen.
 2014-08-05 18:13:39 +02:00
Aurélien Vialon 9a1461442b Some bug correction for new Qt inclusion way. 
Following demonstrations ported to Qt4or5 way :
- Polyhedron
- Linear Cell Complex
- Mesh_3
- Periodic_3_Triangulation
- Periodic_Llyod_3
- Surface_reconstruction_point_3
 2014-08-04 20:16:44 +02:00
Laurent Rineau 283807572f restore correct permissions (not-executable) 2014-08-01 10:32:42 +02:00
Aurélien Vialon a3a84ce2e8 Fix attempt of git problem + Periodic_3_triangulation_3 and Periodic_Llyod_3 demonstrations ported. 2014-07-11 19:22:13 +02:00
Aurélien Vialon ab909badb9 Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3. 2014-07-03 15:07:00 +02:00
Laurent Rineau e4b033e964 Add/remove #include 
- I remove <CGAL/basic.h> when I see it, in favor of <CGAL/config.h>.
- <CGAL/ipower.h> is needed for CGAL::ipower
- <ctime> is needed for std::time
 2014-06-26 19:10:06 +02:00
Sébastien Loriot 746dacc210 periodic_3 demo does not compile if qcollection_generator is not here. 2013-05-21 17:20:25 +02:00
Andreas Fabri 278c1fe6d4 Add an 'f' to a float 2013-02-14 13:16:20 +01:00
Andreas Fabri dfea9e77dc Add a 'f' after a number 2013-02-09 16:24:57 +01:00
Andreas Fabri 21fd50eeb7 Add a static_cast 2013-02-09 16:23:42 +01:00
Andreas Fabri c029f702a3 use more types 2013-02-07 11:02:14 +01:00
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | 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.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Laurent Rineau e534c42e1c Fix the detection of qcollectiongenerator 2012-02-24 12:24:01 +00:00
Sébastien Loriot 20ee8d187d do not compile if qcollectiongenerator is missing 2012-02-04 10:34:16 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Laurent Rineau c7ca93c07e Include <CGAL/glu.h> before any use of GLU 2011-11-09 14:24:17 +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
Laurent Rineau 78b2f8ba39 Remove the use of QT ASSISTANT in CMakeLists.txt (not actually used) 2011-06-14 14:02:42 +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 0dc1194fc8 Fix URLs to the manual pages 2011-04-28 15:14:20 +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 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +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 af3ad196a0 Global fix of all uses of qt4_generate_moc: the destination file path must be absolute. 2010-08-11 13:24:20 +00:00
Laurent Rineau efb2c205a3 - Fix the Qt Help Collection stuff: 
- CMakeLists.txt is changed (now that FindQt4.cmake has been update to
  the version shipped with CMake-2.8.1,
  - the .qhcp files have been updated, so that the first URL is correct.

- Use embedded resources in demo/Periodic_3_triangulation_3/MainWindow.h,
  so that the resources are found even if the build/install directory is
  out of sources.
 2010-08-02 14:51:09 +00:00
Manuel Caroli 4bb914994b the demo's help now uses QProcess to call the qt assistant 
instead of using the deprecated QAssistantClient
 2010-07-11 19:45:18 +00:00
Manuel Caroli 7418d1bf73 put the collection files to the demo's root directory so they can access the icons 2010-07-11 19:26:06 +00:00
Manuel Caroli 32e9308ea2 remove generated binary files from svn 2010-07-11 19:21:33 +00:00
Manuel Caroli 3bb22cc580 make the help work using a non-interactive QProcess that calls the assistant 2010-07-11 19:18:34 +00:00
Manuel Caroli 52227057f8 added the paths to the icons in the collection file 2010-07-05 16:21:17 +00:00
Manuel Caroli 0715fb8896 small bugfixes. Help works now under Linux. 
TODO: the qhc must be registered in the assistant.
Can this be done using cmake?
The help does not show the icons, which works under MacOS though.
 2010-07-05 16:16:56 +00:00
Manuel Caroli 3cf9ee4c67 Use QProcess instead of deprecated QAssistentClient to show custom help 
Does not yet work: the QtAssistent gets stuck in the background
 2010-07-05 15:16:07 +00:00
Manuel Caroli d2305d0ffd - added new iterator Unique_vertex_iterator that iterates over all vertices 
whose corresponding points lie in the original domain
- added the iterator range removal again
 2010-02-08 15:39:04 +00:00
Manuel Caroli 07989fc45b replace version number by "last" in links to the online manual 2010-02-08 08:52:36 +00:00
Manuel Caroli 4bd9d6549f final minor cosmetics before the code freeze 2009-12-17 18:31:13 +00:00
Manuel Caroli 666b6e9c6c enable antialiasing for the viewer 2009-12-09 10:51:00 +00:00
Manuel Caroli dbadc61397 final changes to put the demo on the next release 2009-12-08 21:02:25 +00:00
Manuel Caroli 848c774faf correcting typo 
several cosmetic changes
 2009-12-08 19:55:53 +00:00
Manuel Caroli 83ab1400bb add functions to load and save point sets 2009-12-08 19:31:55 +00:00
Manuel Caroli 9c7b3580a0 bugfix in lloyd_step (centroid computation) 2009-12-08 18:16:06 +00:00
Manuel Caroli b550ee68f2 remove unused variables to avoid warnings 2009-11-11 16:14:09 +00:00
Manuel Caroli 88fe42756b fix warning 2009-10-28 15:09:02 +00:00
Manuel Caroli 84cd6ec9d1 improvements in CMakeLists.txt 2009-10-27 09:33:19 +00:00
Manuel Caroli 996f8b2954 keep one point at constant position to avoid the point set to move as a whole 2009-10-07 14:43:51 +00:00
Manuel Caroli 56e35c3ed1 integrating the icons in the executable 2009-10-07 11:59:24 +00:00
Manuel Caroli d26f570f3c Periodic Lloyd demo initial commit 2009-10-07 09:39:46 +00:00
Laurent Rineau f1a3f94274 Merge to trunk commits from CGAL-3.5-branch so far. 
Merged revisions 50855,50859,50863,50868,50871,50878-50879,50886,50893,50930-50934 via svnmerge from 
svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch

........
  r50855 | lrineau | 2009-07-27 13:47:18 +0200 (Mon, 27 Jul 2009) | 1 line
  
  Attempt to fix links to precompiled demos.
........
  r50859 | lrineau | 2009-07-27 14:37:54 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  update the AUTHORS list
........
  r50863 | lrineau | 2009-07-27 14:53:14 +0200 (Mon, 27 Jul 2009) | 3 lines
  
  Remove occurences of "3.4" in various files (problem reported by
  J. Reichel)
........
  r50868 | lrineau | 2009-07-27 15:38:39 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Fix target names conflicts with Triangulation_2.
........
  r50871 | lrineau | 2009-07-27 15:48:57 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Taucs will be updated for CGAL-3.5.
........
  r50878 | lrineau | 2009-07-27 16:10:03 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  There was still a 3.4 in that file.
........
  r50879 | lrineau | 2009-07-27 16:16:11 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Fix a problem with \cgalrawversion{}: use "\cgalrawversion" instead!
........
  r50886 | reichel | 2009-07-27 19:09:07 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Set CGAL_SONAME_VERSION to 4 and CGAL_SOVERSION to 4.0.0.
........
  r50893 | lsaboret | 2009-07-28 10:27:31 +0200 (Tue, 28 Jul 2009) | 2 lines
  
  * Fixed include path.
  * Fixed order of libraries: TAUCS must be listed before LAPACK.
........
  r50930 | lrineau | 2009-07-29 11:58:00 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add periodic_3_demo to "make demos".
........
  r50931 | lrineau | 2009-07-29 11:59:33 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add CGAL ipelets to "make demos".
........
  r50932 | lrineau | 2009-07-29 12:57:59 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add the polyhedron demo to "make demos".
........
  r50933 | lrineau | 2009-07-29 13:04:50 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add the points set demo to "make demos".
........
  r50934 | lrineau | 2009-07-29 13:09:22 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Make the windows installer fetch the manual from the right place!
........
 2009-07-29 12:49:27 +00:00
Manuel Caroli fa9c26ebed integrating the help directly into the demo 2009-07-22 09:22:31 +00:00
Manuel Caroli 7473705678 forgot to submit file 2009-07-17 11:34:55 +00:00
Manuel Caroli 4097100246 minor changes, mainly cosmetic 2009-07-17 11:33:21 +00:00
Manuel Caroli b270829457 add a manual for the demo 2009-07-17 11:30:53 +00:00
Manuel Caroli 8dde8dc27f minor cosmetics 2009-07-16 19:17:31 +00:00
Manuel Caroli d77ad6fc91 adding icons to the demo 2009-07-16 18:42:39 +00:00
Manuel Caroli 41d493a97d adding icons to the demo 2009-07-16 18:36:17 +00:00
Manuel Caroli d2180ac85e adding icons to the demo 2009-07-16 18:32:28 +00:00
Manuel Caroli 11221e8096 adding about and tooltips 2009-07-15 16:02:03 +00:00
Manuel Caroli c90f6adb95 removing obsolete files 2009-06-30 18:51:49 +00:00
Manuel Caroli 0cd3ec864a bugfix 2009-06-30 18:42:31 +00:00
Manuel Caroli 935f5f7443 removing experimental functionality for the release 2009-06-30 18:25:25 +00:00
Manuel Caroli 941125c849 add a proper class MainWindow 2009-06-30 15:30:03 +00:00
Manuel Caroli 96202c22ef rename periodic.ui to MainWindow.ui together with all the necessary 
modifications
 2009-06-30 14:10:01 +00:00
Manuel Caroli f495b8b0b1 renaming the periodic triangulation demo 2009-06-30 13:50:35 +00:00
Manuel Caroli dc2c4ebf70 removing the constructor Periodic_3_offset_3(int) as written in the doc 
call P3T3::int_to_off instead to decode an offset encoded into an int
 2009-06-24 10:00:40 +00:00
Andreas Fabri 59fcb4fac1 std::min -> (std::min) 2009-06-19 10:14:17 +00:00
Marc Glisse f8d199ad6d No reason not to make this function const, and it helps with several STL 
implementations.
 2009-06-18 19:50:50 +00:00
Manuel Caroli fa036c04cf minor changes to make it work with sunPro 2009-05-25 09:15:38 +00:00
Manuel Caroli 50e282fe19 eliminating compiler error 2009-05-15 09:11:27 +00:00
Manuel Caroli 0611c7ad8f fix in CMakeList.txt 2009-05-12 10:51:34 +00:00
Manuel Caroli 68fc612c96 fixing warnings 2009-05-11 08:09:05 +00:00
Manuel Caroli db8d5ba433 improved cmake configuration file for the demo 2009-05-06 15:01:46 +00:00
Manuel Caroli 7ad7530ff0 removing deprecated demos from svn 2009-05-06 14:51:35 +00:00
Manuel Caroli 6f210c95d0 get rid of warnings 2009-05-05 11:38:34 +00:00
Manuel Caroli 1482d7377f repare makefile 
apply name changes of access functions in the package
 2009-05-05 08:45:51 +00:00
Manuel Caroli 9223aa5191 moving the package Periodic_3_triangulation_3 to the trunk 
upon approval by Laurent R.
 2009-05-04 10:04:08 +00:00