Hugin

Revision: 4117
          http://hugin.svn.sourceforge.net/hugin/?rev=4117&view=rev
Author:   blimbo
Date:     2009-07-27 16:20:44 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Function to write/read lines to/from file. Added other lens models but not quite working yet

Modified Paths:
--------------
    hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.cpp
    hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.h
    hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Main.cpp
    hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/MapPoints.cpp
    hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.cpp
    hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.h

Modified: hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.cpp
===================================================================
--- hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.cpp	2009-07-27 14:56:20 UTC (rev 4116)
+++ hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.cpp	2009-07-27 16:20:44 UTC (rev 4117)
@@ -29,6 +29,7 @@
 unsigned int lens_type = 1;
 unsigned int current_line = 0;
 unsigned int optimise_centre = 0;
+unsigned int lens_model = 1;
 double sensor_width = 0;
 double sensor_height = 0;
 double original_width = 0;

Modified: hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.h
===================================================================
--- hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.h	2009-07-27 14:56:20 UTC (rev 4116)
+++ hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Globals.h	2009-07-27 16:20:44 UTC (rev 4117)
@@ -12,6 +12,7 @@
 extern unsigned int lens_type;
 extern unsigned int current_line;
 extern unsigned int optimise_centre;
+extern unsigned int lens_model;
 extern double sensor_width;
 extern double sensor_height;
 extern double original_width;

Modified: hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Main.cpp
===================================================================
--- hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Main.cpp	2009-07-27 14:56:20 UTC (rev 4116)
+++ hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/Main.cpp	2009-07-27 16:20:44 UTC (rev 4117)
@@ -21,57 +21,15 @@
 #include <fstream>
 #include <vector>
 #include <string>
-#include <sys/stat.h> 
 #include "Globals.h"
 #include "ProcessImage.h"
-
+#include "vigra/diff2d.hxx"
 #include "MapPoints.h"
 
 using namespace std;
 
 #define VERSION 0.1
 
-bool fileexists(string strFilename) {
-
-	struct stat stFileInfo;
-	bool blnReturn;
-	int intStat;
-
-	// Attempt to get the file attributes
-	intStat = stat(strFilename.c_str(),&stFileInfo);
-	if(intStat == 0) {
-
-		blnReturn = true;
-  	}else{
-
-    		blnReturn = false;
-  	}
-  
-  	return(blnReturn);
-}
-
-static void tokenize(const string& str, vector<string>& tokens, const string& delimiters = " "){
-    
-	// Skip delimiters at beginning
-	string::size_type lastPos = str.find_first_not_of(delimiters, 0);
-	
-	// Find first non-delimiter
-	string::size_type pos = str.find_first_of(delimiters, lastPos);
-
- 	while (string::npos != pos || string::npos != lastPos){
-	
-        	// Found a token, add it to the vector
-        	tokens.push_back(str.substr(lastPos, pos - lastPos));
-		
-        	// Skip delimiters.  Note the not_of
-        	lastPos = str.find_first_not_of(delimiters, pos);
-		
-        	// Find next non-delimiter
-        	pos = str.find_first_of(delimiters, lastPos);
-    	}
-	
-}
-
 static void parse_pto(string& f,vector<string>& images,vector<string>& pto_file_top,vector<string>&
 pto_file_cps,vector<string>& pto_file_end, unsigned int& image_number){
  
@@ -296,8 +254,9 @@
 	cout << endl << "Version " << VERSION << endl;
 	cout << endl << "Usage: calibrate_lens [options] image1 image2.." << endl << endl;
 	cout << "Options:" << endl << endl;
-	cout << "  -p <filename>   Input Hugin PTO file." << endl;
+	cout << "  -p <filename>   Input Hugin PTO file." << endl;	
 	cout << "  -i <int>        Image in Hugin PTO file to process. Default 0" << endl;
+	cout << "  -j <filename>   Input file containing line data." << endl;
 	//cout << "  -c <int>        Control points to add to PTO file per line. Default 10." << endl;
 	cout << "  -e <0|1>        Edge detector. 0 = Canny (default) 1 = Shen-Castan." << endl;
 	cout << "  -d <int>        Maximum dimension for re-sized image prior to processing. Default 1600." << endl;
@@ -317,6 +276,11 @@
 	cout << "  -l <int>        Lens type. 1 = Rectilinear (default)" << endl;
 	cout << "                             2 = Equal-area fisheye" << endl;
 	cout << "                             3 = Equal-angle fisheye" << endl;
+
+	cout << "  -x <int>        Lens model.1 = R = u + p2 * u^2 + p4 * u^4 (default)" << endl;
+	cout << "                             2 = R = a * u^4 + b * u^3 + c * u^2 (Panotools)" << endl;
+	cout << "                             3 = R = k * 2 * tan(A/2) + (1 - k) * 2 * sin(A/2) (universal fisheye)" << endl;	
+	
 	//cout << "  -i <0|1>        Generate intermediate images. Default 1" << endl;
 	cout << "  -t <0|1>        Optimise image centre. Default 0" << endl;
 	cout << "  -v <0|1>        Verbose. Default 0" << endl;
@@ -326,12 +290,144 @@
 
 }
 
+void write_lines_to_file(string& filename1, string& filename2){
+
+	// Create output file name
+	string output = path;
+	vector<string> tokens;
+
+	if (filename1 == filename2){
+		// *nix file paths
+		if (filename2.find("/") < filename2.length() || filename2.substr(0, 1) == ("/")){					
+			tokenize(filename2, tokens, "/");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));		
+		// Windows file paths
+		}else{
+			tokenize(filename2, tokens, "\\");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));
+		}
+		output.append(".lines");
+	}else{			
+		// *nix file paths
+		if (filename1.find("/") < filename1.length() || filename1.substr(0, 1) == ("/")){					
+			tokenize(filename1, tokens, "/");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));			
+		// Windows file paths
+		}else{
+			tokenize(filename1, tokens, "\\");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));
+		}
+		output.append("-");
+		// *nix file paths
+		if (filename2.find("/") < filename2.length() || filename2.substr(0, 1) == ("/")){					
+			tokenize(filename2, tokens, "/");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));		
+		// Windows file paths
+		}else{
+			tokenize(filename2, tokens, "\\");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));
+		}
+		output.append(".lines");			
+	}
+
+
+	// File to write to
+	ofstream out;
+	out.open (output.c_str());
+
+  	if(!out.good()){
+    		cout << "Couldn't write lines to file " << output << endl << endl;
+    		exit(1);
+  	}else{
+		cout << "Writing lines to file " << output << endl << endl;
+	}
+	
+	out << "# Lens type:\t\t\t" << lens_type << endl;
+	out << "# Size factor:\t\t\t" << sizefactor << endl;
+	out << "# Crop factor:\t\t\t" << cropFactor << endl;		
+	out << "# Focal length (mm):\t\t" << focal_length << endl;
+	out << "# Focal length (pixels):\t" << focal_length_pixels << endl;	
+
+	for (int i = 0; i < lines.size(); i++){		
+		for (int j = 0; j < lines[i].size(); j++){		
+			out << i+1 << "\t" << lines[i][j]->x << ","<< lines[i][j]->y << endl;
+		}	
+	}
+	out.close();
+
+}
+
+void parse_lines_file(string& lines_file){
+
+       ifstream is(lines_file.c_str());
+
+        // Check to make sure the stream is ok
+        if(!is.good()){
+                cout << "Cannot open file "<< lines_file << endl << endl;
+                exit(1);
+	}else{
+		cout << "Reading input file " << lines_file << "..." << endl << endl;
+	}
+
+        string line;
+        char ch[150];       
+        unsigned int l,lt,x,y;
+	float fl,sf,flp,flmm,cf;
+
+        // Get line from stream
+        while(getline(is,line)){
+
+                // copy the string to a character array
+                strcpy(ch, line.c_str());
+			
+                if(sscanf(ch, "%d %d%*c%d", &l,&x,&y) == 3){
+		
+			if(lines.size() < l){
+				vector<vigra::Point2D> tmp;
+				lines.push_back(tmp);
+			}
+			lines[l-1].push_back(vigra::Point2D((int)x,(int)y));	
+			//cout << "Added pixel " << x << "," << y << " to line " << l << endl;
+
+                }else if (sscanf(ch, "# Focal length (pixels): %e", &fl) == 1){
+			focal_length_pixels = fl;
+			cout << "Found focal length (pixels):\t" << fl << endl;
+		}else if(sscanf(ch, "# Lens type: %d", &lt) == 1){
+			cout << "Found lens type:\t\t" << lt << endl;
+			lens_type = lt;
+		}else if(sscanf(ch, "# Size factor: %f", &sf) == 1){
+			cout << "Found size factor:\t\t" << sf << endl;
+			sizefactor = sf;
+		}else if(sscanf(ch, "# Crop factor: %f", &cf) == 1){
+			cout << "Found crop factor:\t\t" << cf << endl;
+			cropFactor = cf;
+		}else if(sscanf(ch, "# Focal length (mm): %f", &flmm) == 1){
+			cout << "Found focal length (mm):\t" << flmm << endl;
+			focal_length = flmm;
+		}else if(sscanf(ch, "# Focal length (pixels): %f", &flp) == 1){
+			cout << "Found focal length (pixels):\t\t" << flp << endl;
+			focal_length_pixels = flp;
+		}
+        }	
+	is.close();
+	cout << endl;
+
+	for (int i = 0; i < lines.size(); i++){
+		cout << "Found line " << i+1 << ". Pixels:\t\t" << lines[i].size() << endl;	
+	}	
+	cout << endl;
+
+}
+
 int main(int argc, const char* argv[]){
 
+	cout << endl << "Lens calibration tool" << endl;
+	cout << endl << "Version " << VERSION << endl << endl;
+
 	unsigned int i = 1;
 	unsigned int pto_image = 0;
 	unsigned int cps_per_line = 10;
-	string pto_file = (""),output_pto = ("");
+	string pto_file = (""),output_pto = (""),lines_file = ("");
 	vector<string> images,pto_file_top,pto_file_cps,pto_file_end;
 
 	// Deal with arguments
@@ -350,11 +446,13 @@
                                 case 'h' : {usage();}
 				case 'o' : {path = argv[i]; break;}
 				case 'p' : {pto_file = argv[i]; break;}
+				case 'j' : {lines_file = argv[i]; break;}
 				case 'i' : {pto_image = atoi(argv[i]); break;}
 				//case 'c' : {cps_per_line = atoi(argv[i]); break;}
 				//case 'f' : {format = argv[i]; break;}				
 				case 'e' : {detector = atoi(argv[i]); break;}
-				case 'g' : {gap_limit = atoi(argv[i]); break;}
+				case 'g' : {gap_limit = atoi(argv[i]); break;}				
+				case 'x' : {lens_model = atoi(argv[i]); break;}
 				case 't' : {optimise_centre = atoi(argv[i]); break;}
 				case 'v' : {verbose = atoi(argv[i]); break;}
 				case 'd' : {resize_dimension = atoi(argv[i]); break;}
@@ -396,35 +494,55 @@
 		}
 	}
 
+	if (lines_file != ("")){	
+		parse_lines_file(lines_file);
+	}
+
 	//images.push_back("/home/tnugent/src/gsoc2009_lenscalibration/src/lens_calibrate/dsc_0040.jpg");
+	//images.push_back("/home/tnugent/src/gsoc2009_lenscalibration/src/lens_calibrate/dsc_0163.jpg");
 
