[Hugin-cvs] hugin/src/Panorama Panorama.cpp,1.88,1.89 PanoramaMemento.cpp,1.56,1.57

[Douglas W. <dwi...@us...>]

Update of /cvsroot/hugin/hugin/src/Panorama
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18899/src/Panorama

Modified Files:
	Panorama.cpp PanoramaMemento.cpp 
Log Message:
Save enblend option in project file

Index: PanoramaMemento.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/PanoramaMemento.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- PanoramaMemento.cpp	7 Mar 2005 19:51:51 -0000	1.56
+++ PanoramaMemento.cpp	28 May 2005 16:42:11 -0000	1.57
@@ -803,6 +803,28 @@
             if (line.substr(0,14) == "#hugin_options") {
                 DEBUG_DEBUG("parsing special line");
                 getIntParam(options.optimizeReferenceImage, line, "r");
+				int val;
+				if (getIntParam(val,line,"e")) {
+					switch(val) {
+					case 0:
+						options.blendMode = PanoramaOptions::NO_BLEND;
+						break;
+					case 1:
+						options.blendMode = PanoramaOptions::WEIGHTED_BLEND;
+						break;
+					case 2:
+						options.blendMode = PanoramaOptions::SPLINE_BLEND;
+						break;
+					case 3:
+						options.blendMode = PanoramaOptions::CHESSBOARD_BLEND;
+						break;
+					default:
+						options.blendMode = PanoramaOptions::WEIGHTED_BLEND;
+						break;
+					}
+				} else {
+					options.blendMode = PanoramaOptions::WEIGHTED_BLEND;
+				}
             }
             break;
         }

Index: Panorama.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/Panorama/Panorama.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- Panorama.cpp	26 May 2005 22:11:36 -0000	1.88
+++ Panorama.cpp	28 May 2005 16:42:10 -0000	1.89
@@ -888,7 +888,20 @@
     o << std::endl;
 
     // special line with hugins options.
-    o << "#hugin_options r" << output.optimizeReferenceImage << std::endl;
+    o << "#hugin_options r" << output.optimizeReferenceImage;
+    switch (output.blendMode) {
+    case PanoramaOptions::NO_BLEND:
+        o << " e0";
+        break;
+	case PanoramaOptions::WEIGHTED_BLEND:
+        o << " e1";
+        break;
+    case PanoramaOptions::SPLINE_BLEND:
+        o << " e2";
+    case PanoramaOptions::CHESSBOARD_BLEND:
+        o << " e3";
+    }
+	o << std::endl;
 
 #ifdef __unix__
     // reset locale