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

243 Commits

Author SHA1 Message Date
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
Andreas Fabri 7e02bcebfe Add drag and drop 2010-08-13 15:01:05 +00:00
Andreas Fabri eba2d33e3d Remove event dropping as it is now provided by DemosMainWindow 2010-08-13 14:44:00 +00:00
Laurent Rineau 26c4d0086d Fix drap&drops: the graphicsview must not accept drops. By default, 
graphics views accepts them.
 2010-08-13 13:31:41 +00:00
Laurent Rineau 225672765a Backport from trunk: 
| ------------------------------------------------------------------------
  | r57993 | lrineau | 2010-08-11 18:02:00 +0200 (Wed, 11 Aug 2010) | 5 lines
  | 
  | Massive change in all .qrc files: the attribute lang= must not be used. It
  | must be only used to create an alternative for another lang. If a resource
  | exists only with lang=, then that resource will not be found if the locale
  | had not that language.
  | 
  | ------------------------------------------------------------------------
 2010-08-11 16:03:25 +00:00
Laurent Rineau 9204de7204 Massive change in all .qrc files: the attribute lang= must not be used. It 
must be only used to create an alternative for another lang. If a resource
exists only with lang=, then that resource will not be found if the locale
had not that language.
 2010-08-11 16:02:00 +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
Andreas Fabri 9da3d00e19 int -> size_t 2010-06-22 09:53:36 +00:00
Laurent Rineau 185269032c Merged revisions 53906-53926,53928-53934 via svnmerge from 
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53918 | lrineau | 2010-01-29 18:23:40 +0100 (Fri, 29 Jan 2010) | 12 lines
  
  Merge from trunk:
    | ------------------------------------------------------------------------
    | r53910 | stayeb | 2010-01-29 16:33:26 +0100 (Fri, 29 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h
    |    M /trunk/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
    |    M /trunk/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h
    |    M /trunk/Mesh_3/include/CGAL/Mesh_3/Odt_move.h
    | 
    | Fix: ensure that no '0' is inserted in the sizing field.
    | ------------------------------------------------------------------------
........
  r53920 | lrineau | 2010-01-29 18:44:29 +0100 (Fri, 29 Jan 2010) | 2 lines
  
  Bug fixes in a demo.
........
  r53924 | pmachado | 2010-01-29 20:48:24 +0100 (Fri, 29 Jan 2010) | 2 lines
  
  Bug fix: pre-condition + case of three different spheres with 2 coincident
  radical planes (and the consequences).
........
  r53928 | lrineau | 2010-01-31 13:13:10 +0100 (Sun, 31 Jan 2010) | 2 lines
  
  Add a precision that AK/RS is not available on Windows.
........
  r53930 | lrineau | 2010-01-31 13:39:12 +0100 (Sun, 31 Jan 2010) | 2 lines
  
  NSIS installer for CGAL-3.6
........
  r53932 | lrineau | 2010-01-31 13:42:35 +0100 (Sun, 31 Jan 2010) | 2 lines
  
  script_cgal.nsi is no longer named after a specific version.
........
 2010-01-31 13:02:15 +00:00
Laurent Rineau 6de5b28f28 Revert the part of r53095 that were commited by error. 2009-11-18 15:19:18 +00:00
Laurent Rineau 23131c40b5 Merge change 53094 from branches/unsorted-branches/eric/CMAKE/GraphicsView 2009-11-18 15:17:14 +00:00
Laurent Rineau cc73b1b443 Remove the Terrain subdirectory. 
A working-in-progress copy lies in
svn/cgal/branches/experimental-packages/Triangulation_2-projection_traits/
 2009-03-06 15:03:58 +00:00
Laurent Rineau d5e0734193 - Back to the EPIC kernel, instead of EPEC. 
- Use the filtered projection traits.
- Add timers, profilers, etc.
 2009-02-06 15:35:05 +00:00
Laurent Rineau 002d7a33ce Add an action that inserts a given number of random points (inside the 
current bounding box)
 2009-02-05 10:54:08 +00:00
Laurent Rineau 7389127336 Add a constrained edge that complicates the data set a bit. 2009-02-05 10:53:13 +00:00
Laurent Rineau 5e7eb18e4c Display the projection axis. 2009-02-05 10:52:39 +00:00
Laurent Rineau e3306db3d2 - Add <CGAL/Triangulation_2_projection_traits_3.h> (need to be polished a 
bit)
- demo/Triangulation_2/Terrain/ now use that projection traits, with a
  normal that can be changed interactively.
 2009-02-04 22:56:45 +00:00
Laurent Rineau b7ad310cc9 Fix a warning about uninitialized stuff in "Point_3 p;" 2009-02-04 16:36:19 +00:00
Laurent Rineau 69bc2878c4 Add a data set with intersecting segments. 2009-02-04 16:35:34 +00:00
Laurent Rineau e3b02d40c5 - MainWindow.ui: add shortcuts 
- Terrain.cpp: let users pass a filepath as first argument.
- Viewer: 
   - draw constraints edges in red,
   - use lighting when needed.
 2009-01-30 16:09:47 +00:00
Andreas Fabri bc31311906 A terrain demo 2009-01-30 14:57:59 +00:00
Sylvain Pion e339f86cd2 More removal of svn:executable property on images. 2009-01-03 13:30:10 +00:00
Sylvain Pion 873efc64e1 Remove svn:executable property on images. 2009-01-03 13:27:56 +00:00
Laurent Rineau 6b445bdf13 Fix the registering of Triangulation_2 targets in the "demo" target. Bad copy-paste Fernando! :-) 2008-12-18 19:41:24 +00:00
Fernando Cacciola 24f08fc681 Added demos to the demos target 2008-12-18 17:29:36 +00:00
Andreas Fabri 39ae0c680a Remove debug output 2008-12-05 16:34:18 +00:00
Andreas Fabri e44aaafac0 Read weighted point instead of bare point 2008-12-05 16:33:43 +00:00
Laurent Rineau 88cc6becf4 Fix the tooltip of input weighted point 2008-12-05 13:10:13 +00:00
Andreas Fabri 04e8e4f1d0 reorder member initialization 2008-11-25 18:45:03 +00:00
Laurent Rineau 4032eade9a Massive removale of "QUIET" in find_package calls (except for 
FindVTK.cmake, which has a bug). Let's see if that can help us to find out
why we still have problems with demos on MacOS and Windows.
 2008-11-19 13:58:43 +00:00
