From 7404eb629fda75cefe6786c2ca625b05d036fe7c Mon Sep 17 00:00:00 2001 From: Mostafa-ashraf19 Date: Thu, 6 Oct 2022 15:17:01 +0200 Subject: [PATCH] Applied new APIs version in periodic 2 triangulation 2. --- .../CGAL/draw_periodic_2_triangulation_2.h | 374 ++++++++---------- 1 file changed, 159 insertions(+), 215 deletions(-) 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 395edef7a12..41453f1cbcd 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 @@ -8,10 +8,13 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // // Author(s) : Jasmeet Singh +// Mostafa Ashraf #ifndef DRAW_PERIODIC_2_TRIANGULATION_2_H #define DRAW_PERIODIC_2_TRIANGULATION_2_H +#include +#include #include #include @@ -23,255 +26,196 @@ namespace CGAL { -// Default color functor; user can change it to have its own face color -struct DefaultColorFunctorP2T2 { - template - static CGAL::IO::Color run(const P2T2 &, - const typename P2T2::Periodic_triangle_iterator /*ti*/) { - //CGAL::Random random((unsigned int)(std::size_t)(&*ti)); - //return get_random_color(random); - return CGAL::IO::Color(73, 250, 117); - } +namespace draw_function_for_P2T2 +{ + +enum Display_type +{ + STORED = 0, + UNIQUE, // 1 + STORED_COVER_DOMAIN, // 2 + UNIQUE_COVER_DOMAIN // 3 }; -// Viewer class for P2T2 -template -class SimplePeriodic2Triangulation2ViewerQt : public Basic_viewer_qt +template +void compute_vertex(typename P2T2::Periodic_point_iterator pi, const P2T2 &p2t2, + CGAL::Graphic_buffer &graphic_buffer) { - typedef Basic_viewer_qt Base; + // Construct the point in 9-sheeted covering space and add to viewer + graphic_buffer.add_point(p2t2.point(*pi)); +} - typedef typename P2T2::Iterator_type Iterator_type; +template +void compute_edge(typename P2T2::Periodic_segment_iterator si, const P2T2 &p2t2, + CGAL::Graphic_buffer &graphic_buffer) +{ + typedef typename P2T2::Segment Segment; - // Vertex iterators - typedef typename P2T2::Periodic_point_iterator Periodic_point_iterator; + // Construct the segment in 9-sheeted covering space and add to viewer + Segment s(p2t2.segment(*si)); + graphic_buffer.add_segment(s[0], s[1]); +} - // Edge iterators - typedef typename P2T2::Periodic_segment_iterator Periodic_segment_iterator; - typedef typename P2T2::Segment Segment; +template +void compute_face(typename P2T2::Periodic_triangle_iterator ti, const P2T2 &p2t2, + CGAL::Graphic_buffer &graphic_buffer, + const DrawingFunctor &m_drawing_functor) +{ + typedef typename P2T2::Triangle Triangle; - // Face iterators - typedef typename P2T2::Periodic_triangle_iterator Periodic_triangle_iterator; - typedef typename P2T2::Triangle Triangle; + // Construct the triangle in 9-sheeted covering space and add to viewer + Triangle t(p2t2.triangle(*ti)); + if(m_drawing_functor.colored_face(p2t2, ti)) { + + // Need CGAL::IO::Color(73, 250, 117); + CGAL::IO::Color c= m_drawing_functor.face_color(p2t2, ti); + graphic_buffer.face_begin(c); + graphic_buffer.add_point_in_face(t[0]); + graphic_buffer.add_point_in_face(t[1]); + graphic_buffer.add_point_in_face(t[2]); + graphic_buffer.face_end(); + } + + + // Display the edges of the faces as segments with a + // light gray color for better visualization + if(m_drawing_functor.colored_face(p2t2, ti)) { + + // Need CGAL::IO::Color(207, 213, 211); + CGAL::IO::Color c = m_drawing_functor.face_color(p2t2, ti); + + graphic_buffer.add_segment(t[0], t[1], c); + graphic_buffer.add_segment(t[1], t[2], c); + graphic_buffer.add_segment(t[2], t[0], c); + } +} + +template +void compute_domain(const P2T2 &p2t2, CGAL::Graphic_buffer &graphic_buffer) +{ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; -public: - /// Construct the viewer. - /// @param ap2t2 the p2t2 to view - /// @param title the title of the window - /// @param anofaces if true, do not draw faces (faces are not computed; this can be - /// usefull for very big object where this time could be long) - SimplePeriodic2Triangulation2ViewerQt(QWidget* parent, const P2T2& ap2t2, - const char* title="Basic P2T2 Viewer", - bool anofaces=false, - const ColorFunctor& fcolor=ColorFunctor()) : - // First draw: vertices; edges, faces; multi-color; no inverse normal - Base(parent, title, true, true, true, false, false), - p2t2(ap2t2), - m_nofaces(anofaces), - m_fcolor(fcolor), - m_display_type(STORED_COVER_DOMAIN), - m_domain(true) - { - // Add custom key description (see keyPressEvent). - setKeyDescription(::Qt::Key_1, "STORED: Display all geometric primitives as they are stored in " - "Triangulation_data_structure_2"); - setKeyDescription(::Qt::Key_2, "UNIQUE: Display only one representative of each geometric primitive even " - "if the triangulation is computed in multiply sheeted covering space."); - setKeyDescription(::Qt::Key_3, "STORED_COVER_DOMAIN: Same as STORED but also display " - "all primitives whose intersection with the original " - "domain of the current covering space is non-empty"); - setKeyDescription(::Qt::Key_4, "UNIQUE_COVER_DOMAIN: Same as UNIQUE but also display " - "all primitives whose intersection with the original " - "domain of the current covering space is non-empty"); - setKeyDescription(::Qt::Key_D, "Toggle 9-sheeted domain display"); + Kernel::Iso_rectangle_2 orig_domain = p2t2.domain(); + std::array covering_sheets = p2t2.number_of_sheets(); - compute_elements(); - } -protected: - void compute_vertex(Periodic_point_iterator pi) - { - // Construct the point in 9-sheeted covering space and add to viewer - add_point(p2t2.point(*pi)); - } + for(int i = 0; i < covering_sheets[0]; i++){ + for(int j = 0; j < covering_sheets[1]; j++){ + Kernel::Vector_2 shift(i * (orig_domain.xmax() - orig_domain.xmin()), + j * orig_domain.ymax() - orig_domain.ymin()); + Kernel::Point_2 p1((orig_domain.min)()); + Kernel::Point_2 p2(orig_domain.xmin(), orig_domain.ymax()); + Kernel::Point_2 p3(orig_domain.xmax(), orig_domain.ymin()); + Kernel::Point_2 p4((orig_domain.max)()); - void compute_edge(Periodic_segment_iterator si) - { - // Construct the segment in 9-sheeted covering space and add to viewer - Segment s(p2t2.segment(*si)); - add_segment(s[0], s[1]); - } - - void compute_face(Periodic_triangle_iterator ti) - { - // Construct the triangle in 9-sheeted covering space and add to viewer - Triangle t(p2t2.triangle(*ti)); - - CGAL::IO::Color c=m_fcolor.run(p2t2, ti); - face_begin(c); - add_point_in_face(t[0]); - add_point_in_face(t[1]); - add_point_in_face(t[2]); - face_end(); - - // Display the edges of the faces as segments with a - // light gray color for better visualization - add_segment(t[0], t[1], CGAL::IO::Color(207, 213, 211)); - add_segment(t[1], t[2], CGAL::IO::Color(207, 213, 211)); - add_segment(t[2], t[0], CGAL::IO::Color(207, 213, 211)); - } - - void compute_domain() - { - Kernel::Iso_rectangle_2 orig_domain = p2t2.domain(); - std::array covering_sheets = p2t2.number_of_sheets(); - - for(int i = 0; i < covering_sheets[0]; i++){ - for(int j = 0; j < covering_sheets[1]; j++){ - Kernel::Vector_2 shift(i * (orig_domain.xmax() - orig_domain.xmin()), - j * orig_domain.ymax() - orig_domain.ymin()); - Kernel::Point_2 p1((orig_domain.min)()); - Kernel::Point_2 p2(orig_domain.xmin(), orig_domain.ymax()); - Kernel::Point_2 p3(orig_domain.xmax(), orig_domain.ymin()); - Kernel::Point_2 p4((orig_domain.max)()); - - add_segment(p1 + shift, p2 + shift, CGAL::IO::Color(96, 104, 252)); - add_segment(p1 + shift, p3 + shift, CGAL::IO::Color(96, 104, 252)); - add_segment(p2 + shift, p4 + shift, CGAL::IO::Color(96, 104, 252)); - add_segment(p3 + shift, p4 + shift, CGAL::IO::Color(96, 104, 252)); - } + graphic_buffer.add_segment(p1 + shift, p2 + shift, CGAL::IO::Color(96, 104, 252)); + graphic_buffer.add_segment(p1 + shift, p3 + shift, CGAL::IO::Color(96, 104, 252)); + graphic_buffer.add_segment(p2 + shift, p4 + shift, CGAL::IO::Color(96, 104, 252)); + graphic_buffer.add_segment(p3 + shift, p4 + shift, CGAL::IO::Color(96, 104, 252)); } } +} - void compute_elements() { - // Clear the buffers - clear(); +template +void compute_elements(const P2T2 &p2t2, CGAL::Graphic_buffer &graphic_buffer, const DrawingFunctor &m_drawing_functor, bool m_domain = true) { - // Get the display type, iterate through periodic elements according - // to the display type - Iterator_type it_type = (Iterator_type)m_display_type; + typedef typename P2T2::Iterator_type Iterator_type; - // Iterate through vertices, edges and faces, add elements to buffer - for (Periodic_point_iterator it = - p2t2.periodic_points_begin(it_type); - it != p2t2.periodic_points_end(it_type); it++) - { - compute_vertex(it); - } + Display_type m_display_type(Display_type::STORED_COVER_DOMAIN); - for (Periodic_segment_iterator it = - p2t2.periodic_segments_begin(it_type); - it != p2t2.periodic_segments_end(it_type); it++) - { - compute_edge(it); - } + // Get the display type, iterate through periodic elements according + // to the display type + Iterator_type it_type = (Iterator_type)m_display_type; - for (Periodic_triangle_iterator it = - p2t2.periodic_triangles_begin(it_type); - it != p2t2.periodic_triangles_end(it_type); it++) - { - compute_face(it); - } - - if(m_domain){ - // Compute the (9-sheet covering space) domain of the periodic triangulation - compute_domain(); - } + // Iterate through vertices, edges and faces, add elements to buffer + for (typename P2T2::Periodic_point_iterator it = + p2t2.periodic_points_begin(it_type); + it != p2t2.periodic_points_end(it_type); it++) + { + compute_vertex(it, p2t2, graphic_buffer); } - virtual void keyPressEvent(QKeyEvent *e) + for (typename P2T2::Periodic_segment_iterator it = + p2t2.periodic_segments_begin(it_type); + it != p2t2.periodic_segments_end(it_type); it++) { - // Test key pressed: - // const ::Qt::KeyboardModifiers modifiers = e->modifiers(); - // if ((e->key()==Qt::Key_PageUp) && (modifiers==Qt::NoButton)) { ... } - - // Call: * compute_elements() if the model changed, followed by - // * redraw() if some viewing parameters changed that implies some - // modifications of the buffers - // (eg. type of normal, color/mono) - // * update() just to update the drawing - - // Call the base method to process others/classicals key - const ::Qt::KeyboardModifiers modifiers = e->modifiers(); - if (e->text()=="1") - { - m_display_type = Display_type::UNIQUE; - displayMessage(QString("Display type= UNIQUE")); - compute_elements(); - redraw(); - } else if (e->text()=="2") - { - m_display_type = Display_type::UNIQUE_COVER_DOMAIN; - displayMessage(QString("Display type= UNIQUE_COVER_DOMAIN")); - compute_elements(); - redraw(); - } else if (e->text()=="3") - { - m_display_type = Display_type::STORED; - displayMessage(QString("Display type= STORED")); - compute_elements(); - redraw(); - } else if (e->text()=="4") - { - m_display_type = Display_type::STORED_COVER_DOMAIN; - displayMessage(QString("Display type= STORED_COVER_DOMAIN")); - compute_elements(); - redraw(); - } else if ((e->key() == ::Qt::Key_D) && (modifiers == ::Qt::NoButton)) - { - m_domain=!m_domain; - displayMessage(QString("Draw domain=%1.").arg(m_domain?"true":"false")); - compute_elements(); - redraw(); - } else { - Base::keyPressEvent(e); - } + compute_edge(it, p2t2, graphic_buffer); } -protected: - const P2T2& p2t2; - bool m_nofaces; - const ColorFunctor& m_fcolor; - enum Display_type + for (typename P2T2::Periodic_triangle_iterator it = + p2t2.periodic_triangles_begin(it_type); + it != p2t2.periodic_triangles_end(it_type); it++) { - STORED = 0, - UNIQUE, // 1 - STORED_COVER_DOMAIN, // 2 - UNIQUE_COVER_DOMAIN // 3 + compute_face(it, p2t2, graphic_buffer, m_drawing_functor); + } + + if(m_domain){ + // Compute the (9-sheet covering space) domain of the periodic triangulation + compute_domain(p2t2, graphic_buffer); + } +} + +} // namespace draw_function_for_P2T2 + +template +void add_in_graphic_buffer(const P2T2 &p2t2, CGAL::Graphic_buffer &graphic_buffer, + const DrawingFunctor &m_drawing_functor) { + draw_function_for_P2T2::compute_elements(p2t2, graphic_buffer, m_drawing_functor); +} + +template +void add_in_graphic_buffer(const P2T2 &p2t2, CGAL::Graphic_buffer &graphic_buffer) { + + Drawing_functor drawing_functor; + + drawing_functor.colored_face = [](const P2T2&, + typename P2T2::Periodic_triangle_iterator) -> bool + { return true; }; + + // TODO: I think we need to add std::function like this: + // drawing_functor.face_color = [] (const P2T2&, + // typename P2T2::Periodic_triangle_iterator, + // int R, int G, int B) -> CGAL::IO::Color + // { + // return CGAL::IO::Color(R, G, B); + // }; // What do you think? + + drawing_functor.face_color = [] (const P2T2& alcc, + typename P2T2::Periodic_triangle_iterator dh) -> CGAL::IO::Color + { + return CGAL::IO::Color(207, 213, 211); }; - Display_type m_display_type; - bool m_domain; -}; + + add_in_graphic_buffer(p2t2, graphic_buffer, drawing_functor); +} // Specialization of draw function -#define CGAL_P2T2_TYPE CGAL::Periodic_2_triangulation_2 \ - +#define CGAL_P2T2_TYPE CGAL::Periodic_2_triangulation_2 template < class Gt, - class Tds > + class Tds, + class BufferType = float, + class DrawingFunctor > +void draw(const CGAL_P2T2_TYPE& ap2t2, + const DrawingFunctor &drawing_functor) +{ + CGAL::Graphic_buffer buffer; + add_in_graphic_buffer(ap2t2, buffer, drawing_functor); + draw_buffer(buffer); +} + +template < class Gt, + class Tds, + class BufferType = float > void draw(const CGAL_P2T2_TYPE& ap2t2, const char* title = "2D Periodic Triangulation Viewer", bool nofill = false) { -#if defined(CGAL_TEST_SUITE) - bool cgal_test_suite=true; -#else - bool cgal_test_suite=qEnvironmentVariableIsSet("CGAL_TEST_SUITE"); -#endif - - if (!cgal_test_suite) - { - CGAL::Qt::init_ogl_context(4,3); - int argc=1; - const char* argv[2]={"p2t2_viewer", nullptr}; - QApplication app(argc,const_cast(argv)); - DefaultColorFunctorP2T2 fcolor; - SimplePeriodic2Triangulation2ViewerQt - mainwindow(app.activeWindow(), ap2t2, title, nofill, fcolor); - mainwindow.show(); - app.exec(); - } + CGAL::Graphic_buffer buffer; + add_in_graphic_buffer(ap2t2, buffer); + draw_buffer(buffer); } } // namespace CGAL