[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Added diagonal method guide lines

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

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d55004853772
changeset:  5602:d55004853772
user:       tmodes
date:       Fri Sep 30 10:18:27 2011 +0200
description:

Added diagonal method guide lines

diffstat:

 src/hugin1/hugin/PreviewGuideTool.cpp  |  46 ++++++++++++++++++++++++++++++++++
 src/hugin1/hugin/PreviewGuideTool.h    |   5 ++-
 src/hugin1/hugin/xrc/preview_frame.xrc |   4 ++
 3 files changed, 53 insertions(+), 2 deletions(-)

diffs (114 lines):

diff -r 7f2451ca3084 -r d55004853772 src/hugin1/hugin/PreviewGuideTool.cpp
--- a/src/hugin1/hugin/PreviewGuideTool.cpp	Fri Sep 30 10:17:45 2011 +0200
+++ b/src/hugin1/hugin/PreviewGuideTool.cpp	Fri Sep 30 10:18:27 2011 +0200
@@ -112,7 +112,50 @@
         glVertex2f(roi.left(), roi.bottom());
     }
     glEnd();
+};
 
+void DrawDiagonalMethod(const vigra::Rect2D roi)
+{
+    double w=roi.width();
+    double h=roi.height();
+    glBegin(GL_LINES);
+    glVertex2f(roi.left(), roi.top());
+    if(w>h)
+    {
+        glVertex2f(roi.left()+h, roi.bottom());
+    }
+    else
+    {
+        glVertex2f(roi.right(), roi.top()+w);
+    };
+    glVertex2f(roi.left(), roi.bottom());
+    if(w>h)
+    {
+        glVertex2f(roi.left()+h, roi.top());
+    }
+    else
+    {
+        glVertex2f(roi.right(), roi.bottom()-w);
+    };
+    glVertex2f(roi.right(), roi.top());
+    if(w>h)
+    {
+        glVertex2f(roi.right()-h, roi.bottom());
+    }
+    else
+    {
+        glVertex2f(roi.left(), roi.top()+w);
+    };
+    glVertex2f(roi.right(), roi.bottom());
+    if(w>h)
+    {
+        glVertex2f(roi.right()-h, roi.top());
+    }
+    else
+    {
+        glVertex2f(roi.left(), roi.bottom()-w);
+    };
+    glEnd();
 };
 
 void PreviewGuideTool::ReallyAfterDrawImagesEvent()
@@ -143,6 +186,9 @@
         case TRIANGLE_UP:
             DrawTriangle(roi,true);
             break;
+        case DIAGONAL_METHOD:
+            DrawDiagonalMethod(roi);
+            break;
     };
     glDisable(GL_BLEND);
     glEnable(GL_TEXTURE_2D);
diff -r 7f2451ca3084 -r d55004853772 src/hugin1/hugin/PreviewGuideTool.h
--- a/src/hugin1/hugin/PreviewGuideTool.h	Fri Sep 30 10:17:45 2011 +0200
+++ b/src/hugin1/hugin/PreviewGuideTool.h	Fri Sep 30 10:18:27 2011 +0200
@@ -40,8 +40,9 @@
         THIRDS=1,
         GOLDENRATIO=2,
         DIAGONAL=3,
-        TRIANGLE_DOWN=4,
-        TRIANGLE_UP=5
+        DIAGONAL_METHOD=4,
+        TRIANGLE_DOWN=5,
+        TRIANGLE_UP=6
     };
     /** constructor */
     PreviewGuideTool(PreviewToolHelper *helper);
diff -r 7f2451ca3084 -r d55004853772 src/hugin1/hugin/xrc/preview_frame.xrc
--- a/src/hugin1/hugin/xrc/preview_frame.xrc	Fri Sep 30 10:17:45 2011 +0200
+++ b/src/hugin1/hugin/xrc/preview_frame.xrc	Fri Sep 30 10:18:27 2011 +0200
@@ -541,6 +541,7 @@
                           <item>Rule of third</item>
                           <item>Golden ratio</item>
                           <item>Diagonal</item>
+                          <item>Diagonal method</item>
                           <item>Golden triangle (down)</item>
                           <item>Golden triangle (up)</item>
                         </content>
@@ -755,6 +756,7 @@
                           <item>Rule of third</item>
                           <item>Golden ratio</item>
                           <item>Diagonal</item>
+                          <item>Diagonal method</item>
                           <item>Golden triangle (down)</item>
                           <item>Golden triangle (up)</item>
                         </content>
@@ -1234,6 +1236,7 @@
                           <item>Rule of third</item>
                           <item>Golden ratio</item>
                           <item>Diagonal</item>
+                          <item>Diagonal method</item>
                           <item>Golden triangle (down)</item>
                           <item>Golden triangle (up)</item>
                         </content>
@@ -1464,6 +1467,7 @@
                           <item>Rule of third</item>
                           <item>Golden ratio</item>
                           <item>Diagonal</item>
+                          <item>Diagonal method</item>
                           <item>Golden triangle (down)</item>
                           <item>Golden triangle (up)</item>
                         </content>