[Hugin-cvs] /hgroot/hugin/hugin: Added devMosaic() stub function headers and...

[<hug...@li...>]

branch:     2011.4
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/7b11db92557a
changeset:  6164:7b11db92557a
user:       Dev Ghosh <dg...@no...>
date:       Mon Jul 16 11:23:04 2012 -0500
description:

Added devMosaic() stub function headers and body:
* In base class PanoramaData, added pure virtual function header for devMosaic()

* In Panorama.h, added function header for devMosaic()

* In Panorama.cpp, added body (just a printf for now) of devMosaic() as member of Class Panorama

* In OptimizePanel.cpp function OptimizePanel::OnChangeMode(),
  declared Panorama object localPano, copied contents of m_pano (global pano), called devMosaic

diffstat:

 src/hugin1/hugin/OptimizePanel.cpp          |  9 ++++++++-
 src/hugin_base/panodata/PTScriptParsing.cpp |  2 +-
 src/hugin_base/panodata/Panorama.cpp        |  9 +++++++++
 src/hugin_base/panodata/Panorama.h          |  3 ++-
 src/hugin_base/panodata/PanoramaData.h      |  3 ++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diffs (87 lines):

diff -r 564f693cb970 -r 7b11db92557a src/hugin1/hugin/OptimizePanel.cpp
--- a/src/hugin1/hugin/OptimizePanel.cpp	Fri Jul 13 12:05:07 2012 -0500
+++ b/src/hugin1/hugin/OptimizePanel.cpp	Mon Jul 16 11:23:04 2012 -0500
@@ -987,11 +987,18 @@
                 SetCheckMark(m_e_list,true);
                 break;
             case OPT_STR_XYZ:
+            {
                 // Dev: six parameter mosaic model (spin,tilt,rot,x,y,z)
                 printf("selected Dev's tilt model\n");
+                printf("Dev: called OptimizePanel::OnChangeMode() after selecting six param mosaic model\n");
+                Panorama localPano;
+                localPano = m_pano->duplicate();
+                localPano.devMosaic();
+
                 SetCheckMark(m_x_list,true);
                 SetCheckMark(m_y_list,true);
-                SetCheckMark(m_z_list,true);                
+                SetCheckMark(m_z_list,true);
+            }
                 break;
             case OPT_CUSTOM:
                 break;
diff -r 564f693cb970 -r 7b11db92557a src/hugin_base/panodata/PTScriptParsing.cpp
--- a/src/hugin_base/panodata/PTScriptParsing.cpp	Fri Jul 13 12:05:07 2012 -0500
+++ b/src/hugin_base/panodata/PTScriptParsing.cpp	Mon Jul 16 11:23:04 2012 -0500
@@ -213,7 +213,7 @@
 				    "Eev", "Er",  "Eb",
 				    "Ra", "Rb", "Rc", "Rd", "Re",  0};
 
-double ImgInfo::defaultValues[] = {51.0,  0.0, 0.0, 0.0,  0.0, 0.0,  0.0, 0.0,  0.0, 0.0, 0.0,  0.0, 0.0, 0.0, 1.0,  0.0,0.0,1.0,
+double ImgInfo::defaultValues[] = {51.0,  0.0, 0.0, 0.0,  0.0, 0.0,  0.0, 0.0,  0.0, 0.0, 0.0,  0.0,  0.0, 0.0, 1.0,  0.0,0.0,1.0,
 				   1.0, 0.0, 0.0, 0.0,   0.0, 0.0, 
 				   0.0, 1.0,  1.0, 
 				   0.0, 0.0, 0.0, 0.0, 0.0};
diff -r 564f693cb970 -r 7b11db92557a src/hugin_base/panodata/Panorama.cpp
--- a/src/hugin_base/panodata/Panorama.cpp	Fri Jul 13 12:05:07 2012 -0500
+++ b/src/hugin_base/panodata/Panorama.cpp	Mon Jul 16 11:23:04 2012 -0500
@@ -598,6 +598,8 @@
         o << "# hugin project file" << std::endl;
         o << "#hugin_ptoversion 2" << std::endl;
     }
+    printf("Dev: called Panorama::printPanoramaScript() to write script to memory or disk\n");
+    printf("Dev: will write comment to pto script here\n");
     // output options..
 
     output.printScriptLine(o, forPTOptimizer);
@@ -1835,6 +1837,13 @@
     return SUCCESSFUL;
 }
 
+
+// Dev: stub function in HuginBase/Panorama inherited from HuginBase/PanoramaData
+void Panorama::devMosaic()
+{
+    printf("Entered the stub function in HuginBase/Panorama inherited from HuginBase/PanoramaData\n");
+}
+
 void Panorama::updateWhiteBalance(double redFactor, double blueFactor)
 {
     UIntSet modified_images;
diff -r 564f693cb970 -r 7b11db92557a src/hugin_base/panodata/Panorama.h
--- a/src/hugin_base/panodata/Panorama.h	Fri Jul 13 12:05:07 2012 -0500
+++ b/src/hugin_base/panodata/Panorama.h	Mon Jul 16 11:23:04 2012 -0500
@@ -485,7 +485,8 @@
                                  const UIntSet & imgs) const;
 
         
-        
+        // Dev: stub for activating mosaic mode - inherited from PanoramaData
+        void devMosaic();
     //=========== ManagedPanoramaData ==============================================
 
 
diff -r 564f693cb970 -r 7b11db92557a src/hugin_base/panodata/PanoramaData.h
--- a/src/hugin_base/panodata/PanoramaData.h	Fri Jul 13 12:05:07 2012 -0500
+++ b/src/hugin_base/panodata/PanoramaData.h	Mon Jul 16 11:23:04 2012 -0500
@@ -358,7 +358,8 @@
                              const PanoramaOptions & target,
                              const UIntSet & imgs) const =0;
     
-    
+    // Dev: stub for activating mosaic mode. "=0" makes pure virtual function.
+    virtual void devMosaic() =0;           // must be implemented in a subclass
 // -- maintainance --
     
 public: