Commit Graph

339 Commits

Author SHA1 Message Date
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 d1499114e3 Added cmake_minimum_required 2008-10-01 05:23:00 +00:00
Andreas Fabri 1cd15aa6b4 2D regular triangulation demo 2008-09-30 16:33:11 +00:00
Andreas Fabri 52ce566fc9 2D regular triangulation demo 2008-09-30 16:31:59 +00:00
Andreas Fabri c823377874 2D regular triangulation demo 2008-09-30 16:30:44 +00:00
Andreas Fabri e2de7ab0f3 No input if Shift is pressed 2008-09-30 16:28:44 +00:00
Andreas Fabri ba7fcaa5f2 Renamed actionExit to actionQuit 2008-09-30 14:45:34 +00:00
Andreas Fabri 8b1ce4bdc8 find resources and rename actionExit to actionQuit 2008-09-30 12:56:38 +00:00
Andreas Fabri 544bf786a9 find resources and rename actionExit to actionQuit 2008-09-30 12:56:32 +00:00
Laurent Rineau f7fbbd939a Detail: add a separator before actionQuit (in menuFile). 2008-09-29 21:53:05 +00:00
Laurent Rineau bd0d9a5f1e Promote Viewer to QGLViewer 2008-09-29 21:49:49 +00:00
Laurent Rineau 6f0d6698e3 connect the slider and the spinbox values 2008-09-29 21:31:08 +00:00
Laurent Rineau 86f008b6cf connect the slider and the spinbox values 2008-09-29 21:30:13 +00:00
Laurent Rineau 489ea92424 Use light model=TWO_SIDE. 2008-09-29 20:38:48 +00:00
Laurent Rineau 879e9b7c1a - Fix CMakeLists.txt for non-Windows platforms.
- Fill svn:ignore.
2008-09-29 19:12:33 +00:00
Andreas Fabri 61a6ca195f Qt4 based alpha shape demo 2008-09-29 19:02:37 +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 21be621000 Fix typo. 2008-09-29 17:26:00 +00:00
Laurent Rineau a2c1d435eb Fix: make setVisibleEdges() work again. 2008-09-29 16:42:23 +00:00
Laurent Rineau 202d2b53ca Force variables CGAL_<component>_LIBRARY.
For an unkwnon reason, they are copied from the reference cache, which is wrong.
2008-09-29 10:09:35 +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 76843e8416 Added Qt4 based Polygon demo to internal release 2008-09-26 16:29:18 +00:00
Andreas Fabri f42e4df167 Added partition 2008-09-26 16:27:55 +00:00
Andreas Fabri 7051541823 Add 2D triangulation demos to the internal release 2008-09-26 16:24:06 +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
Andreas Fabri aa58744394 Added missing parenthesis 2008-09-24 16:23:32 +00:00
Laurent Rineau 49a57069fd Fix a MSVCism: in a class template, when one use a member data from a base
class, one need to use this->...
2008-09-24 13:24:24 +00:00
Andreas Fabri 7af1c89e97 require Qt4 2008-09-24 12:58:10 +00:00
Andreas Fabri bfdb6cdd09 Add resource file 2008-09-24 12:57:37 +00:00
Laurent Rineau b52c7a09e9 - Fix soname and soversion of libraries (they were exchanged).
- Make get_dependency_version found the print_${LIB}_version.cpp, even
  if the lib is compiled separately.
- Rename FindQt3.cmake to FindQt3-patched.cmake and Qt3Macros to
  Qt3Macros-patched.
- Make CGAL-Qt3 compilable separately.
- Fix all commited CMakeLists.txt:
    - use Qt3-patched and Qt3Macros-patched, and s/QT_/QT3_/
    - add a comment about FindQt3-patched,
    - wrap target creation with if(CGAL_FOUND AND QT3_FOUND)/else/endif
