From 519c7cc1a55d62e35967c0dfb5cb86b781980be5 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Fri, 28 Apr 2023 15:25:40 +0200 Subject: [PATCH] rename add_in_graphic_buffer into add_in_graphic_storage --- BGL/include/CGAL/draw_face_graph.h | 6 ++-- .../doc/Basic_viewer/Basic_viewer.txt | 31 +++++++++++++++++++ .../Basic_viewer/draw_mesh_and_points.cpp | 4 +-- .../draw_surface_mesh_small_faces.cpp | 6 ++-- .../demo/Linear_cell_complex/Viewer.cpp | 4 +-- .../include/CGAL/draw_linear_cell_complex.h | 14 ++++----- Nef_3/include/CGAL/draw_nef_3.h | 12 +++---- .../CGAL/draw_periodic_2_triangulation_2.h | 10 +++--- Point_set_3/include/CGAL/draw_point_set_3.h | 10 +++--- Polygon/include/CGAL/draw_polygon_2.h | 10 +++--- .../include/CGAL/draw_polygon_with_holes_2.h | 10 +++--- Polyhedron/include/CGAL/draw_polyhedron.h | 14 ++++----- .../include/CGAL/draw_straight_skeleton_2.h | 10 +++--- Surface_mesh/include/CGAL/draw_surface_mesh.h | 12 +++---- .../include/CGAL/draw_face_graph_with_paths.h | 12 +++---- .../polygon_triangulation_drawing_functor.h | 4 +-- .../include/CGAL/draw_triangulation_2.h | 10 +++--- .../include/CGAL/draw_triangulation_3.h | 10 +++--- .../include/CGAL/draw_voronoi_diagram_2.h | 10 +++--- 19 files changed, 115 insertions(+), 84 deletions(-) diff --git a/BGL/include/CGAL/draw_face_graph.h b/BGL/include/CGAL/draw_face_graph.h index 04238fd633c..9c28c5c4c09 100644 --- a/BGL/include/CGAL/draw_face_graph.h +++ b/BGL/include/CGAL/draw_face_graph.h @@ -119,7 +119,7 @@ void compute_elements(const FG &fg, } // draw_function_for_FG template -void add_in_graphic_buffer_for_fg(const FG &fg, +void add_in_graphic_storage_for_fg(const FG &fg, CGAL::Graphic_storage &graphic_buffer, const DrawingFunctor &drawing_functor) { @@ -127,7 +127,7 @@ void add_in_graphic_buffer_for_fg(const FG &fg, } template -void add_in_graphic_buffer_for_fg(const FG &fg, +void add_in_graphic_storage_for_fg(const FG &fg, CGAL::Graphic_storage &graphic_buffer) { Drawing_functor graphic_buffer; - CGAL::add_in_graphic_buffer(point_set, graphic_buffer, Drawing_functor_green_points()); - CGAL::add_in_graphic_buffer(output_mesh, graphic_buffer); + CGAL::add_in_graphic_storage(point_set, graphic_buffer, Drawing_functor_green_points()); + CGAL::add_in_graphic_storage(output_mesh, graphic_buffer); CGAL::draw_graphic_storage(graphic_buffer); } else diff --git a/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp b/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp index 56b15be2022..115f96c9e98 100644 --- a/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp +++ b/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp @@ -102,7 +102,7 @@ int main(int argc, char* argv[]) Drawing_functor_small_faces df(sm); CGAL::Graphic_storage buffer; - add_in_graphic_buffer(sm, buffer, df); + add_in_graphic_storage(sm, buffer, df); CGAL::QApplication_and_basic_viewer app(buffer, "Small faces"); if(app) { @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) (QString("Small faces threshold=%1.").arg(df.m_threshold)); basic_viewer->clear(); - add_in_graphic_buffer(sm, buffer, df); + add_in_graphic_storage(sm, buffer, df); basic_viewer->redraw(); } else if ((e->key() == ::Qt::Key_D) && (modifiers == ::Qt::NoButton)) @@ -129,7 +129,7 @@ int main(int argc, char* argv[]) (QString("Small faces threshold=%1.").arg(df.m_threshold)); basic_viewer->clear(); - add_in_graphic_buffer(sm, buffer, df); + add_in_graphic_storage(sm, buffer, df); basic_viewer->redraw(); } else diff --git a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp index 6a7ba68de51..8308b4c4a30 100644 --- a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp +++ b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp @@ -53,7 +53,7 @@ void Viewer::setScene(Scene *scene_, bool doredraw) scene = scene_; if (scene->lcc!=nullptr) - { CGAL::add_in_graphic_buffer(*scene->lcc, gBuffer, m_drawing_functor); } + { CGAL::add_in_graphic_storage(*scene->lcc, gBuffer, m_drawing_functor); } if (doredraw) { Base::redraw(); } @@ -62,7 +62,7 @@ void Viewer::setScene(Scene *scene_, bool doredraw) void Viewer::sceneChanged() { gBuffer.clear(); - CGAL::add_in_graphic_buffer(*scene->lcc, gBuffer, m_drawing_functor); + CGAL::add_in_graphic_storage(*scene->lcc, gBuffer, m_drawing_functor); this->camera()->setSceneBoundingBox( CGAL::qglviewer::Vec(gBuffer.get_bounding_box().xmin(), diff --git a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h index 25c69790707..01cfb7fd5ff 100644 --- a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h +++ b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h @@ -232,14 +232,14 @@ void compute_elements(const LCC& lcc, CGAL::Linear_cell_complex_base -// add_in_graphic_buffer: to add a LCC in the given graphic buffer, with a +// add_in_graphic_storage: to add a LCC in the given graphic buffer, with a // drawing functor. template class Map, class Refs, class Storage_, typename BufferType=float, class DrawingFunctor> -void add_in_graphic_buffer(const CGAL_LCC_TYPE& alcc, +void add_in_graphic_storage(const CGAL_LCC_TYPE& alcc, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& drawing_functor) { @@ -247,13 +247,13 @@ void add_in_graphic_buffer(const CGAL_LCC_TYPE& alcc, graphic_buffer, drawing_functor); } -// add_in_graphic_buffer: to add a LCC in the given graphic buffer, without a +// add_in_graphic_storage: to add a LCC in the given graphic buffer, without a // drawing functor. Use default drawing values. template class Map, class Refs, class Storage_, typename BufferType=float> -void add_in_graphic_buffer(const CGAL_LCC_TYPE& alcc, +void add_in_graphic_storage(const CGAL_LCC_TYPE& alcc, CGAL::Graphic_storage& graphic_buffer) { CGAL::Drawing_functor_with_volume buffer; - add_in_graphic_buffer(alcc, buffer, drawing_functor); + add_in_graphic_storage(alcc, buffer, drawing_functor); draw_graphic_storage(buffer, title); } @@ -301,7 +301,7 @@ template buffer; - add_in_graphic_buffer(alcc, buffer); + add_in_graphic_storage(alcc, buffer); draw_graphic_storage(buffer, title); } diff --git a/Nef_3/include/CGAL/draw_nef_3.h b/Nef_3/include/CGAL/draw_nef_3.h index f4242edd06a..45b2f8488b6 100644 --- a/Nef_3/include/CGAL/draw_nef_3.h +++ b/Nef_3/include/CGAL/draw_nef_3.h @@ -236,10 +236,10 @@ void compute_elements(const Nef_Polyhedron &nef, #define CGAL_NEF3_TYPE Nef_polyhedron_3 -// add_in_graphic_buffer +// add_in_graphic_storage template -void add_in_graphic_buffer(const CGAL_NEF3_TYPE &anef, +void add_in_graphic_storage(const CGAL_NEF3_TYPE &anef, CGAL::Graphic_storage &graphic_buffer, const DrawingFunctor &drawing_functor) { @@ -250,7 +250,7 @@ void add_in_graphic_buffer(const CGAL_NEF3_TYPE &anef, template -void add_in_graphic_buffer(const CGAL_NEF3_TYPE &anef, +void add_in_graphic_storage(const CGAL_NEF3_TYPE &anef, CGAL::Graphic_storage &graphic_buffer) { // Default functor; user can add his own functor. @@ -274,7 +274,7 @@ void add_in_graphic_buffer(const CGAL_NEF3_TYPE &anef, return get_random_color(random); }; - add_in_graphic_buffer(anef, graphic_buffer, drawing_functor); + add_in_graphic_storage(anef, graphic_buffer, drawing_functor); } #ifdef CGAL_USE_BASIC_VIEWER @@ -287,7 +287,7 @@ void draw(const CGAL_NEF3_TYPE &anef, const char *title="Nef Polyhedron Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(anef, buffer, drawing_functor); + add_in_graphic_storage(anef, buffer, drawing_functor); draw_graphic_storage(buffer, title); } @@ -297,7 +297,7 @@ void draw(const CGAL_NEF3_TYPE &anef, const char *title="Nef Polyhedron Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(anef, buffer); + add_in_graphic_storage(anef, buffer); draw_graphic_storage(buffer, title); } diff --git a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h index 1b0c38a68f6..f9e73455342 100644 --- a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h @@ -197,7 +197,7 @@ void compute_elements(const P2T2& p2t2, #define CGAL_P2T2_TYPE CGAL::Periodic_2_triangulation_2 template -void add_in_graphic_buffer(const CGAL_P2T2_TYPE& p2t2, +void add_in_graphic_storage(const CGAL_P2T2_TYPE& p2t2, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& drawing_functor) { @@ -205,7 +205,7 @@ void add_in_graphic_buffer(const CGAL_P2T2_TYPE& p2t2, } template -void add_in_graphic_buffer(const CGAL_P2T2_TYPE& p2t2, +void add_in_graphic_storage(const CGAL_P2T2_TYPE& p2t2, CGAL::Graphic_storage& graphic_buffer) { CGAL::Drawing_functor_periodic_2_triangulation_2 @@ -214,7 +214,7 @@ void add_in_graphic_buffer(const CGAL_P2T2_TYPE& p2t2, typename CGAL_P2T2_TYPE::Periodic_segment_iterator, typename CGAL_P2T2_TYPE::Periodic_triangle_iterator> drawing_functor; - add_in_graphic_buffer(p2t2, graphic_buffer, drawing_functor); + add_in_graphic_storage(p2t2, graphic_buffer, drawing_functor); } #ifdef CGAL_USE_BASIC_VIEWER @@ -226,7 +226,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2, const char* title="2D Periodic Triangulation Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(ap2t2, buffer, drawing_functor); + add_in_graphic_storage(ap2t2, buffer, drawing_functor); draw_graphic_storage(buffer); } @@ -241,7 +241,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2, typename CGAL_P2T2_TYPE::Periodic_segment_iterator, typename CGAL_P2T2_TYPE::Periodic_triangle_iterator> drawing_functor; - add_in_graphic_buffer(ap2t2, buffer, drawing_functor); + add_in_graphic_storage(ap2t2, buffer, drawing_functor); QApplication_and_basic_viewer app(buffer, title); if(app) { diff --git a/Point_set_3/include/CGAL/draw_point_set_3.h b/Point_set_3/include/CGAL/draw_point_set_3.h index 4b8bd016bff..144417fb1dc 100644 --- a/Point_set_3/include/CGAL/draw_point_set_3.h +++ b/Point_set_3/include/CGAL/draw_point_set_3.h @@ -69,7 +69,7 @@ void compute_elements(const PointSet& pointset, } // namespace draw_function_for_PointSet template -void add_in_graphic_buffer(const Point_set_3& apointset, +void add_in_graphic_storage(const Point_set_3& apointset, Graphic_storage& graphic_buffer, const DrawingFunctor& drawing_functor) { @@ -79,13 +79,13 @@ void add_in_graphic_buffer(const Point_set_3& apointset, } template -void add_in_graphic_buffer(const Point_set_3& apointset, +void add_in_graphic_storage(const Point_set_3& apointset, Graphic_storage& graphic_buffer) { CGAL::Drawing_functor, typename Point_set_3::const_iterator, int, int> drawing_functor; - add_in_graphic_buffer(apointset, graphic_buffer, drawing_functor); + add_in_graphic_storage(apointset, graphic_buffer, drawing_functor); } #ifdef CGAL_USE_BASIC_VIEWER @@ -97,7 +97,7 @@ void draw(const Point_set_3& apointset, const char *title="Point_set_3 Basic Viewer") { Graphic_storage buffer; - add_in_graphic_buffer(apointset, buffer, drawing_functor); + add_in_graphic_storage(apointset, buffer, drawing_functor); draw_graphic_storage(buffer, title); } @@ -106,7 +106,7 @@ void draw(const Point_set_3& apointset, const char *title="Point_set_3 Basic Viewer") { Graphic_storage buffer; - add_in_graphic_buffer(apointset, buffer); + add_in_graphic_storage(apointset, buffer); draw_graphic_storage(buffer, title); } diff --git a/Polygon/include/CGAL/draw_polygon_2.h b/Polygon/include/CGAL/draw_polygon_2.h index 2562d0efe35..20897bdb9f8 100644 --- a/Polygon/include/CGAL/draw_polygon_2.h +++ b/Polygon/include/CGAL/draw_polygon_2.h @@ -99,16 +99,16 @@ void compute_elements(const P2& p2, #define CGAL_P2_TYPE CGAL::Polygon_2 -// Specializations of add_in_graphic_buffer function +// Specializations of add_in_graphic_storage function template -void add_in_graphic_buffer(const CGAL_P2_TYPE& ap2, +void add_in_graphic_storage(const CGAL_P2_TYPE& ap2, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& drawingfunctor) { draw_function_for_p2::compute_elements(ap2, graphic_buffer, drawingfunctor); } template -void add_in_graphic_buffer(const CGAL_P2_TYPE& ap2, +void add_in_graphic_storage(const CGAL_P2_TYPE& ap2, CGAL::Graphic_storage &graphic_buffer) { CGAL::Drawing_functor buffer; - add_in_graphic_buffer(ap2, buffer); + add_in_graphic_storage(ap2, buffer); draw_graphic_storage(buffer, title); } @@ -137,7 +137,7 @@ void draw(const CGAL_P2_TYPE &ap2, const char *title="Polygon_2 Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(ap2, buffer, drawingfunctor); + add_in_graphic_storage(ap2, buffer, drawingfunctor); draw_graphic_storage(buffer, title); } diff --git a/Polygon/include/CGAL/draw_polygon_with_holes_2.h b/Polygon/include/CGAL/draw_polygon_with_holes_2.h index 33006449e79..b04fd60ba0a 100644 --- a/Polygon/include/CGAL/draw_polygon_with_holes_2.h +++ b/Polygon/include/CGAL/draw_polygon_with_holes_2.h @@ -127,7 +127,7 @@ void compute_elements(const P2& p2, Graphic_storage &graphic_buffer, #define CGAL_P2_WITH_HOLES_TYPE CGAL::Polygon_with_holes_2 template -void add_in_graphic_buffer(const CGAL_P2_WITH_HOLES_TYPE& p2, +void add_in_graphic_storage(const CGAL_P2_WITH_HOLES_TYPE& p2, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor &drawing_functor) { @@ -136,7 +136,7 @@ void add_in_graphic_buffer(const CGAL_P2_WITH_HOLES_TYPE& p2, } template -void add_in_graphic_buffer(const CGAL_P2_WITH_HOLES_TYPE& p2, +void add_in_graphic_storage(const CGAL_P2_WITH_HOLES_TYPE& p2, CGAL::Graphic_storage& graphic_buffer) { Drawing_functor drawing_functor; - add_in_graphic_buffer(p2, graphic_buffer, drawing_functor); + add_in_graphic_storage(p2, graphic_buffer, drawing_functor); } #ifdef CGAL_USE_BASIC_VIEWER @@ -155,7 +155,7 @@ void draw(const CGAL_P2_WITH_HOLES_TYPE& ap2, const DrawingFunctor &drawing_func const char* title="Polygon with Holes Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(ap2, buffer, drawing_functor); + add_in_graphic_storage(ap2, buffer, drawing_functor); draw_graphic_storage(buffer, title); } @@ -164,7 +164,7 @@ void draw(const CGAL_P2_WITH_HOLES_TYPE& ap2, const char* title="Polygon with Holes Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(ap2, buffer); + add_in_graphic_storage(ap2, buffer); draw_graphic_storage(buffer, title); } diff --git a/Polyhedron/include/CGAL/draw_polyhedron.h b/Polyhedron/include/CGAL/draw_polyhedron.h index 19c96d92188..8e7b1788afe 100644 --- a/Polyhedron/include/CGAL/draw_polyhedron.h +++ b/Polyhedron/include/CGAL/draw_polyhedron.h @@ -26,7 +26,7 @@ namespace CGAL #define CGAL_POLY_TYPE CGAL::Polyhedron_3 \ -// Specialization of add_in_graphic_buffer function. +// Specialization of add_in_graphic_storage function. template @@ -34,10 +34,10 @@ template -void add_in_graphic_buffer(const CGAL_POLY_TYPE& apoly, +void add_in_graphic_storage(const CGAL_POLY_TYPE& apoly, CGAL::Graphic_storage &graphic_buffer, const DrawingFunctor &drawing_functor) -{ add_in_graphic_buffer_for_fg(apoly, graphic_buffer, drawing_functor); } +{ add_in_graphic_storage_for_fg(apoly, graphic_buffer, drawing_functor); } template -void add_in_graphic_buffer(const CGAL_POLY_TYPE& apoly, +void add_in_graphic_storage(const CGAL_POLY_TYPE& apoly, CGAL::Graphic_storage &graphic_buffer) -{ add_in_graphic_buffer_for_fg(apoly, graphic_buffer); } +{ add_in_graphic_storage_for_fg(apoly, graphic_buffer); } // Specialization of draw function: require Qt and the CGAL basic viewer. #ifdef CGAL_USE_BASIC_VIEWER @@ -62,7 +62,7 @@ void draw(const CGAL_POLY_TYPE& apoly, const char* title="Polyhedron Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer_for_fg(apoly, buffer); + add_in_graphic_storage_for_fg(apoly, buffer); draw_graphic_storage(buffer, title); } @@ -78,7 +78,7 @@ void draw(const CGAL_POLY_TYPE& apoly, const char* title="Polyhedron Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer_for_fg(apoly, buffer, drawing_functor); + add_in_graphic_storage_for_fg(apoly, buffer, drawing_functor); draw_graphic_storage(buffer, title); } #endif // CGAL_USE_BASIC_VIEWER diff --git a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h index 8736fd07080..9b4fcddf392 100644 --- a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h @@ -130,7 +130,7 @@ void compute_elements(const SS2& ss2, #define CGAL_SS_TYPE CGAL::Straight_skeleton_2 template -void add_in_graphic_buffer(const CGAL_SS_TYPE &ass2, +void add_in_graphic_storage(const CGAL_SS_TYPE &ass2, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& drawing_functor) { @@ -139,7 +139,7 @@ void add_in_graphic_buffer(const CGAL_SS_TYPE &ass2, } template -void add_in_graphic_buffer(const CGAL_SS_TYPE& ass2, +void add_in_graphic_storage(const CGAL_SS_TYPE& ass2, CGAL::Graphic_storage& graphic_buffer) { Drawing_functor buffer; - add_in_graphic_buffer(ass2, buffer, drawingfunctor); + add_in_graphic_storage(ass2, buffer, drawingfunctor); draw_graphic_storage(buffer, title); } @@ -196,7 +196,7 @@ void draw(const CGAL_SS_TYPE &ass2, const char *title="Straight Skeleton Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(ass2, buffer); + add_in_graphic_storage(ass2, buffer); draw_graphic_storage(buffer, title); } diff --git a/Surface_mesh/include/CGAL/draw_surface_mesh.h b/Surface_mesh/include/CGAL/draw_surface_mesh.h index f68fa485697..3b2f9895c93 100644 --- a/Surface_mesh/include/CGAL/draw_surface_mesh.h +++ b/Surface_mesh/include/CGAL/draw_surface_mesh.h @@ -40,15 +40,15 @@ namespace CGAL { template -void add_in_graphic_buffer(const Surface_mesh& amesh, +void add_in_graphic_storage(const Surface_mesh& amesh, CGAL::Graphic_storage &graphic_buffer, const DrawingFunctor &drawing_functor) -{ add_in_graphic_buffer_for_fg(amesh, graphic_buffer, drawing_functor); } +{ add_in_graphic_storage_for_fg(amesh, graphic_buffer, drawing_functor); } template -void add_in_graphic_buffer(const Surface_mesh& amesh, +void add_in_graphic_storage(const Surface_mesh& amesh, CGAL::Graphic_storage &graphic_buffer) -{ add_in_graphic_buffer_for_fg(amesh, graphic_buffer); } +{ add_in_graphic_storage_for_fg(amesh, graphic_buffer); } #ifdef CGAL_USE_BASIC_VIEWER @@ -58,7 +58,7 @@ void draw(const Surface_mesh& amesh, const char* title="Surface_mesh Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer_for_fg(amesh, buffer); + add_in_graphic_storage_for_fg(amesh, buffer); draw_graphic_storage(buffer, title); } @@ -68,7 +68,7 @@ void draw(const Surface_mesh& amesh, const char* title="Surface_mesh Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer_for_fg(amesh, buffer, drawing_functor); + add_in_graphic_storage_for_fg(amesh, buffer, drawing_functor); draw_graphic_storage(buffer, title); } diff --git a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h index 486ad649010..8eecc3b4f0b 100644 --- a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h +++ b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h @@ -370,7 +370,7 @@ void compute_elements(const Mesh &mesh, } // namespace draw_function_for_face_graph_with_paths template -void add_in_graphic_buffer(const Mesh& mesh, +void add_in_graphic_storage(const Mesh& mesh, CGAL::Graphic_storage& graphic_buffer, const std::vector>* paths, const DrawingFunctor& drawing_functor, @@ -384,7 +384,7 @@ void add_in_graphic_buffer(const Mesh& mesh, } template -void add_in_graphic_buffer(const Mesh& mesh, +void add_in_graphic_storage(const Mesh& mesh, CGAL::Graphic_storage& graphic_buffer, const std::vector>* paths, typename Get_map::type::size_type amark= @@ -397,7 +397,7 @@ void add_in_graphic_buffer(const Mesh& mesh, typename Get_map::type::Dart_const_descriptor /*fh*/> drawing_functor; - add_in_graphic_buffer(mesh, graphic_buffer, drawing_functor, paths, amark); + add_in_graphic_storage(mesh, graphic_buffer, drawing_functor, paths, amark); } #ifdef CGAL_USE_BASIC_VIEWER @@ -410,7 +410,7 @@ void draw(const Mesh& mesh, const char* title="Mesh Viewer With Path") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(mesh, buffer, &paths, amark); + add_in_graphic_storage(mesh, buffer, &paths, amark); draw_graphic_storage(buffer, title); } @@ -423,7 +423,7 @@ void draw(const Mesh& mesh, const char* title="Mesh Viewer With Path") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(mesh, buffer, drawing_functor, &paths, amark); + add_in_graphic_storage(mesh, buffer, drawing_functor, &paths, amark); draw_graphic_storage(buffer, title); } @@ -436,7 +436,7 @@ void draw(const Mesh& mesh, { std::vector> paths=l; CGAL::Graphic_storage buffer; - add_in_graphic_buffer(mesh, buffer, &paths, amark); + add_in_graphic_storage(mesh, buffer, &paths, amark); draw_graphic_storage(buffer, title); } diff --git a/Triangulation_2/examples/Triangulation_2/polygon_triangulation_drawing_functor.h b/Triangulation_2/examples/Triangulation_2/polygon_triangulation_drawing_functor.h index 6880a4921b3..b1750169c7d 100644 --- a/Triangulation_2/examples/Triangulation_2/polygon_triangulation_drawing_functor.h +++ b/Triangulation_2/examples/Triangulation_2/polygon_triangulation_drawing_functor.h @@ -60,7 +60,7 @@ struct Polygon_triangulation_drawing_functor : template -void add_in_graphic_buffer(const CGAL_CT2_TYPE& ct2, +void add_in_graphic_storage(const CGAL_CT2_TYPE& ct2, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& drawing_functor) { @@ -75,7 +75,7 @@ void draw(const CGAL_CT2_TYPE &ct2, const DrawingFunctor &drawingfunctor, const char *title="Constrained Triangulation_2 Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(ct2, buffer, drawingfunctor); + add_in_graphic_storage(ct2, buffer, drawingfunctor); draw_graphic_storage(buffer, title); } diff --git a/Triangulation_2/include/CGAL/draw_triangulation_2.h b/Triangulation_2/include/CGAL/draw_triangulation_2.h index 0e777ffdd43..8d17d21accb 100644 --- a/Triangulation_2/include/CGAL/draw_triangulation_2.h +++ b/Triangulation_2/include/CGAL/draw_triangulation_2.h @@ -118,7 +118,7 @@ void compute_elements(const T2& t2, #define CGAL_T2_TYPE CGAL::Triangulation_2 template -void add_in_graphic_buffer(const CGAL_T2_TYPE& at2, +void add_in_graphic_storage(const CGAL_T2_TYPE& at2, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& drawing_functor) { @@ -126,7 +126,7 @@ void add_in_graphic_buffer(const CGAL_T2_TYPE& at2, } template -void add_in_graphic_buffer(const CGAL_T2_TYPE& at2, +void add_in_graphic_storage(const CGAL_T2_TYPE& at2, CGAL::Graphic_storage& graphic_buffer) { CGAL::Graphic_storage buffer; @@ -147,7 +147,7 @@ void add_in_graphic_buffer(const CGAL_T2_TYPE& at2, return get_random_color(random); }; - add_in_graphic_buffer(at2, graphic_buffer, drawingFunctor); + add_in_graphic_storage(at2, graphic_buffer, drawingFunctor); } #ifdef CGAL_USE_BASIC_VIEWER @@ -158,7 +158,7 @@ void draw(const CGAL_T2_TYPE &at2, const DrawingFunctor &drawingfunctor, const char *title="Triangulation_2 Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(at2, buffer, drawingfunctor); + add_in_graphic_storage(at2, buffer, drawingfunctor); draw_graphic_storage(buffer, title); } @@ -167,7 +167,7 @@ void draw(const CGAL_T2_TYPE& at2, const char *title="Triangulation_2 Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(at2, buffer); + add_in_graphic_storage(at2, buffer); draw_graphic_storage(buffer, title); } diff --git a/Triangulation_3/include/CGAL/draw_triangulation_3.h b/Triangulation_3/include/CGAL/draw_triangulation_3.h index 0a171fc30df..de8f06acd07 100644 --- a/Triangulation_3/include/CGAL/draw_triangulation_3.h +++ b/Triangulation_3/include/CGAL/draw_triangulation_3.h @@ -117,7 +117,7 @@ void compute_elements(const T3* t3, template -void add_in_graphic_buffer(const CGAL_T3_TYPE& at3, +void add_in_graphic_storage(const CGAL_T3_TYPE& at3, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& drawing_functor) { @@ -126,7 +126,7 @@ void add_in_graphic_buffer(const CGAL_T3_TYPE& at3, template -void add_in_graphic_buffer(const CGAL_T3_TYPE& at3, +void add_in_graphic_storage(const CGAL_T3_TYPE& at3, CGAL::Graphic_storage& graphic_buffer) { CGAL::Drawing_functor buffer; - add_in_graphic_buffer(at3, buffer, drawingfunctor); + add_in_graphic_storage(at3, buffer, drawingfunctor); draw_graphic_storage(buffer, title); } @@ -170,7 +170,7 @@ template void draw(const CGAL_T3_TYPE &at3, const char *title="T3 Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(at3, buffer); + add_in_graphic_storage(at3, buffer); draw_graphic_storage(buffer, title); } diff --git a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h index 20bcffc914a..33218f90112 100644 --- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h @@ -337,7 +337,7 @@ void compute_elements(const V2& v2, template -void add_in_graphic_buffer(const CGAL_VORONOI_TYPE &v2, +void add_in_graphic_storage(const CGAL_VORONOI_TYPE &v2, CGAL::Graphic_storage& graphic_buffer, const DrawingFunctor& m_drawing_functor) { @@ -345,7 +345,7 @@ void add_in_graphic_buffer(const CGAL_VORONOI_TYPE &v2, } template -void add_in_graphic_buffer(const CGAL_VORONOI_TYPE& v2, +void add_in_graphic_storage(const CGAL_VORONOI_TYPE& v2, CGAL::Graphic_storage& graphic_buffer) { // Default functor; user can add his own functor. @@ -355,7 +355,7 @@ void add_in_graphic_buffer(const CGAL_VORONOI_TYPE& v2, typename CGAL_VORONOI_TYPE::Face_iterator> drawing_functor; - add_in_graphic_buffer(v2, graphic_buffer, drawing_functor); + add_in_graphic_storage(v2, graphic_buffer, drawing_functor); } #ifdef CGAL_USE_BASIC_VIEWER @@ -368,7 +368,7 @@ void draw(const CGAL_VORONOI_TYPE& av2, const char *title="2D Voronoi Diagram Basic Viewer") { CGAL::Graphic_storage buffer; - add_in_graphic_buffer(av2, buffer, drawing_functor); + add_in_graphic_storage(av2, buffer, drawing_functor); draw_graphic_storage(buffer, title); } @@ -384,7 +384,7 @@ void draw(const CGAL_VORONOI_TYPE& av2, typename CGAL_VORONOI_TYPE::Face_iterator> drawing_functor; - add_in_graphic_buffer(av2, buffer, drawing_functor); + add_in_graphic_storage(av2, buffer, drawing_functor); QApplication_and_basic_viewer app(buffer, title); if(app)