From 534e7894b4bea359de436cdf1e02c03ee047d49f Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Wed, 19 Oct 2022 16:34:08 +0200 Subject: [PATCH] replace use of get_local_point --- GraphicsView/include/CGAL/Graphic_buffer.h | 8 ++++++++ .../include/CGAL/draw_voronoi_diagram_2.h | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/GraphicsView/include/CGAL/Graphic_buffer.h b/GraphicsView/include/CGAL/Graphic_buffer.h index c12b5aaa1ab..425597cfcdb 100644 --- a/GraphicsView/include/CGAL/Graphic_buffer.h +++ b/GraphicsView/include/CGAL/Graphic_buffer.h @@ -61,6 +61,7 @@ class Graphic_buffer public: typedef CGAL::Exact_predicates_inexact_constructions_kernel Local_kernel; typedef Local_kernel::Point_3 Local_point; + typedef Local_kernel::Vector_3 Local_vector; Graphic_buffer() : m_buffer_for_mono_points(&arrays[POS_MONO_POINTS], nullptr, @@ -331,6 +332,13 @@ public: Local_kernel>::get_local_point(p); } + template + static Local_vector get_local_vector(const KVector &v) + { + return internal::Geom_utils::Kernel, + Local_kernel>::get_local_vector(v); + } + template void add_text(const KPoint &kp, const QString &txt) { 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 d25ff88e78e..b1e4ad3de92 100644 --- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h @@ -127,8 +127,8 @@ void add_segments_and_update_bounding_box(const V2& v2, end_point = he->source()->point(); // update_bounding_box_for_ray(end_point, direction); - Local_point lp = Basic_viewer_qt<>::get_local_point(end_point); - Local_vector lv = Basic_viewer_qt<>::get_local_vector(direction); + Local_point lp = graphic_buffer.get_local_point(end_point); + Local_vector lv = graphic_buffer.get_local_vector(direction); CGAL::Bbox_3 b = (lp + lv).bbox(); graphic_buffer.update_bounding_box(b); } @@ -143,9 +143,9 @@ void add_segments_and_update_bounding_box(const V2& v2, // update_bounding_box_for_line(pointOnLine, direction, // perpendicularDirection); - Local_point lp = Basic_viewer_qt<>::get_local_point(pointOnLine); - Local_vector lv = Basic_viewer_qt<>::get_local_vector(direction); - Local_vector lpv = Basic_viewer_qt<>::get_local_vector(perpendicularDirection); + Local_point lp = graphic_buffer.get_local_point(pointOnLine); + Local_vector lv = graphic_buffer.get_local_vector(direction); + Local_vector lpv = graphic_buffer.get_local_vector(perpendicularDirection); CGAL::Bbox_3 b = lp.bbox() + (lp + lv).bbox() + (lp + lpv).bbox(); graphic_buffer.update_bounding_box(b);