Fernando Cacciola 547bffecd9 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-06 13:03:41 +00:00
Fernando Cacciola 70fa9503fd Added CMP0003 policy 2008-11-04 12:30:29 +00:00
Laurent Rineau b067e9a122 Fix conforming functions. 2008-10-27 21:31:12 +00:00
Laurent Rineau 4d288eef9e Fix in demo/Triangulation_2/Delaunay_triangulation_2: the input tool was 
not  working if dimension()==1.
 2008-10-13 09:23:44 +00:00
Andreas Fabri da81bc0f02 Remove graphics item from scene before deleting it 2008-10-09 08:28:15 +00:00
Andreas Fabri af5854f1fa Forgot to store first point 2008-10-08 20:24:30 +00:00
Laurent Rineau 89c607219c Fix conditional compilation. 2008-10-08 11:46:09 +00:00
Andreas Fabri 8162efe2a7 Highlight the conflict zone when entering a point with the mouse 2008-10-01 20:14:30 +00:00
Laurent Rineau 718c1a9f00 Fix MSVCisms: missing typenames. 2008-10-01 13:45:08 +00:00
Andreas Fabri add90360b1 Conditional compilation 2008-10-01 10:43:09 +00:00
Andreas Fabri 67c8337eb8 Keep additional include directory 2008-10-01 10:05:27 +00:00
Andreas Fabri d63921027a Only compile when Qt4 is found 2008-10-01 09:52:43 +00:00
Andreas Fabri 7ad693501b Add the necessary to allow persistence between calls 2008-10-01 09:17:07 +00:00
Andreas Fabri a828d949cc forgot resource file 2008-10-01 08:22:31 +00:00
Andreas Fabri 1cd15aa6b4 2D regular triangulation demo 2008-09-30 16:33:11 +00:00
Andreas Fabri c823377874 2D regular triangulation demo 2008-09-30 16:30:44 +00:00
Laurent Rineau 8a2a1f9902 - New icons for the two Triangulation_2 demos (Andreas: remember that we demo 
about regular).
- Constrained_Delaunay_triangulation_2 can now optionnaly show the mesh
  domain.
 2008-09-29 17:42:10 +00:00
