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

Re-add LCC drawing functions

This commit is contained in:
Thien Hoang 2019-07-28 21:56:44 +07:00
parent 2009469413
commit 07dde8e9aa
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
View File

@ -25,7 +25,6 @@
#ifdef CGAL_USE_BASIC_VIEWER #ifdef CGAL_USE_BASIC_VIEWER
#include <CGAL/Linear_cell_complex_operations.h>
#include <CGAL/Random.h> #include <CGAL/Random.h>
namespace CGAL namespace CGAL
@ -171,7 +170,7 @@ public:
/// @param anofaces if true, do not draw faces (faces are not computed; this can be /// @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) /// usefull for very big object where this time could be long)
SimpleLCCViewerQt(QWidget* parent, SimpleLCCViewerQt(QWidget* parent,
const LCC* alcc=nullptr, const LCC* alcc=NULL,
const char* title="Basic LCC Viewer", const char* title="Basic LCC Viewer",
bool anofaces=false, bool anofaces=false,
const DrawingFunctorLCC& drawing_functor=DrawingFunctorLCC()) : const DrawingFunctorLCC& drawing_functor=DrawingFunctorLCC()) :
@ -245,7 +244,7 @@ protected:
Point p1 = lcc->point(dh); Point p1 = lcc->point(dh);
Dart_const_handle d2 = lcc->other_extremity(dh); Dart_const_handle d2 = lcc->other_extremity(dh);
if (d2!=nullptr) if (d2!=NULL)
{ {
if (m_drawing_functor.colored_edge(*lcc, dh)) if (m_drawing_functor.colored_edge(*lcc, dh))
{ add_segment(p1, lcc->point(d2), m_drawing_functor.edge_color(*lcc, dh)); } { add_segment(p1, lcc->point(d2), m_drawing_functor.edge_color(*lcc, dh)); }
@ -267,7 +266,7 @@ protected:
void compute_elements() void compute_elements()
{ {
clear(); clear();
if (lcc==nullptr) return; if (lcc==NULL) return;
typename LCC::size_type markvolumes = lcc->get_new_mark(); typename LCC::size_type markvolumes = lcc->get_new_mark();
typename LCC::size_type markfaces = lcc->get_new_mark(); typename LCC::size_type markfaces = lcc->get_new_mark();
@ -373,26 +372,16 @@ protected:
const DrawingFunctorLCC& m_drawing_functor; const DrawingFunctorLCC& m_drawing_functor;
}; };
// Specialization of draw function. template<class LCC, class DrawingFunctorLCC>
#define CGAL_LCC_TYPE CGAL::Linear_cell_complex_base \ void draw(const LCC& alcc,
<d_, ambient_dim, Traits_, Items_, Alloc_, Map, Refs, Storage_> const char* title,
bool nofill,
template < unsigned int d_, unsigned int ambient_dim, const DrawingFunctorLCC& drawing_functor)
class Traits_,
class Items_,
class Alloc_,
template<unsigned int,class,class,class,class>
class Map,
class Refs,
class Storage_>
void draw(const CGAL_LCC_TYPE& alcc,
const char* title="LCC for CMap Basic Viewer",
bool nofill=false)
{ {
#if defined(CGAL_TEST_SUITE) #if defined(CGAL_TEST_SUITE)
bool cgal_test_suite=true; bool cgal_test_suite=true;
#else #else
bool cgal_test_suite=qEnvironmentVariableIsSet("CGAL_TEST_SUITE"); bool cgal_test_suite=false;
#endif #endif
if (!cgal_test_suite) if (!cgal_test_suite)
@ -400,16 +389,30 @@ void draw(const CGAL_LCC_TYPE& alcc,
int argc=1; int argc=1;
const char* argv[2]={"lccviewer","\0"}; const char* argv[2]={"lccviewer","\0"};
QApplication app(argc,const_cast<char**>(argv)); QApplication app(argc,const_cast<char**>(argv));
DefaultDrawingFunctorLCC fcolor; SimpleLCCViewerQt<LCC, DrawingFunctorLCC> mainwindow(app.activeWindow(),
SimpleLCCViewerQt<CGAL_LCC_TYPE, DefaultDrawingFunctorLCC> &alcc,
mainwindow(app.activeWindow(), &alcc, title, nofill, fcolor); title,
nofill,
drawing_functor);
mainwindow.show(); mainwindow.show();
app.exec(); app.exec();
} }
} }
// Todo a function taking a const DrawingFunctorLCC& drawing_functor as parameter template<class LCC>
#undef CGAL_LCC_TYPE void draw(const LCC& alcc, const char* title, bool nofill)
{
DefaultDrawingFunctorLCC f;
draw(alcc, title, nofill, f);
}
template<class LCC>
void draw(const LCC& alcc, const char* title)
{ draw(alcc, title, false); }
template<class LCC>
void draw(const LCC& alcc)
{ draw(alcc, "Basic LCC Viewer"); }
} // End namespace CGAL } // End namespace CGAL