[Hugin-cvs] SF.net SVN: hugin:[4362] hugin/releases/2009.2/src/hugin1

[<yu...@us...>]

Revision: 4362
          http://hugin.svn.sourceforge.net/hugin/?rev=4362&view=rev
Author:   yuv
Date:     2009-09-10 16:16:26 +0000 (Thu, 10 Sep 2009)

Log Message:
-----------
apply trunk 4361

Modified Paths:
--------------
    hugin/releases/2009.2/src/hugin1/base_wx/CMakeLists.txt
    hugin/releases/2009.2/src/hugin1/hugin/AssistantPanel.cpp
    hugin/releases/2009.2/src/hugin1/hugin/OptimizePanel.cpp
    hugin/releases/2009.2/src/hugin1/hugin/huginApp.cpp

Modified: hugin/releases/2009.2/src/hugin1/base_wx/CMakeLists.txt
===================================================================
--- hugin/releases/2009.2/src/hugin1/base_wx/CMakeLists.txt	2009-09-10 16:14:09 UTC (rev 4361)
+++ hugin/releases/2009.2/src/hugin1/base_wx/CMakeLists.txt	2009-09-10 16:16:26 UTC (rev 4362)
@@ -1,5 +1,5 @@
 
-SET(HUGIN_WX_BASE_SRC ImageCache.cpp MyProgressDialog.cpp Plot2D.cpp 
+SET(HUGIN_WX_BASE_SRC ImageCache.cpp MyProgressDialog.cpp Plot2D.cpp PTWXDlg.cpp
                       huginConfig.cpp MyExternalCmdExecDialog.cpp platform.cpp
                       RunStitchPanel.cpp )
 

Modified: hugin/releases/2009.2/src/hugin1/hugin/AssistantPanel.cpp
===================================================================
--- hugin/releases/2009.2/src/hugin1/hugin/AssistantPanel.cpp	2009-09-10 16:14:09 UTC (rev 4361)
+++ hugin/releases/2009.2/src/hugin1/hugin/AssistantPanel.cpp	2009-09-10 16:16:26 UTC (rev 4362)
@@ -51,6 +51,7 @@
 #include "hugin/huginApp.h"
 #include "hugin/AutoCtrlPointCreator.h"
 #include "hugin/TextKillFocusHandler.h"
+#include "base_wx/PTWXDlg.h"
 #include "hugin/PanoDruid.h"
 #include "base_wx/MyProgressDialog.h"
 #include "hugin/config_defaults.h"
@@ -560,7 +561,10 @@
 
     {
         wxBusyCursor bc;
+        // temporarily disable PT progress dialog..
+        deregisterPTWXDlgFcn();
         smartOptimize(optPano);
+        registerPTWXDlgFcn(MainFrame::Get());
     }
 
     progress.increaseProgress(1.0, std::wstring(wxString(_("Leveling the panorama")).wc_str(wxConvLocal)));

Modified: hugin/releases/2009.2/src/hugin1/hugin/OptimizePanel.cpp
===================================================================
--- hugin/releases/2009.2/src/hugin1/hugin/OptimizePanel.cpp	2009-09-10 16:14:09 UTC (rev 4361)
+++ hugin/releases/2009.2/src/hugin1/hugin/OptimizePanel.cpp	2009-09-10 16:16:26 UTC (rev 4362)
@@ -36,6 +36,7 @@
 #include "hugin/CommandHistory.h"
 #include "hugin/MainFrame.h"
 #include "base_wx/MyProgressDialog.h"
+#include "base_wx/PTWXDlg.h"
 #include "hugin/config_defaults.h"
 
 using namespace std;
@@ -551,6 +552,7 @@
         optPano.setCtrlPoints(newCP);
 
         // temporarily disable PT progress dialog..
+        deregisterPTWXDlgFcn();
         {
             wxBusyCursor bc;
             // run pairwise optimizer
@@ -562,6 +564,7 @@
         optPano.printPanoramaScript(std::cerr, optPano.getOptimizeVector(), optPano.getOptions(), allImg, false);
 #endif
 
+        registerPTWXDlgFcn(MainFrame::Get());
         // do global optimisation
         optPano.setCtrlPoints(cps);
         PTools::optimize(optPano);

Modified: hugin/releases/2009.2/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/releases/2009.2/src/hugin1/hugin/huginApp.cpp	2009-09-10 16:14:09 UTC (rev 4361)
+++ hugin/releases/2009.2/src/hugin1/hugin/huginApp.cpp	2009-09-10 16:16:26 UTC (rev 4362)
@@ -47,6 +47,7 @@
 #include "hugin/ImagesList.h"
 #include "hugin/PreviewPanel.h"
 #include "hugin/GLPreviewFrame.h"
+#include "base_wx/PTWXDlg.h"
 #include "hugin/CommandHistory.h"
 #include "hugin/wxPanoCommand.h"
 
@@ -115,6 +116,9 @@
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1);
 #endif
 
+    // register our custom pano tools dialog handlers
+    registerPTWXDlgFcn();
+
     // required by wxHtmlHelpController
     wxFileSystem::AddHandler(new wxZipFSHandler);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.