1 files changed, 49 insertions, 91 deletions

diff --git a/src/export.cc b/src/export.cc
index c207f2b..bb389a0 100644
--- a/src/export.cc
+++ b/src/export.cc
@@ -30,52 +30,18 @@
 
 #include <QApplication>
 #include <QProgressDialog>
+#include <QTextStream>
 #include <errno.h>
 #include <fstream>
 
 #ifdef ENABLE_CGAL
 #include "cgal.h"
 
-void cgal_nef3_to_polyset(PolySet *ps, CGAL_Nef_polyhedron *root_N)
-{
-	CGAL_Polyhedron P;
-	root_N->p3.convert_to_Polyhedron(P);
-
-	typedef CGAL_Polyhedron::Vertex                                 Vertex;
-	typedef CGAL_Polyhedron::Vertex_const_iterator                  VCI;
-	typedef CGAL_Polyhedron::Facet_const_iterator                   FCI;
-	typedef CGAL_Polyhedron::Halfedge_around_facet_const_circulator HFCC;
-
-	for (FCI fi = P.facets_begin(); fi != P.facets_end(); ++fi) {
-		HFCC hc = fi->facet_begin();
-		HFCC hc_end = hc;
-		Vertex v1, v2, v3;
-		v1 = *VCI((hc++)->vertex());
-		v3 = *VCI((hc++)->vertex());
-		do {
-			v2 = v3;
-			v3 = *VCI((hc++)->vertex());
-			double x1 = CGAL::to_double(v1.point().x());
-			double y1 = CGAL::to_double(v1.point().y());
-			double z1 = CGAL::to_double(v1.point().z());
-			double x2 = CGAL::to_double(v2.point().x());
-			double y2 = CGAL::to_double(v2.point().y());
-			double z2 = CGAL::to_double(v2.point().z());
-			double x3 = CGAL::to_double(v3.point().x());
-			double y3 = CGAL::to_double(v3.point().y());
-			double z3 = CGAL::to_double(v3.point().z());
-			ps->append_poly();
-			ps->append_vertex(x1, y1, z1);
-			ps->append_vertex(x2, y2, z2);
-			ps->append_vertex(x3, y3, z3);
-		} while (hc != hc_end);
-	}
-}
-
 /*!
-	Saves the current 3D CGAL Nef polyhedron as STL to the given absolute filename.
+	Saves the current 3D CGAL Nef polyhedron as STL to the given file.
+	The file must be open.
  */
-void export_stl(CGAL_Nef_polyhedron *root_N, QString filename, QProgressDialog *pd)
+void export_stl(CGAL_Nef_polyhedron *root_N, QTextStream &output, QProgressDialog *pd)
 {
 	CGAL_Polyhedron P;
 	root_N->p3.convert_to_Polyhedron(P);
@@ -157,7 +123,7 @@ void export_stl(CGAL_Nef_polyhedron *root_N, QString filename, QProgressDialog *
 	setlocale(LC_NUMERIC, "");      // Set default locale
 }
 
-void export_off(CGAL_Nef_polyhedron*, QString, QProgressDialog*)
+void export_off(CGAL_Nef_polyhedron*, QTextStream&, QProgressDialog*)
 {
 	PRINTF("WARNING: OFF import is not implemented yet.");
 }
@@ -165,71 +131,63 @@ void export_off(CGAL_Nef_polyhedron*, QString, QProgressDialog*)
 /*!
 	Saves the current 2D CGAL Nef polyhedron as DXF to the given absolute filename.
  */
-void export_dxf(CGAL_Nef_polyhedron *root_N, QString filename, QProgressDialog *)
+void export_dxf(CGAL_Nef_polyhedron *root_N, QTextStream &output, QProgressDialog *)
 {
-	FILE *f = fopen(filename.toUtf8().data(), "w");
-	if (!f) {
-		PRINTA("Can't open DXF file \"%1\" for DXF export: %2", 
-					 filename, QString(strerror(errno)));
-		set_output_handler(NULL, NULL);
-		return;
-	}
-
 	setlocale(LC_NUMERIC, "C"); // Ensure radix is . (not ,) in output
 	// Some importers (e.g. Inkscape) needs a BLOCKS section to be present
-	fprintf(f, "  0\n"
-					"SECTION\n"
-					"  2\n"
-					"BLOCKS\n"
-					"  0\n"
-					"ENDSEC\n");
-
-	fprintf(f, "  0\n"
-					"SECTION\n"
-					"  2\n"
-					"ENTITIES\n");
+	output << "  0\n"
+				 <<	"SECTION\n"
+				 <<	"  2\n"
+				 <<	"BLOCKS\n"
+				 <<	"  0\n"
+				 << "ENDSEC\n"
+				 << "  0\n"
+				 << "SECTION\n"
+				 << "  2\n"
+				 << "ENTITIES\n";
 
 	DxfData dd(*root_N);
 	for (int i=0; i<dd.paths.size(); i++)
 	{
 		for (int j=1; j<dd.paths[i].points.size(); j++) {
-			DxfData::Point *p1 = dd.paths[i].points[j-1];
-			DxfData::Point *p2 = dd.paths[i].points[j];
-			double x1 = p1->x;
-			double y1 = p1->y;
-			double x2 = p2->x;
-			double y2 = p2->y;
-			fprintf(f, "  0\n");
-			fprintf(f, "LINE\n");
+			const Vector2d &p1 = *dd.paths[i].points[j-1];
+			const Vector2d &p2 = *dd.paths[i].points[j];
+			double x1 = p1[0];
+			double y1 = p1[1];
+			double x2 = p2[0];
+			double y2 = p2[1];
+			output << "  0\n"
+						 << "LINE\n";
 			// Some importers (e.g. Inkscape) needs a layer to be specified
-			fprintf(f, "  8\n");
-			fprintf(f, "0\n");
-			fprintf(f, " 10\n");
-			fprintf(f, "%f\n", x1);
-			fprintf(f, " 11\n");
-			fprintf(f, "%f\n", x2);
-			fprintf(f, " 20\n");
-			fprintf(f, "%f\n", y1);
-			fprintf(f, " 21\n");
-			fprintf(f, "%f\n", y2);
+			output << "  8\n"
+						 << "0\n"
+						 << " 10\n"
+						 << x1 << "\n"
+						 << " 11\n"
+						 << x2 << "\n"
+						 << " 20\n"
+						 << y1 << "\n"
+						 << " 21\n"
+						 << y2 << "\n";
 		}
 	}
+	
+	output << "  0\n"
+				 << "ENDSEC\n";
 
-	fprintf(f, "  0\n");
-	fprintf(f, "ENDSEC\n");
 	// Some importers (e.g. Inkscape) needs an OBJECTS section with a DICTIONARY entry
-	fprintf(f, "  0\n"
-					"SECTION\n"
-					"  2\n"
-					"OBJECTS\n"
-					"  0\n"
-					"DICTIONARY\n"
-					"  0\n"
-					"ENDSEC\n");
-	fprintf(f, "  0\n");
-	fprintf(f, "EOF\n");
-
-	fclose(f);
+	output << "  0\n"
+				 << "SECTION\n"
+				 << "  2\n"
+				 << "OBJECTS\n"
+				 << "  0\n"
+				 << "DICTIONARY\n"
+				 << "  0\n"
+				 << "ENDSEC\n";
+
+	output << "  0\n"
+				 <<"EOF\n";
+
 	setlocale(LC_NUMERIC, "");      // Set default locale
 }