refactor, cleanup, put code where it belongs, make simple logging class

1 files changed, 6 insertions, 250 deletions

diff --git a/src/cgalutils.cc b/src/cgalutils.cc
index 94e990a..601b6f3 100644
--- a/src/cgalutils.cc
+++ b/src/cgalutils.cc
@@ -4,17 +4,6 @@
 #include "polyset.h"
 #include "printutils.h"
 #include "cgal.h"
-#include <CGAL/bounding_box.h>
-typedef CGAL::Point_3<CGAL_Kernel3> CGAL_Point_3;
-typedef CGAL::Iso_cuboid_3<CGAL_Kernel3> CGAL_Iso_cuboid_3;
-
-typedef CGAL_Nef_polyhedron2::Explorer::Point CGAL_Point_2;
-// Iso_rectangle needs to match  CGAL_Nef2::Explorer::Point
-// which is different than CGAL_Kernel2::Point
-typedef CGAL::Iso_rectangle_2< CGAL::Simple_cartesian<NT> > CGAL_Iso_rectangle_2;
-
-#include <boost/algorithm/string.hpp>
-#include <map>
 
 PolySet *createPolySetFromPolyhedron(const CGAL_Polyhedron &p)
 {
@@ -154,45 +143,12 @@ CGAL_Polyhedron *createPolyhedronFromPolySet(const PolySet &ps)
 }
 
 
-std::string svg_header()
-{
-	std::stringstream out;
-  out << "<svg width='480px' height='480px'"
-		<< " xmlns='http://www.w3.org/2000/svg' version='1.1'>";
-	return out.str();
-}
-
-std::string svg_label(std::string s)
-{
-	std::stringstream out;
-	out << "<text fill='black' x='20' y='40' font-size='24'>" << s << "</text>";
-	return out.str();
-}
-std::string svg_border()
-{
-	std::stringstream out;
-	out << " <!-- border -->\n";
-	out << "  <polyline points='0,0 480,0 480,480 0,480'"
-		<< " style='fill:none;stroke:black' />\n";
-	out << " <!-- /border -->";
-	return out.str();
-}
-
-std::string svg_axes()
-{
-	std::stringstream out;
-	out << " <!-- axes -->\n";
-	out << "  <polyline points='10,455 10,475 10,465 18,465 2,465 10,465 14,461 6,469 10,465'"
-		<< " style='fill:none;stroke:black;' />\n";
-	out << " <!-- /axes -->";
-	return out.str();
-}
-
 CGAL_Iso_cuboid_3 bounding_box( const CGAL_Nef_polyhedron3 &N )
 {
 	CGAL_Iso_cuboid_3 result(-1,-1,-1,1,1,1);
 	CGAL_Nef_polyhedron3::Vertex_const_iterator vi;
 	std::vector<CGAL_Nef_polyhedron3::Point_3> points;
+	// can be optimized by rewriting bounding_box to accept vertices
 	CGAL_forall_vertices( vi, N )
 		points.push_back( vi->point() );
 	if (points.size())
@@ -200,12 +156,13 @@ CGAL_Iso_cuboid_3 bounding_box( const CGAL_Nef_polyhedron3 &N )
 	return result;
 }
 
-CGAL_Iso_rectangle_2 bounding_box( const CGAL_Nef_polyhedron2 &N )
+CGAL_Iso_rectangle_2e bounding_box( const CGAL_Nef_polyhedron2 &N )
 {
-	CGAL_Iso_rectangle_2 result(-1,-1,1,1);
-  CGAL_Nef_polyhedron2::Explorer explorer = N.explorer();
+	CGAL_Iso_rectangle_2e result(-1,-1,1,1);
+	CGAL_Nef_polyhedron2::Explorer explorer = N.explorer();
 	CGAL_Nef_polyhedron2::Explorer::Vertex_const_iterator vi;
-	std::vector<CGAL_Point_2> points;
+	std::vector<CGAL_Point_2e> points;
+	// can be optimized by rewriting bounding_box to accept vertices
 	for ( vi = explorer.vertices_begin(); vi != explorer.vertices_end(); ++vi )
 		if ( explorer.is_standard( vi ) )
 			points.push_back( explorer.point( vi ) );
@@ -214,208 +171,7 @@ CGAL_Iso_rectangle_2 bounding_box( const CGAL_Nef_polyhedron2 &N )
 	return result;
 }
 
