Commit Graph

37 Commits

Author SHA1 Message Date
Laurent Rineau ef8ef25311 Followup to revision 46867:
Swap initializers to avoid a warning from gcc: "n_ will be initialized
  after closed_".
2008-11-14 14:08:29 +00:00
Laurent Rineau 2795375b05 Swap two initializers to avoid a warning from gcc: "n_ will be initialized
after closed_".
2008-11-13 10:25:42 +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 6bae1045df Fixed handling of flags when defined interactively 2008-11-03 21:00:22 +00:00
Laurent Rineau cd96b8cfbc Patch to allow the use of Qt-4.2. Previoulsy we used a constructor of
QRectF, which was introduced in Qt-4.3.
2008-10-31 13:48:01 +00:00
Laurent Rineau dc947c0c0c Fix a warning. 2008-10-30 11:18:10 +00:00
Laurent Rineau 45ce44736c Attempt to be compatible with CGAL-4.2.1 2008-10-27 10:45:55 +00:00
Fernando Cacciola d70bdaea18 Prefixed cmake variables with CGAL_ 2008-10-23 14:59:02 +00:00
Laurent Rineau fa27da4d5c Normalize the bounding rect, so that its height is non negative if the y
axis has been turned upside down.
2008-10-15 15:17:12 +00:00
Laurent Rineau 988e6d0429 Add writeState()/readState() to CGAL::Qt::DemosMainWindow, so that one can
save and restore the state of a main window: size, position, and position
of sub-widgets (toolbars and dock widgets, mainly).
2008-10-14 20:51:49 +00:00
Fernando Cacciola b3a611f4a0 (fixed) Allowed CGAL components to be configured and compiled independently
Make library naming consistent with component names
2008-10-02 18:13:13 +00:00
Fernando Cacciola 6fdf8251bd Allowed CGAL components to be configured and compiled independently
Make library naming consistent with component names
2008-10-01 21:38:37 +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 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
Laurent Rineau 6b15cdb91e New header <CGAL/Qt/utility.h> that contains miscellaneous global
functions.
2008-09-23 12:16:00 +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
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
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
Laurent Rineau 04a8b4ee14 Update CGALQt4's CMakeLists.txt, to add:
- soversion/soname,
  - mangled names
2008-09-01 18:36:52 +00:00
Laurent Rineau 0242deacfe Minor modification: fix the first line (a comment). 2008-08-02 14:39:26 +00:00
Laurent Rineau 06c56223ef Fix compilation warnings (MSVC++ 2009) 2008-08-01 07:51:00 +00:00
Laurent Rineau cd3614b441 Add support for recent files in CGAL::Qt::DemosMainWindow 2008-07-30 18:01:51 +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 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 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
Andreas Fabri e54fcaa58c Reorganize classes in a namespace and directory called Qt 2008-06-26 08:07:36 +00:00
Andreas Fabri 00b45e977d after presentation at Inria 2008-06-25 20:16:44 +00:00
Andreas Fabri 4a92e20e15 after presentation at Inria 2008-06-25 20:08:32 +00:00
Laurent Rineau 47bce71dcf New feature in QtNavigation: Ctrl+Shirt+RightButton moves the point under
mouse to the center of the viewport.
2008-06-24 14:32:59 +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 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