Commit Graph

272 Commits

Author SHA1 Message Date
Laurent Rineau e89e4181ed The whole history stuff has been modified as I said in bug#38 comment #5. 2003-02-21 10:59:00 +00:00
Laurent Rineau 03838fe125 Fix warnings 2003-02-18 16:35:56 +00:00
Laurent Rineau db49669416 Add newline at end of files 2003-02-18 16:33:43 +00:00
Laurent Rineau bbf65076ae Remove an unused parameter name 2003-02-18 15:50:12 +00:00
Laurent Rineau 9055b9116b Add typenames to calm down gcc-3.2.1 warnings. 2003-02-18 15:46:37 +00:00
Laurent Rineau 80f14b8da7 Add newline at end of files. 2003-02-18 15:42:26 +00:00
Radu Ursu 0674c7f305 removed "already defined" errors 2003-02-18 10:56:07 +00:00
Radu Ursu 92ff615e9b added #include <qcursor.h> 2003-02-11 14:19:47 +00:00
Radu Ursu 9f9c4c1693 fixed to compile with g++-2.95 with LEDA 2003-01-20 09:56:13 +00:00
Radu Ursu 0795549010 The helpwindow is a part of the CGALQt library. It was removed from Alpha_shape demo and put in /src/CGALQt/Qt_widget_helpwindow.C and /include/CGAL/IO/Qt_widget_helpwindow.h.
The icons went in the header file(declarations) and the source file(definitions).
2003-01-16 10:20:32 +00:00
Radu Ursu 3c2c06fc42 this file contains the big and small pixmaps for alpha_shape demo
this is a new feature that have been added to this demo.
2003-01-08 12:22:53 +00:00
Laurent Rineau 39da2c4efc Fix the constructor under qt-2.3 2002-11-28 11:23:39 +00:00
Laurent Rineau d17ae5db4b Added endlines to these files, to fix gcc warnings. 2002-11-28 10:31:48 +00:00
Laurent Rineau 815758e287 Revert my changes: Qt_widget no longer derives from QFrame. If we want a
border, one can use a QFrame parent of the Qt_widget. It will be probably
more efficient. Thank to Radu for not having agreed to easily: it
prevended my from doing an error. ;-)
2002-11-26 09:58:42 +00:00
Laurent Rineau 2b2b2a9264 - Renaming set_scale_center(x,y) to set_ranges_const_center(): this
functions set ranges (xmin,ymin,xmax,ymax) with constant center. Arguments
where always equal to xcenter, ycenter thus they were uneeded.
- Use drawContents(QPainter*), the protected method of QFrame called by
QFrame::paintEvent(...). paintEvent(...) is no longer overridden.
- Added comments in include/CGAL/IO/Qt_widget.h to explain the role of
private functions. It was increasingly difficult to understand the code.
- New void Qt_widget::frameChanged() function, that resize the pixmap if
the frame border is changed.
2002-11-26 07:47:03 +00:00
Laurent Rineau cd27a5b499 I have changed a lot the class Qt_widget_standard_toolbar.
- It now derives from QToolBar, as it should have since the beginning.
- The constructor has now additional facultative parameters:
    Dock = DockTop,
    bool newLine = true,
    const char* name = 0
  With Qt-3, the first parameter is
QMainWindow::ToolBarDock=QMainWindow::Top
- The header file has been cleaned from uneeded includes or pointer
declarations.
- The backward compatibility has been preserved by adapted default values.
- I have filled bug #36 for as a reminder for documentation changes.
2002-11-26 02:25:54 +00:00
Laurent Rineau 60e3714355 Added a linebreak at end of those files, to remove warnings under linux.
A test file is not correct if it doesn't end by a linebreak.
2002-11-26 01:50:49 +00:00
Laurent Rineau 7db5b59af8 I have a made a change in the library, that can appear to be important,
but is quite small actually:
Qt_widget now derives from QFrame instead of QWidget. The differences are
that:
- the Qt_widget can have a border, like a QFrame
- the drawing area is not the whole Qt_widget but the contentsRect()
rectangle, which is the widget without its border.
As, by default, the border is null, it should change anything for
compatibility. By default, a QFrame is like a QWidget.
2002-11-25 17:44:21 +00:00
Laurent Rineau 6e30bfab04 I really don't understand why zoom_rect was changing the color when
deactivating.
2002-11-23 14:04:43 +00:00
Radu Ursu 5b3cc93b4b small pixmaps were added in the same file as the big pixmaps
the name is composed by : filename_small_xpm
2002-11-12 09:36:42 +00:00
Laurent Rineau c59fae0fd5 to_double has to be prefixed by CGAL::, even when we are in the CGAL
namespace, because however there can be a conflict with the to_double
function defined by LEDA in the global namespace.
2002-10-28 16:45:53 +00:00
Radu Ursu 14d2d756b5 #include <CGAL/Cartesian.h> -> #include <CGAL/Simple_cartesian.h>
Solved bug in output operator for segment in Qt_widget. The operator compute the intersection between the segment and the iso_rectangle using Simple_cartesian<double> kernel.
2002-10-24 13:27:05 +00:00
Radu Ursu 1cadfe5ec0 The layers contain one more boolean member, that is made false by default:
bool does_eat_events;
When you use attach_standard for attaching a layer, this field is true.
The show_mouse_coordinates have this member made false by the standard toolbar.

