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

Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined.

This commit is contained in:
Guillaume Damiand 2018-01-16 19:57:41 +01:00 committed by Maxime Gimeno
parent c7a4236281
commit 5d375eff74
4 changed files with 69 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Polyhedron/include/CGAL/Polyhedron_viewer_qt.h
View File

@ -206,6 +206,15 @@ void draw(const Polyhedron& apoly,
app.exec();
}
template<class Polyhedron>
void draw(const Polyhedron& apoly,
const char* title="Polyhedron Viewer",
bool nofill=false)
{
return display<Polyhedron, DefaultColorFunctorPolyhedron>
(apoly, title, nofill);
}
} // End namespace CGAL
#else // CGAL_USE_BASIC_VIEWER
@ -223,20 +232,17 @@ void draw(const Polyhedron&,
<<std::endl;
}
template<class Polyhedron>
void draw(const Polyhedron&,
const char* ="Polyhedron Viewer",
bool=false)
{
std::cerr<<"Impossible to draw a Polyhedron_3 because CGAL_USE_BASIC_VIEWER is not defined."
<<std::endl;
}
} // End namespace CGAL
#endif // CGAL_USE_BASIC_VIEWER
namespace CGAL
{
template<class Polyhedron>
void draw(const Polyhedron& apoly,
const char* title="Polyhedron Viewer",
bool nofill=false)
{ return display<Polyhedron, DefaultColorFunctorPolyhedron>
(apoly, title, nofill); }
} // End namespace CGAL
#endif // CGAL_POLYHEDRON_VIEWER_QT_H

30
Surface_mesh/include/CGAL/Surface_mesh_viewer_qt.h
View File

@ -198,6 +198,12 @@ void draw(const SM& amesh,
app.exec();
}
template<class SM>
void draw(const SM& amesh,
const char* title="Surface Mesh Viewer",
bool nofill=false)
{ return draw<SM, DefaultColorFunctorSM>(amesh, title, nofill); }
} // End namespace CGAL
#else // CGAL_USE_BASIC_VIEWER
@ -207,9 +213,18 @@ namespace CGAL
template<class SM, class ColorFunctor>
void draw(const SM&,
const char*="Surface Mesh Viewer",
const char* ="Surface Mesh Viewer",
bool=false,
const ColorFunctor&=ColorFunctor())
const ColorFunctor& =ColorFunctor())
{
std::cerr<<"Impossible to draw a Surface mesh because CGAL_USE_BASIC_VIEWER is not defined."
<<std::endl;
}
template<class SM>
void draw(const SM&,
const char* ="Surface Mesh Viewer",
bool=false)
{
std::cerr<<"Impossible to draw a Surface mesh because CGAL_USE_BASIC_VIEWER is not defined."
<<std::endl;
@ -219,15 +234,4 @@ void draw(const SM&,
#endif // CGAL_USE_BASIC_VIEWER
namespace CGAL
{
template<class SM>
void draw(const SM& amesh,
const char* title="Surface Mesh Viewer",
bool nofill=false)
{ return draw<SM, DefaultColorFunctorSM>(amesh, title, nofill); }
} // End namespace CGAL
#endif // CGAL_SURFACE_MESH_VIEWER_QT_H

30
Triangulation_2/include/CGAL/Triangulation_2_viewer_qt.h
View File

@ -147,6 +147,12 @@ void draw(const T2& at2,
app.exec();
}
template<class T2>
void draw(const T2& at2,
const char* title="T2 Viewer",
bool nofill=false)
{ return display<T2, DefaultColorFunctorT2>(at2, title, nofill); }
} // End namespace CGAL
#else // CGAL_USE_BASIC_VIEWER
@ -156,9 +162,18 @@ namespace CGAL
template<class T2, class ColorFunctor>
void draw(const T2&,
const char*="T2 Viewer",
const char* ="T2 Viewer",
bool=false,
const ColorFunctor&=ColorFunctor())
const ColorFunctor& =ColorFunctor())
{
std::cerr<<"Impossible to draw a Triangulation_2 because CGAL_USE_BASIC_VIEWER is not defined."
<<std::endl;
}
template<class T2>
void draw(const T2&,
const char* ="T2 Viewer",
bool=false)
{
std::cerr<<"Impossible to draw a Triangulation_2 because CGAL_USE_BASIC_VIEWER is not defined."
<<std::endl;
@ -168,15 +183,4 @@ void draw(const T2&,
#endif // CGAL_USE_BASIC_VIEWER
namespace CGAL
{
template<class T2>
void draw(const T2& at2,
const char* title="T2 Viewer",
bool nofill=false)
{ return display<T2, DefaultColorFunctorT2>(at2, title, nofill); }
} // End namespace CGAL
#endif // CGAL_T2_VIEWER_QT_H

30
Triangulation_3/include/CGAL/Triangulation_3_viewer_qt.h
View File

@ -151,6 +151,12 @@ void draw(const T3& at3,
app.exec();
}
template<class T3>
void draw(const T3& at3,
const char* title="t3_viewer",
bool nofill=false)
{ return display<T3, DefaultColorFunctor>(at3, title, nofill); }
} // End namespace CGAL
#else // CGAL_USE_BASIC_VIEWER
@ -160,9 +166,18 @@ namespace CGAL
template<class T3, class ColorFunctor>
void draw(const T3&,
const char*="T3 Viewer",
const char* ="T3 Viewer",
bool=false,
const ColorFunctor&=ColorFunctor())
const ColorFunctor& =ColorFunctor())
{
std::cerr<<"Impossible to draw a Triangulation_3 because CGAL_USE_BASIC_VIEWER is not defined."
<<std::endl;
}
template<class T3>
void draw(const T3&,
const char* ="t3_viewer",
bool=false)
{
std::cerr<<"Impossible to draw a Triangulation_3 because CGAL_USE_BASIC_VIEWER is not defined."
<<std::endl;
@ -172,15 +187,4 @@ void draw(const T3&,
#endif // CGAL_USE_BASIC_VIEWER
namespace CGAL
{
template<class T3>
void draw(const T3& at3,
const char* title="t3_viewer",
bool nofill=false)
{ return display<T3, DefaultColorFunctor>(at3, title, nofill); }
} // End namespace CGAL
#endif // CGAL_T3_VIEWER_QT_H