Commit Graph

207 Commits

Author SHA1 Message Date
Andreas Fabri 2d3816ec73 after presentation at Inria 2008-06-25 19:54:33 +00:00
Laurent Rineau 519cb27584 A QtInput must be constructed with a parent (that can be 0).
Thus a QtPolylineInput must also be constructed with a parent!
2008-06-24 14:32:03 +00:00
Laurent Rineau 44e8f0fdc1 Remove Delaunay-Voronoi stuff. 2008-06-24 14:16:39 +00:00
Laurent Rineau c8b36d6419 I had switched left and right by error! 2008-06-24 14:16:22 +00:00
Laurent Rineau a1892acb54 Minor modifications:
- clear the mouse coordinates QLabel, at the very beginning,
  - turn the vertical axe upside down.
2008-06-24 13:55:41 +00:00
Laurent Rineau 52c828657c - Store a Vertex_handle, as the hint, instead of a Face_handle: Vertex_handle
survive to insert(), Face_handle do not.
- vh->face() is used as the Face_handle hint, if vh!=Vertex_handle().
2008-06-24 12:52:27 +00:00
Laurent Rineau 7d811a656b Display circumcircles even if the triangulation is contrained. 2008-06-24 12:26:31 +00:00
Laurent Rineau 0b1d985e33 Code review in MainWindow:
- Add dgi and vgi at the beginning, and use show()/hide() instead of
    addItem/removeItem.
  - Merge connectActions() into MainWindow's constructor. That is clearer
    like that.
  - Add comments in the constructor.
  - Rewrite the two action handlers aboutCGAL and aboutDemo: use html file
    in a resource. That works! The "About CGAL" dialog now has a big shiny
    CGAL logo! :-)
2008-06-20 16:52:41 +00:00
Laurent Rineau 819de032cc Partially revert revision 43718:
once an item is added to a scene, the scene is responsible for its
  deletion!
2008-06-20 16:26:35 +00:00
Laurent Rineau 32a5519e5f (Fix the previous commit.)
QObjects must have parents!
2008-06-20 15:49:27 +00:00
Laurent Rineau e51aa26320 QObjects must have parents! 2008-06-20 15:46:40 +00:00
Laurent Rineau f7eb596370 Do not eat the move event! 2008-06-20 15:41:46 +00:00
Laurent Rineau c115427e74 Code review:
- add a destructor to destroyed circle, which is not a QObject
  - use fh as a hint.
2008-06-20 15:39:18 +00:00
Laurent Rineau af51cec326 Code review:
- Use fh as an hint, to avoid to localize the moving point without hint
    each time it moves.
  - Code factorisation between mousePressEvent and mouseMoveEvent.
2008-06-20 15:03:49 +00:00
Laurent Rineau 78dffac531 - Merge/Move QtPolylineInput_non_templated_base.* files into
QtPolylineInput.*

  The need to split QtPolylineInput into a templated class and a
  non-template base class exists, but there is not need to split the header
  into two headers. QtPolylineInput_non_templated_base can be seen as an
  auxiliary class of QtPolylineInput.

- Turn Point_2<K> into K::Point_2 in <CGAL/IO/QtConverter.h>, to avoid the
  inclusion of <CGAL/Point_2.h>.

- Put most Qt Resource files into the CGALQt4 library, instead of linking
  them into the demo.
2008-06-20 10:10:44 +00:00
Laurent Rineau b873a87c96 - Move two cpp file into src/CGALQt4/
- Build a library "CGAL-Qt4".

I do not now yet how to include that library into the set of libraries of
CGAL.
2008-06-18 14:38:38 +00:00
Laurent Rineau 87e1ef1427 Remove the almost empty .cpp wrappers around .moc files. The moc-generated
files are now compiled directly.
2008-06-18 13:35:08 +00:00
Laurent Rineau 899630711b Remove MainWindow.rcc, which is a generated file. 2008-06-18 11:00:45 +00:00
Laurent Rineau 40f5ba9ec6 Move some header to include/CGAL/IO/, and rename the corresponding classes:
- "Qt" as prefix, instead of a simple "Q",
  - no "_2" suffix.

(Next commit will be the move of some .cpp files to src/CGALQt4/ and the
creation of a new CGAL library.)
2008-06-18 10:57:39 +00:00
Laurent Rineau dcd3efa221 - QNavigation2 is merge into QNavigation.
- QTriangulationVerticesGraphicsItem_2 is merged into
  QTriangulationGraphicsItem_2.
- Better event filtering in QNavigation.
- Remove QDatastructure. MainWindow is now responsible for inserting
  objects (points, polylines) into the triangulation.
- In MainWindow.h: include less headers. Use forward declarations when
  possible.
- In MainWindow.cpp and MainWindow.ui: 
     - add a "Recenter" action, that allows to center and scale the
       viewport on the triangulation,
     - add shortcuts and mnemonic to actions.