The widget send the events to the other active layers attached only if there is no other standard_layer active that eat events.
2002-10-23 09:25:28 +00:00
Radu Ursu 23b8c2e65c File name mentioned in header (Qt_layer_show_mouse_coordinates.h) is incorrect. 2002-10-22 13:04:15 +00:00
Radu Ursu 0ad9dbc601 The demos use the layer show_coordinates from the standard toolbar. 2002-10-18 11:30:05 +00:00
Radu Ursu 2a9633e33e The show_mouse_coordinates layer became a part of standard_toolbar
The Qt_layer_show_mouse_coordinates will be removed.
2002-10-18 08:57:36 +00:00
Radu Ursu 1b58a8c136 The method clear_history should call configure_history_buttons. 2002-10-16 14:52:39 +00:00
Radu Ursu 6a374fa6b5 fixed bug in Triangulation_2_constrained
Point -> OpPoint
2002-10-16 12:39:54 +00:00
Radu Ursu c3d1d03d44 removed unnecessary typename for Linux 2002-10-11 08:24:14 +00:00
Radu Ursu b95eaf1dfc #include <CGAL/Intersections.h> ->
#include <CGAL/intersections.h>
2002-10-11 07:56:22 +00:00
Radu Ursu e3e385653e The << operator for triangulation_2 use the apply to range function, to draw only the triangles that are visible.
Usefull for large traingulations.
+ removed lines too long
2002-10-10 08:28:37 +00:00
Radu Ursu 9dbaee5afe The << operator for triangulation_2 use the apply to range function, to draw only the triangles that are visible.
Usefull for large traingulations.
2002-10-10 08:27:59 +00:00
Radu Ursu ea4cc77293 The << operator for triangles use Triangle_2_Iso_rectangle_2_intersection.h + removed lines too long 2002-09-30 13:41:55 +00:00
Radu Ursu b1526dd843 The << operator for triangles use Triangle_2_Iso_rectangle_2_intersection.h 2002-09-30 13:39:48 +00:00
Radu Ursu ebd54a00cc fixed condition bug in << operator for segment 2002-09-20 12:42:37 +00:00
Radu Ursu 164fd2b8c0 fixed bug : hand_xpm was shown even when dragging instead of holddown_xpm 2002-09-20 09:39:47 +00:00
Radu Ursu b60a4c9026 fixed is_inside condition in << operator for segment
removed warnings line too long
2002-09-16 07:36:27 +00:00
Radu Ursu 3b7a60d0fb fixed is_inside condition in << operator for segment 2002-09-16 07:33:41 +00:00
Radu Ursu aa56cf70c9 removed redraw call
Everything was drawn twice.

IT'S UNBELIVEABLE!!!!!
2002-09-13 15:47:38 +00:00
Radu Ursu bf051644aa removed redraw call
Everything was drawn twice.
2002-09-13 15:37:01 +00:00
Laurent Rineau 561e3bc063 Add a typename so that it is correct and compiles with gcc!
<   R::FT xr1, yr1, xr2, yr2;
---
>   typename R::FT xr1, yr1, xr2, yr2;


These lines will have to be fixed soon because
  FT xr1=w.x_real(0)
