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

Used simple point location instead of naive, get_blah() => blah()

This commit is contained in:
Efi Fogel 2007-09-05 15:46:47 +00:00
parent 4d67c07d82
commit 773f67dc7a
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/MyWindow_operations.cpp
View File

@ -239,8 +239,8 @@ void MyWindow::pointLocationStrategy()
if ( form.exec() )
{
QString type = form.arrComboBox1->currentText();
if(! strcmp(type,"Naive"))
w_demo_p -> change_strategy(NAIVE);
if(! strcmp(type,"Simple"))
w_demo_p -> change_strategy(SIMPLE);
else
if(!strcmp(type,"Trapezoiedal"))
w_demo_p -> change_strategy(TRAP);

16
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/cgal_types.h
View File

@ -40,7 +40,7 @@
#include <CGAL/Bbox_2.h>
#include <CGAL/Arr_trapezoid_ric_point_location.h>
#include <CGAL/Arr_naive_point_location.h>
#include <CGAL/Arr_simple_point_location.h>
#include <CGAL/Arr_walk_along_line_point_location.h>
#include <CGAL/Arr_landmarks_point_location.h>
@ -66,7 +66,7 @@ enum Mode { MODE_INSERT, MODE_DELETE, MODE_POINT_LOCATION,
MODE_RAY_SHOOTING_UP, MODE_RAY_SHOOTING_DOWN, MODE_DRAG,
MODE_MERGE , MODE_SPLIT, MODE_FILLFACE};
enum ConicType { CIRCLE , SEGMENT ,ELLIPSE , PARABOLA , HYPERBOLA};
enum Strategy { NAIVE , TRAP , WALK, LANDMARKS };
enum Strategy { SIMPLE , TRAP , WALK, LANDMARKS };
// default background color
const QColor def_bg_color(0,0,0);
@ -163,8 +163,8 @@ typedef Arr_seg_list::iterator Arr_seg_iter;
//point location
typedef CGAL::Arr_trapezoid_ric_point_location<Seg_arr>
Seg_trap_point_location;
typedef CGAL::Arr_naive_point_location<Seg_arr>
Seg_naive_point_location;
typedef CGAL::Arr_simple_point_location<Seg_arr>
Seg_simple_point_location;
typedef CGAL::Arr_walk_along_line_point_location<Seg_arr>
Seg_walk_point_location;
typedef CGAL::Arr_landmarks_point_location<Seg_arr>
@ -199,8 +199,8 @@ typedef Arr_pol_list::iterator Arr_pol_iter;
//point location
typedef CGAL::Arr_trapezoid_ric_point_location<Pol_arr>
Pol_trap_point_location;
typedef CGAL::Arr_naive_point_location<Pol_arr>
Pol_naive_point_location;
typedef CGAL::Arr_simple_point_location<Pol_arr>
Pol_simple_point_location;
typedef CGAL::Arr_walk_along_line_point_location<Pol_arr>
Pol_walk_point_location;
typedef CGAL::Arr_landmarks_point_location<Pol_arr>
@ -251,8 +251,8 @@ typedef Arr_xconic_list::iterator Arr_xconic_iter;
//point location
typedef CGAL::Arr_trapezoid_ric_point_location<Conic_arr>
Conic_trap_point_location;
typedef CGAL::Arr_naive_point_location<Conic_arr>
Conic_naive_point_location;
typedef CGAL::Arr_simple_point_location<Conic_arr>
Conic_simple_point_location;
typedef CGAL::Arr_walk_along_line_point_location<Conic_arr>
Conic_walk_point_location;
typedef CGAL::Arr_landmarks_point_location<Conic_arr>

56
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/demo_tab.h
View File

@ -241,7 +241,7 @@ private:
typedef typename Tab_traits::Halfedge Halfedge;
typedef typename Tab_traits::Face_iterator Face_iterator;
typedef typename Tab_traits::Trap_point_location Trap_point_location;
typedef typename Tab_traits::Naive_point_location Naive_point_location;
typedef typename Tab_traits::Simple_point_location Simple_point_location;
typedef typename Tab_traits::Walk_point_location Walk_point_location;
typedef typename Tab_traits::Lanmarks_point_location Lanmarks_point_location;
@ -802,7 +802,7 @@ public:
Coord_type x, y;
x_real(e->x(), x);
y_real(e->y(), y);
Coord_point p = get_point(x,y);
Coord_point p = point(x,y);
lock();
QColor old_color = color();
@ -836,7 +836,7 @@ public:
Coord_type x, y;
x_real(e->x(), x);
y_real(e->y(), y);
Coord_point p = get_point(x,y);
Coord_point p = point(x,y);
lock();
QColor old_color = color();
@ -1140,7 +1140,7 @@ public:
Coord_type x, y;
x_real(e->x(), x);
y_real(e->y(), y);
Coord_point p = get_point(x,y);
Coord_point p = point(x,y);
RasterOp old_raster = rasterOp();//save the initial raster mode
setRasterOp(XorROP);
lock();
@ -1178,12 +1178,12 @@ public:
}
}
/*! get_point
/*! point
*\ params x,y - the mouse clicked point coordinates
*\ return a point according to the current snap mode and
* recent points.
*/
Coord_point get_point(Coord_type x, Coord_type y)
Coord_point point(Coord_type x, Coord_type y)
{
int xmin = static_cast<int> (x_min());
int xmax = static_cast<int> (x_max());
@ -1344,9 +1344,9 @@ public:
if (CGAL::assign(walk_pl, m_point_location))
return walk_pl->locate(pt);
Naive_point_location* naive_pl;
if (CGAL::assign(naive_pl, m_point_location))
return naive_pl->locate(pt);
Simple_point_location* simple_pl;
if (CGAL::assign(simple_pl, m_point_location))
return simple_pl->locate(pt);
Trap_point_location* trap_pl;
if (CGAL::assign(trap_pl, m_point_location))
@ -1367,9 +1367,9 @@ public:
if (CGAL::assign(walk_pl, m_point_location))
return walk_pl->ray_shoot_up(pt);
Naive_point_location* naive_pl;
if (CGAL::assign(naive_pl, m_point_location))
return naive_pl->ray_shoot_up(pt);
Simple_point_location* simple_pl;
if (CGAL::assign(simple_pl, m_point_location))
return simple_pl->ray_shoot_up(pt);
Trap_point_location* trap_pl;
if (CGAL::assign(trap_pl, m_point_location))
@ -1394,9 +1394,9 @@ public:
if (CGAL::assign(walk_pl, m_point_location))
return walk_pl->ray_shoot_down(pt);
Naive_point_location* naive_pl;
if (CGAL::assign(naive_pl, m_point_location))
return naive_pl->ray_shoot_down(pt);
Simple_point_location* simple_pl;
if (CGAL::assign(simple_pl, m_point_location))
return simple_pl->ray_shoot_down(pt);
Trap_point_location* trap_pl;
if (CGAL::assign(trap_pl, m_point_location))
@ -1420,8 +1420,8 @@ public:
Walk_point_location* walk_pl = NULL;
if (CGAL::assign(walk_pl, m_point_location)) delete walk_pl;
else {
Naive_point_location* naive_pl = NULL;
if (CGAL::assign(naive_pl, m_point_location)) delete naive_pl;
Simple_point_location* simple_pl = NULL;
if (CGAL::assign(simple_pl, m_point_location)) delete simple_pl;
else {
Trap_point_location* trap_pl = NULL;
if (CGAL::assign(trap_pl, m_point_location)) delete trap_pl;
@ -1438,10 +1438,10 @@ public:
CGAL::make_object(new Walk_point_location(*m_curves_arr));
return;
}
if (s == NAIVE)
if (s == SIMPLE)
{
m_point_location =
CGAL::make_object(new Naive_point_location(*m_curves_arr));
CGAL::make_object(new Simple_point_location(*m_curves_arr));
return;
}
if (s == TRAP)
@ -1568,7 +1568,7 @@ public:
//point location
typedef Seg_trap_point_location Trap_point_location;
typedef Seg_naive_point_location Naive_point_location;
typedef Seg_simple_point_location Simple_point_location;
typedef Seg_walk_point_location Walk_point_location;
typedef Seg_lanmarks_point_location Lanmarks_point_location;
@ -1882,10 +1882,10 @@ public:
typedef Pol_face_iterator Face_iterator;
//point location
typedef Pol_trap_point_location Trap_point_location;
typedef Pol_naive_point_location Naive_point_location;
typedef Pol_walk_point_location Walk_point_location;
typedef Pol_lanmarks_point_location Lanmarks_point_location;
typedef Pol_trap_point_location Trap_point_location;
typedef Pol_simple_point_location Simple_point_location;
typedef Pol_walk_point_location Walk_point_location;
typedef Pol_lanmarks_point_location Lanmarks_point_location;
/*! coordinate scale - used in conics*/
@ -2323,7 +2323,7 @@ public:
//point location
typedef Conic_trap_point_location Trap_point_location;
typedef Conic_naive_point_location Naive_point_location;
typedef Conic_simple_point_location Simple_point_location;
typedef Conic_walk_point_location Walk_point_location;
typedef Conic_lanmarks_point_location Lanmarks_point_location;
@ -2410,7 +2410,7 @@ public:
ker.compare_x_2_object()(curr_p, c.right()) !=
CGAL::LARGER))
continue;
px = c.get_point_at_x (curr_p);
px = c.point_at_x (curr_p);
curr_y = CGAL::to_double(px.y());
pts.push_back(Coord_point(curr_x / COORD_SCALE,
curr_y / COORD_SCALE));
@ -2426,7 +2426,7 @@ public:
ker.compare_x_2_object() (curr_p, c.right()) !=
CGAL::LARGER))
continue;
px = c.get_point_at_x (Arr_conic_point_2(curr_x, 0));
px = c.point_at_x (Arr_conic_point_2(curr_x, 0));
curr_y = CGAL::to_double(px.y());
pts.push_back(Coord_point(curr_x / COORD_SCALE,
curr_y / COORD_SCALE));
@ -2893,7 +2893,7 @@ public:
ker.compare_x_2_object() (curr_p, c.right()) != CGAL::LARGER))
continue;
px = c.get_point_at_x(Arr_conic_point_2(curr_x, 0));
px = c.point_at_x(Arr_conic_point_2(curr_x, 0));
curr_y = CGAL::to_double(px.y());
Coord_segment coord_seg( Coord_point(prev_x, prev_y) ,

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/forms.cpp
View File

@ -491,7 +491,7 @@ QDialog( parent, name, modal, f )
arrComboBox1 = new QComboBox( FALSE, this );
arrComboBox1->insertItem( "Naive" );
arrComboBox1->insertItem( "Simple" );
arrComboBox1->insertItem( "Land marks" );
arrComboBox1->insertItem( "Trapezoiedal" );
arrComboBox1->insertItem( "Walk" );