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

ixed drawing of 2D arrangements

This commit is contained in:
Efi Fogel 2022-05-25 10:48:14 +03:00
parent 7475548832
commit 8890a779eb
1 changed files with 130 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
Arrangement_on_surface_2/include/CGAL/draw_arrangement_2.h
View File

@ -6,44 +6,69 @@
#include <CGAL/Qt/Basic_viewer_qt.h> #include <CGAL/Qt/Basic_viewer_qt.h>
#include <CGAL/Qt/init_ogl_context.h> #include <CGAL/Qt/init_ogl_context.h>
#include <CGAL/Arrangement_2.h> #include <CGAL/Arrangement_2.h>
#include <CGAL/Arr_conic_traits_2.h>
namespace CGAL { namespace CGAL {
// Viewer class for Polygon_2 // Viewer class for Polygon_2
template <typename Arrangement_2> template <typename GeometryTraits_2, typename Dcel>
class Arr_2_viewer_qt : public Basic_viewer_qt { class Arr_2_basic_viewer_qt : public Basic_viewer_qt {
typedef GeometryTraits_2 Gt;
typedef CGAL::Arrangement_2<Gt, Dcel> Arr;
typedef Basic_viewer_qt Base; typedef Basic_viewer_qt Base;
typedef Arrangement_2 Arr;
typedef typename Arr::Point_2 Point; typedef typename Arr::Point_2 Point;
typedef typename Arr::Vertex_const_handle Vertex_const_handle;
typedef typename Arr::Halfedge_const_handle Halfedge_const_handle;
typedef typename Arr::Face_const_handle Face_const_handle; typedef typename Arr::Face_const_handle Face_const_handle;
typedef typename Arr::Ccb_halfedge_const_circulator
Ccb_halfedge_const_circulator;
public: public:
/// Construct the viewer. /// Construct the viewer.
/// @param arr the arrangement to view /// @param arr the arrangement to view
/// @param title the title of the window /// @param title the title of the window
Arr_2_viewer_qt(QWidget* parent, const Arr& arr, Arr_2_basic_viewer_qt(QWidget* parent, const Arr& arr,
const char* title = "2D Arrangement Basic Viewer") : const char* title = "2D Arrangement Basic Viewer") :
// First draw: vertices; edges, faces; multi-color; no inverse normal // First draw: vertices; edges, faces; multi-color; no inverse normal
Base(parent, title, true, true, true, false, false), Base(parent, title, true, true, true, false, false),
m_arr(arr) m_arr(arr)
{ add_elements(); } {}
//!
void add_elements() {
clear();
if (m_arr.is_empty()) return;
CGAL::IO::Color c(75,160,255);
for (auto it = m_arr.unbounded_faces_begin();
it != m_arr.unbounded_faces_end(); ++it)
add_face(it, c);
for (auto it = m_arr.edges_begin(); it != m_arr.edges_end(); ++it)
add_edge(it);
for (auto it = m_arr.vertices_begin(); it != m_arr.vertices_end(); ++it)
add_vertex(it);
}
protected: protected:
//! //!
void add_ccb(typename Arr::Ccb_halfedge_const_circulator circ, bool has_area = true) { virtual void add_ccb(Ccb_halfedge_const_circulator circ) {
std::cout << "1 add_ccb\n";
typename Arr::Ccb_halfedge_const_circulator curr = circ; typename Arr::Ccb_halfedge_const_circulator curr = circ;
do { do this->add_point_in_face(curr->source()->point());
typename Arr::Halfedge_const_handle e = curr; while (++curr != circ);
add_segment(e->source()->point(), e->target()->point());
add_point(e->source()->point());
if (has_area) add_point_in_face(e->source()->point());
} while (++curr != circ);
} }
//! //!
void add_face(Face_const_handle face, CGAL::IO::Color c) { virtual void add_edge(Halfedge_const_handle e)
{ this->add_segment(e->source()->point(), e->target()->point()); }
//!
virtual void add_vertex(Vertex_const_handle v)
{ this->add_point(v->point()); }
//!
void add_face(Face_const_handle face, CGAL::IO::Color color) {
if (! face->is_unbounded()) { if (! face->is_unbounded()) {
face_begin(c); face_begin(color);
add_ccb(face->outer_ccb()); add_ccb(face->outer_ccb());
for (auto iv = face->isolated_vertices_begin(); for (auto iv = face->isolated_vertices_begin();
iv != face->isolated_vertices_end(); ++iv) iv != face->isolated_vertices_end(); ++iv)
@ -51,28 +76,21 @@ protected:
face_end(); face_end();
} }
std::map<Face_const_handle, bool> visited; for (auto it = face->inner_ccbs_begin(); it != face->inner_ccbs_end(); ++it)
for (auto it = face->inner_ccbs_begin(); it != face->inner_ccbs_end(); ++it) { {
auto new_face = (*it)->twin()->face(); std::map<Face_const_handle, bool> visited;
if (new_face == face) { auto curr = *it;
add_ccb(*it, false); do {
continue; auto new_face = curr->twin()->face();
} if (new_face == face) continue;
if (visited.find(new_face) != visited.end()) continue; if (visited.find(new_face) == visited.end()) {
visited[new_face] = true; visited[new_face] = true;
add_face(new_face, c); add_face(new_face, color);
}
} while (++curr != *it);
} }
} }
//!
void add_elements() {
clear();
if (m_arr.is_empty()) return;
CGAL::IO::Color c(75,160,255);
for (auto it = m_arr.unbounded_faces_begin(); it != m_arr.unbounded_faces_end(); ++it)
add_face(it, c);
}
//! //!
virtual void keyPressEvent(QKeyEvent* e) { virtual void keyPressEvent(QKeyEvent* e) {
// Test key pressed: // Test key pressed:
@ -90,9 +108,84 @@ protected:
} }
protected: protected:
const Arrangement_2& m_arr; //! The arrangement to draw
const Arr& m_arr;
}; };
//! Basic viewer of a 2D arrangement.
template <typename GeometryTraits_2, typename Dcel>
class Arr_2_viewer_qt : public Arr_2_basic_viewer_qt<GeometryTraits_2, Dcel> {
public:
typedef GeometryTraits_2 Gt;
typedef CGAL::Arrangement_2<Gt, Dcel> Arr;
typedef Arr_2_basic_viewer_qt<Gt, Dcel> Base;
typedef typename Arr::Point_2 Point;
typedef typename Arr::Halfedge_const_handle Halfedge_const_handle;
typedef typename Arr::Face_const_handle Face_const_handle;
typedef typename Arr::Ccb_halfedge_const_circulator
Ccb_halfedge_const_circulator;
/// Construct the viewer.
/// @param arr the arrangement to view
/// @param title the title of the window
Arr_2_viewer_qt(QWidget* parent, const Arr& arr,
const char* title = "2D Arrangement Basic Viewer") :
Base(parent, arr, title)
{}
};
//!
template <typename RatKernel, typename AlgKernel, typename NtTraits,
typename Dcel>
class Arr_2_viewer_qt<Arr_conic_traits_2<RatKernel, AlgKernel, NtTraits>,
Dcel> :
public Arr_2_basic_viewer_qt<Arr_conic_traits_2<RatKernel, AlgKernel,
NtTraits>, Dcel> {
public:
typedef Arr_conic_traits_2<RatKernel, AlgKernel, NtTraits> Gt;
typedef CGAL::Arrangement_2<Gt, Dcel> Arr;
typedef Arr_2_basic_viewer_qt<Gt, Dcel> Base;
typedef typename Arr::Point_2 Point;
typedef typename Arr::Halfedge_const_handle Halfedge_const_handle;
typedef typename Arr::Face_const_handle Face_const_handle;
typedef typename Arr::Ccb_halfedge_const_circulator
Ccb_halfedge_const_circulator;
/// Construct the viewer.
/// @param arr the arrangement to view
/// @param title the title of the window
Arr_2_viewer_qt(QWidget* parent, const Arr& arr,
const char* title = "2D Arrangement Basic Viewer") :
Base(parent, arr, title)
{}
//!
virtual void add_ccb(Ccb_halfedge_const_circulator circ) {
const auto* traits = this->m_arr.geometry_traits();
auto approx = traits->approximate_2_object();
typename Arr::Ccb_halfedge_const_circulator curr = circ;
do {
std::vector<typename Gt::Approximate_point_2> polyline;
approx(curr->curve(), 10, std::back_inserter(polyline));
for (const auto& p : polyline) this->add_point_in_face(p);
} while (++curr != circ);
}
//!
virtual void add_edge(Halfedge_const_handle e) {
const auto* traits = this->m_arr.geometry_traits();
auto approx = traits->approximate_2_object();
std::vector<typename Gt::Approximate_point_2> polyline;
approx(e->curve(), 10, std::back_inserter(polyline));
auto it = polyline.begin();
auto prev = it++;
for (; it != polyline.end(); prev = it++)
this->add_segment(*prev, *it);
}
};
//!
template <typename GeometryTraits_2, typename Dcel> template <typename GeometryTraits_2, typename Dcel>
void draw(const CGAL::Arrangement_2<GeometryTraits_2, Dcel>& arr, void draw(const CGAL::Arrangement_2<GeometryTraits_2, Dcel>& arr,
const char* title = "2D Arrangement Basic Viewer") { const char* title = "2D Arrangement Basic Viewer") {
@ -104,7 +197,8 @@ void draw(const CGAL::Arrangement_2<GeometryTraits_2, Dcel>& arr,
int argc = 1; int argc = 1;
const char* argv[2] = {"t2_viewer", nullptr}; const char* argv[2] = {"t2_viewer", nullptr};
QApplication app(argc, const_cast<char**>(argv)); QApplication app(argc, const_cast<char**>(argv));
Arr_2_viewer_qt<Arr>mainwindow(app.activeWindow(), arr, title); Arr_2_viewer_qt<Gt, Dcel> mainwindow(app.activeWindow(), arr, title);
mainwindow.add_elements();
mainwindow.show(); mainwindow.show();
app.exec(); app.exec();
} }