-	if (!images.size()){
+	if (!images.size() && lines.size() == 0){
 		//cout << "No images provided!" << endl << endl;
 		usage();
 	}
 
-	cout << endl << "Lens calibration tool" << endl;
-	cout << endl << "Version " << VERSION << endl << endl;
-
-	for(i = 0; i < images.size();i++){			
-			
+	int plotted = 0;
+	for(i = 0; i < images.size();i++){				
 		ifstream ifile(images[i].c_str());
 		if (!ifile){
 			cout << "File " << images[i] << " doesn't exist." << endl << endl;
 			exit(1);
 		}
 		cout << "Processing image " << images[i].c_str() << endl << endl;
-		process_image(images[i]);		
+		process_image(images[i],plotted);		
 	}
 
-	cout << "Found "<< lines.size() <<" lines"<<endl;
+	cout << "Found "<< lines.size() <<" lines."<< endl << endl;
 
 	int n_params = 2;
 	if (lens_type == 2) ++n_params;
-	if(optimise_centre) n_params += 2;
+	if (optimise_centre) n_params += 2;
 
-	if (lines.size() >= n_params ) map_points();
-	else{
+	/*
+	for (int i = 0; i < lines.size(); i++){
+		for (int j = 0; j < lines[i].size(); j++){
+			cout << "_" << i << "," << lines[i][j]->x << "," << lines[i][j]->y << endl;
+		}
+	}	
+	cout << endl;
+	*/
+
+	if (lines.size() >= n_params ){
+		// Write lines to output file
+		if (images.size()){
+			write_lines_to_file(images[0],images[images.size()-1]);	
+		}else{
+			string tmp = ("all_lines.txt");
+			write_lines_to_file(tmp,tmp);	
+		}		
+		// Map points and optimise parameters
+		map_points();	
+	}else{
 		cout << "Not enough lines to fit "<< n_params <<" parameters."<<endl;
 		return 3;
 	}

Modified: hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/MapPoints.cpp
===================================================================
--- hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/MapPoints.cpp	2009-07-27 14:56:20 UTC (rev 4116)
+++ hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/MapPoints.cpp	2009-07-27 16:20:44 UTC (rev 4117)
@@ -69,16 +69,29 @@
 
 	double x_centre = 0;
 	double y_centre = 0;	
-	if (lens_type == 2){	
-		if(optimise_centre){			
+
+	if (lens_model == 2){
+		if(optimise_centre){
 			x_centre = p[3];
-			y_centre = p[4];
-		}	
+			y_centre = p[4];	
+		}		
+	}else if (lens_model == 3){
+		if(optimise_centre){
+			x_centre = p[1];
+			y_centre = p[2];	
+		}			
 	}else{
-		if(optimise_centre){
-			x_centre = p[2];
-			y_centre = p[3];
-		}
+		if (lens_type == 2){	
+			if(optimise_centre){			
+				x_centre = p[3];
+				y_centre = p[4];
+			}	
+		}else{
+			if(optimise_centre){
+				x_centre = p[2];
+				y_centre = p[3];
+			}
+		}		
 	}
 
 	for (unsigned int l = 0; l < lines.size(); l++){
@@ -109,7 +122,6 @@
 			//cout << "(x,y)\t(" << x_point << "," << y_point << ")" << endl;
 				
 			// r - distance of a point from the center of projection, in pixels
-			//double r = PointPointDist(x_point,y_point,x_centre,y_centre);
 			double r = sqrt(x_point * x_point + y_point * y_point);
 		
 			// u = r / f;
@@ -117,19 +129,37 @@
 		
 			// R - distance of a point from the center of projection,
 			// corrected for barrel distortion, unitless, or radians
- 			// (1 - p2 - p4) is for normalisation
-			// p2 = p[0], p4 = [1]
-			double R = (1 - p[0] - p[1]) * u + p[0] * (u*u) + p[1] * (u*u*u*u);
+			double R = 0;
+			
+			if (lens_model == 2){
+		
+				// Panotools
+				// R = a * u^4 + b * u^3 + c * u^2	
+				R = p[0] * (u*u*u*u) + p[1] * (u*u*u) + p[2] * (u*u);
+			
+			}else if (lens_model == 3){
+			
+				// Universal fisheye
+				//R = k * 2 * tan(A/2) + (1 - k) * 2 * sin(A/2)
+				//R = p[0] * 2 * tan(A/2) + (1 - p[0]) * 2 * sin(A/2);
+			
+			}else{
+				// Default
+				//R = u + p2 * u^2 + p4 * u^4 			
+				// (1 - p2 - p4) is for normalisation
+				// p2 = p[0], p4 = [1]
+				R = (1 - p[0] - p[1]) * u + p[0] * (u*u) + p[1] * (u*u*u*u);
+			}			
 
 			// a - angular distance of a point from the center of projection, in radians
 			double a;
 
 			if (lens_type == 2){		
 				// k - equal-area type fisheye design parameter, initial value of 2
-				double k = p[3];		   				
+				double k = p[2];		   				
 				a = k * asin( R / k );
 				/*
-				cout << "k:\t" << p[3] << endl;
+				cout << "k:\t" << p[2] << endl;
 				cout << "r/k:\t" << R/k << endl;
 				cout << "asin(r/k):\t" << asin( R / k ) << endl;				
 				cout << "a:\t" << a << endl;
@@ -177,7 +207,7 @@
 		cout << norm.z << endl << endl;
 		*/	
 		
-		// Comput straigthness error
+		// Compute straigthness error
 		double ssq = 0;
 		for(unsigned int i = 1; i < npnts - 1; i++){			
 			// Add square of dot product of that point with norm
@@ -199,61 +229,130 @@
  
 void map_points(){
 
+	if (lens_model == 2){
+		cout << "Panotools lens model" << endl;
+	}else if (lens_model == 3){
+		cout << "Universal fisheye lens model" << endl;
+	}else{
+		cout << "Default lens model" << endl;
+	}
+
 	int iterations = 1000;
 	double info[LM_INFO_SZ];
 
 	// Set up initial parameters
 	int m = 5;
 	double * p = new double[m];			
-		
-	//p[0] = focal_length_pixels;
-	p[0] = 0; // p2
-	p[1] = 0; // p4		
 
-	if (lens_type == 2){	
-		p[2] = 2; // k
-		if(optimise_centre){
-			p[3] = 0; // x_center;
-			p[4] = 0; // y_center;			
-		}else{
-			m = 3;
-		}	
-	}else{
-		if(optimise_centre){
-			m = 4;
-			p[2] = 0; // x_center;
-			p[3] = 0; // y_center;			
-		}else{
-			m = 2;
-		}
-	}		
-
 	// Set up measurement vector
 	int n = lines.size();		
 	double * x = new double[n];
 	for (unsigned int i = 0; i < n; i++){
 		x[i] = 0;
+	}		
+
+	if(lens_model == 2){
+	
+		// Panotools
+		// R = a * u^4 + b * u^3 + c * u^2
+	
+		// What should starting values be?
+		p[0] = 1; // a
+		p[1] = 1; // b
+		p[2] = 1; // c
+		m = 3;
+
+		if(optimise_centre){
+			p[3] = 0; // x_center;
+			p[4] = 0; // y_center;
+			m = 5;		
+		}
+	
+	}else if (lens_model == 3){
+	
+		// Universal fisheye
+		// R = k * 2 * tan(A/2) + (1 - k) * 2 * sin(A/2)
+		
+		p[0] = 0; // k
+		m = 1;
+		
+		if(optimise_centre){
+			p[1] = 0; // x_center;
+			p[2] = 0; // y_center;
+			m = 3;		
+		}		
+	
+	}else{
+	
+		p[0] = 0; // p2
+		p[1] = 0; // p4		
+
+		if (lens_type == 2){	
+			p[2] = 2; // k
+			if(optimise_centre){
+				p[3] = 0; // x_center;
+				p[4] = 0; // y_center;			
+			}else{
+				m = 3;
+			}	
+		}else{
+			if(optimise_centre){
+				m = 4;
+				p[2] = 0; // x_center;
+				p[3] = 0; // y_center;			
+			}else{
+				m = 2;
+			}
+		}	
 	}
 
+	
+
 	int ret = dlevmar_dif(&Mapto3d, &visf, p, x, m, n, iterations, NULL, info, NULL, NULL, NULL);
 
 	printf("\nLevenberg-Marquardt returned in %g iter, reason %g\nSolution:\n", info[5], info[6]);
-	//cout << "Focal length:\t\t" << p[0] << endl;
-	cout << "p2:\t\t\t" << p[0] << endl;
-	cout << "p4:\t\t\t" << p[1] << endl;
+		
+	if(lens_model == 2){
 
-	if (lens_type == 2){	
-		cout << "k:\t\t\t" << p[2] << endl;
-		if(optimise_centre){			
+		cout << "a:\t\t\t" << p[0] << endl;
+		cout << "b:\t\t\t" << p[1] << endl;
+		cout << "c:\t\t\t" << p[2] << endl;
+
+		if(optimise_centre){
 			cout << "x centre:\t\t" << p[3] << endl;
-			cout << "y centre\t\t" << p[4] << endl;
-		}	
-	}else{
+			cout << "y centre\t\t" << p[4] << endl;	
+		}
+
+	
+	}else if(lens_model == 3){		
+
+		cout << "k:\t\t\t" << p[0] << endl;
+
 		if(optimise_centre){
-			cout << "x centre:\t\t" << p[2] << endl;
-			cout << "y centre\t\t" << p[3] << endl;
+			cout << "x centre:\t\t" << p[1] << endl;
+			cout << "y centre\t\t" << p[2] << endl;	
 		}
+		
+	}else{
+
+		cout << "p2:\t\t\t" << p[0] << endl;
+		cout << "p4:\t\t\t" << p[1] << endl;
+
+		if (lens_type == 2){	
+			cout << "k:\t\t\t" << p[2] << endl;
+			if(optimise_centre){			
+				cout << "x centre:\t\t" << p[3] << endl;
+				cout << "y centre\t\t" << p[4] << endl;
+			}	
+		}else{
+			if(optimise_centre){
+				cout << "x centre:\t\t" << p[2] << endl;
+				cout << "y centre\t\t" << p[3] << endl;
+			}
+		}
 	}	
+		
+			
 	for (unsigned int i = 0; i < n; i++){
 		cout << "Line " << i+1 << " error:\t\t" << line_errors[i] << endl;
 	}

Modified: hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.cpp
===================================================================
--- hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.cpp	2009-07-27 14:56:20 UTC (rev 4116)
+++ hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.cpp	2009-07-27 16:20:44 UTC (rev 4117)
@@ -27,7 +27,6 @@
 #include <exiv2/image.hpp>
 #endif
 
-
 #include "vigra/impex.hxx"
 #include "vigra/stdimage.hxx"
 #include "vigra/edgedetection.hxx"
@@ -38,6 +37,7 @@
 #include "vigra/diff2d.hxx"
 #include <vigra/rgbvalue.hxx>
 #include <vigra/utilities.hxx>
+#include <sys/stat.h> 
 #include "Globals.h"
 #include "ProcessImage.h"
 #include "MapPoints.h"
@@ -68,6 +68,47 @@
 	return (i->x<j->x);
 }
 
+bool fileexists(string strFilename) {
+
+	struct stat stFileInfo;
+	bool blnReturn;
+	int intStat;
+
+	// Attempt to get the file attributes
+	intStat = stat(strFilename.c_str(),&stFileInfo);
+	if(intStat == 0) {
+
+		blnReturn = true;
+  	}else{
+
+    		blnReturn = false;
+  	}
+  
+  	return(blnReturn);
+}
+
+void tokenize(const string& str, vector<string>& tokens, const string& delimiters = " "){
+    
+	// Skip delimiters at beginning
+	string::size_type lastPos = str.find_first_not_of(delimiters, 0);
+	
+	// Find first non-delimiter
+	string::size_type pos = str.find_first_of(delimiters, lastPos);
+
+ 	while (string::npos != pos || string::npos != lastPos){
+	
+        	// Found a token, add it to the vector
+        	tokens.push_back(str.substr(lastPos, pos - lastPos));
+		
+        	// Skip delimiters.  Note the not_of
+        	lastPos = str.find_first_not_of(delimiters, pos);
+		
+        	// Find next non-delimiter
+        	pos = str.find_first_of(delimiters, lastPos);
+    	}
+	
+}
+
 void sort_inliers(vector<Point2D>& inliers){
 
 	unsigned int top = 0;
@@ -94,14 +135,14 @@
 	}
 }
 
-void plot_inliers(BImage& image, vector<Point2D>& inliers, int i){
+void plot_inliers(string& filename, BImage& image, vector<Point2D>& inliers, int i){
 
 	vigra::BRGBImage tmp(image.width(),image.height());		
 	vigra::initImage(srcIterRange(tmp.upperLeft(),
 			tmp.upperLeft() + vigra::Diff2D(image.width(),image.height())),
                 	RGB(255,255,255) );
 
-	cout << "Plotting line " << i << ". Pixels:\t" << inliers.size() << endl << endl;
+	
 	for (unsigned int il = 0; il < inliers.size(); il++){
 
 		/*
@@ -123,16 +164,29 @@
 	}	
 
 	if (generate_images){
-		// Export slice to file
+
 		string output = path;
-		output.append("inliers");
+		vector<string> tokens;
+
+		// *nix file paths
+		if (filename.find("/") < filename.length() || filename.substr(0, 1) == ("/")){					
+			tokenize(filename, tokens, "/");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));		
+		// Windows file paths
+		}else{
+			tokenize(filename, tokens, "\\");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));
+		}
+		output.append("_line_");
 		stringstream ii;
 		ii << i;
 		output.append(ii.str());
-		//output.append("inliers");
-		output.append(".jpg");
-		exportImage(srcImageRange(tmp), ImageExportInfo(output.c_str()).setPixelType("UINT8"));
-		//exportImage(srcImageRange(tmp), output.c_str().setPixelType("UINT8"));
+		output.append(format);
+		
+		if(!fileexists(output)){
+			cout << "Plotting line " << i << ". Pixels:\t" << inliers.size() << endl;
+			exportImage(srcImageRange(tmp), ImageExportInfo(output.c_str()).setPixelType("UINT8"));
+		}
 	}
 }
 
@@ -146,11 +200,14 @@
 	queryPt = annAllocPt(dim,0);        // Allocate query point
 	srand(time(0));
 	int queryidx = rand() % coords.size();
+	
 	queryPt[0] = coords[queryidx]->x;
 	queryPt[1] = coords[queryidx]->y;
 
 	double orientation_scale = 1;
 	double orientation_threshold = 0.2;
+	// Set high to disable
+	orientation_threshold = 1000;
 
 	// Add direction as 3rd dimension
 	double first_o;
@@ -353,7 +410,7 @@
         }
 }
 
-void nuke_corners(BImage& image, FImage& corners, string& file){
+void nuke_corners(BImage& image, FImage& corners, string& filename){
 
         for (unsigned int h = 0; h < corners.height(); h++){
                for (unsigned int w = 0; w < corners.width(); w++){
@@ -388,10 +445,8 @@
 				//cout << value[0] << "\t(" << w << "," << h << ")" << endl;         
 			}    
                }
-        }
+        }	
 
-	
-
 	/*
 	// Smooth with hourglass filter
     	FVector2Image gradient(image.width(),image.height());
@@ -418,22 +473,29 @@
 	
 	if (generate_images){
 
-		// Create output file name
 		string output = path;
-		//if (file.substr(file.length()-4,1) == (".")){			
-		//	output.append(file.substr(0,file.length()-4));								
-		//}else{			
-		//	output.append(file.substr(0,file.length()-4));
-		//}
-		//output.append("_no_corners");
-		output.append("edges_minus_corners");
+		vector<string> tokens;
+
+		// *nix file paths
+		if (filename.find("/") < filename.length() || filename.substr(0, 1) == ("/")){					
+			tokenize(filename, tokens, "/");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));		
+		// Windows file paths
+		}else{
+			tokenize(filename, tokens, "\\");
+			output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));
+		}
+		output.append("_edges_minus_corners");
 		output.append(format);
-		cout << "Writing " << output << endl << endl;
-        	exportImage(srcImageRange(image), ImageExportInfo(output.c_str()).setPixelType("UINT8"));
+
+		if(!fileexists(output)){
+			cout << "Writing " << output << endl << endl;
+        		exportImage(srcImageRange(image), ImageExportInfo(output.c_str()).setPixelType("UINT8"));
+		}
 	}
 }
 
-void detect_edge(BImage& image, string& file, string& path, string& format, BImage& edge_image){
+void detect_edge(BImage& image, string& filename, string& path, string& format, BImage& edge_image){
 
 	try{   
         	// Paint output image white
@@ -452,17 +514,20 @@
         	}
 
 		if (generate_images){
-			// Create output file name
+
 			string output = path;
-		
-			//if (file.substr(file.length()-4,1) == (".")){			
-			//	output.append(file.substr(0,file.length()-4));								
-			//}else{			
-			//	output.append(file.substr(0,file.length()-4));
-			//}
-			//output.append("_threshold");
-			output.append("edges_threshold_");
-			
+			vector<string> tokens;
+
+			// *nix file paths
+			if (filename.find("/") < filename.length() || filename.substr(0, 1) == ("/")){					
+				tokenize(filename, tokens, "/");
+				output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));		
+			// Windows file paths
+			}else{
+				tokenize(filename, tokens, "\\");
+				output.append(tokens[tokens.size()-1].substr(0,tokens[tokens.size()-1].length()-4));
+			}
+			output.append("_edges_threshold_");
 			stringstream dt;
 			dt << threshold;
 			output.append(dt.str());
@@ -472,8 +537,10 @@
 			output.append(ds.str());
 			output.append(format);
 
-			cout << "Writing " << output << endl;
-        		exportImage(srcImageRange(edge_image), output.c_str());
+			if(!fileexists(output)){
+				cout << "Writing " << output << endl;
+        			exportImage(srcImageRange(edge_image), output.c_str());
+			}
 		}	
     	}    
     	catch (StdException & e){
@@ -789,8 +856,21 @@
 	}
 }
 
-void process_image(string& filename){
+bool compare_line_length(vector<vigra::Point2D> l1, vector<vigra::Point2D> l2){
 
+	// Compare by line length
+	//return(line_length_squared(l1[0].x,l1[0].y,l1[l1.size()-1].x,l1[l1.size()-1].y) > line_length_squared(l2[0].x,l2[0].y,l2[l2.size()-1].x,l2[l2.size()-1].y));
+	
+	// Compare by number of pixels
+	return(l1.size() > l2.size());
+}
+
+void sort_lines_by_length(){
+	sort(lines.begin(), lines.end(), compare_line_length);
+}
+
+void process_image(string& filename, int& plotted){
+
 	ImageImportInfo info(filename.c_str());
         
 	UInt16RGBImage in(info.width(), info.height());
@@ -850,15 +930,27 @@
 		find_ann(coords, edgeness, inliers, good_lines);
 		if(inliers.size()){
 			sort_inliers(inliers);
-			plot_inliers(image,inliers,good_lines);	
 			lines.push_back(inliers);
 			inliers.clear();		
 		}			
 		if(verbose) cout << "Remaining coords:\t" << coords.size() << "\t(" << 100*((double)coords.size()/intital_coords_size) << " %)" << endl << endl;
 		
 	}
+		
+	// Sort lines by distance between first and last point or number of pixels
+	sort_lines_by_length();
+	
+
+	
 	if (good_lines == 0){
 		cout << "No lines found!" << endl;
+	}else{
+		// Create image for each line
+		for (int i = plotted; i < lines.size(); i++){
+			plot_inliers(filename, image, lines[i],i+1);
+			plotted++;	
+		}
+		cout << endl;
 	}
 
 }

Modified: hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.h
===================================================================
--- hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.h	2009-07-27 14:56:20 UTC (rev 4116)
+++ hugin/branches/gsoc2009_lenscalibration/src/lens_calibrate/ProcessImage.h	2009-07-27 16:20:44 UTC (rev 4117)
@@ -7,13 +7,17 @@
 double line_length_squared(int, int, int, int);
 bool compare_xy (const vigra::Point2D,const vigra::Point2D);
 bool compare_yx (const vigra::Point2D,const vigra::Point2D);
+bool fileexists(std::string);
+void tokenize(const std::string&, std::vector<std::string>&, const std::string&);
 void resize_image(vigra::UInt16RGBImage&, int&, int&);
 void find_ann(std::vector<vigra::Point2D>&, vigra::FVector2Image&, unsigned int&);
 void sort_inliers(std::vector<vigra::Point2D>&);
-void plot_inliers(vigra::BImage& image, std::vector<vigra::Point2D>&, int);
+void plot_inliers(std::string&, vigra::BImage& image, std::vector<vigra::Point2D>&, int);
 void extract_coords(vigra::BImage&, std::vector<vigra::Point2D>&);
 void nuke_corners(vigra::BImage&, vigra::FImage&, std::string&);
 void detect_edge(vigra::BImage&, std::string&, std::string&, std::string&, vigra::BImage&);
-void process_image(std::string&);
+void process_image(std::string&,int&);
+void sort_lines_by_length();
+bool compare_line_length(std::vector<vigra::Point2D>, std::vector<vigra::Point2D>);
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4114
          http://hugin.svn.sourceforge.net/hugin/?rev=4114&view=rev
Author:   tksharpless
Date:     2009-07-27 11:11:03 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Usable, needs work.
Reads PTGui & PTAsm projects; works with stereographic off; 
Several command options still to be implemented

Modified Paths:
--------------
    autopano-sift-C/trunk/APSCpp/APSCpp.c
    autopano-sift-C/trunk/APSCpp/APSCpp_main.c
    autopano-sift-C/trunk/APSCpp/CamLens.c
    autopano-sift-C/trunk/APSCpp/sphereAlign.h
    autopano-sift-C/trunk/LoweDetector.c
    autopano-sift-C/trunk/RevisionLog.txt

Modified: autopano-sift-C/trunk/APSCpp/APSCpp.c
===================================================================
--- autopano-sift-C/trunk/APSCpp/APSCpp.c	2009-07-27 05:30:19 UTC (rev 4113)
+++ autopano-sift-C/trunk/APSCpp/APSCpp.c	2009-07-27 11:11:03 UTC (rev 4114)
@@ -24,8 +24,6 @@
 #include <math.h>
 #include <tiffio.h>
 
-extern double globFov;  // hfov if no project file
-
 // create empty
 pDIinfo DIinfo_new0(){
 	pDIinfo p = (pDIinfo)malloc(sizeof(DIinfo));
@@ -350,10 +348,13 @@
   18 July 2009 new stgfov argument
     <0 forbids reprojection
 	>=0 allows reprojection when hfov exceeds this value
+
+  26 July 2009 add argument globFov, used when pdi is null.
+
 */
 ///#define _DEBUG_INTERP
 KeypointXMLList * GenerateKeyspp( char * imgname, int maxdim, DIinfo * pdi, 
-								  double stgfov, int * KPcount )
+								  double stgfov, int * KPcount, double globFov )
 {  
 #ifdef _DEBUG_INTERP
 	char tmp[262];
@@ -367,6 +368,8 @@
 	KeypointXMLList* kpp;
 
 	double Scale = 1.0;
+	double xcen, ycen;	// scaled center
+
 	double hfov = 0;
 
 
@@ -390,8 +393,8 @@
 
 	pW = pic->width;
 	pH = pic->height;
-	Xcen = 0.5 * pW;
-	Ycen = 0.5 * pH;
+	xcen = Xcen = 0.5 * pW;
+	ycen = Ycen = 0.5 * pH;
 
 
 // convert to monochrome float and discard input image
@@ -409,7 +412,7 @@
   also convert to stereographic if pdi is valid
 */
   // prescale factor
-	if( maxdim > 0) Scale = max( pW, pH ) / (double) maxdim;
+	if( maxdim > 0) Scale = ( pW > pH ? pW : pH ) / (double) maxdim;
 	if( Scale <= 1 ) Scale = 1;
 
  // interpolate if necessary
@@ -420,15 +423,19 @@
 		int dwid = pW, dhgt = pH;
 	// reduced dimensions
 		if( Scale > 1 ){
-			dwid = (int)(0.5 + pW / Scale );
-			dhgt = (int)(0.5 + pH / Scale );
-			Scale = (double) pW / (double) dwid;	// exact
-		WriteLine("  reduce size to %d x %d ...", dwid, dhgt );
+		// scaled dimensions
+			dwid = (int)( pW / Scale ); xcen = 0.5 * dwid;
+			dhgt = (int)( pH / Scale ); ycen = 0.5 * dhgt;
+		// exact scale factor
+			if( pW > pH ) Scale = (double) pW / (double) dwid;
+			else Scale = (double) pH / (double) dhgt;
+		WriteLine("  reduce to %d x %d (Scale %.4f)...", dwid, dhgt, Scale );
 		// smooth the source for antialiasing
 			ImageMap* tmp = ImageMap_GaussianConvolution( picMap, 0.75 * Scale );
 			ImageMap_delete( picMap );
 			picMap = tmp;
 		}
+	
 	// create result map
 		pn = ImageMap_new( dwid, dhgt );
 
@@ -443,6 +450,8 @@
 		  prm = saRemap_new( psp, pdp );
 		  saRemap_inv ( prm, 0.5 * dwid, 0.5 * dhgt, &Xcen, &Ycen );
 		  WriteLine("  convert to stereographic projection ...");
+		  CamLens_delete( psp );
+		  CamLens_delete( pdp );
 		}
 	// interpolate
 		saInterpSetup((void *)picMap->values,	// void * pdata
@@ -460,7 +469,10 @@
 			for( y = 0; y < pn->yDim; y++ ){
 				X = (double) x; Y = (double) y;		
 				if( prm ) saRemap_inv ( prm, X, Y, &X, &Y );	// ++
-				else { X *= Scale; Y *= Scale; }				// legacy
+				else { 		// linear rescale...
+				// note no need to subtract and re-add center, that just adds noise
+					X *= Scale; Y *= Scale;
+				}
 				saInterp_float( &(pd[y]), X, Y );
 			}
 		}
@@ -468,6 +480,7 @@
 		ImageMap_delete( picMap );
 		picMap = pn;
 		saRemap_delete( prm ); prm = 0;
+
 #ifdef _DEBUG_INTERP
 	strcpy(tmp, imgname);
 	strcat(tmp,"-MAP-PROJ.TIF");
@@ -479,6 +492,7 @@
 
 
 /* find the features 
+  Note feature point coords are at source scale
 */
 	WriteLine("  find keypoints ..." );
 
@@ -488,30 +502,33 @@
 	WriteLine("  %d keypoints found\n", nKeys );
 	*KPcount = nKeys;
 
- /* build the return value
-     for ANN mode a list of Keypoint, 
-	 that will be converted to keypointN after matching
+ /* build the return value.  For APSCPP this is a list of keypoint (float
+    feature vector) not of keypointN (char feature vector).  The feature
+	detector returns KP coordinates at source scale, so here all we need
+	to do is undo the stereographic projection if one was done.
  */
   {
     
 	ArrayList * globalNaturalKeypoints = 0;
 	int i;
-
-	if( pdi ){ // build remapping function at input scale
-	  CamLens * psp, * pdp;
-	  psp = CamLens_new1( pW, pH, pdi->format, hfov, 16.0 );
-	  pdp = CamLens_new1( pW, pH, _stereographic, hfov, 0 );
-	  prm = saRemap_new( psp, pdp );	// dest=>src
+	if( pdi && stgfov >= 0 && hfov >= stgfov ){ 
+	// build remapping function at source scale
+		CamLens * psp, * pdp;
+		psp = CamLens_new1( pW, pH, pdi->format, hfov, 16.0 );
+		pdp = CamLens_new1( pW, pH, _stereographic, hfov, 0 );
+		prm = saRemap_new( psp, pdp );	// dest=>src
+		CamLens_delete( psp );
+		CamLens_delete( pdp );
 	} else prm = 0;
 
 	for(i=0; i < ArrayList_Count(lf->globalKeypoints); i++) {
 		Keypoint* kp = (Keypoint *) ArrayList_GetItem( lf->globalKeypoints, i );
 		if( prm ){		// remap coordinates to image projection
 			saRemap_inv ( prm,
-						  kp->x , kp->y ,	// scale to image size
-						  &kp->x, &kp->y		// remapped coords
+						  kp->x , kp->y ,	
+						  &kp->x, &kp->y	
 						);
-		}
+		} 
 	}
 
   // package the list

Modified: autopano-sift-C/trunk/APSCpp/APSCpp_main.c
===================================================================
--- autopano-sift-C/trunk/APSCpp/APSCpp_main.c	2009-07-27 05:30:19 UTC (rev 4113)
+++ autopano-sift-C/trunk/APSCpp/APSCpp_main.c	2009-07-27 11:11:03 UTC (rev 4114)
@@ -43,65 +43,64 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+
+#define APSCPP_VERSION "2.5.2 23July2009"  // now separate from package version
+
 #include <time.h>
-
 #include "AutoPanoSift.h"
 #include "sphereAlign.h"
 
 // APSCpp.cpp
 int LoadProjectImages( char* script, ArrayList * DIlist, bool equalAngle );
 KeypointXMLList * GenerateKeyspp( char * imgname, int maxdim, 
-								  DIinfo * pdi, double stgfov, int * KPcount );
+								  DIinfo * pdi, double stgfov, 
+								  int * KPcount, double globFov );
 int MultiMatch_ANN ( MultiMatch* );
 
-// globals
-double globFov = 0;	// width for all images in degrees
-
-
 void Usage ()
 {
     WriteLine ("autopano-sift-c: Find control points giving a Hugin project file\n");
-    WriteLine ("   Version %s \n", PACKAGE_VERSION);
+    WriteLine ("   Version %s \n", APSCPP_VERSION);
 	WriteLine ("autopano-sift-c [options] output.pto image1 image2 [..]");
 	WriteLine ("                hugin project file output.pto gets the results ");
 	WriteLine ("                input images can be jpeg, tiff, or other formats.\n");
+	WriteLine ("    output.pto: The output Hugin project file name, or \"-\" for stdout.");
+	WriteLine ("    image<n>:   The input image files (any common format: JPEG, PNG, TIFF,...)");
 	WriteLine ("autopano-sift-c [options] output.pto projectfile");
-	WriteLine ("                projectfile: a Hugin or other PT family project script with");
-    WriteLine ("                image file names, projections, angular widths and optionally");
-    WriteLine ("                alignments.  Enables the options of stereographic projection");
-    WriteLine ("                and layout-guided control point placement.\n");
-
-	WriteLine ("Options");
-	WriteLine ("  --ransac <on|off|1|0>   Switch RANSAC filtration on or off (default: off).");
+	WriteLine ("    projectfile: a Hugin, PTGui, PTAssembler, PTSticher,... project script with");
+	WriteLine ("                image file names, fields of view, alignments and lens correction");
+    WriteLine ("                factors.  Enables stereographic, lens-correction, layout options.");
+    WriteLine ("");										
+	WriteLine ("Options that affect image processing");
+	WriteLine ("  --maxdim <n>            Make largest image dimension <= n (default: 1600).");
+	WriteLine ("  --projection <n>,<d>    n = PT format code, d = hfov in degrees, for all images.");
+	WriteLine ("  --equal-angle-fisheye   lens type for format codes 2,3. Default is equal-area.");
+	WriteLine ("  --lens-type <1|2|3>     set lens type 1: rectlinear ('normal'), 2: equal-area");
+	WriteLine ("                          fisheye (common), 3: equal-angle fisheye (uncommon).");
+	WriteLine ("                          Used instead of format code, for all images.");
+	WriteLine ("  --focal-length <mm>,<cf> mm = lens focal length in mm, cf = camera crop factor.");
+	WriteLine ("                          Used instead of hfov, for all images.");
+	WriteLine ("  --stereographic <on|off|1|0> reprojection on (if enabled) or off. Default on.");
+	WriteLine ("					      Enabled by project file, --projection, --focal-length.");
+ 	WriteLine ("  --stgfov <d>            minimum hfov (degrees) for reprojection. Default 65.");
+	WriteLine ("  --lens-correction <on|off|1|0> correction on (if enabled) or off. Default off.");
+	WriteLine ("                          Enabled if project has lens correction coefficients.");	
+	WriteLine ("");	
+	WriteLine ("Options that affect Control Point processing and output");
+ 	WriteLine ("  --use-layout <on|off|1|0> image alignment in pto file guides control point");
+	WriteLine ("                          placement; or does not.  Default is off.");
 	WriteLine ("  --maxmatches <matches>  Output no more that this many control points per");
 	WriteLine ("                          image pair (default: 25, zero means unlimited)");
-	WriteLine ("  --maxdim <n>            Make largest image dimension <= n (default: 1600).");
-	WriteLine ("  --projection <n>,<d>    n = PT format code, d = hfov in degrees.  These");
-	WriteLine ("                          apply to all images.  Enables stereographic option.");
- 	WriteLine ("  --stereographic <on|off|1|0> reprojection on (if enabled) or off. Default on.");
- 	WriteLine ("  --stgfov <d>            minimum hfov (degrees) for reprojection. Default 65.");
-	WriteLine ("  --equal-angle-fisheye   Set fisheye lens type to equal-angle instead of");
-	WriteLine ("                          equal-area. Ignored for PTAssembler projects.");
-	WriteLine ("  --disable-areafilter    Do not use max-area filtration, which is default.");
-	WriteLine ("                          See manpage for details.");
+	WriteLine ("  --ransac <on|off|1|0>   Switch RANSAC filtration on or off (default: off).");
 	WriteLine ("  --integer-coordinates   Truncate match coordinates to integer numbers.");
 	WriteLine ("  --absolute-pathnames <on|off|1|0>   Use the absolute pathname of the image");
 	WriteLine ("                          file in the PTO output file. Disabled by default.");
- 	WriteLine ("  --use-layout <on|off|1|0> image alignment in pto file guides control point");
-	WriteLine ("                          placement; or does not.  Default is off.");
-    WriteLine ("");
-	
-	WriteLine ("Refinement options");
-	WriteLine ("  --refine                Refine the found control points using the");
-	WriteLine ("                          original images.");
+	WriteLine ("  --disable-areafilter    Do not use max-area filtration, which is default.");
+	WriteLine ("                          See manpage for details.");
+	WriteLine ("  --refine                Refine control points using the original images.");
 	WriteLine ("  --refine-by-middle      Use the best middle point to refine (default).");
 	WriteLine ("  --refine-by-mean        Use the mean of the patches control points.");
-	WriteLine ("  --keep-unrefinable <on|off|1|0>");
-	WriteLine ("                          Keep unrefinable matches (default: on).");
-										
-	WriteLine ("output.pto: The output PTO panorama project file.");
-	WriteLine ("    This filename can be \"-\", then stdout is used");
-	WriteLine ("image<n>: input image files (any common format: JPEG, PNG, TIFF, ..)");
+	WriteLine ("  --keep-unrefinable <on|off|1|0>  Keep unrefinable CPs (default: on).");
 	WriteLine ("");
 }
 
@@ -427,7 +426,7 @@
 	DIinfo * pdi = 0;
 	char buffer[262];
 
-	fprintf(pto, "# Stitcher project file generated by APSCpp version %s\n\n", PACKAGE_VERSION);
+	fprintf(pto, "# Stitcher project file generated by APSCpp version %s\n\n", APSCPP_VERSION);
 	fprintf(pto, "p f2 w3000 h1500 v360  n\"JPEG q90\"\n");
 	fprintf(pto, "m g1 i0\n\n");
 	
@@ -544,11 +543,14 @@
 	// list used in ++ mode only -- image info from pto file
 	ArrayList * DIlist = 0;	// item = DIinfo struct.
 	char *projectfile = 0;
-    // "--projection" option sets these for all images
-	int globFmt = -1;	// PT format code
 	int Nerr = 0;	// counts commandline errors
 
-	// downscale option = largest allowed image dimension (0: none)
+// "--projection" option
+	int globFmt = -1;	// default PT format code
+	double globFov = 0;	// width for all images in degrees
+
+
+// downscale option = largest allowed image dimension (0: none)
 	int maxdim = 1600;
 
 	// output to stdout flag
@@ -560,10 +562,18 @@
 	// Use stereographic projection if feasible
 	bool useStereographic = true;
 	double stgfov = 65;	// don't reproject below this hfov
-  
-	// Use input alignment if feasible
+
+	// Lens and camera settings, valid if > 0
+	double FLmm = 0,
+		   cropFactor = 0;
+	int lensType = 0;
+
+	// Use project alignment if feasible
 	bool useLayout = false;
 
+	// Use project lens correction fn if feasible
+	bool lensCorrection = false;
+
 	// treat fisheye lens as equal-angle
 	bool equalAngle = false;
 
@@ -590,7 +600,7 @@
 	int i;
 	int totalKPs = 0;
 
-	WriteLine ("\nAPSCpp, enhanced autopano-sift-c version %s \n", PACKAGE_VERSION);
+	WriteLine ("\nAPSCpp, enhanced autopano-sift-c version %s \n", APSCPP_VERSION);
 
 	LoweFeatureDetector_SetVerbose(false); // default low chatter
   
@@ -624,6 +634,19 @@
 					++Nerr;
 				}
 
+			} else if( strcmp (optionStr, "--focal-length") == 0) {
+				joptN = 2;
+				char *p = argv[optionN + 1];
+				if(sscanf( p, "%g", &FLmm ) != 1 ){
+					WriteLine ("Invalid focal-length parameter");
+					++Nerr;
+				}
+				p = strchr(p,',');
+				if( !p || sscanf( p, "%g", &cropFactor ) != 1 )
+				{
+					WriteLine ("Invalid focal-length parameter");
+					++Nerr;
+				}
 			} else if (strcmp (optionStr, "--ransac") == 0) {
 				joptN = 2;
 				useRansac = YesNoOption ("--ransac", argv[optionN + 1], &Nerr );
@@ -636,6 +659,9 @@
 			} else if (strcmp (optionStr, "--use-layout") == 0) {
 				joptN = 2;
 				useLayout = YesNoOption ("--use-layout", argv[optionN + 1], &Nerr );
+			} else if (strcmp (optionStr, "--lens-correction") == 0) {
+				joptN = 2;
+				lensCorrection = YesNoOption ("--lens-correction", argv[optionN + 1], &Nerr );
 			} else if (strcmp (optionStr, "--maxmatches") == 0) {
 				joptN = 2;
 				if (sscanf(argv[optionN + 1], "%d",  &maxMatches) != 1) {
@@ -712,19 +738,42 @@
 		DIlist = ArrayList_new0( (void *) DIinfo_delete );
 	}
 
+	/** set up and report options **/
 
-	WriteLine("  Default fisheye lens type is %s.",  
+	if( !DIlist ){
+		lensCorrection = false;
+		useLayout = false;
+		if( globFmt < 0 && FLmm == 0 ) useStereographic = false;
+	}
+
+	if( lensType ){
+		WriteLine("  Assuming %s lens type.", 
+			lensType == 1 ? "rectilinear" 
+			: lensType == 2 ? "equal-area fisheye"
+			: "equal-angle fisheye" );
+	} else {
+		WriteLine("  Default fisheye lens type is %s.",  
 		equalAngle ? "equal-angle" : "equal-area" );
+	}
 
-	if( DIlist ){
-		if( useStereographic )
-		  WriteLine("  Stereographic projection enabled for hfov >= %.1f degrees.", stgfov );
-		if( useLayout )
-		  WriteLine("  Will try to use source image layout to guide CP placement.");
+	if( FLmm && cropFactor ){
+		WriteLine("  Assuming focal length %.2f mm, crop factor %.4f.",
+					FLmm, cropFactor);
+	} else {
+		WriteLine("  Focal length will be computed from hfov.");
 	}
 
+	if( useStereographic )
+	  WriteLine("  Stereographic projection enabled for hfov >= %.1f degrees.", stgfov );
 
+	if( lensCorrection )
+	  WriteLine("  Lens correction enabled BUT NOT IMPLEMENTED.");
 
+	if( useLayout )
+	  WriteLine("  Layout guided CP placement enabled BUT NOT IMPLEMENTED.");
+
+
+
 /** Find keypoints **/
 	start = clock();
 
@@ -748,14 +797,18 @@
 		for( i = 0; i < ArrayList_Count( DIlist ); i++ ){
 		  pd = (pDIinfo) ArrayList_GetItem( DIlist, i);
 		  if( !DIinfo_isDummy( pd ) )
-			ArrayList_AddItem(keylists, GenerateKeyspp( pd->name, maxdim, pd,
-							  useStereographic ? stgfov : -1, &totalKPs ) );
+			ArrayList_AddItem( keylists, 
+							   GenerateKeyspp( pd->name, maxdim, pd,
+							                   useStereographic ? stgfov : -1,
+											   &totalKPs, globFov ) );
 		}
 	} else {
 	// std mode: image names only from commandline
 		for( i=0; i<argc - 1 - optionCount; i++) {
-		  ArrayList_AddItem( keylists, GenerateKeyspp( argv[i+optionCount+1], 
-			                 maxdim, 0, 0, &totalKPs ) );
+		  ArrayList_AddItem( keylists, 
+			                 GenerateKeyspp( argv[i+optionCount+1], 
+											 maxdim, 0, 0, &totalKPs,
+											 globFov ) );
 		}
 	}
 

Modified: autopano-sift-C/trunk/APSCpp/CamLens.c
===================================================================
--- autopano-sift-C/trunk/APSCpp/CamLens.c	2009-07-27 05:30:19 UTC (rev 4113)
+++ autopano-sift-C/trunk/APSCpp/CamLens.c	2009-07-27 11:11:03 UTC (rev 4114)
@@ -150,6 +150,10 @@
 	}
 }
 
+void CamLens_delete( pCamLens self ){
+	if( self ) free( self );
+}
+
 // create empty
 pCamLens CamLens_new0()
 {

Modified: autopano-sift-C/trunk/APSCpp/sphereAlign.h
===================================================================
--- autopano-sift-C/trunk/APSCpp/sphereAlign.h	2009-07-27 05:30:19 UTC (rev 4113)
+++ autopano-sift-C/trunk/APSCpp/sphereAlign.h	2009-07-27 11:11:03 UTC (rev 4114)
@@ -181,6 +181,8 @@
   fmt is a Panotools format code
   flmm should be 0 for ideal projections, else > 0
 */
+// delete
+void CamLens_delete( pCamLens self );
 // create empty
 pCamLens CamLens_new0();
 // create with minimal info

Modified: autopano-sift-C/trunk/LoweDetector.c
===================================================================
--- autopano-sift-C/trunk/LoweDetector.c	2009-07-27 05:30:19 UTC (rev 4113)
+++ autopano-sift-C/trunk/LoweDetector.c	2009-07-27 11:11:03 UTC (rev 4114)
@@ -152,12 +152,12 @@
 		// Print license restriction
 		WriteLine ("");
 		WriteLine ("===============================================================================");
-		WriteLine ("The use of this software is restricted by certain conditions.");
-		WriteLine ("See the \"LICENSE\" file distributed with the program for details.");
+		WriteLine ("    The use of this software is restricted by certain conditions.");
+		WriteLine ("    See the LICENSE file distributed with the program for details.");
 		WriteLine ("");
-		WriteLine ("The University of British Columbia has applied for a patent on the SIFT");
-		WriteLine ("algorithm in the United States.  Commercial applications of this software may");
-		WriteLine ("require a license from the University of British Columbia.");
+		WriteLine ("  The University of British Columbia has applied for a patent on the SIFT");
+		WriteLine ("  algorithm in the United States.  Commercial applications of this software");
+		WriteLine ("  may require a license from the University of British Columbia.");
 		WriteLine ("===============================================================================");
 		WriteLine ("");
 	}

Modified: autopano-sift-C/trunk/RevisionLog.txt
===================================================================
--- autopano-sift-C/trunk/RevisionLog.txt	2009-07-27 05:30:19 UTC (rev 4113)
+++ autopano-sift-C/trunk/RevisionLog.txt	2009-07-27 11:11:03 UTC (rev 4114)
@@ -156,3 +156,147 @@
 Give the output file name the same extension as the input
 project, no matter what user enters?
    
+22 July Design for layout-guided CP selection
+
+The key thing is to match keypoints for one pair of images 
+at a time.  A list of pairs to be processed will be created, 
+based on overlaps predicted by the layout.  
+
+The overlaps should be evaluated using only (Y,P) and some
+kind of average image diameter.  Then candidate CPs can be
+validated (for each pair) as follows.
+
+1) map KP coordinates to the sphere (using lens fn, including
+correction if known).
+2) repeat {
+  find rotation of one image around optic axis that minimizes 
+  the variance of KP differences (considered as 3-vectors);
+  discard outlier CPs;
+} until( set is pretty compact );
+3) If there are more than maxmatches CPs left, sort them on 
+position across the line between image centers, divide into 
+maxmatches groups, and keep the strongest CP in each group.
+
+If there is no layout, it is more efficient to match KPs for
+all images at once, as now; however for really big jobs it
+might be necessary to divide the kp's into several groups &
+do global matching on those.  Anyhow, we should then select
+the image pairs having decent numbers of matches and do the
+rotational refinement on those.
+
+It would be possible to construct a complete alignment from
+the results of the pairwise alignments.  But perhaps just a
+consistency check is enough.
+
+It might be feasible to use a Monte Carlo approach to
+build the overlapping pairs list:  Match a random selection
+of keypoints (equal numbers from each image), count matches 
+by pair, use the pairs with above average numbers of matches.  
+This could be a good check for layout errors, too.
+
+So I need a KP matching subroutine that will support all
+these modes.  For full generality it should take a list of
+KP lists to be loaded into the k-d tree, and a second list
+of KP lists to be used as probes, and output a list of CPs
+(caller can separate that into lists by image pair).
+
+And a rotational optimizer that takes a list of CPs for a
+single pair of images; the projection specifications; and
+maybe a tuning parameter or two, and returns the subset of
+good CPs and the relative alignment of the pair.  I don't
+think this needs to be given an initial alignment.
+
+Infrastructure---
+I'd like to abandon Nowozin's MultiMatch structure as it
+puts all KP data and CP data "in one basket", making it
+hard to partition a big job pairwise.  That will mean
+abandoning his polishing fns too, as they all assume a
+MultiMatch.  So with this change the "autopano" part of
+APSCpp will become a completely different program from
+autopano.
+
+For a performance boost on multicore systems, it would be
+good to repackage the KP finder as a task (or a separate
+command pgm).
+
+But first, test whether there are any systematic coordinate
+errors in CPs:
+-- make project with an image and same rotated 90 degrees;
+   check optimization errors.
+1) Hugin assigns different focal lengths to the 2 images, so
+must set them equal by hand. It then stitches them with near
+perfect cancellation, either with the 90 deg rotation set at 
+load, or using CPS from legacy APSCpp.
+PFS_093-PFS_093-rot.pto, "8mm crop 1.60149 circular fisheye".
+2)Run this thru APSCpp 2.5.2 giving
+ 93-93r-stg.pto  -- maxdim 1600, stg on
+    Hugin and PTAsm display CP at same spots in both images;
+    Hugin gets good auto alignment after deleting 2 bad CPS.
+    PTAsm auto alignment fails.
+ 93-93r-nostg.pto  -- maxdim 1600, stg off
+    Hug & Pta show CPs not coinciding, 
+    Hug auto alignment very bad.
+Clearly I am botching CP rescaling when the stg is off.
+-- try re-using the pre-find remapper & (when stg off) inverting 
+the pre-find scale. Now both stg on & stg off CPs are misplaced!
+The relative positions are same in both images, but all are in
+the wrong places.
+So must review how to prescale & scale back.... tomorrow.
+
+23 July	kp coord scaling tests w/rotated image pairs
+-- put stg rescaling back the way it was.  Compute true factor
+   from long image axis instead of width.
+Now stg on gives good match w/90 deg rot (1 wild CP), stg off
+still gives shifted CP sets.
+-- try 180 deg rotation:  PFS_093-PFS_093-180.pto
+stg on: perfect alignment (1 bad point).
+stg off: perfect alignment (2 bad points). 
+
+So it looks like N. code gets coords wrong on 90 deg rot, and
+SAremap somehow corrects that??  No, as usual the fault is all
+mine:  I forgot to make undoing the stereographic mapping
+conditional on having done it in the first place.  With that 
+fixed the no-stg 90 deg case aligns perfectly (0 bad pnts) -- 
+indeed significantly better than with stg enabled, which means
+the remapping makes SIFT localization a bit less certain.
+
+Now that it's working, improve the API some more....
+-- lens-type option to override PT format codes.
+-- focal-length + crop factor option to override hfovs.
+-- lens-correction option to use a,b,c,d,e from project.
+
+26 July BUT FIRST -- some more testing
+
+Test set: L:EOSPix\StFx\IMG_7346-7350.pts.  Six 15mm fisheye 
+pix that stitch well with PTGui.  Run APSCpp with ransac on, 
+maxdim 1600 (2.19x reduction), autoalign with Hugin...
+  result		CPs	Avg	Worst
+  PTGui	autoalign	200	1.0	7.8
+  no stg		245	2.9	35.4
+  no stg + refine	249	3.5	307
+  stg			222	2.1	17.5
+  stg + refine		241	2.7	26.8
+and at full source resolution...
+  no stg, full rez	334	2.9	20.6
+  stg, full rez		296	2.1	19.2
+
+Stereographic remapping seems quite worthwhile, and gives 
+a big payoff per CPU second because it runs very fast.
+
+Reducing resolution did not degrade CP quality measurably.
+
+The refine option takes a very long time and makes the result
+worse.  It is actually an attempt to find SIFT CPs over again 
+at original resolution, in small patches around the found CPs.  
+I think I'll drop it, possibly in favor of something like local 
+correlation, perhaps on patches that have be reprojected to
+on-axis rectilinear...
+
+Anyhow the bottom line is that APSCpp's CPs are still far
+worse than PTGui's.  And it takes about 5 times longer to
+find them.
+	
+BTW ransac does prune some bad points, but not enough, it
+needs attention too.
+
+BTW 
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4116
          http://hugin.svn.sourceforge.net/hugin/?rev=4116&view=rev
Author:   jlegg
Date:     2009-07-27 14:56:20 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Make the variable links work across Panorama::getSubset.

Modified Paths:
--------------
    hugin/branches/gsoc2009_layout/src/hugin_base/panodata/Panorama.cpp

Modified: hugin/branches/gsoc2009_layout/src/hugin_base/panodata/Panorama.cpp
===================================================================
--- hugin/branches/gsoc2009_layout/src/hugin_base/panodata/Panorama.cpp	2009-07-27 14:10:38 UTC (rev 4115)
+++ hugin/branches/gsoc2009_layout/src/hugin_base/panodata/Panorama.cpp	2009-07-27 14:56:20 UTC (rev 4116)
@@ -1149,29 +1149,55 @@
 
 Panorama Panorama::getSubset(const UIntSet & imgs) const
 {
-    Panorama subset(*this);
-    // clear listeners!
-    subset.observers.clear();
-
+    Panorama subset;
+    // copy data except for listners
+    
+    // bits that don't change in the subset.
+    subset.imgFilePrefix = imgFilePrefix;
+    subset.dirty = dirty;
+    subset.state.options = state.options;
+    subset.state.needsOptimization = state.needsOptimization;
+    subset.changedImages = changedImages;
+    subset.m_forceImagesUpdate = m_forceImagesUpdate;
+    subset.m_ptoptimizerVarNames = m_ptoptimizerVarNames;
+    
     // create image number map.
     std::map<unsigned int, unsigned int> imageNrMap;
 
-    // copy images variables and lenses..
-    subset.state.images.clear();
-    subset.state.optvec.clear();
-
+    // copy image information
     unsigned int ic = 0;
     for (UIntSet::const_iterator imgNrIt = imgs.begin(); imgNrIt != imgs.end();
          ++imgNrIt)
     {
-        /** @todo setup variable links across the subset. These are lost when
-         * the image is copied.
-         */
         subset.state.images.push_back(state.images[*imgNrIt]);
         subset.state.optvec.push_back(state.optvec[*imgNrIt]);
         imageNrMap[*imgNrIt] = ic;
         ic++;
     }
+    
+    // recreate links between image variables.
+    ic = 0;
+    for (UIntSet::const_iterator i = imgs.begin(); i != imgs.end(); ++i)
+    {
+        unsigned int jc = 0;
+        UIntSet::const_iterator j = i;
+        for (++j; j != imgs.end(); ++j)
+        {
+            /** @todo It should be possible to speed this up by not linking
+             * things that have been already linked to something previously
+             * linked to the target.
+             */
+#define image_variable( name, type, default_value )\
+            if (state.images[*i].name##isLinkedWith(state.images[*j]))\
+            {\
+                subset.state.images[ic].link##name(&subset.state.images[jc]);\
+            }
+#include "image_variables.h"
+#undef image_variable
+            jc++;
+        }
+        ic++;
+    }
 
     // select and translate control points.
     subset.state.ctrlPoints.clear();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4115
          http://hugin.svn.sourceforge.net/hugin/?rev=4115&view=rev
Author:   jlegg
Date:     2009-07-27 14:10:38 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Fix crash caused by last commit.

Modified Paths:
--------------
    hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp

Modified: hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp	2009-07-27 11:11:03 UTC (rev 4114)
+++ hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp	2009-07-27 14:10:38 UTC (rev 4115)
@@ -718,12 +718,8 @@
             XRCCTRL(*this, "lens_val_Re", wxTextCtrl)->Clear();
             XRCCTRL(*this, "lens_inherit_v", wxCheckBox)->SetValue(false);
             XRCCTRL(*this, "lens_inherit_a", wxCheckBox)->SetValue(false);
-            XRCCTRL(*this, "lens_inherit_b", wxCheckBox)->SetValue(false);
-            XRCCTRL(*this, "lens_inherit_c", wxCheckBox)->SetValue(false);
             XRCCTRL(*this, "lens_inherit_d", wxCheckBox)->SetValue(false);
-            XRCCTRL(*this, "lens_inherit_e", wxCheckBox)->SetValue(false);
             XRCCTRL(*this, "lens_inherit_g", wxCheckBox)->SetValue(false);
-            XRCCTRL(*this, "lens_inherit_t", wxCheckBox)->SetValue(false);
             XRCCTRL(*this, "lens_inherit_Eev", wxCheckBox)->SetValue(false);
             XRCCTRL(*this, "lens_inherit_Er", wxCheckBox)->SetValue(false);
             XRCCTRL(*this, "lens_inherit_Eb", wxCheckBox)->SetValue(false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4113
          http://hugin.svn.sourceforge.net/hugin/?rev=4113&view=rev
Author:   tmodes
Date:     2009-07-27 05:30:19 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Some formatting of EXIF information

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
    hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc
    hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
    hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h

Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp	2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp	2009-07-27 05:30:19 UTC (rev 4113)
@@ -28,6 +28,7 @@
 #include <config.h>
 #include "panoinc_WX.h"
 #include "panoinc.h"
+#include <time.h>
 
 #include "base_wx/platform.h"
 #include <vector>
@@ -401,6 +402,7 @@
     if (sel.size() == 0) {
         // nothing to edit
         DisableImageCtrls();
+        ClearImgExifInfo();
     } else {
         // enable edit
         EnableImageCtrls();
@@ -417,6 +419,7 @@
             // multiselection, clear all values
             // we don't know which images parameters to show.
             ClearImgParameters();
+            ClearImgExifInfo();
             m_optAnchorButton->Disable();
             m_colorAnchorButton->Disable();
             m_moveDownButton->Disable();
@@ -473,8 +476,8 @@
     val = doubleToString(const_map_get(vars,"r").getValue(),m_degDigits);
     XRCCTRL(*this, "images_text_roll", wxTextCtrl) ->SetValue(wxString(val.c_str(), wxConvLocal));
 
+    ShowExifInfo(imgNr);
     ShowImage(imgNr);
-    ShowExifInfo(imgNr);
 }
 
 
@@ -488,6 +491,7 @@
     initImageFromFile(img,focalLength,cropFactor,applyExposureValue);
 
     std::string val;
+    wxString s;
     val = img.getFilename();
     XRCCTRL(*this, "images_filename",wxStaticText) ->
         SetLabel(wxFileName(wxString(val.c_str(),HUGIN_CONV_FILENAME)).GetFullName());
@@ -500,21 +504,45 @@
     XRCCTRL(*this, "images_camera_model",wxStaticText) ->
         SetLabel(wxString(val.c_str(),wxConvLocal));
 
-    val = img.getExifDate();
-    XRCCTRL(*this, "images_capture_date",wxStaticText) ->
-        SetLabel(wxString(val.c_str(),wxConvLocal));
+    struct tm exifdatetime;
+    if(img.getExifDateTime(&exifdatetime)==0)
+    {
+        wxDateTime s_datetime=wxDateTime(exifdatetime);
+        s=s_datetime.Format();
+    }
+    else
+        s = wxString(img.getExifDate().c_str(),wxConvLocal);
+    XRCCTRL(*this, "images_capture_date",wxStaticText)->SetLabel(s);
 
-    val = doubleToString(img.getExifFocalLength(),1);
-    XRCCTRL(*this, "images_focal_length",wxStaticText) ->
-        SetLabel(wxString(val.c_str(),wxConvLocal));
+    if(img.getExifFocalLength()>0.0)
+        if(img.getExifFocalLength35()>0.0)
+            s = wxString::Format(wxT("%0.1f mm (%0.0f mm)"),img.getExifFocalLength(),img.getExifFocalLength35());
+        else
+            s = wxString::Format(wxT("%0.1f mm"),img.getExifFocalLength());
+    else
+        s = wxEmptyString;
+    XRCCTRL(*this, "images_focal_length",wxStaticText)->SetLabel(s);
 
-    val = doubleToString(img.getExifAperture(),1);
-    XRCCTRL(*this, "images_aperture",wxStaticText) ->
-        SetLabel(wxString(val.c_str(),wxConvLocal));
+    if(img.getExifAperture()>0)
+        s=wxString::Format(wxT("F%.1f"),img.getExifAperture());
+    else
+        s=wxEmptyString;
+    XRCCTRL(*this, "images_aperture",wxStaticText)->SetLabel(s);
 
-    val = doubleToString(img.getExifExposureTime(),5);
-    XRCCTRL(*this, "images_shutter_speed",wxStaticText) ->
-        SetLabel(wxString(val.c_str(),wxConvLocal));
+    if(img.getExifExposureTime()>0.5) 
+        if(img.getExifExposureTime()>=1.0) 
+            if(img.getExifExposureTime()>=10.0) 
+                s=wxString::Format(wxT("%3.0f s"),img.getExifExposureTime());
+            else
+                s=wxString::Format(wxT("%1.1f s"),img.getExifExposureTime());
+        else
+            s=wxString::Format(wxT("%1.2f s"),img.getExifExposureTime());
+    else
+        s=wxString::Format(wxT("1/%2.0f s"),1.0/img.getExifExposureTime());
+    XRCCTRL(*this, "images_shutter_speed",wxStaticText)->SetLabel(s);
+
+    XRCCTRL(*this, "images_shutter_speed",wxStaticText)->GetParent()->Layout();
+    Refresh();
 }
 
 

Modified: hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc	2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin1/hugin/xrc/images_panel.xrc	2009-07-27 05:30:19 UTC (rev 4113)
@@ -42,7 +42,7 @@
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticLine">
-                            <style/>
+                            <style></style>
                           </object>
                           <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
                         </object>
@@ -76,7 +76,7 @@
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticLine">
-                            <style/>
+                            <style></style>
                           </object>
                           <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
                         </object>
@@ -92,7 +92,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticLine">
-                        <style/>
+                        <style></style>
                       </object>
                       <flag>wxTOP|wxBOTTOM|wxEXPAND</flag>
                       <border>6</border>
@@ -128,10 +128,10 @@
                           <object class="wxStaticText">
                             <label>Image Orientation</label>
                             <font>
-                              <size>12</size>
-                              <style>normal</style>
+                              <style platform="mac">normal</style>
+                              <family platform="mac">swiss</family>
                               <weight>bold</weight>
-                              <family>swiss</family>
+                              <size platform="mac">12</size>
                             </font>
                           </object>
                           <flag>wxBOTTOM</flag>
@@ -195,7 +195,7 @@
                             <object class="sizeritem">
                               <object class="wxButton" name="images_reset_pos">
                                 <label>Reset</label>
-                                <style/>
+                                <style></style>
                                 <tooltip>Reset position of selected image(s)</tooltip>
                               </object>
                               <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
@@ -217,10 +217,10 @@
                           <object class="wxStaticText">
                             <label>Feature Matching (Autopano)</label>
                             <font>
-                              <size>12</size>
-                              <style>normal</style>
+                              <style platform="mac">normal</style>
+                              <family platform="mac">swiss</family>
                               <weight>bold</weight>
-                              <family>swiss</family>
+                              <size platform="mac">12</size>
                             </font>
                           </object>
                           <flag>wxBOTTOM|wxEXPAND</flag>
@@ -297,10 +297,10 @@
                           <object class="wxStaticText">
                             <label>Reference Image</label>
                             <font>
-                              <size>12</size>
-                              <style>normal</style>
+                              <style platform="mac">normal</style>
+                              <family platform="mac">swiss</family>
                               <weight>bold</weight>
-                              <family>swiss</family>
+                              <size platform="mac">12</size>
                             </font>
                           </object>
                           <flag>wxBOTTOM</flag>
@@ -311,7 +311,7 @@
                             <object class="sizeritem">
                               <object class="wxButton" name="images_opt_anchor_button">
                                 <label>Anchor this image for position</label>
-                                <style/>
+                                <style></style>
                                 <tooltip>use currently selected image as anchor image. That is, do not optimize the (complete) position of this image.</tooltip>
                               </object>
                               <flag>wxEXPAND</flag>
@@ -347,14 +347,15 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxBoxSizer">
+                    <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
                       <object class="wxStaticText">
                         <label>Selected Image</label>
                         <font>
-                          <size>12</size>
-                          <style>normal</style>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
                           <weight>bold</weight>
-                          <family>swiss</family>
+                          <size platform="mac">12</size>
                         </font>
                       </object>
                       <flag>wxBOTTOM</flag>
@@ -362,114 +363,105 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxBoxSizer">
-                        <orient>wxVERTICAL</orient>
+                        <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
+                          <object class="wxFlexGridSizer">
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Filename:</label>
+                              </object>
+                              <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText" name="images_filename">
+                                <label></label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Make:</label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText" name="images_camera_make">
+                                <label></label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Model:</label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText" name="images_camera_model">
+                                <label></label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Capture Date:</label>
+                              </object>
+                              <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText" name="images_capture_date">
+                                <label></label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Focal Length:</label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText" name="images_focal_length">
+                                <label></label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Aperture:</label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText" name="images_aperture">
+                                <label></label>
+                              </object>
+                            </object>
+                            <cols>2</cols>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>Shutter Speed:</label>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText" name="images_shutter_speed">
+                                <label></label>
+                              </object>
+                            </object>
+                            <vgap>6</vgap>
+                            <hgap>6</hgap>
+                          </object>
+                          <flag>wxALL|wxEXPAND</flag>
+                          <border>5</border>
+                        </object>
+                        <object class="sizeritem">
                           <object class="wxStaticBitmap" name="images_selected_image">
                             <bitmap>data/druid.images.128.png</bitmap>
                           </object>
                           <option>1</option>
-                          <flag>wxEXPAND</flag>
+                          <flag>wxALL|wxEXPAND</flag>
+                          <border>5</border>
                         </object>
                       </object>
                       <option>1</option>
-                      <flag>wxLEFT|wxEXPAND</flag>
-                      <border>12</border>
+                      <flag>wxALL|wxEXPAND</flag>
                     </object>
                     <orient>wxVERTICAL</orient>
                   </object>
                   <flag>wxALL|wxEXPAND</flag>
                   <border>6</border>
                 </object>
-                <object class="sizeritem">
-                  <object class="wxBoxSizer">
-                    <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>EXIF Info</label>
-                        <font>
-                          <size>12</size>
-                          <style>normal</style>
-                          <weight>bold</weight>
-                          <underlined>0</underlined>
-                          <family>swiss</family>
-                          <face>Sans</face>
-                        </font>
-                      </object>
-                      <flag>wxBOTTOM</flag>
-                      <border>6</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxFlexGridSizer">
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Filename:</label>
-                          </object>
-                          <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="images_filename"/>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Make:</label>
-                          </object>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="images_camera_make"/>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Model:</label>
-                          </object>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="images_camera_model"/>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Capture Date:</label>
-                          </object>
-                          <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="images_capture_date"/>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Focal Length:</label>
-                          </object>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="images_focal_length"/>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Aperture:</label>
-                          </object>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="images_aperture"/>
-                        </object>
-                        <cols>2</cols>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Shutter Speed:</label>
-                          </object>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="images_shutter_speed"/>
-                        </object>
-                        <vgap>6</vgap>
-                        <hgap>6</hgap>
-                      </object>
-                      <flag>wxLEFT|wxEXPAND</flag>
-                      <border>12</border>
-                    </object>
-                    <orient>wxVERTICAL</orient>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>6</border>
-                </object>
                 <object class="spacer">
                   <size>10,0</size>
                 </object>

Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp	2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.cpp	2009-07-27 05:30:19 UTC (rev 4113)
@@ -142,6 +142,7 @@
 
     m_exifCropFactor = 0;
     m_exifFocalLength = 0;
+    m_exifFocalLength35 = 0;
     m_exifOrientation = 0;
     m_exifAperture = 0;
     m_exifDistance = 0;
@@ -246,6 +247,7 @@
              m_exifMake == other.m_exifMake &&
              m_exifCropFactor == other.m_exifCropFactor &&
              m_exifFocalLength == other.m_exifFocalLength &&
+             m_exifFocalLength35 == other.m_exifFocalLength35 &&
              m_exifOrientation == other.m_exifOrientation &&
              m_exifAperture == other.m_exifAperture &&
              m_exifISO == other.m_exifISO &&
@@ -607,6 +609,7 @@
 
     // store some important EXIF tags for later usage.
     setExifFocalLength(focalLength);
+    setExifFocalLength35(eFocalLength35);
     setExifCropFactor(cropFactor);
     setExifOrientation(roll);
     setExifAperture(photoFNumber);

Modified: hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
===================================================================
--- hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h	2009-07-27 05:25:59 UTC (rev 4112)
+++ hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h	2009-07-27 05:30:19 UTC (rev 4113)
@@ -333,6 +333,12 @@
     void setExifFocalLength(const double & val)
     { m_exifFocalLength = val; }
 
+    const double & getExifFocalLength35() const
+    { return m_exifFocalLength35; }
+    
+    void setExifFocalLength35(const double & val)
+    { m_exifFocalLength35 = val; }
+
     const double & getExifOrientation() const
     { return m_exifOrientation; }
     
@@ -345,9 +351,16 @@
     void setExifDistance(const double & val)
     { m_exifDistance = val; }
 
+    /** returns EXIF date and time as string */
     const std::string & getExifDate() const
     {return m_exifDate; }
     
+    /** try to convert Exif date time string to struct tm 
+     *  @return 0, if conversion was sucessfull */
+    const int getExifDateTime(struct tm* datetime) const
+    { return Exiv2::exifTime(m_exifDate.c_str(),datetime); }
+
+
     void setExifDate(const std::string & val)
     { m_exifDate = val;}
 
@@ -444,6 +457,7 @@
 
     double      m_exifCropFactor;
     double      m_exifFocalLength;
+    double      m_exifFocalLength35;
     double      m_exifOrientation;
     double      m_exifAperture;
     double      m_exifISO;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4112
          http://hugin.svn.sourceforge.net/hugin/?rev=4112&view=rev
Author:   tmodes
Date:     2009-07-27 05:25:59 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Added option to select which preview window is used after align

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
    hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp
    hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc

Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2009-07-27 05:24:38 UTC (rev 4111)
+++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp	2009-07-27 05:25:59 UTC (rev 4112)
@@ -721,7 +721,16 @@
 
     // show preview frame
     wxCommandEvent dummy;
-    MainFrame::Get()->OnToggleGLPreviewFrame(dummy);
+    long preview=wxConfigBase::Get()->Read(wxT("/Assistant/PreviewWindow"),1l);
+    switch(preview)
+    {
+        case 1:   
+            MainFrame::Get()->OnToggleGLPreviewFrame(dummy); 
+            break;
+        case 2:
+            MainFrame::Get()->OnTogglePreviewFrame(dummy);
+            break;
+    };
 
     // enable stitch button
     m_createButton->Enable();

Modified: hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp	2009-07-27 05:24:38 UTC (rev 4111)
+++ hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp	2009-07-27 05:25:59 UTC (rev 4112)
@@ -647,6 +647,7 @@
                    wxT(HUGIN_STITCHER_EDITOR)));
         MY_STR_VAL("prefs_ass_editor_args", cfg->Read(wxT("/Stitcher/EditorArgs"),
                    wxT(HUGIN_STITCHER_EDITOR_ARGS)));
+        MY_CHOICE_VAL("prefs_ass_preview", cfg->Read(wxT("/Assistant/PreviewWindow"), 1l));
     }
        // Fine tune settings
 
@@ -794,6 +795,7 @@
             cfg->Write(wxT("/Stitcher/RunEditor"), HUGIN_STITCHER_RUN_EDITOR);
             cfg->Write(wxT("/Stitcher/Editor"), wxT(HUGIN_STITCHER_EDITOR));
             cfg->Write(wxT("/Stitcher/EditorArgs"), wxT(HUGIN_STITCHER_EDITOR_ARGS));
+            cfg->Write(wxT("/Assistant/PreviewWindow"), 1l);
         }
         if (noteb->GetSelection() == 2) {
             // hdr
@@ -862,6 +864,7 @@
     cfg->Write(wxT("/Assistant/autoAlign"),MY_G_BOOL_VAL("prefs_ass_autoAlign"));
     cfg->Write(wxT("/Assistant/nControlPoints"), MY_G_SPIN_VAL("prefs_ass_nControlPoints"));
     cfg->Write(wxT("/Assistant/panoDownsizeFactor"), MY_G_SPIN_VAL("prefs_ass_panoDownsizeFactor") / 100.0);
+    cfg->Write(wxT("/Assistant/PreviewWindow"), MY_G_CHOICE_VAL("prefs_ass_preview"));
     // editor
     cfg->Write(wxT("/Stitcher/RunEditor"), MY_G_BOOL_VAL("prefs_ass_run_editor"));
     cfg->Write(wxT("/Stitcher/Editor"), MY_G_STR_VAL("prefs_ass_editor"));

Modified: hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc	2009-07-27 05:24:38 UTC (rev 4111)
+++ hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc	2009-07-27 05:25:59 UTC (rev 4112)
@@ -236,6 +236,53 @@
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
+                  <object class="wxStaticBoxSizer">
+                    <label>Show Preview</label>
+                    <orient>wxVERTICAL</orient>
+                    <object class="sizeritem">
+                      <object class="wxBoxSizer">
+                        <object class="sizeritem">
+                          <object class="wxBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>After align open</label>
+                              </object>
+                              <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                              <border>5</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxChoice" name="prefs_ass_preview">
+                                <content>
+                                  <item>Nothing</item>
+                                  <item>Fast Preview window</item>
+                                  <item>Preview window</item>
+                                </content>
+                              </object>
+                              <flag>wxLEFT|wxRIGHT|wxEXPAND</flag>
+                              <border>5</border>
+                            </object>
+                          </object>
+                          <flag>wxEXPAND</flag>
+                        </object>
+                        <orient>wxVERTICAL</orient>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Use Fast Preview window for general use, 
+for HDR panoramas use Preview window.</label>
+                          </object>
+                          <flag>wxALL|wxEXPAND</flag>
+                          <border>5</border>
+                        </object>
+                      </object>
+                      <flag>wxEXPAND</flag>
+                      <border>5</border>
+                    </object>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
                   <object class="wxPanel">
                     <object class="wxStaticBoxSizer">
                       <label>Create</label>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4111
          http://hugin.svn.sourceforge.net/hugin/?rev=4111&view=rev
Author:   tmodes
Date:     2009-07-27 05:24:38 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Fix colouring of indication bar for cp distance

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp

Modified: hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp	2009-07-27 05:23:32 UTC (rev 4110)
+++ hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp	2009-07-27 05:24:38 UTC (rev 4111)
@@ -157,7 +157,7 @@
     {
         qty_cp = wxString::Format(wxT(" %d"), CPCount[item]);
         GetTextExtent(qty_cp, &qty_w, &h);
-	}
+    }
 
     // determine if the string can fit inside the current combo box
     if (w +qty_w <= maxWidth)
