1 files changed, 67 insertions, 12 deletions

diff --git a/src/Stitch.cxx b/src/Stitch.cxx
index 535995f..1fe3d88 100644
--- a/src/Stitch.cxx
+++ b/src/Stitch.cxx
@@ -26,6 +26,7 @@
 
 #include <Fl/Fl.H>
 
+#include "OutputImage.H"
 #include "Stitch.H"
 
 static double pi_d = asin(1.0) * 2.0;
@@ -33,7 +34,9 @@ static double pi_d = asin(1.0) * 2.0;
 Stitch::Stitch() {
 	for (int i=0; i<MAX_PICS; i++) {
 		gipf[i] = NULL;
+		single_images[i] = NULL;
 	}
+	merged_image = NULL;
 }
 
 Stitch::~Stitch() {
@@ -63,34 +66,86 @@ Stitch::load_image(char *file) {
 
 }
 
+OutputImage*
+Stitch::set_output(OutputImage *img) {
+	OutputImage *ret = merged_image;
+	merged_image = img;
+	return ret;
+}
+
+OutputImage*
+Stitch::set_output(const char *file, OutputImage *img) {
+	OutputImage *ret = NULL;
+
+	for (int i=0; i<MAX_PICS; i++) {
+		if (gipf[i] != NULL) {
+			const char *img_file = gipf[i]->get_image_filename();
+			if (img_file && strcmp(file, img_file) == 0) {
+				ret = single_images[i];
+				single_images[i] = img;
+				break;
+			}
+		}
+	}
+
+	return ret;
+}
+
 int
-Stitch::resample(DataImage *img,
+Stitch::resample(int w, int h,
             double view_start, double view_end) {
-	double step_view = (view_end - view_start) / img->w();
+	double step_view = (view_end - view_start) / w;
 	char r, g, b;
-	int y_off = img->h() / 2;
- 	double radius = (double) img->w() / (view_end -view_start);
+	int y_off = h / 2;
+	int merged_pixel_set;
+ 	double radius = (double) w / (view_end -view_start);
 
-	for (int y=0; y<img->h(); y++) {
+	if (merged_image) {
+		merged_image->init(w, h);
+	}
+	for (int i=0; i<MAX_PICS; i++) {
+		if (single_images[i]) {
+			single_images[i]->init(w, h);
+		}
+	}
+
+	for (int y=0; y<h; y++) {
 		double a_nick = atan((double)(y_off - y)/radius);
 
-		for (int x=0; x<img->w(); x++) {
+		for (int x=0; x<w; x++) {
 			double a_view;
 			a_view = view_start + x * step_view;
-
+			merged_pixel_set = 0;
 			for (int i=0; i<MAX_PICS; i++) {
 				if (gipf[i] == NULL) {
 					break;
 				} else if (gipf[i]->get_pixel(a_view, a_nick, &r, &g, &b)==0) {
-					img->set_pixel(x, y, r, g, b);
-					break;
+					if (single_images[i]) {
+						single_images[i]->set_pixel(x, r, g, b);
+					}
+					if (!merged_pixel_set && merged_image) {
+						merged_image->set_pixel(x, r, g, b);
+						merged_pixel_set++;
+					}
 				}
 			}
 		}
+		if (merged_image) {
+			merged_image->next_line();
+		}
+		for (int i=0; i<MAX_PICS; i++) {
+			if (single_images[i]) {
+				single_images[i]->next_line();
+			}
+		}
+	}
 
-		if (y % (img->h() / 100 + 1) == 0) {
-			img->redraw();
-			Fl::check();
+	if (merged_image) {
+		merged_image->done();
+	}
+	for (int i=0; i<MAX_PICS; i++) {
+		if (single_images[i]) {
+			single_images[i]->done();
 		}
 	}
 }