Laurent Rineau 1ddcec5471 Fix compilation error: header missing. 2008-09-29 17:39:05 +00:00
Laurent Rineau b7ad8da9ea Fix CMakeLists.txt: add cmake_minimum_required. 2008-09-29 17:27:28 +00:00
Laurent Rineau a04928195d Use QApplication::restoreOverrideCursor() instead of 
QApplication::setOverrideCursor(Qt::ArrowCursor).
 2008-09-28 16:23:39 +00:00
Laurent Rineau 451268657e Make the cancel button of the "insert random points" dialog work. 2008-09-28 15:56:32 +00:00
Laurent Rineau 77582cfe07 Change default Windows sizes. 2008-09-26 17:13:52 +00:00
Laurent Rineau e5c3e6d552 Fix a MSVCism: needed typename. 2008-09-26 17:10:37 +00:00
Andreas Fabri a53755d379 A show too much 2008-09-26 16:49:37 +00:00
Andreas Fabri a54674e4e3 Added visualization of conflict zone 2008-09-26 16:08:57 +00:00
Laurent Rineau 1ca86be74c Rename Load/save entries. 2008-09-26 14:30:47 +00:00
Laurent Rineau f2d3b0ecb4 Add a copy of demo/Mesh_2/data/ (that directory will be soon dont_submitted). 2008-09-26 13:35:46 +00:00
Andreas Fabri 683fcfed36 reindentation 2008-09-26 12:47:01 +00:00
Andreas Fabri 59f5bc3c89 Random points in the screen and not the unit cube 2008-09-26 12:46:16 +00:00
Andreas Fabri 068b7cc61e Added marker for boundary nesting level 2008-09-26 12:45:09 +00:00
Laurent Rineau 6b15cdb91e New header <CGAL/Qt/utility.h> that contains miscellaneous global 
functions.
 2008-09-23 12:16:00 +00:00
Laurent Rineau b4adefbf2f Use "modern" find_package(CGAL). That simplifies a lot! 2008-09-11 13:56:30 +00:00
Laurent Rineau 5558487cad Fix: remove an unused non-commited but included header. 2008-09-10 18:41:33 +00:00
Laurent Rineau 1266312e32 Followup of previous commit ("Add auto-link to libCGALQt4 files."). 
Now use auto-link in demos that use CGAL Qt4 support.
 2008-09-05 16:04:07 +00:00
Andreas Fabri b9f817ff9a Added CGAL logo 2008-09-01 14:53:30 +00:00
Laurent Rineau e613317c65 Fix VCisms. 2008-09-01 14:01:19 +00:00
Andreas Fabri b4538d15a5 Incorporated reviewers remarks 2008-09-01 13:52:30 +00:00
Laurent Rineau 4e43b40207 Fix three VC++-ismes (wrong uses of typenames, again). 2008-08-18 15:18:17 +00:00
Laurent Rineau c711f07c2d Change previoux revision 44999: QGraphicsView::matrix returns a *copy* of 
its matrix! Hopefully, QGraphicsView has a member function scale(), similar
to the one of QMatrix.
 2008-08-18 15:16:34 +00:00