@@ -200,6 +200,23 @@
         //inner rectangle with color proportional to max cp error (max. 10)
         wxPen MyPen(wxColour(255,0,0),1,wxSOLID);
         wxBrush MyBrush(wxColour(255,0,0),wxSOLID);
+        double red, green;
+        if(CPConnection[item]>5.0)
+        {
+            red=255.0;
+            green=(1.0-min<double>(CPConnection[item]-5.0,5.0)/5.0)*192.0;
+        }
+        else
+        {
+            green=192.0;
+            red=(CPConnection[item]/5.0)*255.0;
+        }
+        MyPen.SetColour(wxColour(red,green,0));
+        MyBrush.SetColour(wxColour(red,green,0));
+        dc.SetPen(MyPen);
+        dc.SetBrush(MyBrush);
+        dc.DrawRectangle(rect.x+0.75*rect.width,rect.y+rect.height/6+1,x,2*rect.height/3);
+/*
         // half the rectangle
         int half=rect.width/10;
         // color steps
@@ -208,21 +225,6 @@
         // starting color
         double red=255.0;
         double green=0.0;
-		if(x<half)
-		{
-			green=green+x*step_green;
-		}
-		else
-		{
-			green=192.0;
-			red=red-x*step_red;
-		}
-        MyPen.SetColour(wxColour(red,green,0));
-        MyBrush.SetColour(wxColour(red,green,0));
-        dc.SetPen(MyPen);
-        dc.SetBrush(MyBrush);
-		dc.DrawRectangle(rect.x+0.75*rect.width,rect.y+rect.height/6+1,x,2*rect.height/3);
-/*
         for(int i=0;i<x;i++)
         {
             MyPen.SetColour(wxColour(red,green,0));
@@ -244,8 +246,8 @@
         }
 */
         //outer rectangle, same colour as text