assumes that R::FT has a constructor from a double, whereas it is not in
the FT concept!
2002-09-13 13:21:48 +00:00
Radu Ursu 2689935968 << operator for segments does clipping (QT advice) only for the segments that intersect the boundaries of the screen rectangle
use the old x_real function because the new one is too slow in doing the transformation (use GMP if CGAL_USE_GMP is defined)
we should document the old one too, it will never be removed.
2002-09-13 10:47:20 +00:00
Laurent Rineau 420d70b31c Fix a bug:
set_scales() was using geometry() whereas geometry() is not sure to be correct
when the widget is not visible.
Here are the explainations, in french:
-------------
> Dans Qt_widget::set_scales(), Radu se base sur geometry() pour modifier
> xmin, xmax, etc., mais malheureusement geometry() n'a pas forc�ment de
> sens quand le widget n'est pas visible (avant le premier show()
> appell�).

Le principe du patch c'est que set_scale() ne fait rien si le widget
n'est pas visible, mais met un bool�en (set_scale_must_be_done) � true.
Quand le widget apparait, la m�thode showEvent regarde si
set_scale_must_be_done=true, et appelle set_scale(). De plus,
set_scale_center() ne fait rien si set_scale_must_be_done=true car
set_scales() doit toujours avoir �t� appell� avant de bouger le centre.
2002-09-06 15:03:43 +00:00
Laurent Rineau 7213bb3e93 Readded: double x_real(int)
for compatibility.
Move the template function definition to Qt_widget.h and remove it from
Qt_widget.C and let the specialisation for Gmpz into the .C file
2002-09-05 10:58:17 +00:00
Radu Ursu 30e15d3c89 removed x_real_rational, y_real_rational
x_real and y_real are templated and specialized for Gmpq.
2002-09-03 10:14:02 +00:00
Radu Ursu 3a05e36543 Qt_widget have 2 new functions x_real_rational and y_real_rational.
Those 2 return an Gmpq object. The conversion between screen coordinates and real world coordinates return a more simple number (rational), a Gmpq object.
	I put that in the doc either.
