Hugin

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/6852a1edc9fe
changeset: 4803:6852a1edc9fe
user:      tmodes
date:       Fri Jan 07 18:12:02 2011 +0100
description:
Use circular crop for Thoby projection

diffstat:

 src/hugin1/hugin/CropPanel.cpp           |  2 +-
 src/hugin1/hugin/HFOVDialog.cpp          |  2 +-
 src/hugin_base/panodata/Panorama.cpp     |  2 +-
 src/hugin_base/panodata/SrcPanoImage.cpp |  2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 8b3ff381a026 -r 6852a1edc9fe src/hugin1/hugin/CropPanel.cpp
--- a/src/hugin1/hugin/CropPanel.cpp	Thu Jan 06 21:13:35 2011 +0100
+++ b/src/hugin1/hugin/CropPanel.cpp	Fri Jan 07 18:12:02 2011 +0100
@@ -216,7 +216,7 @@
     int dy = roundi(img.getRadialDistortionCenterShift().y);
     /// @todo can this be done with img.getSize() / 2 + img.getRadialDistortionCenterShift()?
     m_center = vigra::Point2D(img.getSize().width()/2 + dx, img.getSize().height()/2 + dy);
-    m_circular = img.getProjection() == SrcPanoImage::CIRCULAR_FISHEYE;
+    m_circular = img.getCropMode() == SrcPanoImage::CROP_CIRCLE;
 
     UpdateDisplay();
 }
diff -r 8b3ff381a026 -r 6852a1edc9fe src/hugin1/hugin/HFOVDialog.cpp
--- a/src/hugin1/hugin/HFOVDialog.cpp	Thu Jan 06 21:13:35 2011 +0100
+++ b/src/hugin1/hugin/HFOVDialog.cpp	Fri Jan 07 18:12:02 2011 +0100
@@ -360,7 +360,7 @@
 
         if (!opts.docrop) {
             m_srcImg.setCropMode(SrcPanoImage::NO_CROP);
-        } else if (m_srcImg.getProjection() == SrcPanoImage::CIRCULAR_FISHEYE) {
+        } else if (m_srcImg.getProjection() == SrcPanoImage::CIRCULAR_FISHEYE || m_srcImg.getProjection() == SrcPanoImage::FISHEYE_THOBY) {
             m_srcImg.setCropMode(SrcPanoImage::CROP_CIRCLE);
             m_srcImg.setCropRect(opts.cropRect);
         } else {
diff -r 8b3ff381a026 -r 6852a1edc9fe src/hugin_base/panodata/Panorama.cpp
--- a/src/hugin_base/panodata/Panorama.cpp	Thu Jan 06 21:13:35 2011 +0100
+++ b/src/hugin_base/panodata/Panorama.cpp	Fri Jan 07 18:12:02 2011 +0100
@@ -2521,7 +2521,7 @@
         new_img.setActive(iImgInfo[i].enabled);
         
         if (!iImgInfo[i].crop.isEmpty()) {
-            if (new_img.getProjection() == SrcPanoImage::CIRCULAR_FISHEYE)
+            if (new_img.getProjection() == SrcPanoImage::CIRCULAR_FISHEYE || new_img.getProjection() == SrcPanoImage::FISHEYE_THOBY)
             {
                 new_img.setCropMode(SrcPanoImage::CROP_CIRCLE);
             } else {
diff -r 8b3ff381a026 -r 6852a1edc9fe src/hugin_base/panodata/SrcPanoImage.cpp
--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Thu Jan 06 21:13:35 2011 +0100
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Fri Jan 07 18:12:02 2011 +0100
@@ -286,7 +286,7 @@
     m_Morph.setData(opts.morph);
     if (opts.docrop)
     {
-        if (m_Projection.getData() == CIRCULAR_FISHEYE)
+        if (m_Projection.getData() == CIRCULAR_FISHEYE || m_Projection.getData() == FISHEYE_THOBY)
         {
             m_CropMode.setData(CROP_CIRCLE);
         }