-		MyPen.SetColour(dc.GetTextForeground());
-		dc.SetPen(MyPen);
+        MyPen.SetColour(dc.GetTextForeground());
+        dc.SetPen(MyPen);
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(rect.x+0.75*rect.width,rect.y+rect.height/6+1,rect.width/5,2*rect.height/3);
         dc.SetPen(*oldPen);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4110
          http://hugin.svn.sourceforge.net/hugin/?rev=4110&view=rev
Author:   tmodes
Date:     2009-07-27 05:23:32 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Set correctly window title of hugin [2824137]

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MainFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2009-07-27 05:21:53 UTC (rev 4109)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2009-07-27 05:23:32 UTC (rev 4110)
@@ -561,10 +561,10 @@
                                                               makefile,
                                                               tmpDir);
         }
+        SetStatusText(wxString::Format(_("saved project %s"), m_filename.c_str()),0);
+        this->SetTitle(scriptName.GetName() + wxT(".") + scriptName.GetExt() + wxT(" - ") + _("Hugin - Panorama Tools Frontend"));
+        pano.clearDirty();
     }
-    SetStatusText(wxString::Format(_("saved project %s"), m_filename.c_str()),0);
-    this->SetTitle(scriptName.GetName() + wxT(".") + scriptName.GetExt() + wxT(" - hugin"));
-    pano.clearDirty();
     } catch (std::exception & e) {
         wxString err(e.what(), wxConvLocal);
         wxMessageBox(err, wxT("Exception during saving project file"));
@@ -653,7 +653,7 @@
         DEBUG_DEBUG("project contains " << pano.getNrOfImages() << " after load");
         opt_panel->setModeCustom();
         SetStatusText(_("Project opened"));
-        this->SetTitle(fname.GetName() + wxT(".") + fname.GetExt() + wxT(" - hugin"));
+        this->SetTitle(fname.GetName() + wxT(".") + fname.GetExt() + wxT(" - ") + _("Hugin - Panorama Tools Frontend"));
         if (! (fname.GetExt() == wxT("pto"))) {
             // do not remember filename if its not a hugin project
             // to avoid overwriting the original project with an
@@ -737,7 +737,7 @@
     GlobalCmdHist::getInstance().addCommand( new NewPanoCmd(pano));
     // remove old images from cache
     ImageCache::getInstance().flush();
-    this->SetTitle(wxT("hugin"));
+    this->SetTitle(_("Hugin - Panorama Tools Frontend"));
     pano.clearDirty();
 
     // Setup pano with options from preferences


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4109
          http://hugin.svn.sourceforge.net/hugin/?rev=4109&view=rev
Author:   tmodes
Date:     2009-07-27 05:21:53 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Provide translatable strings for tip of day dialog [2824100]

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/LocalizedFileTipProvider.cpp

Modified: hugin/trunk/src/hugin1/hugin/LocalizedFileTipProvider.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/LocalizedFileTipProvider.cpp	2009-07-27 05:20:06 UTC (rev 4108)
+++ hugin/trunk/src/hugin1/hugin/LocalizedFileTipProvider.cpp	2009-07-27 05:21:53 UTC (rev 4109)
@@ -101,3 +101,11 @@
     return tip;
 }
 
+#ifdef ThisNeverHappens
+// provide some translatable strings for tip window
+    wxLogMessage(_("&Next Tip"));
+    wxLogMessage(_("&Show tips at startup"));
+    wxLogMessage(_("Tip of the Day"));
+    wxLogMessage(_("&Close"));
+    wxLogMessaeg(_("Did you know..."));
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4108
          http://hugin.svn.sourceforge.net/hugin/?rev=4108&view=rev
Author:   tmodes
Date:     2009-07-27 05:20:06 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Updated CMake file for Exiv2-0.18.2

Modified Paths:
--------------
    hugin/trunk/CMakeModules/FindExiv2.cmake

Modified: hugin/trunk/CMakeModules/FindExiv2.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindExiv2.cmake	2009-07-27 00:52:56 UTC (rev 4107)
+++ hugin/trunk/CMakeModules/FindExiv2.cmake	2009-07-27 05:20:06 UTC (rev 4108)
@@ -74,6 +74,7 @@
                ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/include
+               ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/include
               )
 
      include(FindLibraryWithDebug)
