Commit Graph

423 Commits

Author SHA1 Message Date
Nico Kruithof 05f7dbc322 Working on the demo, adding more icons to the toolbar 2013-01-24 20:21:01 +01:00
Nico Kruithof d23bb62118 Moved the Periodic demo to the graphicsview package. This makes it easier to find icons and other resources 2013-01-22 10:12:49 +01:00
Andreas Fabri 1ae5df0172 When reading a file with 2D points, read the x and y, and ignore the rest of the line. This implies 1 point per line. 2013-01-08 10:31:41 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +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 a7a89c25b7 add_dependencies( Polygon_2 ${CGAL_LIBRARY} ) is useless
Ar the target Polygon_2 links with the CGAL library, CMake already creates
a dependency.
2012-07-31 16:18:17 +00:00
Ophir Setter 005904363f Taking the multiplicity from base class. This caused all 64-bit programs to crash 2012-07-06 07:13:42 +00:00
Eric Berberich b6e350ccfa removed old verbose output 2012-06-11 22:24:22 +00:00
Eric Berberich 463a030267 removed old verbose output 2012-06-11 22:23:28 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Andreas Fabri 792deb3819 Fix for Windows 'min/max' bug and remove superfluous #include 2012-01-19 08:43:49 +00:00
Andreas Fabri 0d56ed88dc Fix for Windows 'min/max' bug 2012-01-19 08:11:02 +00:00
Andreas Fabri 560246e34b Fix for Windows 'min/max' bug 2012-01-19 08:07:40 +00:00
Andreas Fabri 0a89e16d86 Fix for Windows 'min/max' bug 2012-01-19 08:00:17 +00:00
Andreas Fabri 77f3648287 Fix for Windows 'min/max' bug 2012-01-18 12:02:15 +00:00
Andreas Fabri 26ec45fee9 Fix for Windows 'min/max' bug 2012-01-18 11:27:10 +00:00
Andreas Fabri 844e7869fa Fix for Windows 'min/max' bug 2012-01-18 11:25:40 +00:00
Andreas Fabri 10d334d4a5 Fix for Windows 'min/max' bug 2012-01-18 11:21:11 +00:00
Andreas Fabri 73a21e0f47 Fix for Windows 'min/max' bug 2012-01-18 11:17:08 +00:00
Andreas Fabri ae3244e596 Fix for Windows 'min/max' bug 2012-01-18 11:15:52 +00:00
Andreas Fabri f880735fbf Fix for Windows 'min/max' bug 2012-01-18 11:14:44 +00:00
Sébastien Loriot a7456a2736 merge from next 2012-01-16 15:28:51 +00:00
Sébastien Loriot fca9a7bf54 *add operator>> for Constrained_triangulation_2
*update demo
*add save CDT for demo

see the related small feature:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_read_istream_for_constrained_triangulation.
2012-01-16 13:32:05 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Olivier Devillers f5636aa2fa merge next 2011-11-04 12:57:12 +00:00
Laurent Rineau 6ed56d75b5 merge from next 2011-10-25 15:48:02 +00:00
Andreas Fabri c5c387f45e workaround to avoid an unjustified warning of g++ 2011-10-24 13:21:59 +00:00
Olivier Devillers c239517f42 remove warning 2011-10-24 07:55:45 +00:00
Laurent Rineau 5946c69608 merge from next 2011-10-12 13:52:06 +00:00
Andreas Fabri 94191c33e7 fix a memory leak 2011-10-12 12:37:45 +00:00
Andreas Fabri 7566f2cdcc Max area k-gon is implemented for k=3; Additionally the input must be convex 2011-10-12 11:08:33 +00:00
Andreas Fabri 1211b00e3b bug fix: Check if item exists before removing it 2011-10-12 11:04:19 +00:00
Laurent Rineau 4b355f0561 merge from next 2011-10-11 12:28:22 +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
Andreas Fabri 99408ec652 Disambiguate beginning of comment 2011-10-06 19:49:16 +00:00
Sébastien Loriot 75999b64d9 remove executable property 2011-10-03 08:22:54 +00:00
Sébastien Loriot eea04efa5f remove debug output 2011-09-27 15:40:56 +00:00
Sébastien Loriot 22d59a631a read constraints 2011-09-27 15:22:18 +00:00
Laurent Rineau c6b789ca60 Allow to load a .cgal file (result of the operator<< of a CDT) 2011-09-27 15:12:34 +00:00
Philipp Möller f9b288db90 Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller.
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
2011-08-26 14:34:10 +00:00
Eric Berberich fbc101fbb8 Merge from nextwq 2011-06-15 09:20:39 +00:00
Sébastien Loriot 218f4abf1d BUGFIX: when using clear button, really hide the rectangles 2011-06-09 08:36:32 +00:00
Sébastien Loriot dafa949e75 BUGFIX: do not run rectangular_p_center_2 if the number of points is less than p
+cosmetic
2011-06-08 13:39:09 +00:00
Sébastien Loriot 75980ac1c0 remove unused var warnings 2011-06-08 09:53:06 +00:00
Sébastien Loriot f9c4053a0d do not execute discoverComponent if the dimension of the triangulation
is not 2 (avoid seg fault when inserting a segment or a point)
2011-06-08 09:00:08 +00:00
Eric Berberich 8d9c812cb4 merge from next 2011-06-07 15:54:55 +00:00
Laurent Rineau 0a363c52b5 Fix a bug introduced in trunk: criteria for Mesh_2 needs a geom traits 2011-06-04 17:00:31 +00:00
Eric Berberich a7a06c4e2b replaced Arr_..._side_category with :.._side_category 2011-05-31 18:08:54 +00:00
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