[Hugin-cvs] /hgroot/hugin/hugin: Added option to specify number of control p...

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

branch:     gui_overhaul
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/2300b5781b8e
changeset:  5896:2300b5781b8e
user:       tmodes
date:       Sun Jul 22 16:58:31 2012 +0200
description:

Added option to specify number of control points for cp detector
Click with pressed ctrl key on "create control points" to see options

diffstat:

 src/hugin1/hugin/ImagesPanel.cpp |  22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r f36f071f8f1a -r 2300b5781b8e src/hugin1/hugin/ImagesPanel.cpp
--- a/src/hugin1/hugin/ImagesPanel.cpp	Sun Jul 22 16:54:42 2012 +0200
+++ b/src/hugin1/hugin/ImagesPanel.cpp	Sun Jul 22 16:58:31 2012 +0200
@@ -299,7 +299,27 @@
         return;
     }
 
-    long nFeatures = wxConfigBase::Get()->Read(wxT("/Assistant/nControlPoints"), HUGIN_ASS_NCONTROLPOINTS);
+    wxConfigBase* config=wxConfigBase::Get();
+    long nFeatures = HUGIN_ASS_NCONTROLPOINTS;
+    if(wxGetKeyState(WXK_COMMAND))
+    {
+        nFeatures = config->Read(wxT("/MainFrame/nControlPoints"), HUGIN_ASS_NCONTROLPOINTS);
+        nFeatures = wxGetNumberFromUser(
+                            _("Enter maximal number of control points per image pair"),
+                            _("Points per Overlap"),
+                            _("Control point detector option"), 
+                            nFeatures, 1, 10000
+                                 );
+        if(nFeatures<1)
+        {
+            return;
+        };
+        config->Write(wxT("/MainFrame/nControlPoints"), nFeatures);
+    }
+    else
+    {
+        nFeatures = config->Read(wxT("/Assistant/nControlPoints"), HUGIN_ASS_NCONTROLPOINTS);
+    };
 
     AutoCtrlPointCreator matcher;
     CPVector cps = matcher.automatch(cpdetector_config.settings[m_CPDetectorChoice->GetSelection()],