@@ -81,13 +82,13 @@
      find_library_with_debug(EXIV2_LIBRARIES
         WIN32_DEBUG_POSTFIX d
         NAMES exiv2 libexiv2
-        PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib
+        PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib
      )
 
      find_library_with_debug(EXIV2EXPAT_LIBRARIES
         WIN32_DEBUG_POSTFIX d
         NAMES libexpat
-        PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib
+        PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib
      )
 
      SET(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${EXIV2EXPAT_LIBRARIES})


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4107
          http://hugin.svn.sourceforge.net/hugin/?rev=4107&view=rev
Author:   jlegg
Date:     2009-07-27 00:52:56 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Change the link checkboxes on the camera and lens tab to reflect what they actually change.

Modified Paths:
--------------
    hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp
    hugin/branches/gsoc2009_layout/src/hugin1/hugin/xrc/lens_panel.xrc

Modified: hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp
===================================================================
--- hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp	2009-07-26 23:47:54 UTC (rev 4106)
+++ hugin/branches/gsoc2009_layout/src/hugin1/hugin/LensPanel.cpp	2009-07-27 00:52:56 UTC (rev 4107)
@@ -106,12 +106,8 @@
     EVT_BUTTON ( XRCID("lens_button_reset"), LensPanel::OnReset )
     EVT_CHECKBOX ( XRCID("lens_inherit_v"), LensPanel::OnVarInheritChanged )
     EVT_CHECKBOX ( XRCID("lens_inherit_a"), LensPanel::OnVarInheritChanged )
