From d47080e941184c48e76f535111a4657639d1a428 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Tue, 13 Mar 2007 20:12:51 +0100
Subject: gsl based version

---
 src/Stitch.cxx | 73 ++++++++++++++++++++++++++++++++++++++++++++--------------
 src/gipfel.cxx | 12 ++++++----
 2 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/src/Stitch.cxx b/src/Stitch.cxx
index 35c8c99..e41af91 100644
--- a/src/Stitch.cxx
+++ b/src/Stitch.cxx
@@ -101,12 +101,14 @@ Stitch::vignette_calib(GipfelWidget::sample_mode_t m,
 	gsl_vector *yv,  *c;
 	double chisq;
 
-
-	
-	X = gsl_matrix_alloc(max_samples, 3);
+	X = gsl_matrix_alloc(max_samples, 1);
 	yv = gsl_vector_alloc(max_samples);
-	c = gsl_vector_alloc(3);
-	cov = gsl_matrix_alloc (3, 3);
+	c = gsl_vector_alloc(1);
+	cov = gsl_matrix_alloc (1, 1);
+
+	if (merged_image) {
+		merged_image->init(w, h);
+	}
 
 	for (int y=0; y<h; y++) {
 		double a_nick = atan((double)(y_off - y)/radius);
@@ -114,41 +116,66 @@ Stitch::vignette_calib(GipfelWidget::sample_mode_t m,
 		for (int x=0; x<w; x++) {
 			double a_view;
 			a_view = view_start + x * step_view;
+			merged_pixel_set = 0;
 			double l1 = 0.0, l2 = 0.0;
 			double a1, a2;
+			uchar c1[3], c2[3];
 
 			for (int i=0; i<MAX_PICS; i++) {
 
 				if (gipf[i] == NULL) {
 					break;
 				} else if (gipf[i]->get_pixel(m, a_view, a_nick,
-						&r, &g, &b) == 0) {
-					l2 = (double) r + g + b;
+						&c2[0], &c2[1], &c2[2]) == 0) {
+					l2 = (double) c2[0] + c2[1] + c2[2];
 					a2 = fabs(gipf[i]->get_angle_off(a_view, a_nick));
 
-					if (l1 > 0.0 && n_samples < max_samples) {
-						gsl_matrix_set(X, n_samples, 0, l1 * a1 - l2 * a2);
-						gsl_matrix_set(X, n_samples, 1, l1 * a1 * a1 - l2 * a2 * a2);
-						gsl_matrix_set(X, n_samples, 2, l1 * a1 * a1 * a1 - l2 * a2 * a2 * a2);
-						gsl_vector_set(yv, n_samples, l1 - l2);
+					if (l1 > 0.0 && n_samples < max_samples &&
+						fabs(a1 - a2) > 0.1 &&
+						fabs(((double) c1[1]) / ((double) c1[0]) -
+							((double) c2[1]) / ((double) c2[0])) < 0.2 && 
+						fabs(((double) c1[2]) / ((double) c1[0]) -
+							((double) c2[2]) / ((double) c2[0])) < 0.2) {
+
+						gsl_matrix_set(X, n_samples, 0, l1 * a1 * a1 - l2 * a2 * a2);
+						gsl_vector_set(yv, n_samples, l2 - l1);
 						n_samples++;
+
+						if (merged_image) {
+							merged_image->set_pixel(x, 255, 0, 0);	
+							merged_pixel_set++;
+						}
 					}
 						
 					l1 = l2;
 					a1 = a2;
+					c1[0] = c2[0];
+					c1[1] = c2[1];
+					c1[2] = c2[2];
+
+					if (!merged_pixel_set && merged_image) {
+						merged_image->set_pixel(x, r, g, b);
+					}
 				}
 			}
 		}
+		if (merged_image) {
+			merged_image->next_line();
+		}
+	}
+
+	if (merged_image) {
+		merged_image->done();
 	}
 
 	gsl_multifit_linear_workspace * work 
-           = gsl_multifit_linear_alloc (n_samples, 3);
+           = gsl_multifit_linear_alloc (n_samples, 1);
 
 	gsl_multifit_linear (X, yv, c, cov, &chisq, work);
          gsl_multifit_linear_free (work);
 
-	fprintf(stderr, "===> v1 %lf, v2 %lf, v3 %lf (i %d)\n", 
-		gsl_vector_get(c,0), gsl_vector_get(c,1), gsl_vector_get(c,2), n_samples);
+	fprintf(stderr, "===>  v2 %lf, (i %d)\n", 
+		gsl_vector_get(c,0), n_samples);
 
 	return 0;
 }
@@ -166,7 +193,7 @@ Stitch::resample(GipfelWidget::sample_mode_t m,
 	int y_off = h / 2;
 	int merged_pixel_set;
 	double radius = (double) w / (view_end -view_start);
-	double V1 = 6.220359, V2 = -13.874930;
+	double V1 = 0.0, V2 = 0.16435;
 
 	if (merged_image) {
 		merged_image->init(w, h);
@@ -179,6 +206,7 @@ Stitch::resample(GipfelWidget::sample_mode_t m,
 
 	for (int y=0; y<h; y++) {
 		double a_nick = atan((double)(y_off - y)/radius);
+		double a_max = 0.0;
 
 		for (int x=0; x<w; x++) {
 			double a_view;
@@ -192,11 +220,22 @@ Stitch::resample(GipfelWidget::sample_mode_t m,
 					double l2 = (double) r + g + b;
 					double a2 = fabs(gipf[i]->get_angle_off(a_view, a_nick));
 					double devign = ( 1 + a2 * V1 + a2 * a2 * V2);
+if (a2 > a_max) {
+fprintf(stderr, "==> %lf %lf\n", devign, a2);
+a_max = a2;
+}
 
-fprintf(stderr, "==> %lf\n", devign);
+#if 1 
 					r = (uchar) MIN(rint((double) r * devign), 255);
 					g = (uchar) MIN(rint((double) g * devign), 255);
 					b = (uchar) MIN(rint((double) b * devign), 255);
+#else 
+
+					r = (uchar) MIN(rint((double) 250 * devign), 255);
+					g = (uchar) MIN(rint((double) 250 * devign), 255);
+					b = (uchar) MIN(rint((double) 250 * devign), 255);
+#endif
+
 
 					if (single_images[i]) {
 						single_images[i]->set_pixel(x, r
diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index 3862761..584ae15 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -585,10 +585,6 @@ stitch(GipfelWidget::sample_mode_t m,
 
 		st->resample(m, stitch_w, stitch_h, from, to);
 
-	} else if (type = STITCH_VIGNETTE_CALIB) {
-		
-		st->vignette_calib(m, stitch_w, stitch_h, from, to);
-
 	} else {
 		win = new Fl_Window(0,0, stitch_w, stitch_h);
 		scroll = new Fl_Scroll(0, 0, win->w(), win->h());
@@ -598,7 +594,13 @@ stitch(GipfelWidget::sample_mode_t m,
 		win->resizable(scroll);
 		win->show(0, argv); 
 		st->set_output((OutputImage*) img);
-		st->resample(m, stitch_w, stitch_h, from, to);
+
+		if (type == STITCH_VIGNETTE_CALIB) {
+			st->vignette_calib(m, stitch_w, stitch_h, from, to);
+		} else {
+			st->resample(m, stitch_w, stitch_h, from, to);
+		}
+
 		img->redraw();
 		Fl::run();
 	}
-- 
cgit v1.2.3