-CGAL_Point_2 project_svg_3to2( CGAL_Point_3 p, CGAL_Iso_cuboid_3 bbox )
-{
-	// do simple fake isometric projection
-	double x = CGAL::to_double( p.x() );
-	double y = CGAL::to_double( p.y() );
-	double z = CGAL::to_double( p.z() );
-	double screenw = 480;
-	double screenh = 480;
-	double borderw = screenw * 0.1618;
-	double borderh = screenh * 0.1618;
-	double vizw = screenw - borderw*2;
-	double vizh = screenh - borderh*2;
-	double bboxx = CGAL::to_double( bbox.xmax() - bbox.xmin() );
-	double bboxy = CGAL::to_double( bbox.ymax() - bbox.ymin() );
-	double bboxz = CGAL::to_double( bbox.zmax() - bbox.zmin() );
-	double xinbox = CGAL::to_double( p.x() ) - CGAL::to_double( bbox.xmin() );
-	double yinbox = CGAL::to_double( p.y() ) - CGAL::to_double( bbox.ymin() );
-	double zinbox = CGAL::to_double( p.z() ) - CGAL::to_double( bbox.zmin() );
-	double tx = borderw + ( xinbox / ( bboxx==0?1:bboxx ) ) * ( vizw );
-	double ty = screenh - borderh - ( zinbox / ( bboxz==0?1:bboxz ) ) * ( vizh );
-	tx += ( yinbox / ( bboxy==0?1:bboxy ) ) / 3;
-	ty -= ( yinbox / ( bboxy==0?1:bboxy ) ) / 3;
-	return CGAL_Point_2( tx, ty );
-}
-
-CGAL_Point_2 project_svg_2to2( CGAL_Point_2 p, CGAL_Iso_rectangle_2 bbox )
-{
-	double x = CGAL::to_double( p.x() );
-	double y = CGAL::to_double( p.y() );
-	double screenw = 480;
-	double screenh = 480;
-	double borderw = screenw * 0.1618;
-	double borderh = screenh * 0.1618;
-	double vizw = screenw - borderw*2;
-	double vizh = screenh - borderh*2;
-	double bboxw = CGAL::to_double( bbox.xmax() - bbox.xmin() );
-	double bboxh = CGAL::to_double( bbox.ymax() - bbox.ymin() );
-	double xinbox = CGAL::to_double( p.x() ) - CGAL::to_double( bbox.xmin() );
-	double yinbox = CGAL::to_double( p.y() ) - CGAL::to_double( bbox.ymin() );
-	double tx = borderw + ( xinbox / ( bboxw==0?1:bboxw ) ) * ( vizw );
-	double ty = screenh - borderh - ( yinbox / ( bboxh==0?1:bboxh ) ) * ( vizh );
-/*	std::cout << "\nx, y " << x << "," << y << "\n";
-	std::cout << "bbw, bbh " << bboxw << "," << bboxh << "\n";
-	std::cout << "xinb, yinb " << xinbox << "," << yinbox << "\n";
-	std::cout << "vizw, vizh " << vizw <<  "," << vizh << "\n";
-	std::cout << "tx, ty " << tx << "," << ty << "\n";
-*/
-	return CGAL_Point_2( tx, ty );
-}
-
-// for debugging, not necessarily pretty or useful for users.
-std::string dump_cgal_nef_polyhedron2_face_svg(
-	CGAL_Nef_polyhedron2::Explorer::Halfedge_around_face_const_circulator c1,
-	CGAL_Nef_polyhedron2::Explorer::Halfedge_around_face_const_circulator c2,
-	CGAL_Nef_polyhedron2::Explorer explorer,
-	std::string color,
-	bool mark,
-	CGAL_Iso_rectangle_2 bbox )
-{
-  std::stringstream out;
-	CGAL_For_all(c1, c2) {
-		if ( explorer.is_standard( explorer.target(c1) ) ) {
-			CGAL_Point_2 source = explorer.point( explorer.source( c1 ) );
-			CGAL_Point_2 target = explorer.point( explorer.target( c1 ) );
-			CGAL_Point_2 tp1 = project_svg_2to2( source, bbox );
-			CGAL_Point_2 tp2 = project_svg_2to2( target, bbox );
-			double mod=0;
-			if (color=="green") mod=10;
-			out << "      <!-- mark: " << c1->mark() << " -->\n";
-      out << "      <line"
-			  << " x1='" << CGAL::to_double(tp1.x()) + mod << "'"
-			  << " y1='" << CGAL::to_double(tp1.y()) - mod << "'"
-			  << " x2='" << CGAL::to_double(tp2.x()) + mod << "'"
-			  << " y2='" << CGAL::to_double(tp2.y()) - mod << "'"
-			  << " stroke='" << color << "'";
-			if (mark) out << " stroke-dasharray='4 4' />\n";
-			else out << " />\n";
-			// crude "arrowhead" to indicate directionality
-			out << "      <circle"
-			  << " cx='" << CGAL::to_double(tp1.x()+ (tp2.x()-tp1.x())* 7/8) + mod << "'"
-			  << " cy='" << CGAL::to_double(tp1.y()+ (tp2.y()-tp1.y())* 7/8) - mod << "'"
-			  << " r='2'"
-			  << " fill='" << color << "' stroke='" << color << "' />\n";
-		}
-	}
-	return out.str();
-}
 