- Allow the use of the OpenGL QPaintEngine, instead of the traditional one.
2008-06-18 09:45:36 +00:00
Andreas Fabri 734d550728 Circle input handler 2008-06-16 21:40:18 +00:00
Laurent Rineau 06189aeaa4 Correct the bug that i introduced in QPolylineInput_2<K> with
revision 43589.
2008-06-13 16:48:28 +00:00
Laurent Rineau 620539ee4e The "Zoom rectangle" is implemented (as an experiment in min.cpp).
Not the nice transparent "CGAL yellow" color. :-)
2008-06-13 16:36:10 +00:00
Laurent Rineau 5cd6938492 Updated version of the minimal test demo:
- The arrow keys (up, down, left, right) work as expected, now. When they
  are used, the sceneRect of the view if extended.
2008-06-13 13:48:33 +00:00
Laurent Rineau c827149db8 Cosmetic changes (add a comment, modify another one, add a one-line block
after an "if")
2008-06-13 09:43:16 +00:00
Laurent Rineau 069aa9beab I forgot the moc file! 2008-06-13 08:56:11 +00:00
Laurent Rineau 7d86267ea0 - Add a minimal demo: min.cpp
- Make CGAL required, and not optional!
2008-06-13 08:49:27 +00:00
Andreas Fabri aecb9992cd A small program to test graphics view features 2008-06-13 08:15:57 +00:00
Andreas Fabri a11e64b39e got rid of the wrappers of the CGAL datastructures 2008-06-12 20:33:06 +00:00
Andreas Fabri 2b3d38dd9e These proxies were an overkill 2008-06-12 20:20:08 +00:00
Laurent Rineau b7fcecee65 Update the UI (add shortcuts). 2008-06-12 10:52:33 +00:00
Laurent Rineau d6618da2dc Split CGAL::QPolylineInput_2<K> into two classes:
- CGAL::QPolylineInput_2_non_templated_base contains all the non
    templated code,
  - CGAL::QPolylineInput_2<K> contains the four lines of code that need the
    template parameter.

Most of the old file QPolylineInput_2.h is not in a separate compilation
unit compilationQPolylineInput_2_non_templated_base.cpp.

That speeds up the recompilation of that class!
2008-06-12 09:22:11 +00:00
Laurent Rineau f038508508 Remove the svn:executable property of C++ files. 2008-06-12 08:32:51 +00:00
Laurent Rineau 211ecbed2f - Escape, Backspace, and Delete are now equilavent, in QPolylineInput
(I personnaly prefere Escape, and Backspace is more standard).

- If a modifier is pressed, the mouse button will do nothing.
2008-06-11 18:57:57 +00:00
Laurent Rineau 030e06c311 Zoom quicker if Shift or Control is pressed. 2008-06-11 18:54:20 +00:00
Laurent Rineau 4403df2d3f QGraphicsEllipseItem derives from QObject.
Never create a QObject as a member: create it on the heap, instead.

The reason is that a Qt objects are destroyed when their parent is
destroyed. If class has a QObject member, then the destructor will try a
double-free (which triggers a segfault).
2008-06-11 15:54:37 +00:00
Laurent Rineau be5a057a52 Remove a temp file from svn. 2008-06-11 13:56:54 +00:00
Laurent Rineau c6f90ef934 Fix compilation errors (hopfully one day g++ and VC++ will accept the same
language).
2008-06-11 13:53:30 +00:00
Laurent Rineau 07f7f697aa Link the demo with libCGAL (mandatory if auto-link is not availlable). 2008-06-11 13:52:19 +00:00
Laurent Rineau c02122c328 - Fix a typo (in a signal name).
- Check the action showDelaunay by default.
2008-06-11 13:51:42 +00:00
Andreas Fabri 4bea3db56c A demo specific icon 2008-06-11 12:37:54 +00:00
Laurent Rineau 24341620af The qt4 package is named "Qt4", and not "QT4". 2008-06-11 12:32:43 +00:00
Laurent Rineau 5722033165 Remove generated files. 2008-06-11 12:31:20 +00:00
Andreas Fabri 4869a501e2 Regroup icons in ressource files 2008-06-11 11:47:31 +00:00
Andreas Fabri c5dbd53956 switching to cmake 2008-06-11 07:02:28 +00:00
Andreas Fabri 94f7136a09 simplifications 2008-06-10 20:48:58 +00:00
Andreas Fabri b0c6da79fe Renaming 2008-06-10 19:40:13 +00:00
Andreas Fabri 6f579b1f91 minor changes 2008-06-10 19:26:15 +00:00
Andreas Fabri 0812395bca before renaming 2008-06-10 19:02:45 +00:00
Andreas Fabri 1db0ab9a03 before renaming 2008-06-10 19:02:18 +00:00
Andreas Fabri e4d316018e moving and renaming of icons 2008-06-09 09:25:02 +00:00
Andreas Fabri 62ed59508f moving and renaming of icons 2008-06-09 09:24:16 +00:00
Andreas Fabri d95d45d552 moving and renaming of icons 2008-06-09 09:23:41 +00:00
Andreas Fabri d93de42123 moving and renaming of icons 2008-06-09 09:22:02 +00:00
Andreas Fabri 97c3d66e3f moving and renaming of icons 2008-06-09 09:21:27 +00:00
Andreas Fabri 4860429330 icons directory for sharing them across demos 2008-06-09 09:15:30 +00:00
Andreas Fabri 6c437ebfc3 A proof of concept for the GraphicsView as foundation of 2D demos 2008-05-10 20:59:28 +00:00