Laurent Rineau dd033c1748 revert revision 44882: the matrix is modified in place, by its member function scale(). 2008-08-18 15:08:55 +00:00
Andreas Fabri 246f8230df We have to set the matrix and not only to modify a copy 2008-08-11 15:52:58 +00:00
Andreas Fabri c7b95de6af Added Lipschitz sizing field 2008-08-11 12:21:18 +00:00
Laurent Rineau f13d5d2a25 Update for cmake-2.6: moc files must be in source files. 2008-08-01 07:53:35 +00:00
Laurent Rineau 3d0c1d9937 One can now drop files on the Constrained_Delaunay_triangulation_2 window. 2008-07-30 18:28:58 +00:00
Laurent Rineau 9ad27e6e6e Add recent files from CGAL::Qt::DemosMainWindow. 2008-07-30 18:14:23 +00:00
Laurent Rineau 1bca78d94e Update the qrc location. 2008-07-30 08:02:44 +00:00
Andreas Fabri 3ffb9d44d7 Add Delaunay mesh action with a size half the average constraint length 2008-07-29 21:31:11 +00:00
Andreas Fabri 49360f302c Plugged delaunay meshing on the ConformGabriel action, but it doesnt refine. What's wrong 2008-07-22 15:27:18 +00:00
Andreas Fabri 5860d40b43 Removed the moving point stuf from the constrained demo 2008-07-22 14:58:05 +00:00
Andreas Fabri e6370bee48 Tried to make insertion of constraints faster, but it isn't yet 2008-07-22 14:45:59 +00:00
Andreas Fabri 584a21d2e7 Use the statusbar and not std::cout 2008-07-22 12:07:03 +00:00
Andreas Fabri 04670bc9b7 Accelerated insertion and added conforming actions 2008-07-22 11:18:27 +00:00
Andreas Fabri d70aceb7bc Add vertex removal 2008-07-09 15:01:09 +00:00
Laurent Rineau 470f608687 Activate anti-aliasing by default in GraphicsView demos. 2008-07-09 13:49:47 +00:00
Laurent Rineau 9f2384e77d - Remove demo/icons/Logos.qrc, replaced by demo/resources/CGAL.qrc, that 
also contains :/cgal/help/about_CGAL.html
- Add include/CGAL/Qt/debug.h and src/CGALQt/debug.cpp, that will contain
  debug tools/functions. For the moment, they just define:
      void traverse_resources(const QString& name);
  that must be used like that:
      CGAL::Qt:traverse_resources(":/cgal"); // view CGAL resources
  or
      CGAL::Qt:traverse_resources(":"); // view all resources
  and displays the resources tree on std::cerr.
 2008-07-04 13:10:02 +00:00
Laurent Rineau 95af17375f Call graphicsView->setMouseTracking(true). It seems to be on by default, 
but the documentation does not say so.
 2008-07-02 13:36:11 +00:00
Laurent Rineau be4a3ad225 Call graphicsView->setMouseTracking(true). It seems to be on by default, 
but the documentation does not say so.
 2008-07-02 13:35:45 +00:00
Laurent Rineau ad6dbd0209 Remove setMouseTracking. It seems to be on by default. 2008-07-02 13:32:49 +00:00
Laurent Rineau 8c017c943c Rename Constrained_delaunay_triangulation_2 into 
Constrained_Delaunay_triangulation_2 (with capitalized "Delaunay", as in
the class name).
 2008-07-02 13:31:42 +00:00
Andreas Fabri f2431c2d74 robustification 2008-07-02 11:21:51 +00:00
Andreas Fabri 36a8de6cf4 robustification 2008-07-02 09:10:59 +00:00
Laurent Rineau d1501f3c71 Polish the two demos. 
Add a PNG file for "zoom-best-fit".
 2008-07-01 21:59:46 +00:00
Laurent Rineau 5ddfd30c93 In src/CGALQt4: 
- add the class CGAL::Qt::DemosMainWindow in libCGALQt4,
  - compile moc generated files separately

In demo/
  - new sub-directory demo/resources/ that contains, for now,
  about_CGAL.html
  - move the two triangulation demos from demo/GraphicsView to
  demo/Triangulation_2 (to prepare the inclusion in CGAL internal release).
  - For each demo, merge all .h and .cpp files. Each demo now has a ui
  file, a cpp file and a qrc file (and a html file for the "About demo..."
  menu entry).
  - rename the demos to Delaunay_triangulation_2(.exe) and
  Constrained_Delaunay_triangulation_2(.exe)
 2008-07-01 13:18:39 +00:00