[Hugin-cvs] hugin/src/include/PT Panorama.h, 1.49, 1.50 PanoramaMemento.h, 1.55, 1.56

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/include/PT
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17708/include/PT

Modified Files:
	Panorama.h PanoramaMemento.h 
Log Message:
new feature: determine roll from exif data. Rotate image in control point
editor according to the roll value.
Started implementation of the makefile generation for support of new
panotools programs and smartblend (not finished yet).


Index: PanoramaMemento.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/PanoramaMemento.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- PanoramaMemento.h	9 Aug 2006 21:01:19 -0000	1.55
+++ PanoramaMemento.h	11 Nov 2006 21:29:25 -0000	1.56
@@ -210,7 +210,7 @@
     }
 
     /** try to read image information from file */
-    bool initFromFile(const std::string & filename, double &cropFactor);
+    bool initFromFile(const std::string & filename, double &cropFactor, double & roll);
 
 //    double isLandscape() const {
 //        return sensorRatio >=1;
@@ -344,10 +344,16 @@
 
     /** blending mechanism */
     enum BlendingMechanism {
-	NO_BLEND,
-	WEIGHTED_BLEND,
-	SPLINE_BLEND,
-	CHESSBOARD_BLEND
+        NO_BLEND=0,
+        PTBLENDER_BLEND=1,
+        ENBLEND_BLEND=2,
+        SMARTBLEND_BLEND=3
+    };
+
+    enum Remapper {
+        NONA=0,
+        PTSTITCHER,
+        PTREMAP
     };
 
     /** type of color correction
@@ -380,7 +386,8 @@
             featherWidth = 10;
             outputFormat = JPEG;
             remapAcceleration = MAX_SPEEDUP;
-            blendMode = WEIGHTED_BLEND;
+            blendMode = NO_BLEND;
+            remapper = NONA;
             saveCoordImgs = false;
         }
     virtual ~PanoramaOptions() {};
@@ -485,6 +492,7 @@
 
     PTStitcherAcceleration remapAcceleration;
     BlendingMechanism blendMode;
+    Remapper remapper;
 
     bool saveCoordImgs;
 

Index: Panorama.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/Panorama.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Panorama.h	19 Apr 2006 20:35:49 -0000	1.49
+++ Panorama.h	11 Nov 2006 21:29:25 -0000	1.50
@@ -648,6 +648,41 @@
 PT::Variable & map_get(PT::VariableMap &m, const std::string & key);
 const PT::Variable & const_map_get(const PT::VariableMap &m, const std::string & key);
 
+
+struct PTPrograms
+{
+    PTPrograms()
+    {
+        // default programs
+        nona = "nona";
+        PTStitcher = "PTStitcher";
+        PTremap = "PTremap";
+        PTroller = "PTroller";
+        PTblender = "PTblender";
+        enblend = "enblend";
+        smartblend = "smartblend";
+    }
+
+    std::string nona;
+    std::string PTStitcher;
+    std::string PTremap;
+    std::string PTroller;
+    std::string PTblender;
+    std::string enblend;
+    std::string smartblend;
+};
+
+
+/** create a makefile and associated project file for rendering */
+void createMakefile(const Panorama & pano,
+                    const std::string & ptofile,
+                    const std::string & outputPrefix,
+                    const PT::PanoramaOptions & opts,
+                    const PT::UIntSet & imgs,
+                    const PTPrograms & progs,
+                    std::ostream & o);
+
+
 } // namespace