-    EVT_CHECKBOX ( XRCID("lens_inherit_b"), LensPanel::OnVarInheritChanged )
-    EVT_CHECKBOX ( XRCID("lens_inherit_c"), LensPanel::OnVarInheritChanged )
     EVT_CHECKBOX ( XRCID("lens_inherit_d"), LensPanel::OnVarInheritChanged )
-    EVT_CHECKBOX ( XRCID("lens_inherit_e"), LensPanel::OnVarInheritChanged )
     EVT_CHECKBOX ( XRCID("lens_inherit_g"), LensPanel::OnVarInheritChanged )
-    EVT_CHECKBOX ( XRCID("lens_inherit_t"), LensPanel::OnVarInheritChanged )
     EVT_CHECKBOX ( XRCID("lens_inherit_Eev"), LensPanel::OnVarInheritChanged )
     EVT_CHECKBOX ( XRCID("lens_inherit_Er"), LensPanel::OnVarInheritChanged )
     EVT_CHECKBOX ( XRCID("lens_inherit_Eb"), LensPanel::OnVarInheritChanged )
@@ -307,7 +303,11 @@
             if ((*varname)[1] == 'b' || (*varname)[1] == 'x') {
                 m_XRCCTRL(*this, wxString(wxT("lens_inherit_")).append(wxString(*varname, wxConvLocal)), wxCheckBox)->SetValue(linked);
             }