-std::string dump_cgal_nef_polyhedron2_svg( const CGAL_Nef_polyhedron2 &N )
-{
-  std::stringstream out;
-  CGAL_Nef_polyhedron2::Explorer explorer = N.explorer();
-
-	CGAL_Iso_rectangle_2 bbox = bounding_box( N );
-
-  CGAL_Nef_polyhedron2::Explorer::Face_const_iterator i;
-  out << " <svg y='" << svg_counter << "' width='480px' height='480px' xmlns='http://www.w3.org/2000/svg' version='1.1'>\n";
-	out << svg_border() << "\n" << svg_axes() << "\n";
-	svg_counter+=480;
-	if ((svg_counter/480)%3==0) svg_counter += 24;
-	if ((svg_counter/480)%3==1) out << svg_label("old accumulator") << "\n";
-	if ((svg_counter/480)%3==2) out << svg_label("new nef poly") << "\n";
-	if ((svg_counter/480)%3==0) out << svg_label("new accumulator") << "\n";
-
-	for ( i = explorer.faces_begin(); i!= explorer.faces_end(); ++i ) {
-			out << "  <!-- face begin. mark: " << i->mark() << "  -->\n";
-			CGAL_Nef_polyhedron2::Explorer::Halfedge_around_face_const_circulator c1
-				= explorer.face_cycle( i ), c2 ( c1 );
-			out << dump_cgal_nef_polyhedron2_face_svg( c1, c2, explorer, "red", i->mark(), bbox );
-
-		  CGAL_Nef_polyhedron2::Explorer::Hole_const_iterator j;
-			for ( j = explorer.holes_begin( i ); j!= explorer.holes_end( i ); ++j ) {
-				out << "   <!-- hole begin. mark: " << j->mark() << " -->\n";
-				CGAL_Nef_polyhedron2::Explorer::Halfedge_around_face_const_circulator c3( j ), c4 ( c3 );
-				out << dump_cgal_nef_polyhedron2_face_svg( c3, c4, explorer, "green", j->mark(), bbox );
-				out << "   <!-- hole end -->\n";
-			}
-			out << "  <!-- face end -->\n";
-  }
-  out << "</svg>";
-	std::string tmp = out.str();
-	boost::replace_all( tmp, "'", "\"" );
-	return tmp;
-}
-
-
-// This uses the Shell Explorer pattern from the CGAL Manual to dump the 3d Nef Polyhedron information
-// http://www.cgal.org/Manual/latest/doc_html/cgal_manual/Nef_3/Chapter_main.html#Subsection_29.7.2
-class NefPoly3_dumper_svg {
-public:
-	std::stringstream out;
-	CGAL_Iso_cuboid_3 bbox;
-	NefPoly3_dumper_svg(const CGAL_Nef_polyhedron3& N)
-	{
-		bbox = bounding_box( N );
-	}
-	void visit(CGAL_Nef_polyhedron3::Vertex_const_handle v) {}
-	void visit(CGAL_Nef_polyhedron3::Halfedge_const_handle ) {}
-	void visit(CGAL_Nef_polyhedron3::SHalfedge_const_handle ) {}
-	void visit(CGAL_Nef_polyhedron3::SHalfloop_const_handle shh ){}
-	void visit(CGAL_Nef_polyhedron3::SFace_const_handle ) {}
-	void visit( CGAL_Nef_polyhedron3::Halffacet_const_handle hfacet )
-	{
-		int contour_count = 0;
-		out << "  <!-- Halffacet. Mark: " << (*hfacet).mark() << " -->\n";
-		CGAL_Nef_polyhedron3::Halffacet_cycle_const_iterator i;
-		CGAL_forall_facet_cycles_of( i, hfacet ) {
-			CGAL_Nef_polyhedron3::SHalfloop_const_handle shl_handle;
-			out << "   <!-- Halffacet cycle: -->\n";
-			if ( contour_count == 0 ) {
-				out << "    <!-- Body contour:--> \n";
-			} else {
-				out << "    <!-- Hole contour:--> \n" ;
-			}
-			CGAL_Nef_polyhedron3::SHalfedge_around_facet_const_circulator c1(i), c2(c1);
-			CGAL_For_all( c1, c2 ) {
-				out << "     <line";
-				// don't know why we use source()->source(), except thats what CGAL does internally
-				CGAL_Point_3 source = c1->source()->source()->point();
-				CGAL_Point_3 target = c1->source()->target()->point();
-				CGAL_Point_2 tp1 = project_svg_3to2 ( source, bbox );
-				CGAL_Point_2 tp2 = project_svg_3to2 ( target, bbox );
-				out << " "
-					<< "x1='" << CGAL::to_double(tp1.x()) << "' "
-					<< "y1='" << CGAL::to_double(tp1.y()) << "' "
-					<< "x2='" << CGAL::to_double(tp2.x()) << "' "
-					<< "y2='" << CGAL::to_double(tp2.y()) << "' "
-				  << "stroke='red' />\n";
-			}
-			contour_count++;
-		} // next facet cycle (i.e. next contour)
-	} // visit()
-
-};
-
-
-std::string dump_cgal_nef_polyhedron3_svg( const CGAL_Nef_polyhedron3 &N )
-{
-  std::stringstream out;
-	out << svg_header << "\n" << svg_border() << "\n" << svg_axes() << "\n";
-	out << "<!--CGAL_Nef_polyhedron3 dump begin-->\n";
-
-  CGAL_Nef_polyhedron3::Volume_const_iterator c;
-  CGAL_forall_volumes(c,N) {
-    out << " <!--Processing volume...-->\n";
-    out << "  <!--Mark: " << (*c).mark() << "-->\n";
-    CGAL_Nef_polyhedron3::Shell_entry_const_iterator it;
-    CGAL_forall_shells_of(it,c) {
-      out << "  <!--Processing shell...-->\n";
-      NefPoly3_dumper_svg dumper_svg(N);
-      N.visit_shell_objects(CGAL_Nef_polyhedron3::SFace_const_handle(it), dumper_svg );
-			out << dumper_svg.out.str();
-      out << "  <!--Processing shell end-->\n";
-    }
-    out << " <!--Processing volume end-->\n";
-  }
-  out << "<!--CGAL_Nef_polyhedron3 dump end-->\n";
-	out << "</svg>";
-	std::string tmp = out.str();
-	boost::replace_all( tmp, "'", "\"" );
-  return tmp;
-}
 
 
 #endif /* ENABLE_CGAL */