songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1.3.59 - 03/10/2003 

----------------------------------------
        - private -> protected in Qt_widget_get*.h [rursu]
This commit is contained in:
Radu Ursu 2003-10-03 10:10:43 +00:00
parent dc35387e2a
commit 9c51175840
7 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/Qt_widget/changes.txt
View File

@ -1,3 +1,7 @@
1.3.59 - 03/10/2003
----------------------------------------
- private -> protected in Qt_widget_get*.h [rursu]
1.3.58 - 01/10/2003
----------------------------------------
- Moved \chapter to main.tex [af]

12
Packages/Qt_widget/include/CGAL/IO/Qt_widget_get_circle.h
View File

@ -49,7 +49,7 @@ public:
firsttime = true;
}
private:
protected:
bool is_pure(Qt::ButtonState s){
if((s & Qt::ControlButton) ||
(s & Qt::ShiftButton) ||
@ -90,7 +90,7 @@ private:
case Key_Escape: // key_escape
if(firstpoint)
{
firstpoint = false;
firstpoint = false;
RasterOp old_raster = widget->rasterOp();
QColor old_color = widget->color();
widget->lock();
@ -101,7 +101,7 @@ private:
widget->setRasterOp(old_raster);
widget->setColor(old_color);
widget->unlock();
firsttime = true;
firsttime = true;
}
break;
}//endswitch
@ -116,7 +116,7 @@ private:
widget->lock();
widget->setRasterOp(XorROP);
*widget << CGAL::GREEN;
*widget << CGAL::GREEN;
*widget << Circle(Point(x1,y1),
squared_distance(Point(x1, y1), Point(x2,y2)));
widget->unlock();
@ -139,7 +139,7 @@ private:
widget->lock();
*widget << CGAL::GREEN;
if(!firsttime)
*widget << Circle(Point(x1,y1),
*widget << Circle(Point(x1,y1),
squared_distance(Point(x1, y1), Point(x2,y2)));
*widget << Circle(Point(x1,y1),
squared_distance(Point(x1, y1), Point(x,y)));
@ -174,7 +174,7 @@ private:
FT x1, //the X of the first point
y1; //the Y of the first point
FT x2, //the old second point's X
FT x2, //the old second point's X
y2; //the old second point's Y
bool firstpoint, //true if the user left clicked once
firsttime; //true if the line is not drawn

20
Packages/Qt_widget/include/CGAL/IO/Qt_widget_get_iso_rectangle.h
View File

@ -52,8 +52,11 @@ public:
QObject* parent = 0, const char* name = 0)
: Qt_widget_layer(parent, name), cursor(c), widgetrepainted(true),
on_first(false) {};
private:
void draw(){
widgetrepainted = true;
};
protected:
bool is_pure(Qt::ButtonState s){
if((s & Qt::ControlButton) ||
(s & Qt::ShiftButton) ||
@ -63,9 +66,6 @@ private:
return 1;
}
void draw(){
widgetrepainted = TRUE;
};
void mousePressEvent(QMouseEvent *e)
{
if(e->button() == CGAL_QT_LEFT_BUTTON
@ -77,7 +77,7 @@ private:
first_y = e->y();
on_first = true;
} else {
if((e->x() != first_x) && (e->y() != first_y)) {
if((e->x() != first_x) && (e->y() != first_y)) {
RT x, y, xfirst2, yfirst2;
widget->x_real(e->x(), x);
widget->y_real(e->y(), y);
@ -89,12 +89,12 @@ private:
if(y < yfirst2) {ymin = y; ymax = yfirst2;}
else {ymin = yfirst2; ymax = y;};
widget->new_object(
widget->new_object(
make_object(Iso_rectangle_2(xmin, ymin,
xmax, ymax)));
on_first = false;
widgetrepainted = true;
}
on_first = false;
widgetrepainted = true;
}
}
}
};

6
Packages/Qt_widget/include/CGAL/IO/Qt_widget_get_line.h
View File

@ -47,7 +47,7 @@ public:
void draw(){
firsttime = true;
}
private:
protected:
bool is_pure(Qt::ButtonState s){
if((s & Qt::ControlButton) ||
(s & Qt::ShiftButton) ||
@ -89,7 +89,7 @@ private:
case Key_Escape: // key_escape
if(firstpoint)
{
firstpoint = false;
firstpoint = false;
RasterOp old_raster = widget->rasterOp();
QColor old_color = widget->color();
widget->lock();
@ -99,7 +99,7 @@ private:
widget->setRasterOp(old_raster);
widget->setColor(old_color);
widget->unlock();
firsttime = true;
firsttime = true;
}
break;
}//endswitch

2
Packages/Qt_widget/include/CGAL/IO/Qt_widget_get_point.h
View File

@ -42,7 +42,7 @@ public:
QObject* parent = 0, const char* name = 0) :
Qt_widget_layer(parent, name), cursor(c) {};
private:
protected:
bool is_pure(Qt::ButtonState s){
if((s & Qt::ControlButton) ||
(s & Qt::ShiftButton) ||

2
Packages/Qt_widget/include/CGAL/IO/Qt_widget_get_segment.h
View File

@ -44,7 +44,7 @@ public:
: Qt_widget_layer(parent, name), cursor(c), firstpoint(false),
firsttime(true){};
private:
protected:
bool is_pure(Qt::ButtonState s){
if((s & Qt::ControlButton) ||
(s & Qt::ShiftButton) ||

6
Packages/Qt_widget/include/CGAL/IO/Qt_widget_get_simple_polygon.h
View File

@ -71,7 +71,7 @@ private:
for(it = poly.edges_begin(); it != before_last_it; it++)
{
if(do_intersect(*it, rubber_segment))
return false;
return false;
}
//if I'm out of this means that all the edges,
//didn't intersect the last one
@ -79,9 +79,9 @@ private:
Object o = intersection(*it, rubber_segment);
Point_2 p;
if(assign(p, o))
return true;
return true;
else
return false;
return false;
}
else
return true;