-        } else {
+        }
+        else if (((*varname)[0] != 'b' && (*varname)[0] != 'c' &&
+                  (*varname)[0] != 'e' && (*varname)[0] != 't' &&
+                  (*varname)[0] != 'y') || (*varname)[1] != '\0')
+        {
             m_XRCCTRL(*this, wxString(wxT("lens_inherit_")).append(wxString(*varname, wxConvLocal)), wxCheckBox)->SetValue(linked);
         }
     }
@@ -626,12 +626,8 @@
         XRCCTRL(*this, "lens_val_Re", wxTextCtrl)->Disable();
         XRCCTRL(*this, "lens_inherit_v", wxCheckBox)->Disable();
         XRCCTRL(*this, "lens_inherit_a", wxCheckBox)->Disable();
-        XRCCTRL(*this, "lens_inherit_b", wxCheckBox)->Disable();
-        XRCCTRL(*this, "lens_inherit_c", wxCheckBox)->Disable();
         XRCCTRL(*this, "lens_inherit_d", wxCheckBox)->Disable();
-        XRCCTRL(*this, "lens_inherit_e", wxCheckBox)->Disable();
         XRCCTRL(*this, "lens_inherit_g", wxCheckBox)->Disable();
-        XRCCTRL(*this, "lens_inherit_t", wxCheckBox)->Disable();
         XRCCTRL(*this, "lens_inherit_Eev", wxCheckBox)->Disable();
         XRCCTRL(*this, "lens_inherit_Er", wxCheckBox)->Disable();
         XRCCTRL(*this, "lens_inherit_Eb", wxCheckBox)->Disable();