- Modified cgal_create_cmake_script
2008-09-24 10:32:44 +00:00
Andreas Fabri 27160bcce5 A Qt4 based demo of the Circular Kernel 2008-09-23 13:46:15 +00:00
Andreas Fabri 5081742ee6 many fixes concerning the circular arcs 2008-09-23 13:11:22 +00:00
Laurent Rineau 6b15cdb91e New header <CGAL/Qt/utility.h> that contains miscellaneous global
functions.
2008-09-23 12:16:00 +00:00
Andreas Fabri 8291bffe10 Handle el and Esc key 2008-09-23 09:35:45 +00:00
Andreas Fabri 299d43db88 typo 2008-09-23 09:35:09 +00:00
Andreas Fabri f3c0ffc206 fix emit of circular arc input tool 2008-09-23 09:05:29 +00:00
Andreas Fabri f870cb8d38 fix IO for circular arcs 2008-09-23 09:03:13 +00:00
Andreas Fabri c9e3b3416f disable drawing of circular arc as it breaks linear kernel demos 2008-09-22 14:30:39 +00:00
Andreas Fabri 138cac3cea Add support for circular arcs 2008-09-22 14:10:30 +00:00
Andreas Fabri 95dd6eb40f Add support for circular arcs 2008-09-22 14:09:55 +00:00
Andreas Fabri 15ad06b081 Add (buggy) IO for circular arcs 2008-09-22 13:59:26 +00:00
Laurent Rineau f1b56f9a11 Fix some CMakeLists.txt (that use Qt3 or Qt4). 2008-09-22 11:59:21 +00:00
Andreas Fabri d1bae6f176 fix minimal demo 2008-09-22 09:21:24 +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 3a825a09ae Fix a typo in CGALQt4's CMakeLists.txt: moc files where not created. 2008-09-10 11:02:36 +00:00
Laurent Rineau f81780b59c Small adjustments, so that CGAL-Qt4 can be built separately. 2008-09-10 09:49:45 +00:00
Laurent Rineau 808fa204cd Remove "/" from dont_submit. 2008-09-10 09:43:39 +00:00
Fernando Cacciola d8f5eaa9f0 Fixed typo in CGA-Qt4 basename 2008-09-09 21:12:10 +00:00
Fernando Cacciola cd00979002 Added explicit link directives from libCGAL* to libCGAL
Added OpenGL to CGALQt4
2008-09-09 18:53:02 +00:00
Laurent Rineau 14c207fee6 Remove a debug message. 2008-09-09 13:42:35 +00:00
Andreas Fabri ec6d54a8be added parent to the input tools 2008-09-09 12:25:48 +00:00
Andreas Fabri 7bc12af8e9 added parent to the input tools and fixed typos 2008-09-09 12:21:32 +00:00
Laurent Rineau d97c78b177 Include CGALQt4 in the libraries compilation stuff.
We need to create a (potentially incomplete) CGALConfig.cmake file after
the CGAL library has been built.
2008-09-09 12:19:41 +00:00
Andreas Fabri 3e087efec3 Added license header 2008-09-09 11:57:39 +00:00
Andreas Fabri a3d016def5 Added license header 2008-09-09 11:56:57 +00:00
Andreas Fabri 1c56306968 Add input tool for iso-rectangles 2008-09-09 11:48:15 +00:00
Andreas Fabri cbd3315b63 Added illustration 2008-09-09 09:18:54 +00:00
Andreas Fabri f215a5a1d2 don't submit the powerpoint on the design of the package 2008-09-09 09:06:38 +00:00
Andreas Fabri 6c0a6612be cleanup 2008-09-08 10:48:01 +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
Laurent Rineau b2525f2256 Add auto-link to libCGALQt4 files. 2008-09-05 15:34:53 +00:00
Laurent Rineau cd29a74c58 Submit the directories:
demo/GraphicsView/
  demo/icons/
  demo/resources/
but not:
  demo/Polygon/
  demo/Triangulation_2
2008-09-05 13:49:08 +00:00
Laurent Rineau 04a8b4ee14 Update CGALQt4's CMakeLists.txt, to add:
- soversion/soname,
  - mangled names
