Commit Graph

45 Commits

Author SHA1 Message Date
Andreas Fabri 844e7869fa Fix for Windows 'min/max' bug 2012-01-18 11:25:40 +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 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
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
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
Sébastien Loriot ae62b2ae4d remove warnings 2011-02-24 16:36:04 +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
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
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
Andreas Fabri 39ae0c680a Remove debug output 2008-12-05 16:34:18 +00:00
Laurent Rineau b067e9a122 Fix conforming functions. 2008-10-27 21:31:12 +00:00
Andreas Fabri 7ad693501b Add the necessary to allow persistence between calls 2008-10-01 09:17:07 +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 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
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 5558487cad Fix: remove an unused non-commited but included header. 2008-09-10 18:41:33 +00:00
Andreas Fabri b4538d15a5 Incorporated reviewers remarks 2008-09-01 13:52:30 +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 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
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
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 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 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