@@ -675,12 +671,8 @@
             XRCCTRL(*this, "lens_val_Re", wxTextCtrl)->Enable();
             XRCCTRL(*this, "lens_inherit_v", wxCheckBox)->Enable();
             XRCCTRL(*this, "lens_inherit_a", wxCheckBox)->Enable();
-            XRCCTRL(*this, "lens_inherit_b", wxCheckBox)->Enable();
-            XRCCTRL(*this, "lens_inherit_c", wxCheckBox)->Enable();
             XRCCTRL(*this, "lens_inherit_d", wxCheckBox)->Enable();
-            XRCCTRL(*this, "lens_inherit_e", wxCheckBox)->Enable();
             XRCCTRL(*this, "lens_inherit_g", wxCheckBox)->Enable();
-            XRCCTRL(*this, "lens_inherit_t", wxCheckBox)->Enable();
             XRCCTRL(*this, "lens_inherit_Eev", wxCheckBox)->Enable();
             XRCCTRL(*this, "lens_inherit_Er", wxCheckBox)->Enable();
             XRCCTRL(*this, "lens_inherit_Eb", wxCheckBox)->Enable();

Modified: hugin/branches/gsoc2009_layout/src/hugin1/hugin/xrc/lens_panel.xrc
===================================================================
--- hugin/branches/gsoc2009_layout/src/hugin1/hugin/xrc/lens_panel.xrc	2009-07-26 23:47:54 UTC (rev 4106)
+++ hugin/branches/gsoc2009_layout/src/hugin1/hugin/xrc/lens_panel.xrc	2009-07-27 00:52:56 UTC (rev 4107)
@@ -233,21 +233,32 @@
                             <object class="wxBoxSizer">
                               <orient>wxVERTICAL</orient>
                               <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>Radial Distortion</label>
-                                  <font>
-                                    <style platform="mac">normal</style>
-                                    <family platform="mac">swiss</family>
-                                    <weight>bold</weight>
-                                    <size platform="mac">12</size>
-                                  </font>
+                                <object class="wxBoxSizer">
+                                  <orient>wxHORIZONTAL</orient>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Radial Distortion</label>
+                                      <font>
+                                        <style platform="mac">normal</style>
+                                        <family platform="mac">swiss</family>
+                                        <weight>bold</weight>
+                                        <size platform="mac">12</size>
+                                      </font>
+                                    </object>
+                                    <flag>wxBOTTOM</flag>
+                                    <border>6</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxCheckBox" name="lens_inherit_a">
+                                      <label>Link</label>
+                                    </object>
+                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                                  </object>
                                 </object>
-                                <flag>wxBOTTOM</flag>
-                                <border>6</border>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxFlexGridSizer">
-                                  <cols>3</cols>
+                                  <cols>2</cols>
                                   <object class="sizeritem">
                                     <object class="wxStaticText">
                                       <label>distortion (a):</label>
@@ -262,12 +273,6 @@
                                     <flag>wxEXPAND</flag>
                                   </object>
                                   <object class="sizeritem">
-                                    <object class="wxCheckBox" name="lens_inherit_a">
-                                      <label>Link</label>
-                                    </object>
-                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                                  </object>
-                                  <object class="sizeritem">
                                     <object class="wxStaticText">
                                       <label>barrel (b):</label>
                                     </object>
@@ -281,12 +286,6 @@
                                     <flag>wxEXPAND</flag>
                                   </object>
                                   <object class="sizeritem">
-                                    <object class="wxCheckBox" name="lens_inherit_b">
-                                      <label>Link</label>
-                                    </object>
-                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                                  </object>
-                                  <object class="sizeritem">
                                     <object class="wxStaticText">
                                       <label>distortion (c):</label>
                                     </object>
@@ -299,12 +298,6 @@
                                     </object>
                                     <flag>wxEXPAND</flag>
                                   </object>
-                                  <object class="sizeritem">
-                                    <object class="wxCheckBox" name="lens_inherit_c">
-                                      <label>Link</label>
-                                    </object>
-                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                                  </object>
                                   <rows>3</rows>
                                   <vgap>5</vgap>
                                   <hgap>6</hgap>
@@ -320,21 +313,33 @@
                             <object class="wxBoxSizer">
                               <orient>wxVERTICAL</orient>
                               <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>Image Center Shift</label>
-                                  <font>
-                                    <style platform="mac">normal</style>
-                                    <family platform="mac">swiss</family>
-                                    <weight>bold</weight>
-                                    <size platform="mac">12</size>
-                                  </font>
+                                <object class="wxBoxSizer">
+                                <orient>wxHORIZONTAL</orient>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Image Center Shift</label>
+                                      <font>
+                                        <style platform="mac">normal</style>
+                                        <family platform="mac">swiss</family>
+                                        <weight>bold</weight>
+                                        <size platform="mac">12</size>
+                                      </font>
+                                    </object>
+                                    <flag>wxBOTTOM</flag>
+                                    <border>6</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxCheckBox" name="lens_inherit_d">
+                                      <label>Link</label>
+                                      <style></style>
+                                    </object>
+                                    <style>wxALIGN_CENTRE_VERTICAL</style>
+                                  </object>
                                 </object>
-                                <flag>wxBOTTOM</flag>
-                                <border>6</border>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxFlexGridSizer">
-                                  <cols>3</cols>
+                                  <cols>2</cols>
                                   <object class="sizeritem">
                                     <object class="wxStaticText">
                                       <label>horizontal (d):</label>
@@ -349,13 +354,6 @@
                                     <flag>wxEXPAND</flag>
                                   </object>
                                   <object class="sizeritem">
-                                    <object class="wxCheckBox" name="lens_inherit_d">
-                                      <label>Link</label>
-                                      <style></style>
-                                    </object>
-                                    <style>wxALIGN_CENTRE_VERTICAL</style>
-                                  </object>
-                                  <object class="sizeritem">
                                     <object class="wxStaticText">
                                       <label>vertical (e):</label>
                                     </object>
@@ -368,12 +366,6 @@
                                     </object>
                                     <flag>wxEXPAND</flag>
                                   </object>
-                                  <object class="sizeritem">
-                                    <object class="wxCheckBox" name="lens_inherit_e">
-                                      <label>Link</label>
-                                    </object>
-                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                                  </object>
                                   <rows>2</rows>
                                   <vgap>5</vgap>
                                   <hgap>6</hgap>
@@ -401,21 +393,32 @@
                             <object class="wxBoxSizer">
                               <orient>wxVERTICAL</orient>
                               <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>Image Shearing</label>
-                                  <font>
-                                    <style platform="mac">normal</style>
-                                    <family platform="mac">swiss</family>
-                                    <weight>bold</weight>
-                                    <size platform="mac">12</size>
-                                  </font>
+                                <object class="wxBoxSizer">
+                                  <orient>wxHORIZONTAL</orient>
+                                  <object class="sizeritem">
+                                    <object class="wxStaticText">
+                                      <label>Image Shearing</label>
+                                      <font>
+                                        <style platform="mac">normal</style>
+                                        <family platform="mac">swiss</family>
+                                        <weight>bold</weight>
+                                        <size platform="mac">12</size>
+                                      </font>
+                                    </object>
+                                  <flag>wxBOTTOM</flag>
+                                  <border>6</border>
+                                  </object>
+                                  <object class="sizeritem">
+                                    <object class="wxCheckBox" name="lens_inherit_g">
+                                      <label>Link</label>
+                                    </object>
+                                    <style>wxALIGN_CENTRE_VERTICAL</style>
+                                  </object>
                                 </object>
-                                <flag>wxBOTTOM</flag>
-                                <border>6</border>
                               </object>
                               <object class="sizeritem">
                                 <object class="wxFlexGridSizer">
-                                  <cols>3</cols>
+                                  <cols>2</cols>
                                   <object class="sizeritem">
                                     <object class="wxStaticText">
                                       <label>horizontal (g):</label>
@@ -430,12 +433,6 @@
                                     <flag>wxEXPAND</flag>
                                   </object>
                                   <object class="sizeritem">
-                                    <object class="wxCheckBox" name="lens_inherit_g">
-                                      <label>Link</label>
-                                    </object>
-                                    <style>wxALIGN_CENTRE_VERTICAL</style>
-                                  </object>
-                                  <object class="sizeritem">
                                     <object class="wxStaticText">
                                       <label>vertical (t):</label>
                                     </object>
@@ -448,12 +445,6 @@
                                     </object>
                                     <flag>wxEXPAND</flag>
                                   </object>
-                                  <object class="sizeritem">
-                                    <object class="wxCheckBox" name="lens_inherit_t">
-                                      <label>Link</label>
-                                    </object>
-                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                                  </object>
                                   <rows>2</rows>
                                   <vgap>5</vgap>
                                   <hgap>6</hgap>
@@ -662,6 +653,7 @@
                                     <weight>bold</weight>
                                     <size platform="mac">12</size>
                                   </font>
+                                  <flag>wxALIGN_CENTRE_VERTICAL</flag>
                                 </object>
                                 <flag>wxBOTTOM</flag>
                                 <border>6</border>
@@ -702,7 +694,6 @@
                                     <object class="wxCheckBox" name="lens_inherit_Vx">
                                       <label>Link</label>
                                     </object>
-                                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
                                   </object>
                                   <vgap>5</vgap>
                                   <hgap>6</hgap>
@@ -852,4 +843,4 @@
       </object>
     </object>
   </object>
-</resource>
\ No newline at end of file
+</resource>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.