From aa1907bf9300e8b85f5989aa2fdf095fa977ef88 Mon Sep 17 00:00:00 2001
From: Thien Hoang <thienvhoang99@gmail.com>
Date: Sun, 11 Aug 2019 10:46:25 +0700
Subject: [PATCH] Roll back draw_linear_cell_complex.h

---
 .../include/CGAL/draw_linear_cell_complex.h   | 61 +++++++++----------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
index 26333eabd9a..a0a18378998 100644
--- a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
+++ b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
@@ -25,6 +25,7 @@
 
 #ifdef CGAL_USE_BASIC_VIEWER
 
+#include <CGAL/Linear_cell_complex_operations.h>
 #include <CGAL/Random.h>
 
 namespace CGAL
@@ -170,7 +171,7 @@ public:
   /// @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)
   SimpleLCCViewerQt(QWidget* parent,
-                    const LCC* alcc=NULL,
+                    const LCC* alcc=nullptr,
                     const char* title="Basic LCC Viewer",
                     bool anofaces=false,
                     const DrawingFunctorLCC& drawing_functor=DrawingFunctorLCC()) :
@@ -244,7 +245,7 @@ protected:
 
     Point p1 = lcc->point(dh);
     Dart_const_handle d2 = lcc->other_extremity(dh);
-    if (d2!=NULL)
+    if (d2!=nullptr)
     {
       if (m_drawing_functor.colored_edge(*lcc, dh))
       { add_segment(p1, lcc->point(d2), m_drawing_functor.edge_color(*lcc, dh)); }
@@ -266,7 +267,7 @@ protected:
   void compute_elements()
   {
     clear();
-    if (lcc==NULL) return;
+    if (lcc==nullptr) return;
     
     typename LCC::size_type markvolumes  = lcc->get_new_mark();
     typename LCC::size_type markfaces    = lcc->get_new_mark();
@@ -371,51 +372,47 @@ protected:
   bool m_random_face_color;
   const DrawingFunctorLCC& m_drawing_functor;
 };
-  
-template<class LCC, class DrawingFunctorLCC>
-void draw(const LCC& alcc,
-          const char* title,
-          bool nofill,
-          const DrawingFunctorLCC& drawing_functor)
+
+// Specialization of draw function.
+#define CGAL_LCC_TYPE CGAL::Linear_cell_complex_base                    \
+  <d_, ambient_dim, Traits_, Items_, Alloc_, Map, Refs, Storage_>
+
+template < unsigned int d_, unsigned int ambient_dim,
+           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)
   bool cgal_test_suite=true;
 #else
-  bool cgal_test_suite=false;
+  bool cgal_test_suite=qEnvironmentVariableIsSet("CGAL_TEST_SUITE");
 #endif
-
+  
   if (!cgal_test_suite)
   {
     int argc=1;
     const char* argv[2]={"lccviewer","\0"};
     QApplication app(argc,const_cast<char**>(argv));
-    SimpleLCCViewerQt<LCC, DrawingFunctorLCC> mainwindow(app.activeWindow(),
-                                                         &alcc,
-                                                         title,
-                                                         nofill,
-                                                         drawing_functor);
+    DefaultDrawingFunctorLCC fcolor;
+    SimpleLCCViewerQt<CGAL_LCC_TYPE, DefaultDrawingFunctorLCC>
+      mainwindow(app.activeWindow(), &alcc, title, nofill, fcolor);
     mainwindow.show();
     app.exec();
   }
 }
 
-template<class LCC>
-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"); }
-  
+// Todo a function taking a const DrawingFunctorLCC& drawing_functor as parameter
+#undef CGAL_LCC_TYPE
+
 } // End namespace CGAL
 
 #endif // CGAL_USE_BASIC_VIEWER
 
-#endif // CGAL_DRAW_LCC_H
\ No newline at end of file
+#endif // CGAL_DRAW_LCC_H