2002-08-30 12:04:47 +00:00
Radu Ursu 2c30a816c2 The class Gmpq is now available in CGAL I, so Qt_widget could support it.
The conversion from screen coordinates in real word coordinates could be
done via x_real_rational or x_real. Those functions try to use simplest rational in interval.
2002-08-28 07:57:21 +00:00
Radu Ursu 62b8fa0cb3 a 2002-07-12 12:49:35 +00:00
Radu Ursu 9094e3f628 Another patch to this output operator. 2002-07-10 13:27:13 +00:00
Radu Ursu 044119fa85 Another patch to this output operator. 2002-07-10 13:26:47 +00:00
Radu Ursu cc8335b001 removed line too long 2002-07-09 06:47:09 +00:00
Radu Ursu 852f1d2dd0 The Nef_2 demo is up to date 2002-07-09 06:46:29 +00:00
Radu Ursu 2d4cb7ea69 Updated the nef_2 output operator for Qt_widget 2002-07-05 09:12:50 +00:00
Radu Ursu ca2e022310 The function sizeHint should be const 2002-07-03 11:01:56 +00:00
Radu Ursu 00bd2c6f36 Updated Nef_2 output operator 2002-07-03 08:26:41 +00:00
Radu Ursu 7e44fe7125 The Nef_2 output operator use the fillColor, bgColor and Color from Qt_widget. 2002-07-02 12:28:36 +00:00
Radu Ursu 62149caaa2 The types should come from the Explorer and not from the Polyhedron class were they are private. 2002-07-01 08:17:07 +00:00
Radu Ursu 581a8bb1e2 The Nef_2 output operator for Qt_widget stream 2002-07-01 07:02:21 +00:00
Laurent Rineau cfb7ced5a1 The line of sizeHint was too long. 2002-06-27 09:39:11 +00:00
Laurent Rineau 8e4f45a1f2 Merge with the trunk. Only spaces differences. 2002-06-27 09:38:08 +00:00
Radu Ursu e99fc0a30a sizeHint 2002-06-27 08:19:10 +00:00
Radu Ursu a1d4767aeb introduced virtual QSize sizeHint() const; 2002-06-27 07:30:54 +00:00
Radu Ursu 05714041fc Removed warnings on Windows. 2002-06-19 17:13:21 +00:00
Laurent Rineau baec75ec1f Bug 14: wheelEvent has a wrong parameter type!
Radu forgot to fix the headers
2002-06-14 14:14:15 +00:00
Radu Ursu 40e273327a BUG 13. 2002-06-14 08:07:13 +00:00
Radu Ursu 11797aa552 Bug 13.
I have put the const modifier for all the members described in this bug.
2002-06-14 07:46:43 +00:00
Radu Ursu f7cd945a19 Resolved bug 14.
The wheelEvent should have QWheelEvent* parameter.
2002-06-14 07:23:17 +00:00
Laurent Rineau bec568202a Patch so that Qt_widget_get_[simple_]polygon works with gcc-2.95 2002-06-10 14:01:36 +00:00
Radu Ursu 8050d6fff9 I put the CGAL headers before Qt headers in Qt_widget.h 2002-05-24 08:15:26 +00:00
Radu Ursu 56e829652e patched the Iso_rectangle_2 << operator. 2002-05-24 08:08:31 +00:00
Radu Ursu 47dff81dbb Forgot to derive from Qt_widget_layer 2002-05-14 15:54:08 +00:00
Radu Ursu 40230d0e3d replaced no_tool by notool 2002-05-07 13:55:24 +00:00
Radu Ursu ec0f1a83ae replaced zoom_in, and zoom_out by zoom. 2002-05-07 11:07:10 +00:00
Radu Ursu 4c2addf94c the last modifs that are not working 2002-04-24 13:08:15 +00:00
Radu Ursu 887e3ac270 the output operator for Nef_2 2002-04-19 12:53:36 +00:00
Radu Ursu 6668f5d9e2 added some functions in order to build the operator 2002-04-19 11:45:55 +00:00
Radu Ursu b9f3e6cc27 added typename 2002-04-18 07:09:58 +00:00
Radu Ursu 0ebe8210fe the typedefs come from the kernel 2002-04-16 13:51:05 +00:00
Radu Ursu e12e4bc3c1 made the input pixmaps uniform 2002-04-16 12:37:24 +00:00
Radu Ursu 7ed49dea54 replaced 0x1000 by Key_Escape 2002-04-16 11:16:42 +00:00
Radu Ursu a38a1b6212 patched 2002-04-16 08:17:15 +00:00
Radu Ursu 0efca4742e added as deactivating code statusbar clear. 2002-04-15 13:41:04 +00:00
Radu Ursu 6d3924e8a6 removed lines too long 2002-04-15 11:57:40 +00:00
Radu Ursu f9fc24469c restricted the mouse press and release.
Any modifier (Ctrl, Alt, Shift) will not be accepted.
2002-04-15 08:58:20 +00:00
Radu Ursu f65c50a18d restricted the mouse press and release.
Any modifier (Ctrl, Alt, Shift) will not be accepted.
2002-04-15 08:55:29 +00:00
Radu Ursu 96bb228ec5 the pixmap for constrained 2002-04-12 12:51:48 +00:00
Radu Ursu 056ecbaadf commited 2002-04-12 08:07:36 +00:00
Laurent Rineau 2155f103c5 Warning fix 2002-04-11 08:33:12 +00:00
Radu Ursu f1ed35392b patched Qt_widget_history 2002-04-10 12:32:04 +00:00
Radu Ursu a46198b76e patched Qt_widget_history 2002-04-10 12:31:40 +00:00
Radu Ursu f74521eb94 patched Qt_widget_history 2002-04-10 12:30:16 +00:00
Radu Ursu baed4796d8 patched Qt_widget_history 2002-04-10 08:03:48 +00:00
Radu Ursu afa3a4f464 patched Qt_widget_history 2002-04-10 07:54:16 +00:00
Radu Ursu 7a21940565 patched Qt_widget_history 2002-04-09 13:34:03 +00:00
Laurent Rineau 03ccf968ff Get this file compile again 2002-04-09 09:46:16 +00:00
Laurent Rineau 8675c7e72b Warning fix 2002-04-09 07:54:15 +00:00
Radu Ursu 0635be6fc8 patched Qt_widget_history 2002-04-09 07:24:34 +00:00
Radu Ursu a1b57a72dd added support for events. 2002-04-09 06:54:43 +00:00
Radu Ursu 896c410692 added CGAL header 2002-04-08 12:00:30 +00:00
Radu Ursu 59b2c6087d added CGAL header 2002-04-08 11:59:46 +00:00