2008-09-01 18:36:52 +00:00
Laurent Rineau 3c337d4aea fix the minimalist GraphicsView application: min 2008-09-01 15:14:50 +00:00
Andreas Fabri 2a0f605128 Added dont_submit file 2008-09-01 14:56:54 +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
Andreas Fabri b073a2356b Incorporated reviewers remarks 2008-09-01 13:50:09 +00:00
Andreas Fabri 2e7ab87ab7 Incorporated reviewers remarks 2008-09-01 12:42:20 +00:00
Andreas Fabri f6e9a54bb1 Incorporated reviewers remarks 2008-09-01 12:35:14 +00:00
Andreas Fabri e538557c4d Incorporated reviewers remarks 2008-09-01 12:07:38 +00:00
Sylvain Pion 44c185f1f4 Rename boost::array to CGAL::array. 2008-08-26 13:15:21 +00:00
Sylvain Pion 53f5c9679b Add a using directive "using std::array" in namespace CGAL to import either:
- C++0x's std:array from <array>
- TR1's std::tr1::array from <tr1/array>
- boost::array from <boost/array.hpp>
Motivation : GCC's std::array is faster than boost::array.

Move CGALi:make_array to namespace CGAL.

Document CGAL::array.
2008-08-26 13:08:16 +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 0242deacfe Minor modification: fix the first line (a comment). 2008-08-02 14:39:26 +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 06c56223ef Fix compilation warnings (MSVC++ 2009) 2008-08-01 07:51:00 +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 cd3614b441 Add support for recent files in CGAL::Qt::DemosMainWindow 2008-07-30 18:01:51 +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 4094ca645b When the polyline is closed we duplicate the first point 2008-07-29 20:47:43 +00:00
Laurent Rineau b9fa91e06a make_array is in CGALi... 2008-07-28 14:27:05 +00:00
Laurent Rineau 8939e4d897 Use boost::array (and <CGAL/array.h> instead of CGAL::Triple
That code is currently not tested!
2008-07-28 14:11:50 +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 b6dae9c417 - Change svn:ignore of the directory (files generated by CMake).
- Change the horizontalStretch of the two central widgets (2/3, 1/3).
2008-07-11 13:25:51 +00:00
Laurent Rineau 14ca3447e5 Fix: Logos.qrc no longer exists. Use CGAL.qrc instead. 2008-07-11 13:09:58 +00:00
Andreas Fabri fb894e0f08 Add signal modelChanged for inout handlers that modify a model 2008-07-09 15:02:52 +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
Andreas Fabri 6bd3e07953 Add Polygon Demo 2008-07-08 21:48:06 +00:00
Andreas Fabri e165edec50 Add Polygon Demo 2008-07-08 21:44:43 +00:00
Laurent Rineau 275b3e5ccd - Add a new icons for zoom-fit-best, taken from Qt.
- Add a license.txt that says four icons come from Qt.
2008-07-08 12:36:56 +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
Laurent Rineau cfe37f831c Use \ccAnchor instead of a construction with \ccTexHtml 2008-07-02 12:51:34 +00:00
Laurent Rineau 4fc594a562 Fix compilation error in doc_tex/. 2008-07-02 12:41:37 +00:00
Andreas Fabri 806dcfd607 small improvements of the reference manual pages 2008-07-02 12:25:52 +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
Andreas Fabri fce1726039 Added links to the Qt online documentation 2008-07-02 09:08:36 +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 1143bf9543 Missing ":". 2008-07-01 13:34:08 +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
Laurent Rineau 4e9791b602 (Leftover of revision 43782.)
Remove toolBar2, that was added during the presentation at Inria, and
commited by error.
2008-06-28 09:29:55 +00:00
Laurent Rineau 0571512148 Polished demos.
- added an icons "insertPoint.png",
  - added a new html file for the about dialog of Delaunay triangulation,
  - the Voronoi diagram is now painted in blue,
  - add the button for Voronoi,
  - general cleaning of the code.
2008-06-27 13:20:55 +00:00
Laurent Rineau ec42da4230 Delaunay-voronoi demo. Not yet polished, but still. 2008-06-27 10:45:04 +00:00
Laurent Rineau 4d6d9b314c Fix compilation error in VoronoiGraphicsItem<DT>. 2008-06-27 10:42:50 +00:00
Laurent Rineau bed7194768 Rename "delaunay" to "constrained_delaunay_triangulation" and "MainWindow"
to "Constrained_Delaunay_triangulation_MainWindow".
2008-06-26 16:22:45 +00:00
Laurent Rineau b731d74096 CGAL::Qt::GraphicsViewNavigation is no longer constructed from a
QGraphicsView*. It is now able to handle several graphics view at the same
time (just install several event filters).

New class CGAL::Qt::DemosMainWindow. That class has several protected
methods:
  void setupStatusBar();
  void addNavigation(QGraphicsView*);
  void setupOptionsMenu(QMenu* menu  = NULL);
  void addAboutCGAL(QMenu* menu  = NULL);
  void addAboutDemo(QString htmlResourceName, QMenu* menu  = NULL);

setupStatusBar() adds a label in the statusBar(), that is connected to the
navigation class, and shows the position of the mouse.

addNavigation(QGraphicsView* v) adds a navigation class to the view v.

setupOptionsMenu(QMenu* m  = NULL) adds two options "Use OpenGL" and
"Use antialiasing" to the menu m. If m==0, a menu named "Options" is searched
for, or created if it does not exists.

addAboutCGAL(QMenu* m  = NULL) adds an entry "About CGAL..." to the menu
m. If m==0, a "Help" menu is searched for or created.

addAboutDemo(QString htmlResourceName, QMenu* m  = NULL) adds an entre
"About the demo...", to the menu m. If m==0, a "Help" menu is searched for
or created. If the entry is clicked, a popup dialog shows the content of
the resource/file whose name is in htmlResourceName.
Example:
  addAboutDemo(":/cgal/help/about_triangulation.html")
2008-06-26 15:19:44 +00:00
Laurent Rineau a42a3d4cb3 Use T::Geom_traits instead of K 2008-06-26 13:07:40 +00:00
Andreas Fabri 834ca71ffa more low level conversion and drawing 2008-06-26 12:46:19 +00:00
Laurent Rineau bbaa078d3f Fix compilation errors. 2008-06-26 11:52:39 +00:00
Laurent Rineau 1740edf306 - Anti-aliasing is quite slow (but in OpenGL mode). It is deactivated by
default.

- Add a temp message in the status bar when the aliasing mode is changed.
2008-06-26 11:47:21 +00:00
Andreas Fabri 710f73f806 Added GraphicsViewIsoRectangleInput.tex 2008-06-26 11:40:37 +00:00
Andreas Fabri 67ec2f0a80 Added PainterOstream.tex 2008-06-26 11:29:39 +00:00
Andreas Fabri 5cd6426480 Renamed file of Converter 2008-06-26 11:27:20 +00:00
Andreas Fabri f5f98c4263 Added the PainterOstream 2008-06-26 11:25:55 +00:00
Laurent Rineau 13d8e38b82 Fix some compilations errors. 2008-06-26 10:28:21 +00:00
Laurent Rineau cb540abc20 - Remove actionToto and actionDisplay_Nearest_Neighbor (added during the
presentation at Inria, and commited by error).
- Add actionUse_Antialiasing in the Options menu.
2008-06-26 10:22:14 +00:00
Laurent Rineau 0d62ce2202 Exclude the "min demo" from "make all". 2008-06-26 10:19:33 +00:00
Andreas Fabri bfbcddd90e Added nested namespace 2008-06-26 10:19:08 +00:00
Andreas Fabri 993092d7b2 Put the clipping in the Converter 2008-06-26 10:18:11 +00:00
Andreas Fabri 48b005732f Put the clipping in the Converter 2008-06-26 10:17:51 +00:00