Hugin

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/8dc60fd1fa29
changeset:  5358:8dc60fd1fa29
user:       Bruno Postle <bruno@...>
date:       Sun Jun 26 22:18:02 2011 +0100
description:

Some files shouldn't be executable...

diffstat:

 src/hugin_script_interface/CMakeLists.txt         |  2 +-
 src/hugin_script_interface/plugins/CMakeLists.txt |  6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 24617f8a1402 -r 8dc60fd1fa29 src/hugin_script_interface/CMakeLists.txt
--- a/src/hugin_script_interface/CMakeLists.txt	Sun Jun 26 21:36:39 2011 +0100
+++ b/src/hugin_script_interface/CMakeLists.txt	Sun Jun 26 22:18:02 2011 +0100
@@ -223,7 +223,7 @@
             DESTINATION ${pyinstalldir}
             )
 
-    INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/hsi.py
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hsi.py
             DESTINATION ${pyinstalldir}
             )
 
diff -r 24617f8a1402 -r 8dc60fd1fa29 src/hugin_script_interface/plugins/CMakeLists.txt
--- a/src/hugin_script_interface/plugins/CMakeLists.txt	Sun Jun 26 21:36:39 2011 +0100
+++ b/src/hugin_script_interface/plugins/CMakeLists.txt	Sun Jun 26 22:18:02 2011 +0100
@@ -1,4 +1,6 @@
 # install plugin files into appropriate folder
 
-FILE(GLOB PLUGINFILES *.py README*.txt)
-INSTALL(PROGRAMS ${PLUGINFILES} DESTINATION ${INSTALL_DATA_DIR}/plugins)
+FILE(GLOB PLUGINFILES README*.txt)
+FILE(GLOB PLUGINPROGRAMS *.py)
+INSTALL(PROGRAMS ${PLUGINPROGRAMS} DESTINATION ${INSTALL_DATA_DIR}/plugins)
+INSTALL(FILES ${PLUGINFILES} DESTINATION ${INSTALL_DATA_DIR}/plugins)

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/24617f8a1402
changeset:  5357:24617f8a1402
user:       Bruno Postle <bruno@...>
date:       Sun Jun 26 21:36:39 2011 +0100
description:

Scripts with shebang should be installed executable

diffstat:

 src/hugin_script_interface/CMakeLists.txt             |  6 +++---
 src/hugin_script_interface/plugins-dev/CMakeLists.txt |  2 +-
 src/hugin_script_interface/plugins/CMakeLists.txt     |  2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 2fa26fb3dafa -r 24617f8a1402 src/hugin_script_interface/CMakeLists.txt
--- a/src/hugin_script_interface/CMakeLists.txt	Sun Jun 26 21:32:15 2011 +0100
+++ b/src/hugin_script_interface/CMakeLists.txt	Sun Jun 26 21:36:39 2011 +0100
@@ -219,15 +219,15 @@
             NAMELINK_SKIP
             )
 
-    INSTALL(FILES hpi.py
+    INSTALL(PROGRAMS hpi.py
             DESTINATION ${pyinstalldir}
             )
 
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hsi.py
+    INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/hsi.py
             DESTINATION ${pyinstalldir}
             )
 
 ENDIF()
 
 ADD_SUBDIRECTORY(plugins)
-ADD_SUBDIRECTORY(plugins-dev)
\ No newline at end of file
+ADD_SUBDIRECTORY(plugins-dev)
diff -r 2fa26fb3dafa -r 24617f8a1402 src/hugin_script_interface/plugins-dev/CMakeLists.txt
--- a/src/hugin_script_interface/plugins-dev/CMakeLists.txt	Sun Jun 26 21:32:15 2011 +0100
+++ b/src/hugin_script_interface/plugins-dev/CMakeLists.txt	Sun Jun 26 21:36:39 2011 +0100
@@ -1,4 +1,4 @@
 # install plugin files into appropriate folder
 
 FILE(GLOB PLUGINFILES *.py README*.txt)
-INSTALL(FILES ${PLUGINFILES} DESTINATION ${INSTALL_DATA_DIR}/plugins-templates)
+INSTALL(PROGRAMS ${PLUGINFILES} DESTINATION ${INSTALL_DATA_DIR}/plugins-templates)
diff -r 2fa26fb3dafa -r 24617f8a1402 src/hugin_script_interface/plugins/CMakeLists.txt
--- a/src/hugin_script_interface/plugins/CMakeLists.txt	Sun Jun 26 21:32:15 2011 +0100
+++ b/src/hugin_script_interface/plugins/CMakeLists.txt	Sun Jun 26 21:36:39 2011 +0100
@@ -1,4 +1,4 @@
 # install plugin files into appropriate folder
 
 FILE(GLOB PLUGINFILES *.py README*.txt)
-INSTALL(FILES ${PLUGINFILES} DESTINATION ${INSTALL_DATA_DIR}/plugins)
+INSTALL(PROGRAMS ${PLUGINFILES} DESTINATION ${INSTALL_DATA_DIR}/plugins)

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/2fa26fb3dafa
changeset:  5356:2fa26fb3dafa
user:       Bruno Postle <bruno@...>
date:       Sun Jun 26 21:32:15 2011 +0100
description:

Script with shebang should be executable

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/53078b0a7c6f
changeset:  5355:53078b0a7c6f
user:       Yuval Levy <yuv@...>
date:       Sun Jun 26 13:05:33 2011 -0400
description:

added stub about CMake 2.8.5rc2 issue to 2011.2.0_beta2 work in progress release notes

diffstat:

 doc/releases/hugin-2011.2.0_beta2.txt |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 76ee1060a8d1 -r 53078b0a7c6f doc/releases/hugin-2011.2.0_beta2.txt
--- a/doc/releases/hugin-2011.2.0_beta2.txt	Sun Jun 26 12:09:52 2011 -0400
+++ b/doc/releases/hugin-2011.2.0_beta2.txt	Sun Jun 26 13:05:33 2011 -0400
@@ -170,6 +170,9 @@
 * SWIG >2.0
 * Python
 
+There is a known problem building with CMake 2.8.5rc2.
+Workaround: downgrade to 2.8.4.
+
 
 _Control point generators_

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/76ee1060a8d1
changeset:  5354:76ee1060a8d1
user:       Yuval Levy <yuv@...>
date:       Sun Jun 26 12:09:52 2011 -0400
description:

Build against the proper SWIG version conditional on the Python version available
https://bugs.launchpad.net/hugin/+bug/801869
(credits: Andreas Metzler, Kay F. Jahnke)

diffstat:

 CMakeLists.txt                            |  40 ++++++++++++++++++--
 src/hugin_script_interface/CMakeLists.txt |  29 --------------
 2 files changed, 36 insertions(+), 33 deletions(-)

diffs (92 lines):

diff -r 562db7962f6d -r 76ee1060a8d1 CMakeLists.txt
--- a/CMakeLists.txt	Sun Jun 26 10:52:02 2011 -0400
+++ b/CMakeLists.txt	Sun Jun 26 12:09:52 2011 -0400
@@ -294,13 +294,45 @@
 
 OPTION(BUILD_HSI "Python Scripting Interface" OFF)
 IF(BUILD_HSI)
-  find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)
-  FIND_PACKAGE(SWIG REQUIRED)
-  INCLUDE(${SWIG_USE_FILE})
-
+  # find Python first because the version of SWIG required depends on the
+  # version of Python available
   FIND_PACKAGE(PythonLibs REQUIRED)
   INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
   ADD_DEFINITIONS(-DHUGIN_HSI)
+  # get version of Python libs
+  FILE(STRINGS "${PYTHON_INCLUDE_DIRS}/patchlevel.h"
+	  PY_DEF_MAJOR
+	  REGEX "#define[ \t]+PY_MAJOR_VERSION.*$")
+  FILE(STRINGS "${PYTHON_INCLUDE_DIRS}/patchlevel.h"
+      PY_DEF_MINOR
+      REGEX "#define[ \t]+PY_MINOR_VERSION.*$")
+
+  FILE(STRINGS "${PYTHON_INCLUDE_DIRS}/patchlevel.h"
+      PY_DEF_MICRO
+      REGEX "#define[ \t]+PY_MICRO_VERSION.*$")
+  STRING(REGEX
+        REPLACE "^.*VERSION[ \t]+([0-9]+).*" "\\1"
+        PYTHON_VERSION_MAJOR
+        "${PY_DEF_MAJOR}")
+  STRING(REGEX
+        REPLACE "^.*VERSION[ \t]+([0-9]+).*" "\\1"
+        PYTHON_VERSION_MINOR
+        "${PY_DEF_MINOR}")
+  STRING(REGEX
+        REPLACE "^.*VERSION[ \t]+([0-9]+).*" "\\1"
+        PYTHON_VERSION_PATCH
+        "${PY_DEF_MICRO}")
+  # now we can find the right SWIG version
+  find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)
+  # unclean to test for Python 3, but the assumption is that by the
+  # time we have Python 4 this issue is long gone
+  IF(${PYTHON_VERSION_MAJOR} EQUAL 3 AND 
+      ${PYTHON_VERSION_MINOR} GREATER 1)
+    FIND_PACKAGE(SWIG 2.0.4 REQUIRED)
+  ELSE()
+    FIND_PACKAGE(SWIG 2.0 REQUIRED)
+  ENDIF()
+  INCLUDE(${SWIG_USE_FILE})
 ENDIF()
 
 ##
diff -r 562db7962f6d -r 76ee1060a8d1 src/hugin_script_interface/CMakeLists.txt
--- a/src/hugin_script_interface/CMakeLists.txt	Sun Jun 26 10:52:02 2011 -0400
+++ b/src/hugin_script_interface/CMakeLists.txt	Sun Jun 26 12:09:52 2011 -0400
@@ -4,35 +4,6 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-# get version of Python libs
-
-FILE(STRINGS "${PYTHON_INCLUDE_DIRS}/patchlevel.h"
-     PY_DEF_MAJOR
-     REGEX "#define[ \t]+PY_MAJOR_VERSION.*$")
-
-FILE(STRINGS "${PYTHON_INCLUDE_DIRS}/patchlevel.h"
-     PY_DEF_MINOR
-     REGEX "#define[ \t]+PY_MINOR_VERSION.*$")
-
-FILE(STRINGS "${PYTHON_INCLUDE_DIRS}/patchlevel.h"
-     PY_DEF_MICRO
-     REGEX "#define[ \t]+PY_MICRO_VERSION.*$")
-
-STRING(REGEX
-       REPLACE "^.*VERSION[ \t]+([0-9]+).*" "\\1"
-       PYTHON_VERSION_MAJOR
-       "${PY_DEF_MAJOR}")
-
-STRING(REGEX
-       REPLACE "^.*VERSION[ \t]+([0-9]+).*" "\\1"
-       PYTHON_VERSION_MINOR
-       "${PY_DEF_MINOR}")
-
-STRING(REGEX
-       REPLACE "^.*VERSION[ \t]+([0-9]+).*" "\\1"
-       PYTHON_VERSION_PATCH
-       "${PY_DEF_MICRO}")
-
 MESSAGE(STATUS "Python libs version: ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}")
 
 # access to the swig runtime code in the hpi module is via

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/562db7962f6d
changeset:  5353:562db7962f6d
user:       Yuval Levy <yuv@...>
date:       Sun Jun 26 10:52:02 2011 -0400
description:

* skip the @max-api test for development versions
* added verbosity/feedback to make PluginItems class more understandable

diffstat:

 src/hugin1/hugin/PluginItems.cpp |  20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diffs (80 lines):

diff -r b7f778d81beb -r 562db7962f6d src/hugin1/hugin/PluginItems.cpp
--- a/src/hugin1/hugin/PluginItems.cpp	Thu Jun 23 22:55:39 2011 +0200
+++ b/src/hugin1/hugin/PluginItems.cpp	Sun Jun 26 10:52:02 2011 -0400
@@ -33,6 +33,10 @@
 #include "hugin_utils/alphanum.h"
 #include "PluginItems.h"
 
+//for console/debugging output
+#include <iostream>
+char buf[200];
+
 bool comparePluginItem(PluginItem item1,PluginItem item2)
 {
     int res=doj::alphanum_comp(
@@ -102,6 +106,11 @@
     wxString tagDescription(wxT("@description"));
     int pos;
 
+    // tell me who you are processing
+    strncpy( buf, (const char*)m_filename.GetFullPath().mb_str(wxConvUTF8),200 );
+    std::cout << buf << std::endl;
+
+
     while(!in.Eof() && !(foundCategory && foundName && foundAPImin && foundAPImax && foundSYS && foundDescription))
     {
         wxString line=text.ReadLine();
@@ -115,6 +124,7 @@
             if(pos==wxNOT_FOUND)
             {
                 m_validAPI=false;
+                std::cout << "   fails @sys" << std::endl;
             };
             continue;
         };
@@ -126,9 +136,12 @@
             if(compareVersion(wxT(HUGIN_API_VERSION),APImin))
             {
                 m_validAPI=false;
+                std::cout << "   fails @api-min" << std::endl;
             };
             continue;
         };
+// test max API only for release versions
+#if ((VERSION_MINOR%2)==0)
         pos=lowerLine.Find(tagAPImax);
         if(pos!=wxNOT_FOUND)
         {
@@ -137,14 +150,18 @@
             if(compareVersion(APImax,wxT(HUGIN_API_VERSION)))
             {
                 m_validAPI=false;
+                std::cout << "   fails @api-max" << std::endl;
             };
             continue;
         };
+#endif
         pos=lowerLine.Find(tagCategory);
         if(pos!=wxNOT_FOUND)
         {
             m_category = line.Mid(pos+1+tagCategory.length()).Trim().Trim(false);
             foundCategory=true;
+            strncpy( buf, (const char*)m_category.mb_str(wxConvUTF8),200 );
+            std::cout << "   CAT:" << buf << std::endl;
             continue;
         };
         pos=lowerLine.Find(tagName);
@@ -152,6 +169,8 @@
         {
             m_name = line.Mid(pos+1+tagName.length()).Trim().Trim(false);
             foundName=true;
+            strncpy( buf, (const char*)m_name.mb_str(wxConvUTF8),200 );
+            std::cout << "   NAM:" << buf << std::endl;
             continue;
         };
         pos=lowerLine.Find(tagDescription);
@@ -188,4 +207,3 @@
 {
     return m_description;
 };
-

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/56a9ba457e28
changeset:  5351:56a9ba457e28
user:       tmodes
date:       Thu Jun 23 22:35:09 2011 +0200
description:

Bakeout changeset f96f56d17f65

diffstat:

 src/hugin1/hugin/CMakeLists.txt        |    4 +-
 src/hugin1/hugin/ImagesPanel.cpp       |  510 +++++++++++++++++++--
 src/hugin1/hugin/ImagesPanel.h         |   73 ++-
 src/hugin1/hugin/MainFrame.cpp         |  291 +++++++++++-
 src/hugin1/hugin/PanoOperation.cpp     |  613 --------------------------
 src/hugin1/hugin/PanoOperation.h       |  169 -------
 src/hugin1/hugin/PanoOperationTree.cpp |  180 -------
 src/hugin1/hugin/PanoOperationTree.h   |   77 ---
 src/hugin1/hugin/PluginItems.cpp       |   29 -
 src/hugin1/hugin/PluginItems.h         |   12 -
 src/hugin1/hugin/huginApp.cpp          |    2 -
 src/hugin1/hugin/xrc/images_panel.xrc  |  892 +++++++++++++++++++++++---------------
 12 files changed, 1316 insertions(+), 1536 deletions(-)

diffs (truncated from 3285 to 500 lines):

diff -r d0d9e62fd87b -r 56a9ba457e28 src/hugin1/hugin/CMakeLists.txt
--- a/src/hugin1/hugin/CMakeLists.txt	Thu Jun 23 19:40:29 2011 +0200
+++ b/src/hugin1/hugin/CMakeLists.txt	Thu Jun 23 22:35:09 2011 +0200
@@ -34,7 +34,7 @@
 PreviewCropTool.cpp DragTool.cpp PreviewIdentifyTool.cpp PanosphereSphereTool.cpp
 PreviewDifferenceTool.cpp PreviewPanoMaskTool.cpp PreviewControlPointTool.cpp
 GreatCircles.cpp AboutDialog.cpp LayoutRemapper.cpp PreviewLayoutLinesTool.cpp PreviewColorPickerTool.cpp
-MaskEditorPanel.cpp MaskImageCtrl.cpp MaskLoadDialog.cpp HtmlWindow.cpp PanoOperation.cpp PanoOperationTree.cpp)
+MaskEditorPanel.cpp MaskImageCtrl.cpp MaskLoadDialog.cpp HtmlWindow.cpp)
 
 set(hugin_HEADERS
 huginApp.h ImagesList.h MainFrame.h CPImageCtrl.h CPImagesComboBox.h CPEditorPanel.h CPDetectorDialog.h LensPanel.h 
@@ -49,7 +49,7 @@
 PreviewCropTool.h DragTool.h PreviewIdentifyTool.h PanosphereSphereTool.h
 PreviewDifferenceTool.h PreviewPanoMaskTool.h PreviewControlPointTool.h
 GreatCircles.h AboutDialog.h LayoutRemapper.h PreviewLayoutLinesTool.h PreviewColorPickerTool.h
-MaskEditorPanel.h MaskImageCtrl.h MaskLoadDialog.h HtmlWindow.h PanoOperation.h PanoOperationTree.h)
+MaskEditorPanel.h MaskImageCtrl.h MaskLoadDialog.h HtmlWindow.h)
 
 IF(BUILD_HSI)
 LIST(APPEND hugin_SOURCES PluginItems.cpp PythonProgress.cpp)
diff -r d0d9e62fd87b -r 56a9ba457e28 src/hugin1/hugin/ImagesPanel.cpp
--- a/src/hugin1/hugin/ImagesPanel.cpp	Thu Jun 23 19:40:29 2011 +0200
+++ b/src/hugin1/hugin/ImagesPanel.cpp	Thu Jun 23 22:35:09 2011 +0200
@@ -34,24 +34,38 @@
 #include <vector>
 #include <map>
 
+//#include <vigra_ext/PointMatching.h>
+//#include <vigra_ext/LoweSIFT.h>
+
 #include "hugin/ImagesPanel.h"
 #include "hugin/CommandHistory.h"
 #include "hugin/TextKillFocusHandler.h"
+#include "hugin/CPEditorPanel.h"
 #include "hugin/ImagesList.h"
 #include "hugin/MainFrame.h"
 #include "hugin/huginApp.h"
+#include "icpfind/AutoCtrlPointCreator.h"
 #include "hugin/config_defaults.h"
-#include "hugin/PanoOperationTree.h"
-#include "hugin/PanoOperation.h"
+#include "base_wx/MyProgressDialog.h"
+#include "base_wx/PTWXDlg.h"
+#include <algorithms/control_points/CleanCP.h>
+#include <PT/PTOptimise.h>
 
 #include <panodata/StandardImageVariableGroups.h>
 
+// Celeste header
+#include "Celeste.h"
+#include "CelesteGlobals.h"
+#include "Utilities.h"
+
 using namespace PT;
 using namespace hugin_utils;
 using namespace vigra;
 using namespace vigra_ext;
 using namespace std;
 
+ImgPreview * canvas;
+
 #define m_XRCID(str_id) \
     wxXmlResource::GetXRCID(str_id)
 #define m_XRCCTRL(window, id, type) \
@@ -62,17 +76,26 @@
 #define GET_VAR(val) pano->getVariable(orientationEdit_RefImg).val.getValue()
 
 BEGIN_EVENT_TABLE(ImagesPanel, wxPanel)
+//    EVT_SIZE   ( ImagesPanel::OnSize )
+//    EVT_MOUSE_EVENTS ( ImagesPanel::OnMouse )
+//    EVT_MOTION ( ImagesPanel::ChangePreview )
+//	EVT_SPLITTER_SASH_POS_CHANGED(XRCID("image_panel_splitter"), ImagesPanel::OnPositionChanged)
     EVT_LIST_ITEM_SELECTED( XRCID("images_list_unknown"),
                             ImagesPanel::ListSelectionChanged )
     EVT_LIST_ITEM_DESELECTED( XRCID("images_list_unknown"),
                             ImagesPanel::ListSelectionChanged )
+    EVT_BUTTON     ( XRCID("images_opt_anchor_button"), ImagesPanel::OnOptAnchorChanged)
+    EVT_BUTTON     ( XRCID("images_color_anchor_button"), ImagesPanel::OnColorAnchorChanged)
+    EVT_BUTTON     ( XRCID("images_feature_matching"), ImagesPanel::SIFTMatching)
+    EVT_BUTTON     ( XRCID("images_cp_clean"), ImagesPanel::OnCleanCP)
+    EVT_BUTTON     ( XRCID("images_remove_cp"), ImagesPanel::OnRemoveCtrlPoints)
     EVT_BUTTON     ( XRCID("images_reset_pos"), ImagesPanel::OnResetImagePositions)
-#ifndef __WXGTK__
     EVT_BUTTON     ( XRCID("action_remove_images"),  ImagesPanel::OnRemoveImages)
-#endif
     EVT_BUTTON     ( XRCID("images_move_image_down"),  ImagesPanel::OnMoveImageDown)
     EVT_BUTTON     ( XRCID("images_move_image_up"),  ImagesPanel::OnMoveImageUp)
-    EVT_BUTTON     ( XRCID("images_execute_operation"), ImagesPanel::OnExecuteOperation)
+    EVT_BUTTON	   ( XRCID("images_celeste_button"), ImagesPanel::OnCelesteButton)
+    EVT_BUTTON	   ( XRCID("images_new_stack"), ImagesPanel::OnNewStack)
+    EVT_BUTTON	   ( XRCID("images_change_stack"), ImagesPanel::OnChangeStack)
     EVT_TEXT_ENTER ( XRCID("images_text_y"), ImagesPanel::OnVarTextChanged )
     EVT_TEXT_ENTER ( XRCID("images_text_p"), ImagesPanel::OnVarTextChanged )
     EVT_TEXT_ENTER ( XRCID("images_text_r"), ImagesPanel::OnVarTextChanged )
@@ -86,7 +109,7 @@
 
 ImagesPanel::ImagesPanel()
 {
-    pano = NULL;
+    pano = 0;
     m_restoreLayoutOnResize = false;
 }
 
@@ -110,15 +133,32 @@
 
     m_showImgNr = INT_MAX;
 
+    m_optAnchorButton = XRCCTRL(*this, "images_opt_anchor_button", wxButton);
+    DEBUG_ASSERT(m_optAnchorButton);
+
+    m_colorAnchorButton = XRCCTRL(*this, "images_color_anchor_button", wxButton);
+    DEBUG_ASSERT(m_colorAnchorButton);
+    m_matchingButton = XRCCTRL(*this, "images_feature_matching", wxButton);
+    DEBUG_ASSERT(m_matchingButton);
+    m_cleaningButton = XRCCTRL(*this, "images_cp_clean", wxButton);
+    DEBUG_ASSERT(m_cleaningButton);
+    m_removeCPButton = XRCCTRL(*this, "images_remove_cp", wxButton);
+    DEBUG_ASSERT(m_removeCPButton);
     m_moveUpButton = XRCCTRL(*this, "images_move_image_up", wxButton);
     DEBUG_ASSERT(m_moveUpButton);
     m_moveDownButton = XRCCTRL(*this, "images_move_image_down", wxButton);
     DEBUG_ASSERT(m_moveDownButton);
+    m_stackNewButton = XRCCTRL(*this, "images_new_stack", wxButton);
+    DEBUG_ASSERT(m_stackNewButton);
+    m_stackChangeButton = XRCCTRL(*this, "images_change_stack", wxButton);
+    DEBUG_ASSERT(m_stackChangeButton);
+    
     m_linkCheckBox = XRCCTRL(*this, "images_check_link", wxCheckBox);
-    DEBUG_ASSERT(m_linkCheckBox);
-    m_operationTree = XRCCTRL(*this, "images_pano_operation_tree", PanoOperationTreeCtrl);
-    DEBUG_ASSERT(m_operationTree);
-    m_operationTree->GenerateTree();
+
+    m_img_ctrls = XRCCTRL(*this, "image_control_panel", wxPanel);
+    DEBUG_ASSERT(m_img_ctrls);
+
+    m_CPDetectorChoice = XRCCTRL(*this, "cpdetector_settings", wxChoice);
 
     // Image Preview
     m_smallImgCtrl = XRCCTRL(*this, "images_selected_image", wxStaticBitmap);
@@ -138,6 +178,10 @@
 //                     wxBITMAP_TYPE_PNG);
     m_smallImgCtrl->SetBitmap(m_empty);
 
+    wxListEvent ev;
+    ListSelectionChanged(ev);
+    DEBUG_TRACE("end");
+
 //    SetAutoLayout(false);
 
     wxConfigBase* config=wxConfigBase::Get();
@@ -147,11 +191,8 @@
     //write current autopano generator settings
     cpdetector_config.Write(config);
     config->Flush();
-    m_operationTree->UpdateCPDetectorItems(cpdetector_config);
+    cpdetector_config.FillControl(m_CPDetectorChoice,true);
     Layout();
-    wxListEvent ev;
-    ListSelectionChanged(ev);
-    DEBUG_TRACE("end");
 
     return true;
 }
@@ -164,15 +205,6 @@
     pano->addObserver(this);
 }
 
-#ifdef HUGIN_HSI
-void ImagesPanel::AddPythonOperations(PluginItems items)
-{
-    m_operationTree->GeneratePythonTree(items);
-    UIntSet images;
-    m_operationTree->UpdateState(*pano,images);
-};
-#endif
-
 ImagesPanel::~ImagesPanel()
 {
     DEBUG_TRACE("dtor");
@@ -231,7 +263,21 @@
     if (pano.getNrOfImages() == 0)
     {
         DisableImageCtrls();
-    };
+        m_removeCPButton->Disable();
+        m_matchingButton->Disable();
+    } else {
+        m_removeCPButton->Enable();
+        m_matchingButton->Enable();
+    }
+    if (pano.getNrOfImages()>1)
+    {
+        if(pano.getNrOfCtrlPoints()>2)
+            m_cleaningButton->Enable();
+        else
+            m_cleaningButton->Disable();
+    }
+    else
+        m_cleaningButton->Disable();
 
     if (selected.size() == 1 &&
         *(selected.begin()) < pano.getNrOfImages() &&
@@ -244,7 +290,6 @@
     {
         ClearImgParameters( );
     }
-    m_operationTree->UpdateState(pano,selected);
 
     DEBUG_TRACE("");
 }
@@ -258,6 +303,84 @@
 }
 
 // #####  Here start the eventhandlers  #####
+
+/** run sift matching on selected images, and add control points */
+void ImagesPanel::SIFTMatching(wxCommandEvent & e)
+{
+    UIntSet selImg = images_list->GetSelected();
+    if ( selImg.size() < 2) {
+        // add all images.
+        selImg.clear();
+        unsigned int nImg = pano->getNrOfImages();
+        for (unsigned int i=0; i < nImg; i++) {
+            selImg.insert(i);
+        }
+    }
+
+    if (selImg.size() == 0) {
+        return;
+    }
+
+    long nFeatures = XRCCTRL(*this, "images_points_per_overlap"
+                            , wxSpinCtrl)->GetValue();
+
+    AutoCtrlPointCreator matcher;
+    CPVector cps = matcher.automatch(cpdetector_config.settings[m_CPDetectorChoice->GetSelection()],
+        *pano, selImg, nFeatures,this);
+    wxString msg;
+    wxMessageBox(wxString::Format(_("Added %lu control points"), (unsigned long) cps.size()), _("Control point detector result"),wxOK|wxICON_INFORMATION,this);
+    GlobalCmdHist::getInstance().addCommand(
+            new PT::AddCtrlPointsCmd(*pano, cps)
+                                           );
+
+};
+
+void ImagesPanel::OnCleanCP(wxCommandEvent & e)
+{
+    if (pano->getNrOfImages()<2)
+        return;
+
+    if (pano->getNrOfCtrlPoints()<2)
+        return;
+
+    deregisterPTWXDlgFcn();
+    // work around a flaw in wxProgresDialog that results in incorrect layout
+    // by pre-allocting sufficient horizontal space
+    ProgressReporterDialog progress(2, _("Cleaning Control points"), _("Checking pairwise")+wxString((wxChar)' ',10),this, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_ELAPSED_TIME);
+    UIntSet CPremove=getCPoutsideLimit_pair(*pano,2.0);
+    
+    unsigned int NrRemoved=CPremove.size();
+    if(NrRemoved>0)
+    {
+        GlobalCmdHist::getInstance().addCommand(
+                        new PT::RemoveCtrlPointsCmd(*pano,CPremove)
+                        );
+        
+    };
+    CPremove.clear();
+    
+    //check for unconnected images
+    CPGraph graph;
+    createCPGraph(*pano, graph);
+    CPComponents comps;
+    int n=findCPComponents(graph, comps);
+    progress.increaseProgress(1, std::wstring(wxString(_("Checking whole project")).wc_str(wxConvLocal)));
+    if (n <= 1)
+    {
+        CPremove=getCPoutsideLimit(*pano,2.0);
+    }
+    progress.increaseProgress(1, std::wstring(wxString(_("Finished cleaning")).wc_str(wxConvLocal)));
+    registerPTWXDlgFcn(MainFrame::Get());
+    if(CPremove.size()>0)
+    {
+        GlobalCmdHist::getInstance().addCommand(
+                        new PT::RemoveCtrlPointsCmd(*pano,CPremove)
+                        );
+        NrRemoved+=CPremove.size();
+    };
+    wxMessageBox(wxString::Format(_("Removed %u control points"), NrRemoved), _("Cleaning"),wxOK|wxICON_INFORMATION,this);
+};
+
 void ImagesPanel::OnVarTextChanged ( wxCommandEvent & e )
 {
 
@@ -316,6 +439,41 @@
         );
 }
 
+void ImagesPanel::OnOptAnchorChanged(wxCommandEvent &e )
+{
+    const UIntSet & sel = images_list->GetSelected();
+    if ( sel.size() == 1 ) {
+        // set first image to be the anchor
+        PanoramaOptions opt = pano->getOptions();
+        opt.optimizeReferenceImage = *(sel.begin());
+
+        GlobalCmdHist::getInstance().addCommand(
+            new PT::SetPanoOptionsCmd( *pano, opt )
+            );
+    }
+}
+
+void ImagesPanel::OnColorAnchorChanged(wxCommandEvent &e )
+{
+    const UIntSet & sel = images_list->GetSelected();
+    if ( sel.size() == 1 ) {
+        // set first image to be the anchor
+        PanoramaOptions opt = pano->getOptions();
+        opt.colorReferenceImage = *(sel.begin());
+		// Set the color correction mode so that the anchor image is persisted
+		if (opt.colorCorrection == 0) {
+		  opt.colorCorrection = (PanoramaOptions::ColorCorrection) 1;
+		}
+		DEBUG_INFO("Color reference image is now: " << opt.colorReferenceImage);
+		DEBUG_INFO("Color correction mode : " << opt.colorCorrection);
+        GlobalCmdHist::getInstance().addCommand(
+            new PT::SetPanoOptionsCmd( *pano, opt )
+            );
+    }
+	
+}
+
+
 void ImagesPanel::ListSelectionChanged(wxListEvent & e)
 {
     DEBUG_TRACE(e.GetIndex());
@@ -335,6 +493,8 @@
             unsigned int imgNr = *(sel.begin());
             // single selection, show its parameters
             ShowImgParameters(imgNr);
+            m_optAnchorButton->Enable();
+            m_colorAnchorButton->Enable();
             m_moveDownButton->Enable();
             m_moveUpButton->Enable();
         } else {
@@ -342,20 +502,12 @@
             // multiselection, clear all values
             // we don't know which images parameters to show.
             ClearImgParameters();
+            m_optAnchorButton->Disable();
+            m_colorAnchorButton->Disable();
             m_moveDownButton->Disable();
             m_moveUpButton->Disable();
         }
     }
-    if(pano!=NULL)
-    {
-        m_operationTree->UpdateState(*pano,sel);
-    }
-    else
-    {
-        Panorama pano2;
-        UIntSet images;
-        m_operationTree->UpdateState(pano2,images);
-    };
 }
 
 
@@ -373,12 +525,15 @@
     m_smallImgCtrl->SetBitmap(m_empty);
     m_smallImgCtrl->GetParent()->Layout();
     m_smallImgCtrl->Refresh();
+    m_optAnchorButton->Disable();
+    m_colorAnchorButton->Disable();
     m_moveDownButton->Disable();
     m_moveUpButton->Disable();
     XRCCTRL(*this, "images_reset_pos", wxButton)->Disable();
-#ifndef __WXGTK__
     XRCCTRL(*this, "action_remove_images", wxButton)->Disable();
-#endif
+    XRCCTRL(*this, "images_celeste_button", wxButton)->Disable();
+    m_stackNewButton->Disable();
+    m_stackChangeButton->Disable();
     m_linkCheckBox->Disable();
 }
 
@@ -394,9 +549,10 @@
         m_moveDownButton->Enable();
         m_moveUpButton->Enable();
         XRCCTRL(*this, "images_reset_pos", wxButton)->Enable();
-#ifndef __WXGTK__
         XRCCTRL(*this, "action_remove_images", wxButton)->Enable();
-#endif
+	XRCCTRL(*this, "images_celeste_button", wxButton)->Enable();
+        m_stackNewButton->Enable();
+        m_stackChangeButton->Enable();
         m_linkCheckBox->Enable();
     }
 }
@@ -533,7 +689,6 @@
     XRCCTRL(*this, "images_focal_length", wxStaticText) ->SetLabel(wxT(""));
     XRCCTRL(*this, "images_aperture", wxStaticText) ->SetLabel(wxT(""));
     XRCCTRL(*this, "images_shutter_speed", wxStaticText) ->SetLabel(wxT(""));
-    XRCCTRL(*this, "images_iso",wxStaticText)->SetLabel(wxT(""));
 }
 
 
@@ -591,6 +746,75 @@
     }
 }
 
+
+#if 0
+void ImagesPanel::ShowImage(unsigned int imgNr)
+{
+    // show preview image
+
+    // static bitmap behaves strangely under windows,
+    // we need to resize it to its maximum size every time before
+    // a new image is set, else it will keep the old size..
+    // however, I'm not sure how this should be done with wxWindows
+
+
+    const wxImage * img = ImageCache::getInstance().getSmallImage(
+    pano->getImage(imgNr).getFilename());
+
+    double iRatio = (double)img->GetWidth() / img->GetHeight();
+
+    wxSize sz;
+#ifdef USE_WX253
+    // get width from splitter window
+    wxSize szs = m_img_splitter->GetSize();
+    wxSize sz1 = m_img_splitter->GetWindow1()->GetSize();
+    wxSize sz2 = m_img_splitter->GetWindow2()->GetSize();
+
+    // estimate image size
+    sz = m_img_splitter->GetWindow2()->GetSize();
+    int maxw = sz.GetWidth() - 40;
+    int maxh = sz.GetHeight() - m_smallImgCtrl->GetPosition().y - 20;
+    sz.SetHeight(std::max(maxh, 20));
+    sz.SetWidth(std::max(maxw, 20));
+    double sRatio = (double)sz.GetWidth() / sz.GetHeight();
+    if (iRatio > sRatio) {
+        // image is wider than screen, display landscape
+        sz.SetHeight((int) (sz.GetWidth() / iRatio));
+    } else {
+        // portrait
+        sz.SetWidth((int) (sz.GetHeight() * iRatio));
+    }
+
+#else
+    // get size from parent panel (its just there, to provide the size..
+    wxPanel * imgctrlpanel = XRCCTRL(*this, "images_selected_image_panel", wxPanel);
+    DEBUG_ASSERT(imgctrlpanel);
+    wxSize sz = imgctrlpanel->GetSize();
+    DEBUG_DEBUG("imgctrl panel size: " << sz.x << "," << sz.y);
+    double sRatio = (double)sz.GetWidth() / sz.GetHeight();
+
+    if (iRatio > sRatio) {
+        // image is wider than screen, display landscape
+        sz.SetHeight((int) (sz.GetWidth() / iRatio));
+    } else {
+        // portrait
+        sz.SetWidth((int) (sz.GetHeight() * iRatio));
+    }
+#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION == 4)
+    imgctrlpanel->Clear();
+#else
+    imgctrlpanel->ClearBackground();
+#endif
+    imgctrlpanel->SetSize(sz.GetWidth(),sz.GetHeight());
+
+#endif
+
+    wxImage scaled = img->Scale(sz.GetWidth(),sz.GetHeight());
+    m_smallImgCtrl->SetSize(sz.GetWidth(),sz.GetHeight());
+    m_smallImgCtrl->SetBitmap(wxBitmap(scaled));
+}
+#endif
+
 void ImagesPanel::OnResetImagePositions(wxCommandEvent & e)
 {
     DEBUG_TRACE("");
@@ -613,6 +837,7 @@
         GlobalCmdHist::getInstance().addCommand(
             new PT::UpdateImagesVariablesCmd( *pano, selImg, vars ));
     }
+
 }
 
 void ImagesPanel::OnAddImages(wxCommandEvent &e)
@@ -622,15 +847,59 @@
 
 void ImagesPanel::OnRemoveImages(wxCommandEvent & e)
 {
+    DEBUG_TRACE("");
+

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b7f778d81beb
changeset:  5352:b7f778d81beb
user:       tmodes
date:       Thu Jun 23 22:55:39 2011 +0200
description:

Backed out changeset b6e5a533d9fb

diffstat:

 src/hugin1/PT/PanoCommand.h         |   37 -------
 src/hugin1/hugin/CMakeLists.txt     |    4 +-
 src/hugin1/hugin/MainFrame.cpp      |   29 +----
 src/hugin1/hugin/PythonProgress.cpp |  204 ----------------------------------------
 src/hugin1/hugin/PythonProgress.h   |   95 -------------------
 src/hugin1/hugin/wxPanoCommand.cpp  |   29 +++++
 src/hugin1/hugin/wxPanoCommand.h    |   21 ++++
 src/hugin_script_interface/hpi.py   |   27 -----
 8 files changed, 60 insertions(+), 386 deletions(-)

diffs (truncated from 534 to 500 lines):

diff -r 56a9ba457e28 -r b7f778d81beb src/hugin1/PT/PanoCommand.h
--- a/src/hugin1/PT/PanoCommand.h	Thu Jun 23 22:35:09 2011 +0200
+++ b/src/hugin1/PT/PanoCommand.h	Thu Jun 23 22:55:39 2011 +0200
@@ -989,43 +989,6 @@
     //=========================================================================
     //=========================================================================
 
-    /** updates the current project with given PanoramaMemento.
-     *
-     *  Used by Python scripts.
-     *
-     */
-    class UpdateProjectCmd : public PanoCommand
-    {
-    public:
-        UpdateProjectCmd(Panorama & pano, const PanoramaMemento panoMemento)
-            : PanoCommand(pano),
-            m_panoMemento(panoMemento)
-            { }
-
-        virtual bool processPanorama(Panorama& pano)
-            {
-                pano.setMemento(m_panoMemento);
-                //mark all images as changed
-                for(size_t i=0;i<pano.getNrOfImages();i++)
-                {
-                    pano.imageChanged(i);
-                };
-                pano.changeFinished();
-                return true;
-            };
-
-        virtual std::string getName() const
-            {
-                return "update project";
-            }
-
-    private:
-        const PanoramaMemento m_panoMemento;
-    };
-
-    //=========================================================================
-    //=========================================================================
-
     /** Rotate the panorama
      */
     class RotatePanoCmd : public PanoCommand
diff -r 56a9ba457e28 -r b7f778d81beb src/hugin1/hugin/CMakeLists.txt
--- a/src/hugin1/hugin/CMakeLists.txt	Thu Jun 23 22:35:09 2011 +0200
+++ b/src/hugin1/hugin/CMakeLists.txt	Thu Jun 23 22:55:39 2011 +0200
@@ -52,8 +52,8 @@
 MaskEditorPanel.h MaskImageCtrl.h MaskLoadDialog.h HtmlWindow.h)
 
 IF(BUILD_HSI)
-LIST(APPEND hugin_SOURCES PluginItems.cpp PythonProgress.cpp)
-LIST(APPEND hugin_HEADERS PluginItems.h PythonProgress.h)
+LIST(APPEND hugin_SOURCES PluginItems.cpp)
+LIST(APPEND hugin_HEADERS PluginItems.h)
 ENDIF()
 
 IF(APPLE)
diff -r 56a9ba457e28 -r b7f778d81beb src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp	Thu Jun 23 22:35:09 2011 +0200
+++ b/src/hugin1/hugin/MainFrame.cpp	Thu Jun 23 22:55:39 2011 +0200
@@ -71,7 +71,6 @@
 
 #if HUGIN_HSI
 #include "PluginItems.h"
-#include "hugin/PythonProgress.h"
 #endif
 
 using namespace PT;
@@ -1718,16 +1717,10 @@
     {
         wxString filename = dlg.GetPath();
         wxConfig::Get()->Write(wxT("/pythonScriptPath"), dlg.GetDirectory());
-        PythonProgress pythonDlg(this,pano,filename);
-        if(pythonDlg.RunScript())
-        {
-            if(pythonDlg.ShowModal()==wxID_OK)
-            {
-                GlobalCmdHist::getInstance().addCommand(
-                    new PT::UpdateProjectCmd(pano,pythonDlg.GetPanoramaMemento())
-                    );
-            };
-        };
+        std::string scriptfile((const char *)filename.mb_str(HUGIN_CONV_FILENAME));
+        GlobalCmdHist::getInstance().addCommand(
+            new PythonScriptPanoCmd(pano,scriptfile)
+            );
     }
 }
 
@@ -1736,16 +1729,10 @@
     wxFileName file=m_plugins[e.GetId()];
     if(file.FileExists())
     {
-        PythonProgress pythonDlg(this,pano,file.GetFullPath());
-        if(pythonDlg.RunScript())
-        {
-            if(pythonDlg.ShowModal()==wxID_OK)
-            {
-                GlobalCmdHist::getInstance().addCommand(
-                    new PT::UpdateProjectCmd(pano,pythonDlg.GetPanoramaMemento())
-                    );
-            };
-        };
+        std::string scriptfile((const char *)file.GetFullPath().mb_str(HUGIN_CONV_FILENAME));
+        GlobalCmdHist::getInstance().addCommand(
+                                 new PythonScriptPanoCmd(pano,scriptfile)
+                                 );
     }
     else
     {
diff -r 56a9ba457e28 -r b7f778d81beb src/hugin1/hugin/PythonProgress.cpp
--- a/src/hugin1/hugin/PythonProgress.cpp	Thu Jun 23 22:35:09 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-// -*- c-basic-offset: 4 -*-
-
-/** @file PythonProgess.cpp
- *
- *  @brief implementation of Python progress window
- *
- *  @author T. Modes
- *
- */
-
-/*
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public
- *  License along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#include "base_wx/platform.h"
-#include "hugin/config_defaults.h"
-#include "hugin/PythonProgress.h"
-#include "hugin_script_interface/hpi.h"
-#include "hugin/huginApp.h"
-
-// a random id, hope this doesn't break something..
-enum {
-    ID_PYTHON_CLOSE = wxID_HIGHEST + 147,
-    ID_PYTHON_CLOSE_WHEN_DONE,
-    ID_PYTHON_FINISHED,
-};
-
-#if wxCHECK_VERSION(2,9,0)
-    wxDEFINE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
-#else
-#if _WINDOWS && defined Hugin_shared
-    DEFINE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED)
-#else
-    DEFINE_EVENT_TYPE(EVT_PYTHON_FINISHED)
-#endif
-#endif
-
-BEGIN_EVENT_TABLE(PythonProgress, wxDialog)
-    EVT_BUTTON(ID_PYTHON_CLOSE,PythonProgress::OnCloseButton)
-    EVT_CLOSE(PythonProgress::OnClose)
-    EVT_COMMAND(wxID_ANY, EVT_PYTHON_FINISHED, PythonProgress::OnPythonFinished)
-END_EVENT_TABLE()
-
-PythonProgress::PythonProgress(wxWindow* parent, PT::Panorama &pano, wxString scriptfile) : 
-    wxDialog(parent,wxID_ANY,_("Running Python script"),wxDefaultPosition, wxDefaultSize,wxCAPTION | wxSYSTEM_MENU | wxRESIZE_BORDER)
-{
-    m_success=false;
-    m_pano=pano.duplicate();
-    m_scriptfile=scriptfile;
-    wxBoxSizer* topSizer=new wxBoxSizer(wxVERTICAL);
-    wxTextCtrl* textCtrl=new wxTextCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(350,250),wxTE_MULTILINE | wxTE_READONLY);
-    m_redirect=new wxStreamToTextRedirector(textCtrl);
-    topSizer->Add(textCtrl,1,wxALL|wxEXPAND,6);
-    wxBoxSizer* sizer2=new wxBoxSizer(wxHORIZONTAL);
-    m_closeWhenDone=new wxCheckBox(this,ID_PYTHON_CLOSE_WHEN_DONE,_("Close window after running script"));
-    long value=wxConfigBase::Get()->Read(wxT("/PythonProgressWindow/CloseWhenDone"),0l);
-    m_closeWhenDone->SetValue(value!=0);
-    sizer2->Add(m_closeWhenDone,1,wxALL|wxALIGN_CENTRE_VERTICAL,6);
-    sizer2->AddStretchSpacer(1);
-    m_closeButton=new wxButton(this,ID_PYTHON_CLOSE,_("Close"));
-    m_closeButton->Enable(false);
-    sizer2->Add(m_closeButton,0,wxALL|wxALIGN_CENTRE_VERTICAL,6);
-    topSizer->Add(sizer2,0,wxEXPAND);
-    SetSizerAndFit(topSizer);
-    RestoreFramePosition(this,wxT("PythonProgressWindow"));
-    Layout();
-    CenterOnScreen();
-};
-
-PythonProgress::~PythonProgress()
-{
-    StoreFramePosition(this,wxT("PythonProgressWindow"));
-    wxConfigBase* config=wxConfigBase::Get();
-    if(m_closeWhenDone->GetValue())
-    {
-        config->Write(wxT("/PythonProgressWindow/CloseWhenDone"),1l);
-    }
-    else
-    {
-        config->Write(wxT("/PythonProgressWindow/CloseWhenDone"),0l);
-    };
-    config->Flush();
-    delete m_redirect;
-};
-
-bool PythonProgress::RunScript()
-{
-#if wxCHECK_VERSION(2,9,0)
-    if(CreateThread(wxTHREAD_JOINABLE)!=wxTHREAD_NO_ERROR)
-#else
-    if(wxThreadHelper::Create()!=wxTHREAD_NO_ERROR)
-#endif
-    {
-        wxLogError(wxT("Could not create the worker thread!"));
-        return false;
-    }
-    if (GetThread()->Run()!=wxTHREAD_NO_ERROR)
-    {
-        wxLogError(wxT("Could not run the worker thread!"));
-        return false;
-    }
-    return true;
-};
-
-const HuginBase::PanoramaMemento PythonProgress::GetPanoramaMemento()
-{
-    return m_pano.getMemento();
-};
-
-void PythonProgress::OnCloseButton(wxCommandEvent & e)
-{
-    if(m_success)
-    {
-        EndModal(wxID_OK);
-    }
-    else
-    {
-        EndModal(wxID_CANCEL);
-    };
-};
-
-void PythonProgress::OnClose(wxCloseEvent & e)
-{
-    if (e.CanVeto() && GetThread() && GetThread()->IsRunning())
-    {
-        e.Veto();
-        return;
-    }
-    e.Skip();
-};
-
-void PythonProgress::OnPythonFinished(wxCommandEvent &e)
-{
-    m_success=(e.GetInt()==0);
-    m_closeButton->Enable(true);
-    Update();
-    if(m_success)
-    {
-        if(m_closeWhenDone->GetValue())
-        {
-            wxCommandEvent dummy;
-            OnCloseButton(dummy);
-        };
-    }
-    else
-    {
-        wxMessageBox(wxString::Format(wxT("Script returned %d"),e.GetInt()),_("Result"), wxICON_INFORMATION);
-    };
-};
-
-wxThread::ExitCode PythonProgress::Entry()
-{
-    wxCriticalSectionLocker lock(m_panoCS);
-    int success = hpi::callhpi((const char *)m_scriptfile.mb_str(HUGIN_CONV_FILENAME), 1, "HuginBase::Panorama*", &m_pano);
-    //notify window in thread-safe way
-#if wxCHECK_VERSION(2,9,0)
-    wxCommandEvent* cmdEvent=new wxCommandEvent(EVT_PYTHON_FINISHED,wxID_ANY);
-    cmdEvent->SetInt(success);
-    wxQueueEvent(this,cmdEvent);
-#else
-    wxCommandEvent cmdEvent(EVT_PYTHON_FINISHED,wxID_ANY);
-    cmdEvent.SetInt(success);
-    wxPostEvent(this,cmdEvent);
-#endif
-    return (wxThread::ExitCode)0;
-};
-
-PythonWithImagesProgress::PythonWithImagesProgress(wxWindow* parent, PT::Panorama &pano, HuginBase::UIntSet images, wxString scriptfile)
-    : PythonProgress(parent,pano,scriptfile)
-{
-    m_images=images;
-};
-
-wxThread::ExitCode PythonWithImagesProgress::Entry()
-{
-    wxCriticalSectionLocker lock(m_panoCS);
-    HuginBase::UIntSet images=m_images;
-    int success = hpi::callhpi((const char *)m_scriptfile.mb_str(HUGIN_CONV_FILENAME), 2, 
-        "HuginBase::Panorama*", &m_pano, "HuginBase::UIntSet*", &images);
-    //notify window in thread-safe way
-#if wxCHECK_VERSION(2,9,0)
-    wxCommandEvent* cmdEvent=new wxCommandEvent(EVT_PYTHON_FINISHED,wxID_ANY);
-    cmdEvent->SetInt(success);
-    wxQueueEvent(this,cmdEvent);
-#else
-    wxCommandEvent cmdEvent(EVT_PYTHON_FINISHED,wxID_ANY);
-    cmdEvent.SetInt(success);
-    wxPostEvent(this,cmdEvent);
-#endif
-    return (wxThread::ExitCode)0;
-};
diff -r 56a9ba457e28 -r b7f778d81beb src/hugin1/hugin/PythonProgress.h
--- a/src/hugin1/hugin/PythonProgress.h	Thu Jun 23 22:35:09 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-// -*- c-basic-offset: 4 -*-
-/** @file PythonProgress.h
- *
-  *  @brief declaration of Python progress window
- *
- *  @author T. Modes
- *
- */
-
-/*
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public
- *  License along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifndef PYTHONPROGRESS_H
-#define PYTHONPROGRESS_H
-
-#include "panoinc_WX.h"
-#include "panoinc.h"
-
-#if wxCHECK_VERSION(2,9,0)
-    wxDECLARE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
-#else
-#if _WINDOWS && defined Hugin_shared
-    DECLARE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
-#else
-    DECLARE_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
-#endif
-#endif
-
-/** The progress window for running Python scripts
- */
-class PythonProgress : public wxDialog, public wxThreadHelper
-{
-public:
-    /** constructor, builds windows, initialize some variables 
-     */
-    PythonProgress(wxWindow* parent, PT::Panorama &pano, wxString scriptfile);
-    /** destructor */
-    ~PythonProgress();
-    /** starts the Python script 
-      *  @returns true, if thread was started successful 
-      */
-    bool RunScript();
-    /** returns the modified PanoramaMemento */
-    const HuginBase::PanoramaMemento GetPanoramaMemento();
-protected:
-    /** event handler for close button */
-    void OnCloseButton(wxCommandEvent &e);
-    /** prevent closing window if thread is running */
-    void OnClose(wxCloseEvent &e);
-    /** notify event when Python has finished */
-    void OnPythonFinished(wxCommandEvent &e);
-    /** main Python calling */
-    virtual wxThread::ExitCode Entry();
-
-    // panorama object and critical section to lock if Python is running
-    HuginBase::Panorama m_pano;
-    wxCriticalSection m_panoCS;
-    wxString m_scriptfile;
-private:
-    wxStreamToTextRedirector* m_redirect;
-    wxButton* m_closeButton;
-    wxCheckBox* m_closeWhenDone;
-    bool m_success;
-
-    DECLARE_EVENT_TABLE()
-};
-
-/** Python progress window similiar to PythonProgress, passes selected images to Python */
-class PythonWithImagesProgress:public PythonProgress
-{
-public:
-    /** constructor, builds windows, initialize some variables 
-     */
-    PythonWithImagesProgress(wxWindow* parent, PT::Panorama &pano, HuginBase::UIntSet images, wxString scriptfile);
-protected:
-    /** main Python calling */
-    virtual wxThread::ExitCode Entry();
-private:
-    HuginBase::UIntSet m_images;
-};
-
-#endif // PYTHONPROGRESS_H
diff -r 56a9ba457e28 -r b7f778d81beb src/hugin1/hugin/wxPanoCommand.cpp
--- a/src/hugin1/hugin/wxPanoCommand.cpp	Thu Jun 23 22:35:09 2011 +0200
+++ b/src/hugin1/hugin/wxPanoCommand.cpp	Thu Jun 23 22:55:39 2011 +0200
@@ -40,6 +40,10 @@
 
 #include <hugin_utils/alphanum.h>
 
+#ifdef HUGIN_HSI
+#include "hugin_script_interface/hpi.h"
+#endif
+
 using namespace std;
 using namespace vigra;
 using namespace hugin_utils;
@@ -693,5 +697,30 @@
     pano.changeFinished();
 }
 
+#ifdef HUGIN_HSI
+bool PythonScriptPanoCmd::processPanorama(Panorama& pano)
+{
+    std::cout << "run python script: " << m_scriptFile.c_str() << std::endl;
+
+    int success = hpi::callhpi ( m_scriptFile.c_str() , 1 ,
+                   "HuginBase::Panorama*" , &pano ) ;
+
+    if(success!=0)
+        wxMessageBox(wxString::Format(wxT("Script returned %d"),success),_("Result"), wxICON_INFORMATION);
+    std::cout << "Python interface returned " << success << endl ;
+    // notify other of change in panorama
+    if(pano.getNrOfImages()>0)
+    {
+        for(unsigned int i=0;i<pano.getNrOfImages();i++)
+        {
+            pano.imageChanged(i);
+        };
+    };
+    pano.changeFinished();
+
+    return true;
+}
+#endif
+
 } // namespace
 
diff -r 56a9ba457e28 -r b7f778d81beb src/hugin1/hugin/wxPanoCommand.h
--- a/src/hugin1/hugin/wxPanoCommand.h	Thu Jun 23 22:35:09 2011 +0200
+++ b/src/hugin1/hugin/wxPanoCommand.h	Thu Jun 23 22:55:39 2011 +0200
@@ -154,6 +154,27 @@
         double cornerThreshold;
     };
 
+    /** run a python script */
+#ifdef HUGIN_HSI
+    class PythonScriptPanoCmd : public PanoCommand
+    {
+    public:
+        PythonScriptPanoCmd(Panorama & pano, const std::string & scriptFile)
+            : PanoCommand(pano), m_scriptFile(scriptFile)
+            { };
+
+        virtual bool processPanorama(Panorama& pano);
+        
+        virtual std::string getName() const
+            {
+                return "python script";
+            }
+    private:
+        std::string m_scriptFile;
+    };
+#endif
+
+
 } // namespace PT
 
 #endif // _WXPANOCOMMAND__H
diff -r 56a9ba457e28 -r b7f778d81beb src/hugin_script_interface/hpi.py
--- a/src/hugin_script_interface/hpi.py	Thu Jun 23 22:35:09 2011 +0200
+++ b/src/hugin_script_interface/hpi.py	Thu Jun 23 22:55:39 2011 +0200

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d0d9e62fd87b
changeset:  5350:d0d9e62fd87b
user:       tmodes
date:       Thu Jun 23 19:40:29 2011 +0200
description:

Renamed some strings for Python interface

diffstat:

 src/hugin1/hugin/PluginItems.cpp |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 27a49c97de4c -r d0d9e62fd87b src/hugin1/hugin/PluginItems.cpp
--- a/src/hugin1/hugin/PluginItems.cpp	Thu Jun 23 18:35:05 2011 +0200
+++ b/src/hugin1/hugin/PluginItems.cpp	Thu Jun 23 19:40:29 2011 +0200
@@ -168,19 +168,19 @@
 
 void PluginItem::CheckCategory()
 {
-    if(m_category.CmpNoCase(wxT("images"))==0)
+    if(m_category.CmpNoCase(wxT("images.images"))==0)
     {
         m_type=ImagePlugin;
     }
     else
     {
-        if(m_category.CmpNoCase(wxT("stacks"))==0)
+        if(m_category.CmpNoCase(wxT("images.stacks"))==0)
         {
             m_type=StackPlugin;
         }
         else
         {
-            if(m_category.CmpNoCase(wxT("control points"))==0)
+            if(m_category.CmpNoCase(wxT("images.controlpoints"))==0)
             {
                 m_type=ControlpointPlugin;
             };

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/27a49c97de4c
changeset:  5349:27a49c97de4c
user:       tmodes
date:       Thu Jun 23 18:35:05 2011 +0200
description:

Trying to fix Python progress window on Linux

diffstat:

 src/hugin1/hugin/PythonProgress.cpp |  24 ++++++++++++------------
 src/hugin1/hugin/PythonProgress.h   |  20 ++++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diffs (87 lines):

diff -r 889032768095 -r 27a49c97de4c src/hugin1/hugin/PythonProgress.cpp
--- a/src/hugin1/hugin/PythonProgress.cpp	Thu Jun 23 18:34:08 2011 +0200
+++ b/src/hugin1/hugin/PythonProgress.cpp	Thu Jun 23 18:35:05 2011 +0200
@@ -38,15 +38,15 @@
     ID_PYTHON_FINISHED,
 };
 
-#if wxCHECK_VERSION(2,9,0)
-    wxDEFINE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
-#else
-#if _WINDOWS && defined Hugin_shared
-    DEFINE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED)
-#else
-    DEFINE_EVENT_TYPE(EVT_PYTHON_FINISHED)
-#endif
-#endif
+#if wxCHECK_VERSION(2,9,0)
+    wxDEFINE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
+#else
+#if _WINDOWS && defined Hugin_shared
+    DEFINE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED)
+#else
+    DEFINE_EVENT_TYPE(EVT_PYTHON_FINISHED)
+#endif
+#endif
 
 BEGIN_EVENT_TABLE(PythonProgress, wxDialog)
     EVT_BUTTON(ID_PYTHON_CLOSE,PythonProgress::OnCloseButton)
@@ -55,10 +55,10 @@
 END_EVENT_TABLE()
 
 PythonProgress::PythonProgress(wxWindow* parent, PT::Panorama &pano, wxString scriptfile) : 
-    wxDialog(parent,wxID_ANY,_("Running Python script"),wxDefaultPosition, wxDefaultSize,wxCAPTION | wxSYSTEM_MENU | wxRESIZE_BORDER),
-      m_pano(pano)
+    wxDialog(parent,wxID_ANY,_("Running Python script"),wxDefaultPosition, wxDefaultSize,wxCAPTION | wxSYSTEM_MENU | wxRESIZE_BORDER)
 {
     m_success=false;
+    m_pano=pano.duplicate();
     m_scriptfile=scriptfile;
     wxBoxSizer* topSizer=new wxBoxSizer(wxVERTICAL);
     wxTextCtrl* textCtrl=new wxTextCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(350,250),wxTE_MULTILINE | wxTE_READONLY);
@@ -146,7 +146,7 @@
 {
     m_success=(e.GetInt()==0);
     m_closeButton->Enable(true);
-    Refresh();
+    Update();
     if(m_success)
     {
         if(m_closeWhenDone->GetValue())
diff -r 889032768095 -r 27a49c97de4c src/hugin1/hugin/PythonProgress.h
--- a/src/hugin1/hugin/PythonProgress.h	Thu Jun 23 18:34:08 2011 +0200
+++ b/src/hugin1/hugin/PythonProgress.h	Thu Jun 23 18:35:05 2011 +0200
@@ -29,15 +29,15 @@
 #include "panoinc_WX.h"
 #include "panoinc.h"
 
-#if wxCHECK_VERSION(2,9,0)
-    wxDECLARE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
-#else
-#if _WINDOWS && defined Hugin_shared
-    DECLARE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
-#else
-    DECLARE_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
-#endif
-#endif
+#if wxCHECK_VERSION(2,9,0)
+    wxDECLARE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
+#else
+#if _WINDOWS && defined Hugin_shared
+    DECLARE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
+#else
+    DECLARE_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
+#endif
+#endif
 
 /** The progress window for running Python scripts
  */
@@ -66,7 +66,7 @@
     virtual wxThread::ExitCode Entry();
 
     // panorama object and critical section to lock if Python is running
-    HuginBase::Panorama & m_pano;
+    HuginBase::Panorama m_pano;
     wxCriticalSection m_panoCS;
     wxString m_scriptfile;
 private:

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/889032768095
changeset:  5348:889032768095
user:       tmodes
date:       Thu Jun 23 18:34:08 2011 +0200
description:

Simplify hpi OutputToCStream class

diffstat:

 src/hugin_script_interface/hpi.py |  13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diffs (32 lines):

diff -r fa65e6eaba77 -r 889032768095 src/hugin_script_interface/hpi.py
--- a/src/hugin_script_interface/hpi.py	Wed Jun 22 23:08:36 2011 -0400
+++ b/src/hugin_script_interface/hpi.py	Thu Jun 23 18:34:08 2011 +0200
@@ -33,8 +33,7 @@
 
     # we take the stream to be diverted as our 'victim'
 
-    def __init__ ( self , victim , copy ) :
-        self.victim = victim
+    def __init__ ( self , copy ) :
         self.copy = copy
 
     # if write is called, we write to 'copy' first
@@ -44,16 +43,10 @@
         self.copy.write ( s , len ( s ) )
         self.copy.flush()
 
-    # all other activities are delegated to 'victim'
-
-    def __getattr__ ( self , name ) :
-
-        return getattr ( self.victim , name )
-
 # finally, we use two OutputToCStream objects, one for cout and one for cerr.
 
-sys.stdout = OutputToCStream ( sys.stdout , hsi.cout )
-sys.stderr = OutputToCStream ( sys.stderr , hsi.cerr ) 
+sys.stdout = OutputToCStream ( hsi.cout )
+sys.stderr = OutputToCStream ( hsi.cerr ) 
 
 # the dispatcher is currently not very sophisticated. All it does
 # is take the string passed to it in the 'plugin' parameter and

branch:     system_vigra
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/130014a5ba3a
changeset:  5347:130014a5ba3a
user:       Lukas Jirkovsky <l.jirkovsky@...>
date:       Thu Jun 23 08:33:00 2011 +0200
description:

Capitalize class name.

diffstat:

 src/hugin_base/vigra_ext/FileRAII.h      |  92 ++++++++++++++++++++++++++++++
 src/hugin_base/vigra_ext/ReduceOpenEXR.h |   6 +-
 src/hugin_base/vigra_ext/fileRAII.h      |  92 ------------------------------
 3 files changed, 95 insertions(+), 95 deletions(-)

diffs (224 lines):

diff -r 1bff1e7aeb81 -r 130014a5ba3a src/hugin_base/vigra_ext/FileRAII.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin_base/vigra_ext/FileRAII.h	Thu Jun 23 08:33:00 2011 +0200
@@ -0,0 +1,92 @@
+/** @file fileRAII.h
+ *
+ *  @author Lukas Jirkovsky <l.jirkovsky@...>
+ *
+ *  This is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This software is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public
+ *  License along with this software; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <string>
+#include <cstdio>
+#include <cerrno>
+
+#include <vigra/error.hxx>
+
+namespace vigra_ext
+{
+/** Class used for opening files.
+ * File class using RAII (Resource Acquisition Is Initialization) technique.
+ * This ensures that the file is properly close even when an exception occurs.
+ */
+class FileRAII
+{
+public:
+    /** Open the specified file.
+     *
+     * \param path path to a file
+     * \param mode mode as defined by the fopen function
+     */
+    FileRAII(const char *path, const char *mode)
+    {
+        file = std::fopen(path, mode);
+        if (file == 0) {
+            std::string msg("Unable to open file '");
+            msg += path;
+            msg += "'.";
+            vigra_precondition(0, msg.c_str());
+        }
+    }
+
+    ~FileRAII()
+    {
+        if (file) {
+            errno = 0;
+            if (std::fclose(file)) {
+                // there are several possible errors, handle some of them
+                std::string msg;
+                switch(errno)
+                {
+                    case EBADF:
+                        msg = "Bad file descriptor.";
+                        break;
+                    case EIO:
+                        msg = "An I/O error occurred while closing the file.";
+                        break;
+                    default:
+                        msg = "An error ocured while closing the file.";
+                        break;
+                }
+                vigra_postcondition(0, msg.c_str());
+            }
+        }
+    }
+
+    /** Get pointer to opened file.
+     * \return FILE* pointer to the opened file.
+     */
+    FILE* get()
+    {
+        return file;
+    }
+
+private:
+    FILE* file;
+
+    // this class should never be copied or assigned
+    FileRAII(const FileRAII &);
+    FileRAII& operator=(const FileRAII &);
+};
+
+}
\ No newline at end of file
diff -r 1bff1e7aeb81 -r 130014a5ba3a src/hugin_base/vigra_ext/ReduceOpenEXR.h
--- a/src/hugin_base/vigra_ext/ReduceOpenEXR.h	Wed Jun 22 14:46:33 2011 +0200
+++ b/src/hugin_base/vigra_ext/ReduceOpenEXR.h	Thu Jun 23 08:33:00 2011 +0200
@@ -27,7 +27,7 @@
 #include <ImfRgbaFile.h>
 #include <ImfArray.h>
 
-#include "fileRAII.h"
+#include "FileRAII.h"
 
 // hack to read pgm header
 inline bool readPGMHeader(FILE * file, int & w, int &h, int & maxval)
@@ -56,7 +56,7 @@
     typedef float MaskType;
     typedef vigra::RGBValue<float> PixelType;
     typedef boost::shared_ptr<Imf::RgbaInputFile> InFilePtr;
-    typedef boost::shared_ptr<vigra_ext::fileRAII> AutoFilePtr;
+    typedef boost::shared_ptr<vigra_ext::FileRAII> AutoFilePtr;
 
     // open all input files.
     std::vector<AutoFilePtr> inputGrayFiles;
@@ -74,7 +74,7 @@
         dw = in->displayWindow();
         vigra::Rect2D imgSize(dw.min.x, dw.min.y, dw.max.x+1, dw.max.y+1);
 
-        AutoFilePtr inGray(new vigra_ext::fileRAII(grayFile.c_str(), "rb"));
+        AutoFilePtr inGray(new vigra_ext::FileRAII(grayFile.c_str(), "rb"));
         int w, h, maxval;
         readPGMHeader(inGray->get(), w, h, maxval);
         vigra_precondition(w == roi.width() && h == roi.height(), ".exr and _gray.pgm images not of the same size");
diff -r 1bff1e7aeb81 -r 130014a5ba3a src/hugin_base/vigra_ext/fileRAII.h
--- a/src/hugin_base/vigra_ext/fileRAII.h	Wed Jun 22 14:46:33 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/** @file fileRAII.h
- *
- *  @author Lukas Jirkovsky <l.jirkovsky@...>
- *
- *  This is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This software is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public
- *  License along with this software; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#include <string>
-#include <cstdio>
-#include <cerrno>
-
-#include <vigra/error.hxx>
-
-namespace vigra_ext
-{
-/** Class used for opening files.
- * File class using RAII (Resource Acquisition Is Initialization) technique.
- * This ensures that the file is properly close even when an exception occurs.
- */
-class fileRAII
-{
-public:
-    /** Open the specified file.
-     *
-     * \param path path to a file
-     * \param mode mode as defined by the fopen function
-     */
-    fileRAII(const char *path, const char *mode)
-    {
-        file = std::fopen(path, mode);
-        if (file == 0) {
-            std::string msg("Unable to open file '");
-            msg += path;
-            msg += "'.";
-            vigra_precondition(0, msg.c_str());
-        }
-    }
-
-    ~fileRAII()
-    {
-        if (file) {
-            errno = 0;
-            if (std::fclose(file)) {
-                // there are several possible errors, handle some of them
-                std::string msg;
-                switch(errno)
-                {
-                    case EBADF:
-                        msg = "Bad file descriptor.";
-                        break;
-                    case EIO:
-                        msg = "An I/O error occurred while closing the file.";
-                        break;
-                    default:
-                        msg = "An error ocured while closing the file.";
-                        break;
-                }
-                vigra_postcondition(0, msg.c_str());
-            }
-        }
-    }
-
-    /** Get pointer to opened file.
-     * \return FILE* pointer to the opened file.
-     */
-    FILE* get()
-    {
-        return file;
-    }
-
-private:
-    FILE* file;
-
-    // this class should never be copied or assigned
-    fileRAII(const fileRAII &);
-    fileRAII& operator=(const fileRAII &);
-};
-
-}
\ No newline at end of file

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/fa65e6eaba77
changeset:  5346:fa65e6eaba77
user:       Yuval Levy <yuv@...>
date:       Wed Jun 22 23:08:36 2011 -0400
description:

prepared release notes for 2011.2.0_beta2

diffstat:

 doc/releases/hugin-2011.2.0_beta2.txt |  231 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 231 insertions(+), 0 deletions(-)

diffs (235 lines):

diff -r ff7fac539804 -r fa65e6eaba77 doc/releases/hugin-2011.2.0_beta2.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/releases/hugin-2011.2.0_beta2.txt	Wed Jun 22 23:08:36 2011 -0400
@@ -0,0 +1,231 @@
+Hugin-2011.2.0_beta2 RELEASE NOTES  WORK IN PROGRESS NOT TO BE RELEASED YET
+
+Hugin is a panorama stitcher and more.  A new version is available.
+
+
+SCHEDULE
+
+https://launchpad.net/hugin/2011.2
+
+The purpose of the schedule is to make the process as predictable as possible
+so that contributors can plan for their own contributions (e.g. translations
+and bug fixes) and distributors can plan for the binary builds.
+
+The schedule is just an indication.  The release will happen when it is ready.
+
+
+DOWNLOAD
+
+The 2011.2beta2 source tarball can be downloaded
+* from sourceforge at
+http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.2_beta/hugin-2011.2.0_beta2.tar.bz2/download
+
+* from launchpad at
+http://launchpad.net/hugin/2011.2/2011.2beta2/+download/hugin-2011.2.0_beta2.tar.bz2
+
+This is a source code release.  For executables see below.
+
+This tarball is equivalent to rev/changeset EDIT in our Mercurial
+repository, where it is also tagged 2011.2beta2
+
+Verify its SHA1SUM
+EDIT
+
+EXECUTABLES
+
+Users communities produce executables for their respective platforms.
+
+A number of users have built recent snapshots and executables are likely to be
+announced within a few days of this tarball release.
+
+Watch http://groups.google.com/group/hugin-ptx for the announcements of binary
+releases.  If you don't see a binary for your platform it has most likely not
+been produced yet.  Consider stepping up to the task.  Instructions at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Supported_Platforms
+
+Announce your build on http://groups.google.com/group/hugin-ptx
+
+
+TRANSLATIONS
+
+New strings have been added.  Now is a good time to help update your language.
+Instructions at http://wiki.panotools.org/Hugin_translation_guide
+
+
+RELEASE MANAGEMENT
+
+I've been running most of the releases of the past two years.  I will be
+stepping down from this role latest September 6, 2011 because of other
+time committments.
+
+There is a possibility that 2011.2 will be left orphaned in the middle of
+the release cycle, and Hugin needs volunteers to step in for future releases.
+
+If you want to step up to the task, I will be happy to hand over to you
+immediately and mentor you through this release process.  Please contact us
+at http://groups.google.com/group/hugin-ptx
+
+The process is documented in detail at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Release
+
+And you can count on me mentoring you through it.
+
+
+USER-CONTRIBUTED ARTWORK
+
+To promote artists using Hugin the project embellishes the
+application's splash screen and the official release notes
+on the Hugin web page with one artwork generated with Hugin
+and selected by popular vote.
+
+For this release, the runner up from the previous vote
+will be used.
+
+Users have contributed a number of interesting ideas to
+the selection process for the future and a permanent
+contribution and voting facility will be set up for
+future editions.
+
+
+CHANGES SINCE 2011.0.0
+
+Little time has passed since our last release and yet there is new major
+functionality.  Hugin has received a Python scripting interface and new
+lens calibration tool.  A critical bug affecting a significant number of
+Mac users has been fixed and many general improvements have been made.
+
+
+_Lens Calibration Tool_
+
+Lenses are designed to follow a perfect geometric model.  For rectilinear
+lenses, a straight line in the depicted scene should be straight in the
+picture.  This is not always the case:  most lenses have an inherent
+deviation from the perfect model, resulting in imperfections such as
+pincushion or barrel distortion in rectilinear lenses.
+
+Adherence to the perfect geometric model is desirable for aesthetic purposes
+and indespensible to achieve proper alignment when stitching images.
+Hugin can calculate lens distortion parameters on the fly when optimizing
+a project, however this requires more control points and more computational
+effort than a project starting with a calibrated lens, and is prone to more
+errors.
+
+The new lens calibration tool calculates the distortion parameters of a
+lens based on an input image.  The input image must contain straight
+lines, ideally many of them at different distances from the center of the
+lens, covering at least 1/4 of the image.  The calculated parameters are
+valid for a given combination of focal distance, aperture (F-stop), and
+sensor.
+
+The values, saved into a lens profile, can be used in Hugin to achieve
+a better stitch, or on single images taken with this lens / settings
+combination to achieve a more aesthetically pleasing outcome.
+
+
+_Python Scripting Interface_
+
+Hugin now exposes some of its data structure and functionalities through
+a Python module.  To get started with scripting, start your Python
+interpreter and type:
+
+   >>> import hsi
+   >>> help (hsi)
+
+Standalone Python programs can access a panorama object with Hugin's
+functionality.  It is possible to develop complete command line and
+even GUI tools based on this module.
+
+
+_Python Plugin Interface_
+
+Hugin can now run Python scripts inside the application.  In an enabled
+Hugin binary, a new "Actions" menu gives access to system-wide plugins
+distributed with Hugin.  Moreover, plugins can be written, modified,
+customized in the user's own directory.
+
+Currently there are only a few plugins available, but we expect the
+body of available plugins and functionality to grow organically as
+the interface is being made available to the general public.
+
+
+_Other Improvements_
+
+* PTBatcherGUI has matured to become the default processor for
+  stitching projects.
+* ICC profiles saved in output.
+* Support for newer Olympus camera.
+* Improved auto cropping.
+* New mask type: exclude region from all images shot with the same lens
+* Copy&paste of masks in Mask Tab
+* Show extent of active masks and crop in Mask Editor
+* Fix for critical issue affecting stitching on Mac OS X Leopard.
+* Many more improvements and bug fixes.
+
+
+_Libraries and Build_
+
+The Python interface introduces new dependencies:
+* SWIG >2.0
+* Python
+
+
+_Control point generators_
+
+Since 2010.4 Hugin ships with its own control point generator CPFind.
+Third-party generators are still supported through the plug-in architecture.
+CPFind is the recommended control points generator and the only one that has
+the endorsement of the Hugin project team.
+
+
+_Upgrading_
+
+Upgrading from previous versions of Hugin should be seamless. If you do have
+problems with old settings, these can be reset in the Preferences by clicking
+'Load defaults'.
+
+It is strongly recommeded to set the default control point detector to
+Hugin's CPFind.
+
+
+_Compiling_
+
+For users compiling from source:
+* Hugin uses the wxWidgets GUI toolkit version >=2.7.0.
+  2.9 support is experimental. 2.8.11 is recommended.
+* boost >=1.34 is required.  The following boost libraries are used:
+   * filesystem
+   * graph
+   * iostreams
+   * regex
+   * signals
+   * system
+   * thread
+* Hugin requires a libtiff library with LZW support.
+* Hugin depends on libpano13 version >=2.9.18
+* Hugin requires GLEW the OpenGL Extension Wrangler Library,
+  freeglut the OpenGL utility toolkit, and libGLU the OpenGL utility library.
+* Building the Python module is optional.  SWIG>2.0 and Python are required.
+  To build it, configure BUILD_HSI=ON before compiling.
+  The Python module is currently not supported on Mac OS X for lack of
+  development resources but we hope to get it working during the current
+  release cycle or shortly thereafter.
+* On Linux/Unix systems, libaries are installed in a private location.
+  This simplifies things for users who want to run multiple versions of Hugin
+  simultaneously.
+* On Linux/Unix systems, Hugin can be compiled with gcc-4.4.4, gcc-4.5.1,
+  and gcc-4.6.
+* On Windows, Hugin can be compiled with MSVC 2008 and MSVC 2010.
+  The (free) Express Edition is enough, although it lacks OpenMP support.
+
+For more information, see the README and INSTALL_cmake files and
+http://wiki.panotools.org/Development_of_Open_Source_tools#Build_your_Own_Test_Builds
+
+Thanks to all the contributors to this release and members of the hugin-ptx
+mailing list, too many to mention here.
+
+Hugin can be found at http://hugin.sourceforge.net/ and at https://launchpad.net/hugin
+
+
+A DETAILED CHANGELOG SINCE THE LAST RELEASE FOLLOWS

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/ff7fac539804
changeset:  5345:ff7fac539804
user:       tmodes
date:       Wed Jun 22 21:23:23 2011 +0200
description:

Don't add mask to new images [800411]

diffstat:

 src/hugin1/hugin/wxPanoCommand.cpp       |  3 +++
 src/hugin_base/panodata/SrcPanoImage.cpp |  6 ++++++
 src/hugin_base/panodata/SrcPanoImage.h   |  2 ++
 3 files changed, 11 insertions(+), 0 deletions(-)

diffs (55 lines):

diff -r 8c002a42cbc0 -r ff7fac539804 src/hugin1/hugin/wxPanoCommand.cpp
--- a/src/hugin1/hugin/wxPanoCommand.cpp	Wed Jun 22 20:50:49 2011 +0200
+++ b/src/hugin1/hugin/wxPanoCommand.cpp	Wed Jun 22 21:23:23 2011 +0200
@@ -225,6 +225,7 @@
                         double ev = srcImg.getExposureValue();
                         srcImg = pano.getSrcImage(i);
                         srcImg.setFilename(filename);
+                        srcImg.deleteAllMasks();
                         // add image
                         int imgNr = pano.addImage(srcImg);
                         variable_groups.update();
@@ -283,6 +284,7 @@
                     set_exposure = true;
                     srcImg = pano.getSrcImage(i);
                     srcImg.setFilename(filename);
+                    srcImg.deleteAllMasks();
                     srcImg.setExposureValue(ev);
                     break;
                 }
@@ -294,6 +296,7 @@
                     // the file name
                     srcImg = pano.getSrcImage(i);
                     srcImg.setFilename(filename);
+                    srcImg.deleteAllMasks();
                     break;
                 }
             }
diff -r 8c002a42cbc0 -r ff7fac539804 src/hugin_base/panodata/SrcPanoImage.cpp
--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Wed Jun 22 20:50:49 2011 +0200
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Wed Jun 22 21:23:23 2011 +0200
@@ -844,6 +844,12 @@
     };
 };
 
+void SrcPanoImage::deleteAllMasks()
+{
+    MaskPolygonVector emptyMaskVector;
+    m_Masks.setData(emptyMaskVector);
+};
+
 bool SrcPanoImage::isInsideMasks(vigra::Point2D p) const
 {
     if(!hasActiveMasks())
diff -r 8c002a42cbc0 -r ff7fac539804 src/hugin_base/panodata/SrcPanoImage.h
--- a/src/hugin_base/panodata/SrcPanoImage.h	Wed Jun 22 20:50:49 2011 +0200
+++ b/src/hugin_base/panodata/SrcPanoImage.h	Wed Jun 22 21:23:23 2011 +0200
@@ -400,6 +400,8 @@
     void changeMaskType(unsigned int index, HuginBase::MaskPolygon::MaskType newType);
     /** delete mask at index */
     void deleteMask(unsigned int index);
+    /** delete all masks */
+    void deleteAllMasks();
     /** writes all mask lines to stream, using given image number */
     void printMaskLines(std::ostream &o, unsigned int newImgNr) const;
     /** returns true, if point p is inside of one mask polygon */

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/8c002a42cbc0
changeset:  5344:8c002a42cbc0
user:       tmodes
date:       Wed Jun 22 20:50:49 2011 +0200
description:

Added new mask type to documentation

diffstat:

 doc/nona.txt |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r b6e5a533d9fb -r 8c002a42cbc0 doc/nona.txt
--- a/doc/nona.txt	Wed Jun 22 20:36:15 2011 +0200
+++ b/doc/nona.txt	Wed Jun 22 20:50:49 2011 +0200
@@ -197,6 +197,7 @@
 #                   1 - positive (include region)
 #                   2 - negative, stack aware (exclude region from stack)
 #                   3 - positive, stack aware (include region from stack)
+#                   4 - negative, lens (exclude region from all images of same lens)
 #
 #  p"1262 2159 1402 2065 1468 2003"  List of node coordinates
 #               Coordinates are in pairs, at least three pairs are required

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b6e5a533d9fb
changeset:  5343:b6e5a533d9fb
user:       tmodes
date:       Wed Jun 22 20:36:15 2011 +0200
description:

Added window to show output when running Python scripts

diffstat:

 src/hugin1/PT/PanoCommand.h         |   37 +++++++
 src/hugin1/hugin/CMakeLists.txt     |    4 +-
 src/hugin1/hugin/MainFrame.cpp      |   40 +++++--
 src/hugin1/hugin/PanoOperation.cpp  |   18 ++-
 src/hugin1/hugin/PythonProgress.cpp |  204 ++++++++++++++++++++++++++++++++++++++++
 src/hugin1/hugin/PythonProgress.h   |   95 +++++++++++++++++++
 src/hugin1/hugin/wxPanoCommand.cpp  |   54 ----------
 src/hugin1/hugin/wxPanoCommand.h    |   40 --------
 src/hugin_script_interface/hpi.py   |   34 ++++++
 9 files changed, 411 insertions(+), 115 deletions(-)

diffs (truncated from 642 to 500 lines):

diff -r eef46760054e -r b6e5a533d9fb src/hugin1/PT/PanoCommand.h
--- a/src/hugin1/PT/PanoCommand.h	Wed Jun 22 19:16:11 2011 +0200
+++ b/src/hugin1/PT/PanoCommand.h	Wed Jun 22 20:36:15 2011 +0200
@@ -989,6 +989,43 @@
     //=========================================================================
     //=========================================================================
 
+    /** updates the current project with given PanoramaMemento.
+     *
+     *  Used by Python scripts.
+     *
+     */
+    class UpdateProjectCmd : public PanoCommand
+    {
+    public:
+        UpdateProjectCmd(Panorama & pano, const PanoramaMemento panoMemento)
+            : PanoCommand(pano),
+            m_panoMemento(panoMemento)
+            { }
+
+        virtual bool processPanorama(Panorama& pano)
+            {
+                pano.setMemento(m_panoMemento);
+                //mark all images as changed
+                for(size_t i=0;i<pano.getNrOfImages();i++)
+                {
+                    pano.imageChanged(i);
+                };
+                pano.changeFinished();
+                return true;
+            };
+
+        virtual std::string getName() const
+            {
+                return "update project";
+            }
+
+    private:
+        const PanoramaMemento m_panoMemento;
+    };
+
+    //=========================================================================
+    //=========================================================================
+
     /** Rotate the panorama
      */
     class RotatePanoCmd : public PanoCommand
diff -r eef46760054e -r b6e5a533d9fb src/hugin1/hugin/CMakeLists.txt
--- a/src/hugin1/hugin/CMakeLists.txt	Wed Jun 22 19:16:11 2011 +0200
+++ b/src/hugin1/hugin/CMakeLists.txt	Wed Jun 22 20:36:15 2011 +0200
@@ -52,8 +52,8 @@
 MaskEditorPanel.h MaskImageCtrl.h MaskLoadDialog.h HtmlWindow.h PanoOperation.h PanoOperationTree.h)
 
 IF(BUILD_HSI)
-LIST(APPEND hugin_SOURCES PluginItems.cpp)
-LIST(APPEND hugin_HEADERS PluginItems.h)
+LIST(APPEND hugin_SOURCES PluginItems.cpp PythonProgress.cpp)
+LIST(APPEND hugin_HEADERS PluginItems.h PythonProgress.h)
 ENDIF()
 
 IF(APPLE)
diff -r eef46760054e -r b6e5a533d9fb src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp	Wed Jun 22 19:16:11 2011 +0200
+++ b/src/hugin1/hugin/MainFrame.cpp	Wed Jun 22 20:36:15 2011 +0200
@@ -70,6 +70,7 @@
 
 #if HUGIN_HSI
 #include "PluginItems.h"
+#include "hugin/PythonProgress.h"
 #endif
 
 using namespace PT;
@@ -1458,10 +1459,10 @@
 {
     wxString fname;
     wxFileDialog dlg(this,
-		     _("Select python script"),
-		     wxConfigBase::Get()->Read(wxT("/lensPath"),wxT("")), wxT(""),
-		     _("Python script (*.py)|*.py|All files (*.*)|*.*"),
-		     wxFD_OPEN, wxDefaultPosition);
+            _("Select python script"),
+            wxConfigBase::Get()->Read(wxT("/lensPath"),wxT("")), wxT(""),
+            _("Python script (*.py)|*.py|All files (*.*)|*.*"),
+            wxFD_OPEN, wxDefaultPosition);
 
     wxString p;
     if(!wxConfigBase::Get()->Read(wxT("/pythonScriptPath"), &p))
@@ -1470,13 +1471,20 @@
     }
     dlg.SetDirectory(p);
 
-    if (dlg.ShowModal() == wxID_OK) {
+    if (dlg.ShowModal() == wxID_OK)
+    {
         wxString filename = dlg.GetPath();
         wxConfig::Get()->Write(wxT("/pythonScriptPath"), dlg.GetDirectory());
-        std::string scriptfile((const char *)filename.mb_str(HUGIN_CONV_FILENAME));
-        GlobalCmdHist::getInstance().addCommand(
-            new PythonScriptPanoCmd(pano,scriptfile)
-            );
+        PythonProgress pythonDlg(this,pano,filename);
+        if(pythonDlg.RunScript())
+        {
+            if(pythonDlg.ShowModal()==wxID_OK)
+            {
+                GlobalCmdHist::getInstance().addCommand(
+                    new PT::UpdateProjectCmd(pano,pythonDlg.GetPanoramaMemento())
+                    );
+            };
+        };
     }
 }
 
@@ -1485,10 +1493,16 @@
     wxFileName file=m_plugins[e.GetId()];
     if(file.FileExists())
     {
-        std::string scriptfile((const char *)file.GetFullPath().mb_str(HUGIN_CONV_FILENAME));
-        GlobalCmdHist::getInstance().addCommand(
-                                 new PythonScriptPanoCmd(pano,scriptfile)
-                                 );
+        PythonProgress pythonDlg(this,pano,file.GetFullPath());
+        if(pythonDlg.RunScript())
+        {
+            if(pythonDlg.ShowModal()==wxID_OK)
+            {
+                GlobalCmdHist::getInstance().addCommand(
+                    new PT::UpdateProjectCmd(pano,pythonDlg.GetPanoramaMemento())
+                    );
+            };
+        };
     }
     else
     {
diff -r eef46760054e -r b6e5a533d9fb src/hugin1/hugin/PanoOperation.cpp
--- a/src/hugin1/hugin/PanoOperation.cpp	Wed Jun 22 19:16:11 2011 +0200
+++ b/src/hugin1/hugin/PanoOperation.cpp	Wed Jun 22 20:36:15 2011 +0200
@@ -33,6 +33,9 @@
 #include "celeste/Celeste.h"
 #include <exiv2/exif.hpp>
 #include <exiv2/image.hpp>
+#ifdef HUGIN_HSI
+#include "hugin/PythonProgress.h"
+#endif
 
 using namespace HuginBase;
 
@@ -595,13 +598,16 @@
 {
     if(m_filename.FileExists())
     {
-        std::string scriptfile((const char *)m_filename.GetFullPath().mb_str(HUGIN_CONV_FILENAME));
-        return new PythonScriptWithImagesPanoCmd(pano,scriptfile,images);
+        PythonWithImagesProgress pythonDlg(parent,pano,images,m_filename.GetFullPath());
+        if(pythonDlg.RunScript())
+        {
+            if(pythonDlg.ShowModal()==wxID_OK)
+            {
+                return new PT::UpdateProjectCmd(pano,pythonDlg.GetPanoramaMemento());
+            };
+        };
     }
-    else
-    {
-        return NULL;
-    };
+    return NULL;
 };
 
 #endif
\ No newline at end of file
diff -r eef46760054e -r b6e5a533d9fb src/hugin1/hugin/PythonProgress.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin1/hugin/PythonProgress.cpp	Wed Jun 22 20:36:15 2011 +0200
@@ -0,0 +1,204 @@
+// -*- c-basic-offset: 4 -*-
+
+/** @file PythonProgess.cpp
+ *
+ *  @brief implementation of Python progress window
+ *
+ *  @author T. Modes
+ *
+ */
+
+/*
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This software is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public
+ *  License along with this software; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "base_wx/platform.h"
+#include "hugin/config_defaults.h"
+#include "hugin/PythonProgress.h"
+#include "hugin_script_interface/hpi.h"
+#include "hugin/huginApp.h"
+
+// a random id, hope this doesn't break something..
+enum {
+    ID_PYTHON_CLOSE = wxID_HIGHEST + 147,
+    ID_PYTHON_CLOSE_WHEN_DONE,
+    ID_PYTHON_FINISHED,
+};
+
+#if wxCHECK_VERSION(2,9,0)
+    wxDEFINE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
+#else
+#if _WINDOWS && defined Hugin_shared
+    DEFINE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED)
+#else
+    DEFINE_EVENT_TYPE(EVT_PYTHON_FINISHED)
+#endif
+#endif
+
+BEGIN_EVENT_TABLE(PythonProgress, wxDialog)
+    EVT_BUTTON(ID_PYTHON_CLOSE,PythonProgress::OnCloseButton)
+    EVT_CLOSE(PythonProgress::OnClose)
+    EVT_COMMAND(wxID_ANY, EVT_PYTHON_FINISHED, PythonProgress::OnPythonFinished)
+END_EVENT_TABLE()
+
+PythonProgress::PythonProgress(wxWindow* parent, PT::Panorama &pano, wxString scriptfile) : 
+    wxDialog(parent,wxID_ANY,_("Running Python script"),wxDefaultPosition, wxDefaultSize,wxCAPTION | wxSYSTEM_MENU | wxRESIZE_BORDER),
+      m_pano(pano)
+{
+    m_success=false;
+    m_scriptfile=scriptfile;
+    wxBoxSizer* topSizer=new wxBoxSizer(wxVERTICAL);
+    wxTextCtrl* textCtrl=new wxTextCtrl(this,wxID_ANY,wxEmptyString,wxDefaultPosition,wxSize(350,250),wxTE_MULTILINE | wxTE_READONLY);
+    m_redirect=new wxStreamToTextRedirector(textCtrl);
+    topSizer->Add(textCtrl,1,wxALL|wxEXPAND,6);
+    wxBoxSizer* sizer2=new wxBoxSizer(wxHORIZONTAL);
+    m_closeWhenDone=new wxCheckBox(this,ID_PYTHON_CLOSE_WHEN_DONE,_("Close window after running script"));
+    long value=wxConfigBase::Get()->Read(wxT("/PythonProgressWindow/CloseWhenDone"),0l);
+    m_closeWhenDone->SetValue(value!=0);
+    sizer2->Add(m_closeWhenDone,1,wxALL|wxALIGN_CENTRE_VERTICAL,6);
+    sizer2->AddStretchSpacer(1);
+    m_closeButton=new wxButton(this,ID_PYTHON_CLOSE,_("Close"));
+    m_closeButton->Enable(false);
+    sizer2->Add(m_closeButton,0,wxALL|wxALIGN_CENTRE_VERTICAL,6);
+    topSizer->Add(sizer2,0,wxEXPAND);
+    SetSizerAndFit(topSizer);
+    RestoreFramePosition(this,wxT("PythonProgressWindow"));
+    Layout();
+    CenterOnScreen();
+};
+
+PythonProgress::~PythonProgress()
+{
+    StoreFramePosition(this,wxT("PythonProgressWindow"));
+    wxConfigBase* config=wxConfigBase::Get();
+    if(m_closeWhenDone->GetValue())
+    {
+        config->Write(wxT("/PythonProgressWindow/CloseWhenDone"),1l);
+    }
+    else
+    {
+        config->Write(wxT("/PythonProgressWindow/CloseWhenDone"),0l);
+    };
+    config->Flush();
+    delete m_redirect;
+};
+
+bool PythonProgress::RunScript()
+{
+#if wxCHECK_VERSION(2,9,0)
+    if(CreateThread(wxTHREAD_JOINABLE)!=wxTHREAD_NO_ERROR)
+#else
+    if(wxThreadHelper::Create()!=wxTHREAD_NO_ERROR)
+#endif
+    {
+        wxLogError(wxT("Could not create the worker thread!"));
+        return false;
+    }
+    if (GetThread()->Run()!=wxTHREAD_NO_ERROR)
+    {
+        wxLogError(wxT("Could not run the worker thread!"));
+        return false;
+    }
+    return true;
+};
+
+const HuginBase::PanoramaMemento PythonProgress::GetPanoramaMemento()
+{
+    return m_pano.getMemento();
+};
+
+void PythonProgress::OnCloseButton(wxCommandEvent & e)
+{
+    if(m_success)
+    {
+        EndModal(wxID_OK);
+    }
+    else
+    {
+        EndModal(wxID_CANCEL);
+    };
+};
+
+void PythonProgress::OnClose(wxCloseEvent & e)
+{
+    if (e.CanVeto() && GetThread() && GetThread()->IsRunning())
+    {
+        e.Veto();
+        return;
+    }
+    e.Skip();
+};
+
+void PythonProgress::OnPythonFinished(wxCommandEvent &e)
+{
+    m_success=(e.GetInt()==0);
+    m_closeButton->Enable(true);
+    Refresh();
+    if(m_success)
+    {
+        if(m_closeWhenDone->GetValue())
+        {
+            wxCommandEvent dummy;
+            OnCloseButton(dummy);
+        };
+    }
+    else
+    {
+        wxMessageBox(wxString::Format(wxT("Script returned %d"),e.GetInt()),_("Result"), wxICON_INFORMATION);
+    };
+};
+
+wxThread::ExitCode PythonProgress::Entry()
+{
+    wxCriticalSectionLocker lock(m_panoCS);
+    int success = hpi::callhpi((const char *)m_scriptfile.mb_str(HUGIN_CONV_FILENAME), 1, "HuginBase::Panorama*", &m_pano);
+    //notify window in thread-safe way
+#if wxCHECK_VERSION(2,9,0)
+    wxCommandEvent* cmdEvent=new wxCommandEvent(EVT_PYTHON_FINISHED,wxID_ANY);
+    cmdEvent->SetInt(success);
+    wxQueueEvent(this,cmdEvent);
+#else
+    wxCommandEvent cmdEvent(EVT_PYTHON_FINISHED,wxID_ANY);
+    cmdEvent.SetInt(success);
+    wxPostEvent(this,cmdEvent);
+#endif
+    return (wxThread::ExitCode)0;
+};
+
+PythonWithImagesProgress::PythonWithImagesProgress(wxWindow* parent, PT::Panorama &pano, HuginBase::UIntSet images, wxString scriptfile)
+    : PythonProgress(parent,pano,scriptfile)
+{
+    m_images=images;
+};
+
+wxThread::ExitCode PythonWithImagesProgress::Entry()
+{
+    wxCriticalSectionLocker lock(m_panoCS);
+    HuginBase::UIntSet images=m_images;
+    int success = hpi::callhpi((const char *)m_scriptfile.mb_str(HUGIN_CONV_FILENAME), 2, 
+        "HuginBase::Panorama*", &m_pano, "HuginBase::UIntSet*", &images);
+    //notify window in thread-safe way
+#if wxCHECK_VERSION(2,9,0)
+    wxCommandEvent* cmdEvent=new wxCommandEvent(EVT_PYTHON_FINISHED,wxID_ANY);
+    cmdEvent->SetInt(success);
+    wxQueueEvent(this,cmdEvent);
+#else
+    wxCommandEvent cmdEvent(EVT_PYTHON_FINISHED,wxID_ANY);
+    cmdEvent.SetInt(success);
+    wxPostEvent(this,cmdEvent);
+#endif
+    return (wxThread::ExitCode)0;
+};
diff -r eef46760054e -r b6e5a533d9fb src/hugin1/hugin/PythonProgress.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin1/hugin/PythonProgress.h	Wed Jun 22 20:36:15 2011 +0200
@@ -0,0 +1,95 @@
+// -*- c-basic-offset: 4 -*-
+/** @file PythonProgress.h
+ *
+  *  @brief declaration of Python progress window
+ *
+ *  @author T. Modes
+ *
+ */
+
+/*
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This software is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public
+ *  License along with this software; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef PYTHONPROGRESS_H
+#define PYTHONPROGRESS_H
+
+#include "panoinc_WX.h"
+#include "panoinc.h"
+
+#if wxCHECK_VERSION(2,9,0)
+    wxDECLARE_EVENT(EVT_PYTHON_FINISHED,wxCommandEvent);
+#else
+#if _WINDOWS && defined Hugin_shared
+    DECLARE_LOCAL_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
+#else
+    DECLARE_EVENT_TYPE(EVT_PYTHON_FINISHED,-1)
+#endif
+#endif
+
+/** The progress window for running Python scripts
+ */
+class PythonProgress : public wxDialog, public wxThreadHelper
+{
+public:
+    /** constructor, builds windows, initialize some variables 
+     */
+    PythonProgress(wxWindow* parent, PT::Panorama &pano, wxString scriptfile);
+    /** destructor */
+    ~PythonProgress();
+    /** starts the Python script 
+      *  @returns true, if thread was started successful 
+      */
+    bool RunScript();
+    /** returns the modified PanoramaMemento */
+    const HuginBase::PanoramaMemento GetPanoramaMemento();
+protected:
+    /** event handler for close button */
+    void OnCloseButton(wxCommandEvent &e);
+    /** prevent closing window if thread is running */
+    void OnClose(wxCloseEvent &e);
+    /** notify event when Python has finished */
+    void OnPythonFinished(wxCommandEvent &e);
+    /** main Python calling */
+    virtual wxThread::ExitCode Entry();
+
+    // panorama object and critical section to lock if Python is running
+    HuginBase::Panorama & m_pano;
+    wxCriticalSection m_panoCS;
+    wxString m_scriptfile;
+private:
+    wxStreamToTextRedirector* m_redirect;
+    wxButton* m_closeButton;
+    wxCheckBox* m_closeWhenDone;
+    bool m_success;
+
+    DECLARE_EVENT_TABLE()
+};
+
+/** Python progress window similiar to PythonProgress, passes selected images to Python */
+class PythonWithImagesProgress:public PythonProgress
+{
+public:
+    /** constructor, builds windows, initialize some variables 
+     */
+    PythonWithImagesProgress(wxWindow* parent, PT::Panorama &pano, HuginBase::UIntSet images, wxString scriptfile);
+protected:
+    /** main Python calling */
+    virtual wxThread::ExitCode Entry();
+private:
+    HuginBase::UIntSet m_images;
+};
+
+#endif // PYTHONPROGRESS_H
diff -r eef46760054e -r b6e5a533d9fb src/hugin1/hugin/wxPanoCommand.cpp
--- a/src/hugin1/hugin/wxPanoCommand.cpp	Wed Jun 22 19:16:11 2011 +0200
+++ b/src/hugin1/hugin/wxPanoCommand.cpp	Wed Jun 22 20:36:15 2011 +0200
@@ -40,10 +40,6 @@
 
 #include <hugin_utils/alphanum.h>
 
-#ifdef HUGIN_HSI
-#include "hugin_script_interface/hpi.h"
-#endif
-
 using namespace std;
 using namespace vigra;
 using namespace hugin_utils;
@@ -694,55 +690,5 @@
     pano.changeFinished();
 }
 
-#ifdef HUGIN_HSI
-bool PythonScriptPanoCmd::processPanorama(Panorama& pano)
-{
-    std::cout << "run python script: " << m_scriptFile.c_str() << std::endl;

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/eef46760054e
changeset:  5342:eef46760054e
user:       tmodes
date:       Wed Jun 22 19:16:11 2011 +0200
description:

Fixes passing variables to Python [799905]
Fix to hpi_classes.cpp by Kay F. Jahnke

diffstat:

 src/hugin1/hugin/MainFrame.cpp             |  10 ++--------
 src/hugin_script_interface/hpi_classes.cpp |   2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r f96f56d17f65 -r eef46760054e src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp	Mon Jun 20 22:13:46 2011 +0200
+++ b/src/hugin1/hugin/MainFrame.cpp	Wed Jun 22 19:16:11 2011 +0200
@@ -324,10 +324,7 @@
         // skip incompatible plugins
         if(item.GetPluginType()!=PluginItem::DefaultPlugin)
         {
-            // the following can only be activated if bug 799905 if fixed
-            // currently only the HuginBase::Panorama object is passed to Python
-            // all other variables are ignored
-            // continue;
+            continue;
         };
         int categoryID=pluginMenu->FindItem(item.GetCategory());
         wxMenu* categoryMenu;
@@ -374,10 +371,7 @@
     assert(images_panel);
     images_panel->Init(&pano);
 #ifdef HUGIN_HSI
-    // the following can only be activated if bug 799905 if fixed
-    // currently only the HuginBase::Panorama object is passed to Python
-    // all other variables are ignored
-    //images_panel->AddPythonOperations(items);
+    images_panel->AddPythonOperations(items);
 #endif
 
     DEBUG_TRACE("");
diff -r f96f56d17f65 -r eef46760054e src/hugin_script_interface/hpi_classes.cpp
--- a/src/hugin_script_interface/hpi_classes.cpp	Mon Jun 20 22:13:46 2011 +0200
+++ b/src/hugin_script_interface/hpi_classes.cpp	Wed Jun 22 19:16:11 2011 +0200
@@ -127,7 +127,7 @@
 PyObject* python_arglist::make_hsi_object ( const char* hsi_type ,
                             void* hugin_value )
 {
-    SWIGRUNTIME swig_type_info* swigtype = SWIG_Python_TypeQuery ( hsi_type );
+    swig_type_info* swigtype = SWIG_Python_TypeQuery ( hsi_type );
 #ifdef HPI_VERBOSE
     fprintf ( stdout ,
                 "HPI: making a %s from %p\n" ,

branch:     system_vigra
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/3a10d02bdd83
changeset:  5339:3a10d02bdd83
user:       Lukas Jirkovsky <l.jirkovsky@...>
date:       Wed Jun 22 14:40:58 2011 +0200
description:

Make hugin_hdrmerge work.

diffstat:

 src/hugin_base/vigra_ext/ReduceOpenEXR.h |  6 +++---
 src/tools/CMakeLists.txt                 |  6 +++---
 src/tools/hugin_hdrmerge.cpp             |  1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 73b00c2a2be4 -r 3a10d02bdd83 src/hugin_base/vigra_ext/ReduceOpenEXR.h
--- a/src/hugin_base/vigra_ext/ReduceOpenEXR.h	Wed Jun 22 14:39:31 2011 +0200
+++ b/src/hugin_base/vigra_ext/ReduceOpenEXR.h	Wed Jun 22 14:40:58 2011 +0200
@@ -23,11 +23,11 @@
 
 #include <vigra/sized_int.hxx>
 #include <vigra_ext/HDRUtils.h>
-#include <vigra_impex/auto_file.hxx>
 
 #include <ImfRgbaFile.h>
 #include <ImfArray.h>
 
+#include "fileRAII.h"
 
 // hack to read pgm header
 inline bool readPGMHeader(FILE * file, int & w, int &h, int & maxval)
@@ -56,7 +56,7 @@
     typedef float MaskType;
     typedef vigra::RGBValue<float> PixelType;
     typedef boost::shared_ptr<Imf::RgbaInputFile> InFilePtr;
-    typedef boost::shared_ptr<vigra::auto_file> AutoFilePtr;
+    typedef boost::shared_ptr<vigra_ext::fileRAII> AutoFilePtr;
 
     // open all input files.
     std::vector<AutoFilePtr> inputGrayFiles;
@@ -74,7 +74,7 @@
         dw = in->displayWindow();
         vigra::Rect2D imgSize(dw.min.x, dw.min.y, dw.max.x+1, dw.max.y+1);
 
-        AutoFilePtr inGray(new vigra::auto_file(grayFile.c_str(), "rb"));
+        AutoFilePtr inGray(new vigra_ext::fileRAII(grayFile.c_str(), "rb"));
         int w, h, maxval;
         readPGMHeader(inGray->get(), w, h, maxval);
         vigra_precondition(w == roi.width() && h == roi.height(), ".exr and _gray.pgm images not of the same size");
diff -r 73b00c2a2be4 -r 3a10d02bdd83 src/tools/CMakeLists.txt
--- a/src/tools/CMakeLists.txt	Wed Jun 22 14:39:31 2011 +0200
+++ b/src/tools/CMakeLists.txt	Wed Jun 22 14:40:58 2011 +0200
@@ -38,11 +38,11 @@
 add_executable(pano_modify pano_modify.cpp)
 target_link_libraries(pano_modify ${common_libs} )
 
-#add_executable(hugin_hdrmerge hugin_hdrmerge.cpp ../deghosting/deghosting.cpp ../deghosting/deghosting.h ../deghosting/khan.h ../deghosting/support.h ../deghosting/algtinyvector.h)
-#target_link_libraries(hugin_hdrmerge ${common_libs} ${image_libs} )
+add_executable(hugin_hdrmerge hugin_hdrmerge.cpp ../deghosting/deghosting.cpp ../deghosting/deghosting.h ../deghosting/khan.h ../deghosting/support.h ../deghosting/algtinyvector.h)
+target_link_libraries(hugin_hdrmerge ${common_libs} ${image_libs} )
 
 install(TARGETS nona vig_optimize autooptimiser fulla align_image_stack
-#        tca_correct pto2mk cpclean checkpto hugin_hdrmerge pano_trafo pano_modify pto_merge
+        tca_correct pto2mk cpclean checkpto hugin_hdrmerge pano_trafo pano_modify pto_merge
         tca_correct pto2mk cpclean checkpto pano_trafo pano_modify pto_merge
         DESTINATION ${BINDIR})
 
diff -r 73b00c2a2be4 -r 3a10d02bdd83 src/tools/hugin_hdrmerge.cpp
--- a/src/tools/hugin_hdrmerge.cpp	Wed Jun 22 14:39:31 2011 +0200
+++ b/src/tools/hugin_hdrmerge.cpp	Wed Jun 22 14:40:58 2011 +0200
@@ -36,7 +36,6 @@
 
 #include <vigra/error.hxx>
 #include <vigra/functorexpression.hxx>
-#include <vigra_impex/codecmanager.hxx>
 
 #include <hugin_utils/utils.h>

branch:     system_vigra
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/1bff1e7aeb81
changeset:  5341:1bff1e7aeb81
user:       Lukas Jirkovsky <l.jirkovsky@...>
date:       Wed Jun 22 14:46:33 2011 +0200
description:

Remove references to the LICENCE_VIGRA file.

diffstat:

 CMakeModules/win_bundle.cmake                        |  2 +-
 platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs |  4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r e938da3eeeff -r 1bff1e7aeb81 CMakeModules/win_bundle.cmake
--- a/CMakeModules/win_bundle.cmake	Wed Jun 22 14:42:54 2011 +0200
+++ b/CMakeModules/win_bundle.cmake	Wed Jun 22 14:46:33 2011 +0200
@@ -8,7 +8,7 @@
 #  CONFIGURE_FILE(platforms/windows/msi/big_banner.bmp ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/big_banner.bmp COPYONLY)
 
   # install hugin readme, license etc.
-  INSTALL(FILES AUTHORS COPYING LICENCE_VIGRA
+  INSTALL(FILES AUTHORS COPYING
           DESTINATION doc/hugin)
 
   # find the path to enblend and panotools build directories
diff -r e938da3eeeff -r 1bff1e7aeb81 platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs
--- a/platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs	Wed Jun 22 14:42:54 2011 +0200
+++ b/platforms/windows/msi/hugin 0.7 beta 4 Win Setup.wxs	Wed Jun 22 14:46:33 2011 +0200
@@ -390,9 +390,6 @@
             <Component Id="IDE08D724ADA7E41B330C3A109909E15C6" Guid="93f5a10f-6cb6-44ba-8ccc-1e2c15edad40">
               <File Id="ID_26253371_0299_4ae5_917c_a4abd5817a6b" Source=".\FILES\LICENCE_JHEAD.txt" DiskId="1" Name="LICENCE_JHEAD.txt" />
             </Component>
-            <Component Id="IDF59A88A5FA3B91DA7DDC061EED41CC12" Guid="4f2f48d9-1733-49ef-af5c-f8e17b094b6e">
-              <File Id="ID_dfd60d20_e27c_4627_b939_8eed99e8e268" Source=".\FILES\LICENCE_VIGRA.txt" DiskId="1" Name="LICENCE_VIGRA.txt" />
-            </Component>
             <Component Id="IDAC295338BB774B2290C96FFEC57B5292" Guid="5b969a15-7519-4799-b7e3-19b3d9dfed22">
               <File Id="ID_22b5689d_ebec_45e2_9405_7e806f91fb73" Source=".\FILES\NEWS.txt" DiskId="1" Name="NEWS.txt" />
             </Component>
@@ -446,7 +443,6 @@
       <ComponentRef Id="ID5B5ACB9A77C30DBB991101CC4A1E302A" />
       <ComponentRef Id="IDFF36E688A16C91889B2F8F6C1C514E42" />
       <ComponentRef Id="IDE08D724ADA7E41B330C3A109909E15C6" />
-      <ComponentRef Id="IDF59A88A5FA3B91DA7DDC061EED41CC12" />
       <ComponentRef Id="IDAC295338BB774B2290C96FFEC57B5292" />
       <ComponentRef Id="IDF99BC5877C66564FD6DAFE3C86605C1E" />
       <ComponentRef Id="ID0D55843DE31BC853CCC73E35D291C762" />

branch:     system_vigra
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e938da3eeeff
changeset:  5340:e938da3eeeff
user:       Lukas Jirkovsky <l.jirkovsky@...>
date:       Wed Jun 22 14:42:54 2011 +0200
description:

Remove LICENCE_VIGRA because VIGRA is no longer bundled within hugin.

diffstat:

 LICENCE_VIGRA |  25 -------------------------
 1 files changed, 0 insertions(+), 25 deletions(-)

diffs (29 lines):

diff -r 3a10d02bdd83 -r e938da3eeeff LICENCE_VIGRA
--- a/LICENCE_VIGRA	Wed Jun 22 14:40:58 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-The VIGRA License
-=================
-(identical to the MIT X11 License)
-
-Permission is hereby granted, free of charge, to any person    
-obtaining a copy of this software and associated documentation 
-files (the "Software"), to deal in the Software without        
-restriction, including without limitation the rights to use,   
-copy, modify, merge, publish, distribute, sublicense, and/or   
-sell copies of the Software, and to permit persons to whom the 
-Software is furnished to do so, subject to the following       
-conditions:                                                    
-                                                               
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the          
-Software.                                                      
-                                                               
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND       
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,   
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  
-OTHER DEALINGS IN THE SOFTWARE.

branch:     system_vigra
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/73b00c2a2be4
changeset:  5338:73b00c2a2be4
user:       Lukas Jirkovsky <l.jirkovsky@...>
date:       Wed Jun 22 14:39:31 2011 +0200
description:

Implement fileRAII class which replaces auto_file class from VIGRA.

diffstat:

 src/hugin_base/vigra_ext/fileRAII.h |  92 ++++++++++++++++++++++++++++++
 1 files changed, 92 insertions(+), 0 deletions(-)

diffs (97 lines):

diff -r 832b36211fb5 -r 73b00c2a2be4 src/hugin_base/vigra_ext/fileRAII.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin_base/vigra_ext/fileRAII.h	Wed Jun 22 14:39:31 2011 +0200
@@ -0,0 +1,92 @@
+/** @file fileRAII.h
+ *
+ *  @author Lukas Jirkovsky <l.jirkovsky@...>
+ *
+ *  This is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This software is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public
+ *  License along with this software; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <string>
+#include <cstdio>
+#include <cerrno>
+
+#include <vigra/error.hxx>
+
+namespace vigra_ext
+{
+/** Class used for opening files.
+ * File class using RAII (Resource Acquisition Is Initialization) technique.
+ * This ensures that the file is properly close even when an exception occurs.
+ */
+class fileRAII
+{
+public:
+    /** Open the specified file.
+     *
+     * \param path path to a file
+     * \param mode mode as defined by the fopen function
+     */
+    fileRAII(const char *path, const char *mode)
+    {
+        file = std::fopen(path, mode);
+        if (file == 0) {
+            std::string msg("Unable to open file '");
+            msg += path;
+            msg += "'.";
+            vigra_precondition(0, msg.c_str());
+        }
+    }
+
+    ~fileRAII()
+    {
+        if (file) {
+            errno = 0;
+            if (std::fclose(file)) {
+                // there are several possible errors, handle some of them
+                std::string msg;
+                switch(errno)
+                {
+                    case EBADF:
+                        msg = "Bad file descriptor.";
+                        break;
+                    case EIO:
+                        msg = "An I/O error occurred while closing the file.";
+                        break;
+                    default:
+                        msg = "An error ocured while closing the file.";
+                        break;
+                }
+                vigra_postcondition(0, msg.c_str());
+            }
+        }
+    }
+
+    /** Get pointer to opened file.
+     * \return FILE* pointer to the opened file.
+     */
+    FILE* get()
+    {
+        return file;
+    }
+
+private:
+    FILE* file;
+
+    // this class should never be copied or assigned
+    fileRAII(const fileRAII &);
+    fileRAII& operator=(const fileRAII &);
+};
+
+}
\ No newline at end of file

branch:     system_vigra
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/832b36211fb5
changeset:  5337:832b36211fb5
user:       Lukas Jirkovsky <l.jirkovsky@...>
date:       Wed Jun 22 13:23:42 2011 +0200
description:

Merge branch default into system_vigra.

diffstat:

 .hgignore                                                                                     |      3 +
 .hgtags                                                                                       |      1 +
 CMakeLists.txt                                                                                |     40 +-
 CMakeModules/FindExiv2.cmake                                                                  |      7 +-
 CMakeModules/FindGLEW.cmake                                                                   |      2 +-
 CMakeModules/FindGLUT.cmake                                                                   |      6 +-
 CMakeModules/FindJPEG.cmake                                                                   |      3 +-
 CMakeModules/FindLAPACK.cmake                                                                 |      9 +-
 CMakeModules/FindOpenEXR.cmake                                                                |     30 +-
 CMakeModules/FindPANO13.cmake                                                                 |      4 +-
 CMakeModules/FindPNG.cmake                                                                    |      5 +-
 CMakeModules/FindTIFF.cmake                                                                   |      7 +-
 CMakeModules/FindZLIB.cmake                                                                   |      3 +-
 CMakeModules/win_bundle.cmake                                                                 |     38 +-
 COPYING                                                                                       |     41 +-
 ChangeLog                                                                                     |  67615 ++++++---
 Changelog.style                                                                               |      5 +
 INSTALL_cmake                                                                                 |      1 +
 README                                                                                        |     71 +-
 README_WINDOWS                                                                                |     40 -
 artwork-src/2010/splash/splash_with_artwork.svg                                               |    764 +-
 artwork-src/2011.0-splash/2011.0.splash.svg                                                   |   1755 +
 artwork-src/2011.0-splash/SeattleSunset.png                                                   |        
 artwork-src/2011.0-splash/readme.txt                                                          |     18 +
 authors.txt                                                                                   |      2 +
 doc/PTBatcher.pod                                                                             |     80 +
 doc/autopano-noop.sh.pod                                                                      |     32 +
 doc/calibrate_lens.pod                                                                        |     90 -
 doc/calibrate_lens_gui.pod                                                                    |     26 +
 doc/hugin.pod                                                                                 |      2 +-
 doc/matchpoint.pod                                                                            |     44 +
 doc/releases/hugin-2011.0.0.txt                                                               |    180 +
 doc/releases/hugin-2011.0.0_rc1.txt                                                           |    593 +
 doc/releases/hugin-2011.0.0_rc2.txt                                                           |    200 +
 doc/releases/hugin-2011.2.0_beta1.txt                                                         |   2264 +
 mac/Hugin.xcodeproj/project.pbxproj                                                           |   6238 +-
 mac/HuginCompleteInstaller.pmproj                                                             |        
 mac/Version.xcconfig                                                                          |      2 +-
 mac/complete-bundle.sh                                                                        |      3 +-
 mac/complete-tools-package.sh                                                                 |      2 +-
 mac/create_stripped_apps_for_installer.sh                                                     |     38 +
 mac/lens_calibrate_gui-Info copy.plist                                                        |     47 +
 mac/lens_calibrate_gui-xrc.sh                                                                 |     27 +
 mac/nona_gui-Info.plist                                                                       |      8 +-
 mac/patch-xrc.sh                                                                              |      4 +-
 platforms/windows/CMakeLists.txt                                                              |      3 +-
 platforms/windows/huginsetup/HuginSetup_common.nsh                                            |    652 +-
 platforms/windows/smartblend-wrapper/CMakeLists.txt                                           |      6 +
 platforms/windows/smartblend-wrapper/smartblend-hugin.bat                                     |      2 +
 src/CMakeLists.txt                                                                            |      9 +-
 src/dox/folder.dox                                                                            |      9 +-
 src/dox/introduction.dox                                                                      |      3 -
 src/dox/mainpage.dox                                                                          |      3 +
 src/foreign/ANN/ANN.cpp                                                                       |    198 -
 src/foreign/ANN/ANN.h                                                                         |    832 -
 src/foreign/ANN/ANNperf.h                                                                     |    223 -
 src/foreign/ANN/ANNx.h                                                                        |    167 -
 src/foreign/ANN/CMakeLists.txt                                                                |     25 -
 src/foreign/ANN/Copyright.txt                                                                 |     43 -
 src/foreign/ANN/License.txt                                                                   |    448 -
 src/foreign/ANN/ReadMe.txt                                                                    |     63 -
 src/foreign/ANN/bd_fix_rad_search.cpp                                                         |     61 -
 src/foreign/ANN/bd_pr_search.cpp                                                              |     62 -
 src/foreign/ANN/bd_search.cpp                                                                 |     61 -
 src/foreign/ANN/bd_tree.cpp                                                                   |    417 -
 src/foreign/ANN/bd_tree.h                                                                     |    100 -
 src/foreign/ANN/brute.cpp                                                                     |    109 -
 src/foreign/ANN/kd_dump.cpp                                                                   |    444 -
 src/foreign/ANN/kd_fix_rad_search.cpp                                                         |    183 -
 src/foreign/ANN/kd_fix_rad_search.h                                                           |     44 -
 src/foreign/ANN/kd_pr_search.cpp                                                              |    219 -
 src/foreign/ANN/kd_pr_search.h                                                                |     49 -
 src/foreign/ANN/kd_search.cpp                                                                 |    210 -
 src/foreign/ANN/kd_search.h                                                                   |     48 -
 src/foreign/ANN/kd_split.cpp                                                                  |    428 -
 src/foreign/ANN/kd_split.h                                                                    |     85 -
 src/foreign/ANN/kd_tree.cpp                                                                   |    405 -
 src/foreign/ANN/kd_tree.h                                                                     |    197 -
 src/foreign/ANN/kd_util.cpp                                                                   |    439 -
 src/foreign/ANN/kd_util.h                                                                     |    124 -
 src/foreign/ANN/perf.cpp                                                                      |    134 -
 src/foreign/ANN/pr_queue.h                                                                    |    125 -
 src/foreign/ANN/pr_queue_k.h                                                                  |    118 -
 src/foreign/CMakeLists.txt                                                                    |      1 -
 src/foreign/flann/CMakeLists.txt                                                              |      2 +-
 src/foreign/flann/algorithms/all_indices.h                                                    |     12 +-
 src/foreign/flann/algorithms/autotuned_index.h                                                |     31 +-
 src/foreign/flann/algorithms/composite_index.h                                                |    182 +-
 src/foreign/flann/algorithms/dist.h                                                           |     17 +-
 src/foreign/flann/algorithms/kdtree_index.h                                                   |     44 +-
 src/foreign/flann/algorithms/kdtree_single_index.h                                            |    372 +-
 src/foreign/flann/algorithms/kmeans_index.h                                                   |     24 +-
 src/foreign/flann/algorithms/linear_index.h                                                   |      8 +-
 src/foreign/flann/flann.cpp                                                                   |    927 +-
 src/foreign/flann/flann.h                                                                     |    510 +-
 src/foreign/flann/flann.hpp                                                                   |    208 +-
 src/foreign/flann/flann_cpp.cpp                                                               |     52 +-
 src/foreign/flann/flann_mpi.hpp                                                               |    313 +-
 src/foreign/flann/general.h                                                                   |    196 +-
 src/foreign/flann/io/hdf5.h                                                                   |      2 +-
 src/foreign/flann/nn/ground_truth.h                                                           |      5 +-
 src/foreign/flann/nn/index_testing.h                                                          |      3 +-
 src/foreign/flann/util/allocator.h                                                            |      2 +-
 src/foreign/flann/util/logger.cpp                                                             |      8 +-
 src/foreign/flann/util/logger.h                                                               |      6 +-
 src/foreign/flann/util/matrix.h                                                               |      2 +
 src/foreign/flann/util/pair_iterator.hpp                                                      |     36 +-
 src/foreign/flann/util/random.h                                                               |    111 +-
 src/foreign/flann/util/result_set.h                                                           |     10 +-
 src/foreign/flann/util/saving.h                                                               |     56 +-
 src/hugin1/CMakeLists.txt                                                                     |      1 +
 src/hugin1/PT/PanoCommand.h                                                                   |    119 +-
 src/hugin1/PT/PanoImage.h                                                                     |      2 -
 src/hugin1/base_wx/CMakeLists.txt                                                             |      4 +-
 src/hugin1/base_wx/LensTools.cpp                                                              |    339 +
 src/hugin1/base_wx/LensTools.h                                                                |     65 +
 src/hugin1/calibrate_lens/CMakeLists.txt                                                      |     18 +
 src/hugin1/calibrate_lens/LensCalApp.cpp                                                      |    219 +
 src/hugin1/calibrate_lens/LensCalApp.h                                                        |     73 +
 src/hugin1/calibrate_lens/LensCalFrame.cpp                                                    |    848 +
 src/hugin1/calibrate_lens/LensCalFrame.h                                                      |    131 +
 src/hugin1/calibrate_lens/LensCalImageCtrl.cpp                                                |    437 +
 src/hugin1/calibrate_lens/LensCalImageCtrl.h                                                  |    132 +
 src/hugin1/calibrate_lens/LensCalTypes.cpp                                                    |    104 +
 src/hugin1/calibrate_lens/LensCalTypes.h                                                      |     72 +
 src/hugin1/calibrate_lens/calibrate_lens_gui.desktop                                          |     13 +
 src/hugin1/calibrate_lens/calibrate_lens_gui_rc.rc                                            |     15 +
 src/hugin1/hugin/AboutDialog.cpp                                                              |     93 +-
 src/hugin1/hugin/AboutDialog.h                                                                |     11 +-
 src/hugin1/hugin/AnchorPositionCtrl.h                                                         |     49 -
 src/hugin1/hugin/AssistantPanel.cpp                                                           |     78 +-
 src/hugin1/hugin/CMakeLists.txt                                                               |     13 +-
 src/hugin1/hugin/CPEditorPanel.cpp                                                            |     66 +-
 src/hugin1/hugin/CPEditorPanel.h                                                              |     14 -
 src/hugin1/hugin/CPEditorPanelHandler.h                                                       |     44 -
 src/hugin1/hugin/CPFineTuneFrame.cpp                                                          |     79 -
 src/hugin1/hugin/CPFineTuneFrame.h                                                            |     65 -
 src/hugin1/hugin/CPImageCtrl.cpp                                                              |    100 +-
 src/hugin1/hugin/CPImageCtrl.h                                                                |     28 +-
 src/hugin1/hugin/CPZoomDisplayPanel.cpp                                                       |    466 -
 src/hugin1/hugin/CPZoomDisplayPanel.h                                                         |    117 -
 src/hugin1/hugin/GLPreviewFrame.cpp                                                           |     14 +-
 src/hugin1/hugin/GLPreviewFrame.h                                                             |      3 -
 src/hugin1/hugin/GLRenderer.cpp                                                               |     10 +-
 src/hugin1/hugin/HFOVDialog.cpp                                                               |    108 +-
 src/hugin1/hugin/HFOVDialog.h                                                                 |      9 -
 src/hugin1/hugin/ImageProcessing.h                                                            |    198 -
 src/hugin1/hugin/ImagesList.cpp                                                               |      2 +-
 src/hugin1/hugin/ImagesPanel.cpp                                                              |    510 +-
 src/hugin1/hugin/ImagesPanel.h                                                                |     73 +-
 src/hugin1/hugin/LensPanel.cpp                                                                |   2247 +-
 src/hugin1/hugin/LensPanel.h                                                                  |      3 -
 src/hugin1/hugin/MainFrame.cpp                                                                |    510 +-
 src/hugin1/hugin/MainFrame.h                                                                  |     12 +-
 src/hugin1/hugin/MaskEditorPanel.cpp                                                          |    220 +-
 src/hugin1/hugin/MaskEditorPanel.h                                                            |     10 +
 src/hugin1/hugin/MaskImageCtrl.cpp                                                            |    237 +-
 src/hugin1/hugin/MaskImageCtrl.h                                                              |     17 +-
 src/hugin1/hugin/MaskLoadDialog.cpp                                                           |      6 +-
 src/hugin1/hugin/NonaOptionsDialog.h                                                          |      3 -
 src/hugin1/hugin/PanoOperation.cpp                                                            |    607 +
 src/hugin1/hugin/PanoOperation.h                                                              |    169 +
 src/hugin1/hugin/PanoOperationTree.cpp                                                        |    180 +
 src/hugin1/hugin/PanoOperationTree.h                                                          |     77 +
 src/hugin1/hugin/PanoPanel.cpp                                                                |    171 +-
 src/hugin1/hugin/PanoPanel.h                                                                  |      9 +-
 src/hugin1/hugin/PluginItems.cpp                                                              |    220 +
 src/hugin1/hugin/PluginItems.h                                                                |     77 +
 src/hugin1/hugin/PreferencesDialog.cpp                                                        |    127 +-
 src/hugin1/hugin/PreferencesDialog.h                                                          |      3 +
 src/hugin1/hugin/PreviewControlPointTool.cpp                                                  |      4 +-
 src/hugin1/hugin/PreviewIdentifyTool.cpp                                                      |      5 +-
 src/hugin1/hugin/StitcherPanel.h                                                              |     52 -
 src/hugin1/hugin/UniversalCursor.cpp                                                          |    253 -
 src/hugin1/hugin/UniversalCursor.h                                                            |     66 -
 src/hugin1/hugin/ViewState.cpp                                                                |      4 +-
 src/hugin1/hugin/config.h.tmpl                                                                |     44 -
 src/hugin1/hugin/config_defaults.h                                                            |     13 +-
 src/hugin1/hugin/huginApp.cpp                                                                 |      6 +
 src/hugin1/hugin/huginApp.h                                                                   |      4 +
 src/hugin1/hugin/win_prep.h                                                                   |      3 -
 src/hugin1/hugin/wxPanoCommand.cpp                                                            |     89 +-
 src/hugin1/hugin/wxPanoCommand.h                                                              |     39 +
 src/hugin1/hugin/xrc/CMakeLists.txt                                                           |      3 +-
 src/hugin1/hugin/xrc/about.xrc                                                                |     17 +-
 src/hugin1/hugin/xrc/batch_frame.xrc                                                          |     23 +-
 src/hugin1/hugin/xrc/data/CMakeLists.txt                                                      |      2 +-
 src/hugin1/hugin/xrc/data/about.txt                                                           |     19 -
 src/hugin1/hugin/xrc/data/help_en_EN/16bit.html                                               |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/16bit_workflow_with_hugin.html                           |     24 +-
 src/hugin1/hugin/xrc/data/help_en_EN/200px-Hugin-2011.0_fpw_overview.png                      |        
 src/hugin1/hugin/xrc/data/help_en_EN/5a12c95d04637539015c2d09b5002204.png                     |        
 src/hugin1/hugin/xrc/data/help_en_EN/Aliasing.html                                            |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Align_a_stack_of_photos.html                             |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Align_image_stack.html                                   |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Alpha_channel.html                                       |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Aspect_Ratio.html                                        |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html                                       |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift-C.html                                     |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift.html                                       |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Autopano.html                                            |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Banding.html                                             |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Barrel_distortion.html                                   |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Bracketing.html                                          |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/CCD.html                                                 |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/CMakeLists.txt                                           |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Calibrate_lens_gui.html                                  |     73 +
 src/hugin1/hugin/xrc/data/help_en_EN/Camera_response_curve.html                               |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Celeste_standalone.html                                  |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Checkpto.html                                            |     64 +
 src/hugin1/hugin/xrc/data/help_en_EN/Chromatic_aberration.html                                |     52 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Color_correct_tiff.html                                  |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Colour_profile.html                                      |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Contrast.html                                            |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html                   |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Control_point_generators.html                            |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Control_points.html                                      |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cpclean.html                                             |     37 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html                                              |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Crop_factor.html                                         |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cropped_TIFF.html                                        |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cubic.html                                               |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cubic_Projection.html                                    |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical.html                                         |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_Projection.html                              |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_panorama.html                                |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html                           |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Depth_of_Field.html                                      |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Diffraction.html                                         |     20 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Dust_Removal_with_Flatfield.html                         |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Dynamic_range.html                                       |     12 +-
 src/hugin1/hugin/xrc/data/help_en_EN/EXIF.html                                                |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Enblend.html                                             |     26 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Enblend_reference_manual.html                            |     40 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Enfuse.html                                              |     56 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Enfuse_reference_manual.html                             |     92 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Entrance_pupil.html                                      |     36 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular.html                                     |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html                              |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Projection.html                          |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Field_of_View.html                                       |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Fisheye_Projection.html                                  |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Focal_Length.html                                        |     12 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Freepv.html                                              |     36 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Fulla.html                                               |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/GIF.html                                                 |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Gamma.html                                               |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/HDR.html                                                 |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/HDR_workflow_with_hugin.html                             |     32 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Horizontal_control_points.html                           |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html                                               |     55 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html                                 |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html                               |     26 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Camera_and_Lens_tab.html                           |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html                            |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html                          |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html                                      |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html                                  |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html                                           |     75 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html                           |     52 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html                                    |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html                            |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html                                   |     38 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html                                      |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html                                 |     12 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html                                   |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html                                |     22 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html                           |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html                           |    135 +
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html                                  |     38 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Trackers.html                                      |     40 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html                                |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html                             |     38 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Icpfind.html                                             |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Illustration4.png                                        |        
 src/hugin1/hugin/xrc/data/help_en_EN/Interpolation.html                                       |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/JPEG.html                                                |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Landscape.html                                           |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Lens_correction_model.html                               |     52 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Lens_distortion.html                                     |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Lightprobe.html                                          |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/MatchPoint.html                                          |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/NPP.html                                                 |     36 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Nadir.html                                               |     24 +-
 src/hugin1/hugin/xrc/data/help_en_EN/No-parallax_point.html                                   |     36 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Nodal_Point.html                                         |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Nona.html                                                |     12 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Nona_gui.html                                            |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/OpenEXR.html                                             |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Optimization.html                                        |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PNG.html                                                 |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PPI.html                                                 |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PSD.html                                                 |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PTOptimizer.html                                         |     75 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PTStitcher.html                                          |     40 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PTblender.html                                           |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PTmender.html                                            |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/PTtiff2psd.html                                          |     12 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panini.html                                              |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pano12.html                                              |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html                                         |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panoglview.html                                          |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panoinfo.html                                            |     24 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panomatic.html                                           |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panorama.html                                            |     12 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panorama_formats.html                                    |     30 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panorama_scripting_in_a_nutshell.html                    |     98 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panorama_tools.html                                      |     34 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Panotools.html                                           |     34 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Parallax.html                                            |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Perspective_correction.html                              |     30 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Perspective_distortion.html                              |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pfstmo.html                                              |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pincushion_distortion.html                               |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pitch.html                                               |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Portrait.html                                            |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Projections.html                                         |     56 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pto2mk.html                                              |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html                                           |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/QTVR.html                                                |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Qtvr2img.html                                            |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/RAW.html                                                 |     18 +-
 src/hugin1/hugin/xrc/data/help_en_EN/RGBE.html                                                |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Rectilinear_Projection.html                              |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Roll.html                                                |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html                                          |     30 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Spherical.html                                           |      4 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Stereographic_Projection.html                            |     24 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Stitching_a_photo-mosaic.html                            |     86 +
 src/hugin1/hugin/xrc/data/help_en_EN/Straight_line_control_points.html                        |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html                                           |     12 +-
 src/hugin1/hugin/xrc/data/help_en_EN/TIFF.html                                                |     46 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Tca_correct.html                                         |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/The_General_Panini_Projection.html                       |     22 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Tone_mapping.html                                        |      8 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Using_Celeste_with_hugin.html                            |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Vertical_control_points.html                             |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Vig_optimize.html                                        |     10 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html                                          |     16 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Wavy_distortion.html                                     |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html                                                 |      6 +-
 src/hugin1/hugin/xrc/data/help_en_EN/Zenith.html                                              |     14 +-
 src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl                                                |     13 +-
 src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk                                        |     32 +
 src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc                                          |     16 +
 src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp                                     |      4 +
 src/hugin1/hugin/xrc/data/help_en_EN/license.html                                             |    381 +-
 src/hugin1/hugin/xrc/data/help_en_EN/manual.css                                               |     26 +
 src/hugin1/hugin/xrc/data/help_en_EN/pages.txt                                                |      4 +
 src/hugin1/hugin/xrc/data/help_it_IT/license.html                                             |    381 +-
 src/hugin1/hugin/xrc/data/intro.htm                                                           |     20 +
 src/hugin1/hugin/xrc/images_panel.xrc                                                         |    908 +-
 src/hugin1/hugin/xrc/lenscal_frame.xrc                                                        |    462 +
 src/hugin1/hugin/xrc/main_menu.xrc                                                            |      8 +-
 src/hugin1/hugin/xrc/mask_editor_panel.xrc                                                    |    227 +-
 src/hugin1/hugin/xrc/pano_panel.xrc                                                           |     23 +-
 src/hugin1/hugin/xrc/pref_dialog.xrc                                                          |    118 +-
 src/hugin1/ptbatcher/Batch.cpp                                                                |     50 +-
 src/hugin1/ptbatcher/Batch.h                                                                  |      6 +-
 src/hugin1/ptbatcher/BatchFrame.cpp                                                           |    175 +-
 src/hugin1/ptbatcher/BatchFrame.h                                                             |     19 +
 src/hugin1/ptbatcher/BatchTrayIcon.cpp                                                        |    197 +
 src/hugin1/ptbatcher/BatchTrayIcon.h                                                          |     85 +
 src/hugin1/ptbatcher/CMakeLists.txt                                                           |      6 +-
 src/hugin1/ptbatcher/FindPanoDialog.cpp                                                       |    158 +-
 src/hugin1/ptbatcher/FindPanoDialog.h                                                         |     25 +-
 src/hugin1/ptbatcher/PTBatcherGUI.cpp                                                         |     20 +-
 src/hugin1/ptbatcher/PTBatcherGUI.h                                                           |      8 +-
 src/hugin1/ptbatcher/ProjectListBox.cpp                                                       |      7 +-
 src/hugin1/stitch_project/hugin_stitch_project.cpp                                            |      9 +
 src/hugin_base/CMakeLists.txt                                                                 |      4 +-
 src/hugin_base/algorithms/basic/CalculateCPStatistics.h                                       |      2 +-
 src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp                                       |     10 +
 src/hugin_base/algorithms/control_points/CleanCP.cpp                                          |      7 +-
 src/hugin_base/algorithms/control_points/CleanCP.h                                            |      3 +-
 src/hugin_base/algorithms/nona/FitPanorama.h                                                  |      2 +-
 src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h                       |      2 +-
 src/hugin_base/algorithms/point_sampler/PointSampler.cpp                                      |     20 -
 src/hugin_base/hugin_basic.h                                                                  |      1 -
 src/hugin_base/hugin_math/Vector3.h                                                           |      4 +-
 src/hugin_base/hugin_math/hugin_math.h                                                        |      2 +-
 src/hugin_base/hugin_utils/alphanum.cpp                                                       |    137 +
 src/hugin_base/hugin_utils/alphanum.h                                                         |     73 +
 src/hugin_base/hugin_utils/alphanum.hpp                                                       |    460 -
 src/hugin_base/lines/CMakeLists.txt                                                           |     18 +
 src/hugin_base/lines/FindLines.cpp                                                            |    146 +
 src/hugin_base/lines/FindLines.h                                                              |     72 +
 src/hugin_base/lines/FindN8Lines.cpp                                                          |    619 +
 src/hugin_base/lines/FindN8Lines.h                                                            |     59 +
 src/hugin_base/lines/LinesTypes.h                                                             |     53 +
 src/hugin_base/makefilelib/Variable.cpp                                                       |     29 +-
 src/hugin_base/makefilelib/Variable.h                                                         |     17 +-
 src/hugin_base/panodata/ControlPoint.h                                                        |      3 +
 src/hugin_base/panodata/ImageVariableGroup.h                                                  |      7 +
 src/hugin_base/panodata/ImageVariableTranslate.h                                              |      6 +-
 src/hugin_base/panodata/Lens.h                                                                |      6 +-
 src/hugin_base/panodata/Mask.h                                                                |      3 +-
 src/hugin_base/panodata/PTScriptParsing.cpp                                                   |      4 +-
 src/hugin_base/panodata/PTScriptParsing.h                                                     |      2 +-
 src/hugin_base/panodata/PanoImage.h                                                           |     92 -
 src/hugin_base/panodata/Panorama.cpp                                                          |     71 +-
 src/hugin_base/panodata/Panorama.h                                                            |     14 +-
 src/hugin_base/panodata/PanoramaData.h                                                        |     16 +-
 src/hugin_base/panodata/PanoramaOptions.h                                                     |      4 +-
 src/hugin_base/panodata/PanoramaVariable.h                                                    |     39 +-
 src/hugin_base/panodata/SrcPanoImage.cpp                                                      |     59 +-
 src/hugin_base/panodata/SrcPanoImage.h                                                        |     36 +-
 src/hugin_base/panodata/image_variables.h                                                     |      5 +-
 src/hugin_base/panotools/PanoToolsInterface.cpp                                               |      1 -
 src/hugin_base/panotools/PanoToolsInterface.h                                                 |     24 +-
 src/hugin_cpfind/cpfind/PanoDetector.cpp                                                      |     31 +-
 src/hugin_cpfind/cpfind/PanoDetector.h                                                        |      3 +-
 src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp                                 |      4 +-
 src/hugin_script_interface/CMakeLists.txt                                                     |    262 +
 src/hugin_script_interface/README.dox                                                         |     48 +
 src/hugin_script_interface/README_hsi.txt                                                     |     71 +
 src/hugin_script_interface/hpi.cpp                                                            |    180 +
 src/hugin_script_interface/hpi.h                                                              |     53 +
 src/hugin_script_interface/hpi.py                                                             |    153 +
 src/hugin_script_interface/hpi_classes.cpp                                                    |    192 +
 src/hugin_script_interface/hpi_classes.h                                                      |    130 +
 src/hugin_script_interface/hsi.i                                                              |    276 +
 src/hugin_script_interface/plugins-dev/CMakeLists.txt                                         |      4 +
 src/hugin_script_interface/plugins-dev/dual_use.py                                            |     84 +
 src/hugin_script_interface/plugins-dev/plugin_skeleton.py                                     |     48 +
 src/hugin_script_interface/plugins/CMakeLists.txt                                             |      4 +
 src/hugin_script_interface/plugins/README_woa.txt                                             |    205 +
 src/hugin_script_interface/plugins/crop_cp.py                                                 |    337 +
 src/hugin_script_interface/plugins/shooting_pattern.py                                        |     92 +
 src/hugin_script_interface/plugins/top_five.py                                                |     76 +
 src/hugin_script_interface/plugins/woa.py                                                     |   1913 +
 src/hugin_shared.h                                                                            |      7 +
 src/hugin_version.h.in.cmake                                                                  |      1 +
 src/lens_calibrate/CMakeLists.txt                                                             |     26 -
 src/lens_calibrate/Globals.cpp                                                                |     71 -
 src/lens_calibrate/Globals.h                                                                  |     70 -
 src/lens_calibrate/HermiteSpline.c                                                            |    355 -
 src/lens_calibrate/HermiteSpline.h                                                            |     91 -
 src/lens_calibrate/Main.cpp                                                                   |    613 -
 src/lens_calibrate/MapPoints.cpp                                                              |    285 -
 src/lens_calibrate/MapPoints.h                                                                |     26 -
 src/lens_calibrate/ProcessImage.cpp                                                           |   1787 -
 src/lens_calibrate/ProcessImage.h                                                             |     47 -
 src/lens_calibrate/README                                                                     |     41 -
 src/lens_calibrate/Straighten.cpp                                                             |    103 -
 src/lens_calibrate/Straighten.h                                                               |     26 -
 src/lens_calibrate/find_N8_lines.cpp                                                          |    670 -
 src/lens_calibrate/find_N8_lines.h                                                            |     59 -
 src/lens_calibrate/lensFunc.cpp                                                               |    831 -
 src/lens_calibrate/lensFunc.h                                                                 |    490 -
 src/lens_calibrate/lensFunc_glue.h                                                            |     49 -
 src/lens_calibrate/test_lensFunc.cpp                                                          |    148 -
 src/matchpoint/COPYING                                                                        |     39 +-
 src/tools/checkpto.cpp                                                                        |     76 +-
 src/tools/cpclean.cpp                                                                         |     17 +-
 src/tools/nona.cpp                                                                            |      4 +-
 src/tools/pano_trafo.cpp                                                                      |    104 +-
 src/translations/bg.po                                                                        |   3107 +-
 src/translations/ca_ES.po                                                                     |   3106 +-
 src/translations/cs_CZ.po                                                                     |   3041 +-
 src/translations/de.po                                                                        |   3040 +-
 src/translations/en_GB.po                                                                     |   2999 +-
 src/translations/es.po                                                                        |   3119 +-
 src/translations/fi.po                                                                        |   3064 +-
 src/translations/fr.po                                                                        |   3044 +-
 src/translations/hu.po                                                                        |   3035 +-
 src/translations/hugin.pot                                                                    |   2958 +-
 src/translations/it.po                                                                        |   3051 +-
 src/translations/ja.po                                                                        |   5622 +-
 src/translations/ko.po                                                                        |   3083 +-
 src/translations/nl.po                                                                        |   5557 +-
 src/translations/pl.po                                                                        |   3064 +-
 src/translations/pt_BR.po                                                                     |   3041 +-
 src/translations/ro.po                                                                        |   3059 +-
 src/translations/ru.po                                                                        |   3358 +-
 src/translations/sk.po                                                                        |   3041 +-
 src/translations/sl.po                                                                        |   3094 +-
 src/translations/sv.po                                                                        |   5641 +-
 src/translations/uk.po                                                                        |   3095 +-
 src/translations/zh_CN.po                                                                     |   3042 +-
 src/translations/zh_TW.po                                                                     |   3053 +-
 482 files changed, 115052 insertions(+), 85435 deletions(-)

diffs (truncated from 304523 to 500 lines):

diff -r 9e26ccb0d3d0 -r 832b36211fb5 .hgignore
--- a/.hgignore	Thu Mar 31 17:05:11 2011 +0200
+++ b/.hgignore	Wed Jun 22 13:23:42 2011 +0200
@@ -3,3 +3,6 @@
 glob:rev.txt
 glob:src/hugin/*
 ^build_*
+^BUILD/
+^build/
+^src/translations/messages.mo$
diff -r 9e26ccb0d3d0 -r 832b36211fb5 .hgtags
--- a/.hgtags	Thu Mar 31 17:05:11 2011 +0200
+++ b/.hgtags	Wed Jun 22 13:23:42 2011 +0200
@@ -64,3 +64,4 @@
 0000000000000000000000000000000000000000 hugin-2009.2.0_beta3
 af5ab8815d4d2a455ac88ec44f14ff416b2126fc 2009.2.0beta4
 0000000000000000000000000000000000000000 2009.2.0beta4
+67a96ebdac744cc4809e821cf98535077024f948 2011.0.0
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeLists.txt	Wed Jun 22 13:23:42 2011 +0200
@@ -8,6 +8,22 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules )
 
+set(ARCH_TRIPLET)
+if(UNIX)
+  FIND_PROGRAM(DPKG_ARCHITECTURE_EXECUTABLE dpkg-architecture)
+  if(DPKG_ARCHITECTURE_EXECUTABLE)
+    EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+      OUTPUT_VARIABLE ARCH_TRIPLET
+      ERROR_VARIABLE ERROR_ARCH_TRIPLET
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+endif()
+if(ARCH_TRIPLET)
+  set(SYSTEM_LIB_DIRS /usr/lib /usr/lib/${ARCH_TRIPLET} /usr/local/lib)
+else()
+  set(SYSTEM_LIB_DIRS /usr/lib /usr/local/lib)
+endif()
+
 include(HuginMacros)
 include(CheckIncludeFiles)
 
@@ -16,7 +32,7 @@
 
 # version
 set(V_MAJOR 2011)
-set(V_MINOR 1)
+set(V_MINOR 3)
 set(V_PATCH 0)
 
 #
@@ -60,7 +76,7 @@
 IF (EXISTS ${PROJECT_SOURCE_DIR}/.hg)
   IF (UPDATE_CHANGELOG)
    FIND_PROGRAM(_hg hg)
-   EXECUTE_PROCESS(COMMAND ${_hg} log --follow --style=changelog
+   EXECUTE_PROCESS(COMMAND ${_hg} log --follow --style ${PROJECT_SOURCE_DIR}/Changelog.style
    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
    OUTPUT_FILE ${PROJECT_SOURCE_DIR}/ChangeLog)
    MESSAGE("-- New ChangeLog generated")
@@ -277,6 +293,17 @@
   MESSAGE(FATAL_ERROR "Tclap library not found")
 ENDIF(NOT TCLAP_FOUND)
 
+OPTION(BUILD_HSI "Python Scripting Interface" OFF)
+IF(BUILD_HSI)
+  find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)
+  FIND_PACKAGE(SWIG REQUIRED)
+  INCLUDE(${SWIG_USE_FILE})
+
+  FIND_PACKAGE(PythonLibs REQUIRED)
+  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+  ADD_DEFINITIONS(-DHUGIN_HSI)
+ENDIF()
+
 ##
 ## LAPACK (optional, enable by -DENABLE_LAPACK=ON)
 ##
@@ -486,7 +513,7 @@
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "${V_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${V_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}.${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${V_MAJOR}.${V_MINOR}")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "hugin-${V_MAJOR}.${V_MINOR}.${V_PATCH}")
 SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
@@ -551,9 +578,10 @@
 "Makefile\\\\.in$"
 "/\\\\.hg/"
  )
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpano13(>=2.9.17)")
-# one day we'll get these to work right
-#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpano13(>=2.9.17), libpost2c2, libglew(>=1.5), freeglut3, libboost-filesystem(>=1.38.0), liblcms1, libopenexr6, libtiff4")
+
+# Use dpkg-shlibdeps to get the needed dependences
+SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
 SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/Debian/postinst")
 INCLUDE(CPack)
 
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindExiv2.cmake
--- a/CMakeModules/FindExiv2.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindExiv2.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -71,6 +71,7 @@
                /usr/local/include
                /usr/include
                ${SOURCE_BASE_DIR}/exiv2/msvc/include
+               ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/include
                ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/include
@@ -85,7 +86,7 @@
        find_library_with_debug(EXIV2_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES exiv2 libexiv2
-          PATHS ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+          PATHS ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
        )
 
        find_library_with_debug(EXIV2EXPAT_LIBRARIES
@@ -97,13 +98,13 @@
        find_library_with_debug(EXIV2_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES exiv2 libexiv2
-          PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
+          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
        )
 
        find_library_with_debug(EXIV2EXPAT_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES libexpat
-          PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
+          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
        )
 
        # since exiv 0.19, xmpsdk needs explicit linked in static build
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindGLEW.cmake
--- a/CMakeModules/FindGLEW.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindGLEW.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -13,7 +13,7 @@
   ENDIF(${HUGIN_SHARED})
 ELSE(WIN32)
   FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS /usr/include /usr/local/include)
-  FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS /usr/lib /usr/local/lib)
+  FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS ${SYSTEM_LIB_DIRS})
 ENDIF(WIN32)
 
 IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARIES)
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindGLUT.cmake
--- a/CMakeModules/FindGLUT.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindGLUT.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -48,15 +48,15 @@
       )
   
     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-      /usr/openwin/lib
+      /usr/openwin/lib ${SYSTEM_LIB_DIRS}
       )
     
     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-      /usr/openwin/lib
+      /usr/openwin/lib /usr/lib/x86_64-linux-gnu
       )
     
     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-      /usr/openwin/lib
+      /usr/openwin/lib /usr/lib/x86_64-linux-gnu
       )
     
   ENDIF (APPLE)
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindJPEG.cmake
--- a/CMakeModules/FindJPEG.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindJPEG.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -17,6 +17,7 @@
 FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
   /usr/local/include
   /usr/include
+  ${SOURCE_BASE_DIR}/jpeg-8c
   ${SOURCE_BASE_DIR}/jpeg-8b
   ${SOURCE_BASE_DIR}/jpeg-8a
   ${SOURCE_BASE_DIR}/jpeg-8
@@ -28,7 +29,7 @@
 find_library_with_debug(JPEG_LIBRARIES
   WIN32_DEBUG_POSTFIX d
   NAMES jpeg libjpeg wxjpeg
-  PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/jpeg-8b/lib ${SOURCE_BASE_DIR}/jpeg-8a/Release ${SOURCE_BASE_DIR}/jpeg-8/Release ${SOURCE_BASE_DIR}/jpeg-8/lib ${wxWidgets_LIB_DIR}
+  PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/jpeg-8c/lib ${SOURCE_BASE_DIR}/jpeg-8b/lib ${SOURCE_BASE_DIR}/jpeg-8a/Release ${SOURCE_BASE_DIR}/jpeg-8/Release ${SOURCE_BASE_DIR}/jpeg-8/lib ${wxWidgets_LIB_DIR}
 )
 
 
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindLAPACK.cmake
--- a/CMakeModules/FindLAPACK.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindLAPACK.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -9,24 +9,21 @@
 
 FIND_LIBRARY(LAPACK_LAPACK_LIBRARY
   NAMES lapack
-  PATHS /usr/lib
-        /usr/local/lib
+  PATHS ${SYSTEM_LIB_DIRS}
         ${SOURCE_BASE_DIR}/
         ${SOURCE_BASE_DIR}/lapack
   )
 
 FIND_LIBRARY(LAPACK_BLAS_LIBRARY
   NAMES blas
-  PATHS /usr/lib
-        /usr/local/lib
+  PATHS ${SYSTEM_LIB_DIRS}
         ${SOURCE_BASE_DIR}/
         ${SOURCE_BASE_DIR}/lapack
   )
 
 FIND_LIBRARY(LAPACK_G2C_LIBRARY
   NAMES g2c
-  PATHS /usr/lib
-        /usr/local/lib
+  PATHS ${SYSTEM_LIB_DIRS}
         ${SOURCE_BASE_DIR}/
         ${SOURCE_BASE_DIR}/lapack
   )
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindOpenEXR.cmake
--- a/CMakeModules/FindOpenEXR.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindOpenEXR.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -34,8 +34,7 @@
   FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -44,8 +43,7 @@
     NAMES Iex
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -53,8 +51,7 @@
   FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -62,8 +59,7 @@
   FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -72,8 +68,7 @@
   FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf 
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -81,8 +76,7 @@
   FIND_LIBRARY(OPENEXR_HALF_LIBRARY_DEBUG NAMES Half
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -91,8 +85,7 @@
     NAMES Iex
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -100,8 +93,7 @@
   FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY_DEBUG NAMES IlmThread
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -109,8 +101,7 @@
   FIND_LIBRARY(OPENEXR_IMATH_LIBRARY_DEBUG NAMES Imath
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -118,8 +109,7 @@
   FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY_DEBUG NAMES IlmImf 
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindPANO13.cmake
--- a/CMakeModules/FindPANO13.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindPANO13.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -22,7 +22,7 @@
 
 FIND_LIBRARY(PANO13_LIBRARIES
   NAMES pano13
-  PATHS /usr/lib /usr/local/lib 
+  PATHS ${SYSTEM_LIB_DIRS} 
         "${PANO13_INCLUDE_DIR}/pano13/Release LIB CMD"
         "${PANO13_INCLUDE_DIR}/pano13/Release CMD/Win32"
         ${PANO13_INCLUDE_DIR}/pano13/Release
@@ -63,7 +63,7 @@
   ENDIF(NOT PANO13_FIND_QUIETLY)
   FIND_LIBRARY( PANO13_DEBUG_LIBRARIES
     NAMES Panotools pano13d pano13
-    PATHS /usr/lib /usr/local/lib 
+    PATHS ${SYSTEM_LIB_DIRS}
 	  "${PANO13_INCLUDE_DIR}/pano13/Debug LIB CMD"
 	  "${PANO13_INCLUDE_DIR}/pano13/Debug CMD/Win32"
 	  ${PANO13_INCLUDE_DIR}/pano13/Debug
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindPNG.cmake
--- a/CMakeModules/FindPNG.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindPNG.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -24,6 +24,7 @@
   FIND_PATH(PNG_INCLUDE_DIR png.h
     /usr/local/include
     /usr/include
+    ${SOURCE_BASE_DIR}/libpng/include
     ${SOURCE_BASE_DIR}/lpng142
     ${SOURCE_BASE_DIR}/lpng141
     ${SOURCE_BASE_DIR}/lpng140
@@ -32,8 +33,8 @@
 
   find_library_with_debug(PNG_LIBRARIES
     WIN32_DEBUG_POSTFIX d
-    NAMES png libpng libpng14 wxpng
-    PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
+    NAMES png libpng libpng14 libpng15 wxpng
+    PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/libpng/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
   )
 
   include(FindPackageHandleStandardArgs)
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindTIFF.cmake
--- a/CMakeModules/FindTIFF.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindTIFF.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -17,6 +17,7 @@
 FIND_PATH(TIFF_INCLUDE_DIR tiff.h
   /usr/local/include
   /usr/include
+  ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
   ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
   ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
   ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff
@@ -31,7 +32,8 @@
 # and the import library libtiff_i for dynamic build
   find_library(TIFF_LIBRARIES
     NAMES libtiff_i
-    PATHS /usr/lib /usr/local/lib
+    PATHS ${SYSTEM_LIB_DIRS}
+          ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
   )
@@ -39,7 +41,8 @@
   find_library_with_debug(TIFF_LIBRARIES
     WIN32_DEBUG_POSTFIX d
     NAMES tiff libtiff wxtiff
-    PATHS /usr/lib /usr/local/lib
+    PATHS ${SYSTEM_LIB_DIRS}
+          ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
           ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/FindZLIB.cmake
--- a/CMakeModules/FindZLIB.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/FindZLIB.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -24,6 +24,7 @@
   /usr/local/include
   /usr/include
   ${SOURCE_BASE_DIR}/zlib
+  ${SOURCE_BASE_DIR}/zlib/include
   ${wxWidgets_ROOT_DIR}/src/zlib
 )
 
@@ -32,7 +33,7 @@
 find_library_with_debug(ZLIB_LIBRARIES
   WIN32_DEBUG_POSTFIX d
   NAMES z zlib zlib1 wxzlib
-  PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/zlib ${wxWidgets_LIB_DIR}
+  PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/zlib/lib ${SOURCE_BASE_DIR}/zlib ${wxWidgets_LIB_DIR}
 )
 
 
diff -r 9e26ccb0d3d0 -r 832b36211fb5 CMakeModules/win_bundle.cmake
--- a/CMakeModules/win_bundle.cmake	Thu Mar 31 17:05:11 2011 +0200
+++ b/CMakeModules/win_bundle.cmake	Wed Jun 22 13:23:42 2011 +0200
@@ -39,7 +39,7 @@
             DOC "Location of pano13 source"
             NO_DEFAULT_PATH)
   INSTALL(FILES ${PANO13_SRC_DIR}/AUTHORS
-          ${PANO13_SRC_DIR}/gpl.txt
+          ${PANO13_SRC_DIR}/COPYING
           ${PANO13_SRC_DIR}/README
           ${PANO13_SRC_DIR}/doc/Optimize.txt
           ${PANO13_SRC_DIR}/doc/PTblender.readme
@@ -50,7 +50,7 @@
   # install enblend/enfuse files
 
   FIND_PATH(ENBLEND_EXE_DIR enblend_openmp.exe
-            ${SOURCE_BASE_DIR}/enblend-enfuse-4.0
+            PATHS ${SOURCE_BASE_DIR}/enblend-enfuse-4.1 ${SOURCE_BASE_DIR}/enblend-enfuse-4.0
             DOC "Location of enblend executables"
             NO_DEFAULT_PATH
             )
@@ -112,22 +112,22 @@
   IF(${HUGIN_SHARED})
     FIND_FILE(TIFF_DLL
       NAMES libtiff.dll 
-      PATHS ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
+      PATHS ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_FILE(JPEG_DLL
       NAMES jpeg.dll 
-      PATHS ${SOURCE_BASE_DIR}/jpeg-8b/Release ${SOURCE_BASE_DIR}/jpeg-8a/Release ${SOURCE_BASE_DIR}/jpeg-8/Release
+      PATHS ${SOURCE_BASE_DIR}/jpeg-8c/lib ${SOURCE_BASE_DIR}/jpeg-8b/Release ${SOURCE_BASE_DIR}/jpeg-8a/Release ${SOURCE_BASE_DIR}/jpeg-8/Release
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_FILE(PNG_DLL
-      NAMES libpng14.dll 
-      PATHS ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib
+      NAMES libpng14.dll libpng15.dll
+      PATHS ${SOURCE_BASE_DIR}/libpng/bin ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_FILE(ZLIB_DLL
       NAMES zlib1.dll 
-      PATHS ${SOURCE_BASE_DIR}/zlib
+      PATHS ${SOURCE_BASE_DIR}/zlib ${SOURCE_BASE_DIR}/zlib/bin
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_PATH(OPENEXR_BIN_DIR Half.dll 
@@ -141,14 +141,15 @@
     FILE(GLOB BOOST_DATE_TIME_DLL ${Boost_LIBRARY_DIRS}/boost_date_time*.dll)
     FILE(GLOB BOOST_SYSTEM_DLL ${Boost_LIBRARY_DIRS}/boost_system*.dll)
     FILE(GLOB BOOST_REGEX_DLL ${Boost_LIBRARY_DIRS}/boost_regex*.dll)
+    FILE(GLOB BOOST_SIGNALS_DLL ${Boost_LIBRARY_DIRS}/boost_signals*.dll)
     FIND_FILE(EXIV2_DLL 
       NAMES exiv2.dll 
-      PATHS ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+      PATHS ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_FILE(LIBEXPAT_DLL 
       NAMES libexpat.dll 
-      PATHS ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+      PATHS ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     FIND_FILE(GLEW_DLL
@@ -162,20 +163,21 @@
       NO_SYSTEM_ENVIRONMENT_PATH
     )
     # hand tuned dll, so that only necesarry dll are install and not all wxWidgets DLL to save space
-    FIND_FILE(WXWIDGETS_DLL1 NAMES wxbase28u_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
-    FIND_FILE(WXWIDGETS_DLL2 NAMES wxmsw28u_core_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
-    FIND_FILE(WXWIDGETS_DLL3 NAMES wxmsw28u_xrc_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
-    FIND_FILE(WXWIDGETS_DLL4 NAMES wxmsw28u_adv_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
-    FIND_FILE(WXWIDGETS_DLL5 NAMES wxmsw28u_gl_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
-    FIND_FILE(WXWIDGETS_DLL6 NAMES wxmsw28u_html_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
-    FIND_FILE(WXWIDGETS_DLL7 NAMES wxbase28u_xml_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)
+    FIND_FILE(WXWIDGETS_DLL1 NAMES wxbase28u_vc_custom.dll wxbase291u_vc_custom.dll PATHS ${wxWidgets_LIB_DIR} NO_SYSTEM_ENVIRONMENT_PATH)

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/f96f56d17f65
changeset:  5336:f96f56d17f65
user:       tmodes
date:       Mon Jun 20 22:13:46 2011 +0200
description:

Redesign of images tab to allow better extensibility
Integration of Python scripts currently commented out because of bug 799905

diffstat:

 src/hugin1/hugin/CMakeLists.txt        |    4 +-
 src/hugin1/hugin/ImagesPanel.cpp       |  510 ++------------------
 src/hugin1/hugin/ImagesPanel.h         |   73 +--
 src/hugin1/hugin/MainFrame.cpp         |  353 ++------------
 src/hugin1/hugin/PanoOperation.cpp     |  607 +++++++++++++++++++++++++
 src/hugin1/hugin/PanoOperation.h       |  169 +++++++
 src/hugin1/hugin/PanoOperationTree.cpp |  180 +++++++
 src/hugin1/hugin/PanoOperationTree.h   |   77 +++
 src/hugin1/hugin/PluginItems.cpp       |   29 +
 src/hugin1/hugin/PluginItems.h         |   14 +
 src/hugin1/hugin/huginApp.cpp          |    2 +
 src/hugin1/hugin/wxPanoCommand.cpp     |   55 +-
 src/hugin1/hugin/wxPanoCommand.h       |   21 +-
 src/hugin1/hugin/xrc/images_panel.xrc  |  908 +++++++++++++++----------------------
 14 files changed, 1633 insertions(+), 1369 deletions(-)

diffs (truncated from 3699 to 500 lines):

diff -r a4627a193a65 -r f96f56d17f65 src/hugin1/hugin/CMakeLists.txt
--- a/src/hugin1/hugin/CMakeLists.txt	Sun Jun 19 23:58:20 2011 -0400
+++ b/src/hugin1/hugin/CMakeLists.txt	Mon Jun 20 22:13:46 2011 +0200
@@ -34,7 +34,7 @@
 PreviewCropTool.cpp DragTool.cpp PreviewIdentifyTool.cpp PanosphereSphereTool.cpp
 PreviewDifferenceTool.cpp PreviewPanoMaskTool.cpp PreviewControlPointTool.cpp
 GreatCircles.cpp AboutDialog.cpp LayoutRemapper.cpp PreviewLayoutLinesTool.cpp PreviewColorPickerTool.cpp
-MaskEditorPanel.cpp MaskImageCtrl.cpp MaskLoadDialog.cpp HtmlWindow.cpp)
+MaskEditorPanel.cpp MaskImageCtrl.cpp MaskLoadDialog.cpp HtmlWindow.cpp PanoOperation.cpp PanoOperationTree.cpp)
 
 set(hugin_HEADERS
 huginApp.h ImagesList.h MainFrame.h CPImageCtrl.h CPImagesComboBox.h CPEditorPanel.h CPDetectorDialog.h LensPanel.h 
@@ -49,7 +49,7 @@
 PreviewCropTool.h DragTool.h PreviewIdentifyTool.h PanosphereSphereTool.h
 PreviewDifferenceTool.h PreviewPanoMaskTool.h PreviewControlPointTool.h
 GreatCircles.h AboutDialog.h LayoutRemapper.h PreviewLayoutLinesTool.h PreviewColorPickerTool.h
-MaskEditorPanel.h MaskImageCtrl.h MaskLoadDialog.h HtmlWindow.h)
+MaskEditorPanel.h MaskImageCtrl.h MaskLoadDialog.h HtmlWindow.h PanoOperation.h PanoOperationTree.h)
 
 IF(BUILD_HSI)
 LIST(APPEND hugin_SOURCES PluginItems.cpp)
diff -r a4627a193a65 -r f96f56d17f65 src/hugin1/hugin/ImagesPanel.cpp
--- a/src/hugin1/hugin/ImagesPanel.cpp	Sun Jun 19 23:58:20 2011 -0400
+++ b/src/hugin1/hugin/ImagesPanel.cpp	Mon Jun 20 22:13:46 2011 +0200
@@ -34,38 +34,24 @@
 #include <vector>
 #include <map>
 
-//#include <vigra_ext/PointMatching.h>
-//#include <vigra_ext/LoweSIFT.h>
-
 #include "hugin/ImagesPanel.h"
 #include "hugin/CommandHistory.h"
 #include "hugin/TextKillFocusHandler.h"
-#include "hugin/CPEditorPanel.h"
 #include "hugin/ImagesList.h"
 #include "hugin/MainFrame.h"
 #include "hugin/huginApp.h"
-#include "icpfind/AutoCtrlPointCreator.h"
 #include "hugin/config_defaults.h"
-#include "base_wx/MyProgressDialog.h"
-#include "base_wx/PTWXDlg.h"
-#include <algorithms/control_points/CleanCP.h>
-#include <PT/PTOptimise.h>
+#include "hugin/PanoOperationTree.h"
+#include "hugin/PanoOperation.h"
 
 #include <panodata/StandardImageVariableGroups.h>
 
-// Celeste header
-#include "Celeste.h"
-#include "CelesteGlobals.h"
-#include "Utilities.h"
-
 using namespace PT;
 using namespace hugin_utils;
 using namespace vigra;
 using namespace vigra_ext;
 using namespace std;
 
-ImgPreview * canvas;
-
 #define m_XRCID(str_id) \
     wxXmlResource::GetXRCID(str_id)
 #define m_XRCCTRL(window, id, type) \
@@ -76,26 +62,17 @@
 #define GET_VAR(val) pano->getVariable(orientationEdit_RefImg).val.getValue()
 
 BEGIN_EVENT_TABLE(ImagesPanel, wxPanel)
-//    EVT_SIZE   ( ImagesPanel::OnSize )
-//    EVT_MOUSE_EVENTS ( ImagesPanel::OnMouse )
-//    EVT_MOTION ( ImagesPanel::ChangePreview )
-//	EVT_SPLITTER_SASH_POS_CHANGED(XRCID("image_panel_splitter"), ImagesPanel::OnPositionChanged)
     EVT_LIST_ITEM_SELECTED( XRCID("images_list_unknown"),
                             ImagesPanel::ListSelectionChanged )
     EVT_LIST_ITEM_DESELECTED( XRCID("images_list_unknown"),
                             ImagesPanel::ListSelectionChanged )
-    EVT_BUTTON     ( XRCID("images_opt_anchor_button"), ImagesPanel::OnOptAnchorChanged)
-    EVT_BUTTON     ( XRCID("images_color_anchor_button"), ImagesPanel::OnColorAnchorChanged)
-    EVT_BUTTON     ( XRCID("images_feature_matching"), ImagesPanel::SIFTMatching)
-    EVT_BUTTON     ( XRCID("images_cp_clean"), ImagesPanel::OnCleanCP)
-    EVT_BUTTON     ( XRCID("images_remove_cp"), ImagesPanel::OnRemoveCtrlPoints)
     EVT_BUTTON     ( XRCID("images_reset_pos"), ImagesPanel::OnResetImagePositions)
+#ifndef __WXGTK__
     EVT_BUTTON     ( XRCID("action_remove_images"),  ImagesPanel::OnRemoveImages)
+#endif
     EVT_BUTTON     ( XRCID("images_move_image_down"),  ImagesPanel::OnMoveImageDown)
     EVT_BUTTON     ( XRCID("images_move_image_up"),  ImagesPanel::OnMoveImageUp)
-    EVT_BUTTON	   ( XRCID("images_celeste_button"), ImagesPanel::OnCelesteButton)
-    EVT_BUTTON	   ( XRCID("images_new_stack"), ImagesPanel::OnNewStack)
-    EVT_BUTTON	   ( XRCID("images_change_stack"), ImagesPanel::OnChangeStack)
+    EVT_BUTTON     ( XRCID("images_execute_operation"), ImagesPanel::OnExecuteOperation)
     EVT_TEXT_ENTER ( XRCID("images_text_y"), ImagesPanel::OnVarTextChanged )
     EVT_TEXT_ENTER ( XRCID("images_text_p"), ImagesPanel::OnVarTextChanged )
     EVT_TEXT_ENTER ( XRCID("images_text_r"), ImagesPanel::OnVarTextChanged )
@@ -109,7 +86,7 @@
 
 ImagesPanel::ImagesPanel()
 {
-    pano = 0;
+    pano = NULL;
     m_restoreLayoutOnResize = false;
 }
 
@@ -133,32 +110,15 @@
 
     m_showImgNr = INT_MAX;
 
-    m_optAnchorButton = XRCCTRL(*this, "images_opt_anchor_button", wxButton);
-    DEBUG_ASSERT(m_optAnchorButton);
-
-    m_colorAnchorButton = XRCCTRL(*this, "images_color_anchor_button", wxButton);
-    DEBUG_ASSERT(m_colorAnchorButton);
-    m_matchingButton = XRCCTRL(*this, "images_feature_matching", wxButton);
-    DEBUG_ASSERT(m_matchingButton);
-    m_cleaningButton = XRCCTRL(*this, "images_cp_clean", wxButton);
-    DEBUG_ASSERT(m_cleaningButton);
-    m_removeCPButton = XRCCTRL(*this, "images_remove_cp", wxButton);
-    DEBUG_ASSERT(m_removeCPButton);
     m_moveUpButton = XRCCTRL(*this, "images_move_image_up", wxButton);
     DEBUG_ASSERT(m_moveUpButton);
     m_moveDownButton = XRCCTRL(*this, "images_move_image_down", wxButton);
     DEBUG_ASSERT(m_moveDownButton);
-    m_stackNewButton = XRCCTRL(*this, "images_new_stack", wxButton);
-    DEBUG_ASSERT(m_stackNewButton);
-    m_stackChangeButton = XRCCTRL(*this, "images_change_stack", wxButton);
-    DEBUG_ASSERT(m_stackChangeButton);
-    
     m_linkCheckBox = XRCCTRL(*this, "images_check_link", wxCheckBox);
-
-    m_img_ctrls = XRCCTRL(*this, "image_control_panel", wxPanel);
-    DEBUG_ASSERT(m_img_ctrls);
-
-    m_CPDetectorChoice = XRCCTRL(*this, "cpdetector_settings", wxChoice);
+    DEBUG_ASSERT(m_linkCheckBox);
+    m_operationTree = XRCCTRL(*this, "images_pano_operation_tree", PanoOperationTreeCtrl);
+    DEBUG_ASSERT(m_operationTree);
+    m_operationTree->GenerateTree();
 
     // Image Preview
     m_smallImgCtrl = XRCCTRL(*this, "images_selected_image", wxStaticBitmap);
@@ -178,10 +138,6 @@
 //                     wxBITMAP_TYPE_PNG);
     m_smallImgCtrl->SetBitmap(m_empty);
 
-    wxListEvent ev;
-    ListSelectionChanged(ev);
-    DEBUG_TRACE("end");
-
 //    SetAutoLayout(false);
 
     wxConfigBase* config=wxConfigBase::Get();
@@ -191,8 +147,11 @@
     //write current autopano generator settings
     cpdetector_config.Write(config);
     config->Flush();
-    cpdetector_config.FillControl(m_CPDetectorChoice,true);
+    m_operationTree->UpdateCPDetectorItems(cpdetector_config);
     Layout();
+    wxListEvent ev;
+    ListSelectionChanged(ev);
+    DEBUG_TRACE("end");
 
     return true;
 }
@@ -205,6 +164,15 @@
     pano->addObserver(this);
 }
 
+#ifdef HUGIN_HSI
+void ImagesPanel::AddPythonOperations(PluginItems items)
+{
+    m_operationTree->GeneratePythonTree(items);
+    UIntSet images;
+    m_operationTree->UpdateState(*pano,images);
+};
+#endif
+
 ImagesPanel::~ImagesPanel()
 {
     DEBUG_TRACE("dtor");
@@ -263,21 +231,7 @@
     if (pano.getNrOfImages() == 0)
     {
         DisableImageCtrls();
-        m_removeCPButton->Disable();
-        m_matchingButton->Disable();
-    } else {
-        m_removeCPButton->Enable();
-        m_matchingButton->Enable();
-    }
-    if (pano.getNrOfImages()>1)
-    {
-        if(pano.getNrOfCtrlPoints()>2)
-            m_cleaningButton->Enable();
-        else
-            m_cleaningButton->Disable();
-    }
-    else
-        m_cleaningButton->Disable();
+    };
 
     if (selected.size() == 1 &&
         *(selected.begin()) < pano.getNrOfImages() &&
@@ -290,6 +244,7 @@
     {
         ClearImgParameters( );
     }
+    m_operationTree->UpdateState(pano,selected);
 
     DEBUG_TRACE("");
 }
@@ -303,84 +258,6 @@
 }
 
 // #####  Here start the eventhandlers  #####
-
-/** run sift matching on selected images, and add control points */
-void ImagesPanel::SIFTMatching(wxCommandEvent & e)
-{
-    UIntSet selImg = images_list->GetSelected();
-    if ( selImg.size() < 2) {
-        // add all images.
-        selImg.clear();
-        unsigned int nImg = pano->getNrOfImages();
-        for (unsigned int i=0; i < nImg; i++) {
-            selImg.insert(i);
-        }
-    }
-
-    if (selImg.size() == 0) {
-        return;
-    }
-
-    long nFeatures = XRCCTRL(*this, "images_points_per_overlap"
-                            , wxSpinCtrl)->GetValue();
-
-    AutoCtrlPointCreator matcher;
-    CPVector cps = matcher.automatch(cpdetector_config.settings[m_CPDetectorChoice->GetSelection()],
-        *pano, selImg, nFeatures,this);
-    wxString msg;
-    wxMessageBox(wxString::Format(_("Added %lu control points"), (unsigned long) cps.size()), _("Control point detector result"),wxOK|wxICON_INFORMATION,this);
-    GlobalCmdHist::getInstance().addCommand(
-            new PT::AddCtrlPointsCmd(*pano, cps)
-                                           );
-
-};
-
-void ImagesPanel::OnCleanCP(wxCommandEvent & e)
-{
-    if (pano->getNrOfImages()<2)
-        return;
-
-    if (pano->getNrOfCtrlPoints()<2)
-        return;
-
-    deregisterPTWXDlgFcn();
-    // work around a flaw in wxProgresDialog that results in incorrect layout
-    // by pre-allocting sufficient horizontal space
-    ProgressReporterDialog progress(2, _("Cleaning Control points"), _("Checking pairwise")+wxString((wxChar)' ',10),this, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_ELAPSED_TIME);
-    UIntSet CPremove=getCPoutsideLimit_pair(*pano,2.0);
-    
-    unsigned int NrRemoved=CPremove.size();
-    if(NrRemoved>0)
-    {
-        GlobalCmdHist::getInstance().addCommand(
-                        new PT::RemoveCtrlPointsCmd(*pano,CPremove)
-                        );
-        
-    };
-    CPremove.clear();
-    
-    //check for unconnected images
-    CPGraph graph;
-    createCPGraph(*pano, graph);
-    CPComponents comps;
-    int n=findCPComponents(graph, comps);
-    progress.increaseProgress(1, std::wstring(wxString(_("Checking whole project")).wc_str(wxConvLocal)));
-    if (n <= 1)
-    {
-        CPremove=getCPoutsideLimit(*pano,2.0);
-    }
-    progress.increaseProgress(1, std::wstring(wxString(_("Finished cleaning")).wc_str(wxConvLocal)));
-    registerPTWXDlgFcn(MainFrame::Get());
-    if(CPremove.size()>0)
-    {
-        GlobalCmdHist::getInstance().addCommand(
-                        new PT::RemoveCtrlPointsCmd(*pano,CPremove)
-                        );
-        NrRemoved+=CPremove.size();
-    };
-    wxMessageBox(wxString::Format(_("Removed %u control points"), NrRemoved), _("Cleaning"),wxOK|wxICON_INFORMATION,this);
-};
-
 void ImagesPanel::OnVarTextChanged ( wxCommandEvent & e )
 {
 
@@ -439,41 +316,6 @@
         );
 }
 
-void ImagesPanel::OnOptAnchorChanged(wxCommandEvent &e )
-{
-    const UIntSet & sel = images_list->GetSelected();
-    if ( sel.size() == 1 ) {
-        // set first image to be the anchor
-        PanoramaOptions opt = pano->getOptions();
-        opt.optimizeReferenceImage = *(sel.begin());
-
-        GlobalCmdHist::getInstance().addCommand(
-            new PT::SetPanoOptionsCmd( *pano, opt )
-            );
-    }
-}
-
-void ImagesPanel::OnColorAnchorChanged(wxCommandEvent &e )
-{
-    const UIntSet & sel = images_list->GetSelected();
-    if ( sel.size() == 1 ) {
-        // set first image to be the anchor
-        PanoramaOptions opt = pano->getOptions();
-        opt.colorReferenceImage = *(sel.begin());
-		// Set the color correction mode so that the anchor image is persisted
-		if (opt.colorCorrection == 0) {
-		  opt.colorCorrection = (PanoramaOptions::ColorCorrection) 1;
-		}
-		DEBUG_INFO("Color reference image is now: " << opt.colorReferenceImage);
-		DEBUG_INFO("Color correction mode : " << opt.colorCorrection);
-        GlobalCmdHist::getInstance().addCommand(
-            new PT::SetPanoOptionsCmd( *pano, opt )
-            );
-    }
-	
-}
-
-
 void ImagesPanel::ListSelectionChanged(wxListEvent & e)
 {
     DEBUG_TRACE(e.GetIndex());
@@ -493,8 +335,6 @@
             unsigned int imgNr = *(sel.begin());
             // single selection, show its parameters
             ShowImgParameters(imgNr);
-            m_optAnchorButton->Enable();
-            m_colorAnchorButton->Enable();
             m_moveDownButton->Enable();
             m_moveUpButton->Enable();
         } else {
@@ -502,12 +342,20 @@
             // multiselection, clear all values
             // we don't know which images parameters to show.
             ClearImgParameters();
-            m_optAnchorButton->Disable();
-            m_colorAnchorButton->Disable();
             m_moveDownButton->Disable();
             m_moveUpButton->Disable();
         }
     }
+    if(pano!=NULL)
+    {
+        m_operationTree->UpdateState(*pano,sel);
+    }
+    else
+    {
+        Panorama pano2;
+        UIntSet images;
+        m_operationTree->UpdateState(pano2,images);
+    };
 }
 
 
@@ -525,15 +373,12 @@
     m_smallImgCtrl->SetBitmap(m_empty);
     m_smallImgCtrl->GetParent()->Layout();
     m_smallImgCtrl->Refresh();
-    m_optAnchorButton->Disable();
-    m_colorAnchorButton->Disable();
     m_moveDownButton->Disable();
     m_moveUpButton->Disable();
     XRCCTRL(*this, "images_reset_pos", wxButton)->Disable();
+#ifndef __WXGTK__
     XRCCTRL(*this, "action_remove_images", wxButton)->Disable();
-    XRCCTRL(*this, "images_celeste_button", wxButton)->Disable();
-    m_stackNewButton->Disable();
-    m_stackChangeButton->Disable();
+#endif
     m_linkCheckBox->Disable();
 }
 
@@ -549,10 +394,9 @@
         m_moveDownButton->Enable();
         m_moveUpButton->Enable();
         XRCCTRL(*this, "images_reset_pos", wxButton)->Enable();
+#ifndef __WXGTK__
         XRCCTRL(*this, "action_remove_images", wxButton)->Enable();
-	XRCCTRL(*this, "images_celeste_button", wxButton)->Enable();
-        m_stackNewButton->Enable();
-        m_stackChangeButton->Enable();
+#endif
         m_linkCheckBox->Enable();
     }
 }
@@ -689,6 +533,7 @@
     XRCCTRL(*this, "images_focal_length", wxStaticText) ->SetLabel(wxT(""));
     XRCCTRL(*this, "images_aperture", wxStaticText) ->SetLabel(wxT(""));
     XRCCTRL(*this, "images_shutter_speed", wxStaticText) ->SetLabel(wxT(""));
+    XRCCTRL(*this, "images_iso",wxStaticText)->SetLabel(wxT(""));
 }
 
 
@@ -746,75 +591,6 @@
     }
 }
 
-
-#if 0
-void ImagesPanel::ShowImage(unsigned int imgNr)
-{
-    // show preview image
-
-    // static bitmap behaves strangely under windows,
-    // we need to resize it to its maximum size every time before
-    // a new image is set, else it will keep the old size..
-    // however, I'm not sure how this should be done with wxWindows
-
-
-    const wxImage * img = ImageCache::getInstance().getSmallImage(
-    pano->getImage(imgNr).getFilename());
-
-    double iRatio = (double)img->GetWidth() / img->GetHeight();
-
-    wxSize sz;
-#ifdef USE_WX253
-    // get width from splitter window
-    wxSize szs = m_img_splitter->GetSize();
-    wxSize sz1 = m_img_splitter->GetWindow1()->GetSize();
-    wxSize sz2 = m_img_splitter->GetWindow2()->GetSize();
-
-    // estimate image size
-    sz = m_img_splitter->GetWindow2()->GetSize();
-    int maxw = sz.GetWidth() - 40;
-    int maxh = sz.GetHeight() - m_smallImgCtrl->GetPosition().y - 20;
-    sz.SetHeight(std::max(maxh, 20));
-    sz.SetWidth(std::max(maxw, 20));
-    double sRatio = (double)sz.GetWidth() / sz.GetHeight();
-    if (iRatio > sRatio) {
-        // image is wider than screen, display landscape
-        sz.SetHeight((int) (sz.GetWidth() / iRatio));
-    } else {
-        // portrait
-        sz.SetWidth((int) (sz.GetHeight() * iRatio));
-    }
-
-#else
-    // get size from parent panel (its just there, to provide the size..
-    wxPanel * imgctrlpanel = XRCCTRL(*this, "images_selected_image_panel", wxPanel);
-    DEBUG_ASSERT(imgctrlpanel);
-    wxSize sz = imgctrlpanel->GetSize();
-    DEBUG_DEBUG("imgctrl panel size: " << sz.x << "," << sz.y);
-    double sRatio = (double)sz.GetWidth() / sz.GetHeight();
-
-    if (iRatio > sRatio) {
-        // image is wider than screen, display landscape
-        sz.SetHeight((int) (sz.GetWidth() / iRatio));
-    } else {
-        // portrait
-        sz.SetWidth((int) (sz.GetHeight() * iRatio));
-    }
-#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION == 4)
-    imgctrlpanel->Clear();
-#else
-    imgctrlpanel->ClearBackground();
-#endif
-    imgctrlpanel->SetSize(sz.GetWidth(),sz.GetHeight());
-
-#endif
-
-    wxImage scaled = img->Scale(sz.GetWidth(),sz.GetHeight());
-    m_smallImgCtrl->SetSize(sz.GetWidth(),sz.GetHeight());
-    m_smallImgCtrl->SetBitmap(wxBitmap(scaled));
-}
-#endif
-
 void ImagesPanel::OnResetImagePositions(wxCommandEvent & e)
 {
     DEBUG_TRACE("");
@@ -837,7 +613,6 @@
         GlobalCmdHist::getInstance().addCommand(
             new PT::UpdateImagesVariablesCmd( *pano, selImg, vars ));
     }
-
 }
 
 void ImagesPanel::OnAddImages(wxCommandEvent &e)
@@ -847,59 +622,15 @@
 
 void ImagesPanel::OnRemoveImages(wxCommandEvent & e)
 {
-    DEBUG_TRACE("");
-

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a4627a193a65
changeset:  5335:a4627a193a65
user:       Kay F. Jahnke <_kfj@...>
date:       Sun Jun 19 23:58:20 2011 -0400
description:

* added new template scripts
* polished shooting pattern script

diffstat:

 src/hugin_script_interface/CMakeLists.txt                 |   1 +
 src/hugin_script_interface/plugins-dev/CMakeLists.txt     |   4 +
 src/hugin_script_interface/plugins-dev/dual_use.py        |  84 ++++++++++++++++
 src/hugin_script_interface/plugins-dev/plugin_skeleton.py |  48 +++++++++
 src/hugin_script_interface/plugins/demo_plugin.py         |  89 -----------------
 src/hugin_script_interface/plugins/shooting_pattern.py    |  92 ++++++++++++++++++
 6 files changed, 229 insertions(+), 89 deletions(-)

diffs (346 lines):

diff -r a3d4e6c0da0a -r a4627a193a65 src/hugin_script_interface/CMakeLists.txt
--- a/src/hugin_script_interface/CMakeLists.txt	Sun Jun 19 20:23:43 2011 -0400
+++ b/src/hugin_script_interface/CMakeLists.txt	Sun Jun 19 23:58:20 2011 -0400
@@ -259,3 +259,4 @@
 ENDIF()
 
 ADD_SUBDIRECTORY(plugins)
+ADD_SUBDIRECTORY(plugins-dev)
\ No newline at end of file
diff -r a3d4e6c0da0a -r a4627a193a65 src/hugin_script_interface/plugins-dev/CMakeLists.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin_script_interface/plugins-dev/CMakeLists.txt	Sun Jun 19 23:58:20 2011 -0400
@@ -0,0 +1,4 @@
+# install plugin files into appropriate folder
+
+FILE(GLOB PLUGINFILES *.py README*.txt)
+INSTALL(FILES ${PLUGINFILES} DESTINATION ${INSTALL_DATA_DIR}/plugins-templates)
diff -r a3d4e6c0da0a -r a4627a193a65 src/hugin_script_interface/plugins-dev/dual_use.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin_script_interface/plugins-dev/dual_use.py	Sun Jun 19 23:58:20 2011 -0400
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+gpl = r"""
+    dual_use.py - a skeleton for a plugin that can also run standalone
+    
+    Copyright (C) 2011  Kay F. Jahnke
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+# @category Examples
+# @name     Dual Use Plugin
+# @api-min  2011.1
+# @api-max  2011.2
+
+# dual_use will function as a hugin plugin and as a standalone
+# Python script.
+
+# first is the entry routine which is called when this script is used
+# as a plugin from hugin. This is the workhorse routine where you
+# actually do stuff - or don't ;-)
+
+def entry ( pano ) :
+
+    print ( '********************' )
+    print ( 'doing nothing at all with:' )
+    print ( '%s' % pano )
+    print ( '********************' )
+
+    return 0
+
+# the standalone routine is what's called if this script has been called
+# from the command line. In this case we do the CLI thing. In this demo
+# we expect a panorama as the only parameter which we open and pass to
+# the workhorse routine. No checking is done.
+
+def standalone() :
+
+    import sys                      # to look at the argument vector
+    import hsi                      # to use hugin's scripting interface
+
+    if len ( sys.argv ) < 2 :
+        print ( 'usage: %s <pto file>' % sys.argv[0] )
+        sys.exit ( -1 )
+  
+    panofile = sys.argv[1]          # the only parameter: a pto file
+    ifs = hsi.ifstream ( panofile ) # create a C++ ifstream from it
+    pano = hsi.Panorama()           # and a Panorama object
+    success = pano.readData ( ifs ) # feed the ifstream to the pano object
+    
+    # check if all went well
+    if success != hsi.DocumentData.SUCCESSFUL :
+        # if it failed, complain
+        print ( 'input file %s contains invalid data' % panofile )
+        success = -1
+    else :
+        # if it succeeded, call the workhorse
+        entry ( pano )
+        success = 0
+
+    # and that's it
+    return success
+
+# The script determines whether it's been called as a plugin or from
+# the command line by looking at the global variable __name__, which
+# is set to '__main__' when it's called standalone. Otherwise, the
+# entry() routine is called from hugin.
+
+if __name__ == "__main__":
+
+    standalone()
diff -r a3d4e6c0da0a -r a4627a193a65 src/hugin_script_interface/plugins-dev/plugin_skeleton.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py	Sun Jun 19 23:58:20 2011 -0400
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+# plugin_skeleton.py - a skeleton for a hugin plugin
+# Copyright (C) 2011  Kay F. Jahnke
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# @category Examples
+# @name     Skeleton Plugin
+# @api-min  2011.1
+# @api-max  2011.2
+
+# we use modern type python print statements:
+
+from __future__ import print_function
+
+# the entry routine is called by hugin. This is the workhorse routine
+# where you actually do stuff - or don't ;-)
+# it receives a panorama object from hugin as it's only parameter.
+
+def entry ( pano ) :
+
+    print ( '********************' )
+    print ( 'doing nothing at all with:' )
+    print ( '%s' % pano )
+    print ( '********************' )
+
+    return 0
+
+# The script determines whether it's been called as a plugin or from
+# the command line by looking at the global variable __name__, which
+# is set to '__main__' when it's called standalone. Otherwise, the
+# entry() routine is called from hugin.
+
+if __name__ == "__main__":
+
+    print ( 'this script only runs as a hugin plugin.' )
diff -r a3d4e6c0da0a -r a4627a193a65 src/hugin_script_interface/plugins/demo_plugin.py
--- a/src/hugin_script_interface/plugins/demo_plugin.py	Sun Jun 19 20:23:43 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-#!/usr/bin/env python
-#    demo_plugin.py - apply a 6-1-1 shooting pattern to a panorama
-#    Copyright (C) 2011  Kay F. Jahnke
-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# this script is an archetypal plugin for hpi, the hugin plugin interface.
-# the plugin defines an entry routine, which does the actual work of
-# the plugin. this routine will take parameters passed on to it from
-# the dispatcher in hpi.py.
-
-# If you modify this script to derive your plugin from it, this is the
-# routine you first start tinkering with.
-
-# Notice that you won't see any output from print statements if you
-# haven't called hugin from the command line.
-
-# The script will apply a shooting pattern to an eight-image panorama,
-# assuming the pattern was six around, 1 up 60 degrees and one down 60.
-
-# the position() subroutine sets yaw, pitch and roll for an image
-
-# If you want to integrate your script into the menu, you will need to
-# edit the following self-explanatory lines:
-
-# @category Kay's Toolbox
-# @name     Demo Plugin
-# @description Plugin to demonstrate a Python plugin inside Hugin
-# @sys win nix
-# @api-max 2011.1.0
-# @api-min 2011.1.0
-
-
-
-def position ( pano , number , yaw , pitch , roll ) :
-    print ( "%d: y %d p %d r %d" % ( number , yaw , pitch , roll ) )
-
-    # we make sure we only access images that exist.
-    images = pano.getNrOfImages()
-    if number < 0 or number >= images :
-        print ( "no image %d" % number )
-    else :
-        # fine, let's do it.
-        img=pano.getImage(number)
-        img.setYaw(yaw)
-        img.setPitch(pitch)
-        img.setRoll(roll)
-        pano.setImage(number,img)
-
-# the entry routine is what is called from the dispatcher in hpi.py
-# notice that it takes an arbitrary number of arguments after the
-# first one which must be a panorama.
-
-def entry ( pano , *args ) :
-
-    # this plugin doesn't take any extra arguments
-
-    if args :
-        print ( 'ignoring extra arguments %s' % str(args) )
-
-    # for the purpose of this demonstration, it's assumed that
-    # we have 8 images loaded: 6 around, 1 up 60 degrees, 1 down 60.
-    # If there are less images in the panorama, the excessive calls
-    # to 'position' have no effect. In 'real' life the plugin would
-    # pass back an error message to be displayed by the GUI, but
-    # this isn't yet implemented.
-
-    position ( pano , 0 , 0 , 0 , 0 )
-    position ( pano , 1 , 60 , 0 , 0 )
-    position ( pano , 2 , 120 , 0 , 0 )
-    position ( pano , 3 , 180 , 0 , 0 )
-    position ( pano , 4 , 240 , 0 , 0 )
-    position ( pano , 5 , 300 , 0 , 0 )
-    position ( pano , 6 , 0 , 60 , 0 )
-    position ( pano , 7 , 0 , -60 , 0 )
-
-    return 0
-
diff -r a3d4e6c0da0a -r a4627a193a65 src/hugin_script_interface/plugins/shooting_pattern.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin_script_interface/plugins/shooting_pattern.py	Sun Jun 19 23:58:20 2011 -0400
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+#    shooting_pattern.py - apply a 6-1-1 shooting pattern to a panorama
+#    Copyright (C) 2011  Kay F. Jahnke
+
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# this script is an archetypal plugin for hpi, the hugin plugin interface.
+# the plugin defines an entry routine, which does the actual work of
+# the plugin. this routine will take parameters passed on to it from
+# the dispatcher in hpi.py.
+
+# If you modify this script to derive your plugin from it, this is the
+# routine you first start tinkering with.
+
+# Notice that you won't see any output from print statements if you
+# haven't called hugin from the command line.
+
+# The script will apply a shooting pattern to an eight-image panorama,
+# assuming the pattern was six around, 1 up 60 degrees and one down 60.
+
+# the position() subroutine sets yaw, pitch and roll for an image
+
+# If you want to integrate your script into the menu, you will need to
+# edit the following self-explanatory lines:
+
+# @category initial distribution
+# @name     6-1-1 Shooting Pattern
+# @description apply a shooting pattern (6 around, 1 up 1 down)
+# @sys win nix mac
+# @api-max 2011.1.0
+# @api-min 2011.1.0
+
+# the position routine will apply yaw, pitch to an image
+
+def position ( pano , number , yaw , pitch , roll ) :
+    print ( "%d: y %d p %d r %d" % ( number , yaw , pitch , roll ) )
+
+    # we make sure we only access images that exist.
+    images = pano.getNrOfImages()
+    if number < 0 or number >= images :
+        print ( "no image %d" % number )
+    else :
+        # fine, let's do it.
+        img=pano.getImage(number)
+        img.setYaw(yaw)
+        img.setPitch(pitch)
+        img.setRoll(roll)
+        pano.setImage(number,img)
+
+# the entry routine is what is called from hugin.
+# notice that it takes an arbitrary number of arguments after the
+# first one which must be a panorama.
+
+def entry ( pano ) :
+
+    # for the purpose of this demonstration, it's assumed that
+    # we have 8 images loaded: 6 around, 1 up 60 degrees, 1 down 60.
+    # If there are less images in the panorama, the excessive calls
+    # to 'position' have no effect. In 'real' life the plugin would
+    # pass back an error message to be displayed by the GUI, but
+    # this isn't yet implemented.
+
+    position ( pano , 0 , 0 , 0 , 0 )
+    position ( pano , 1 , 60 , 0 , 0 )
+    position ( pano , 2 , 120 , 0 , 0 )
+    position ( pano , 3 , 180 , 0 , 0 )
+    position ( pano , 4 , 240 , 0 , 0 )
+    position ( pano , 5 , 300 , 0 , 0 )
+    position ( pano , 6 , 0 , 60 , 0 )
+    position ( pano , 7 , 0 , -60 , 0 )
+
+    return 0
+
+# This script won't work standalone.
+
+if __name__ == "__main__":
+
+    print ( 'this script only runs as a hugin plugin.' )

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a3d4e6c0da0a
changeset:  5334:a3d4e6c0da0a
user:       Yuval Levy <yuv@...>
date:       Sun Jun 19 20:23:43 2011 -0400
description:

hugin-2011.2.0_beta1 release notes

diffstat:

 doc/releases/hugin-2011.2.0_beta1.txt |  2264 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 2264 insertions(+), 0 deletions(-)

diffs (truncated from 2268 to 500 lines):

diff -r 419f0b6205cf -r a3d4e6c0da0a doc/releases/hugin-2011.2.0_beta1.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/releases/hugin-2011.2.0_beta1.txt	Sun Jun 19 20:23:43 2011 -0400
@@ -0,0 +1,2264 @@
+Hugin-2011.2.0_beta1 RELEASE NOTES
+
+Hugin is a panorama stitcher and more.  A new version is available.
+
+
+SCHEDULE
+
+https://launchpad.net/hugin/2011.2
+
+The purpose of the schedule is to make the process as predictable as possible
+so that contributors can plan for their own contributions (e.g. translations
+and bug fixes) and distributors can plan for the binary builds.
+
+The schedule is just an indication.  The release will happen when it is ready.
+
+
+DOWNLOAD
+
+The 2011.2beta1 source tarball can be downloaded
+* from sourceforge at
+http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.2_beta/hugin-2011.2.0_beta1.tar.bz2/download
+
+* from launchpad at
+http://launchpad.net/hugin/2011.2/2011.2beta1/+download/hugin-2011.2.0_beta1.tar.bz2
+
+This is a source code release.  For executables see below.
+
+This tarball is equivalent to rev/changeset 5332:b5df442ec624 in our Mercurial
+repository, where it is also tagged 2011.2beta1
+
+Verify its SHA1SUM
+ed32ac77b836bf0ae6aa43c8a368cf2df80e76ab  hugin-2011.2.0_beta1.tar.bz2
+
+
+EXECUTABLES
+
+Users communities produce executables for their respective platforms.
+
+A number of users have built recent snapshots and executables are likely to be
+announced within a few days of this tarball release.
+
+Watch http://groups.google.com/group/hugin-ptx for the announcements of binary
+releases.  If you don't see a binary for your platform it has most likely not
+been produced yet.  Consider stepping up to the task.  Instructions at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Supported_Platforms
+
+Announce your build on http://groups.google.com/group/hugin-ptx
+
+
+TRANSLATIONS
+
+New strings have been added.  Now is a good time to help update your language.
+Instructions at http://wiki.panotools.org/Hugin_translation_guide
+
+
+RELEASE MANAGEMENT
+
+I've been running most of the releases of the past two years.  I will be
+stepping down from this role latest September 6, 2011 because of other
+time committments.
+
+There is a possibility that 2011.2 will be left orphaned in the middle of
+the release cycle, and Hugin needs volunteers to step in for future releases.
+
+If you want to step up to the task, I will be happy to hand over to you
+immediately and mentor you through this release process.  Please contact us
+at http://groups.google.com/group/hugin-ptx
+
+The process is documented in detail at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Release
+
+And you can count on me mentoring you through it.
+
+
+USER-CONTRIBUTED ARTWORK
+
+To promote artists using Hugin the project embellishes the
+application's splash screen and the official release notes
+on the Hugin web page with one artwork generated with Hugin
+and selected by popular vote.
+
+For this release, the runner up from the previous vote
+will be used.
+
+Users have contributed a number of interesting ideas to
+the selection process for the future and a permanent
+contribution and voting facility will be set up for
+future editions.
+
+
+CHANGES SINCE 2011.0.0
+
+Little time has passed since our last release and yet there is new major
+functionality.  Hugin has received a Python scripting interface and new
+lens calibration tool.  A critical bug affecting a significant number of
+Mac users has been fixed and many general improvements have been made.
+
+
+_Lens Calibration Tool_
+
+Lenses are designed to follow a perfect geometric model.  For rectilinear
+lenses, a straight line in the depicted scene should be straight in the
+picture.  This is not always the case:  most lenses have an inherent
+deviation from the perfect model, resulting in imperfections such as
+pincushion or barrel distortion in rectilinear lenses.
+
+Adherence to the perfect geometric model is desirable for aesthetic purposes
+and indespensible to achieve proper alignment when stitching images.
+Hugin can calculate lens distortion parameters on the fly when optimizing
+a project, however this requires more control points and more computational
+effort than a project starting with a calibrated lens, and is prone to more
+errors.
+
+The new lens calibration tool calculates the distortion parameters of a
+lens based on an input image.  The input image must contain straight
+lines, ideally many of them at different distances from the center of the
+lens, covering at least 1/4 of the image.  The calculated parameters are
+valid for a given combination of focal distance, aperture (F-stop), and
+sensor.
+
+The values, saved into a lens profile, can be used in Hugin to achieve
+a better stitch, or on single images taken with this lens / settings
+combination to achieve a more aesthetically pleasing outcome.
+
+
+_Python Scripting Interface_
+
+Hugin now exposes some of its data structure and functionalities through
+a Python module.  To get started with scripting, start your Python
+interpreter and type:
+
+   >>> import hsi
+   >>> help (hsi)
+
+Standalone Python programs can access a panorama object with Hugin's
+functionality.  It is possible to develop complete command line and
+even GUI tools based on this module.
+
+
+_Python Plugin Interface_
+
+Hugin can now run Python scripts inside the application.  In an enabled
+Hugin binary, a new "Actions" menu gives access to system-wide plugins
+distributed with Hugin.  Moreover, plugins can be written, modified,
+customized in the user's own directory.
+
+Currently there are only a few plugins available, but we expect the
+body of available plugins and functionality to grow organically as
+the interface is being made available to the general public.
+
+
+_Other Improvements_
+
+* PTBatcherGUI has matured to become the default processor for
+  stitching projects.
+* ICC profiles saved in output.
+* Support for newer Olympus camera.
+* Improved auto cropping.
+* Fix for critical issue affecting stitching on Mac OS X Leopard.
+* Many more improvements and bug fixes.
+
+
+_Libraries and Build_
+
+The Python interface introduces new dependencies:
+* SWIG >2.0
+* Python
+
+
+_Control point generators_
+
+Since 2010.4 Hugin ships with its own control point generator CPFind.
+Third-party generators are still supported through the plug-in architecture.
+CPFind is the recommended control points generator and the only one that has
+the endorsement of the Hugin project team.
+
+
+_Upgrading_
+
+Upgrading from previous versions of Hugin should be seamless. If you do have
+problems with old settings, these can be reset in the Preferences by clicking
+'Load defaults'.
+
+It is strongly recommeded to set the default control point detector to
+Hugin's CPFind.
+
+
+_Compiling_
+
+For users compiling from source:
+* Hugin uses the wxWidgets GUI toolkit version >=2.7.0.
+  2.9 support is experimental. 2.8.11 is recommended.
+* boost >=1.34 is required.  The following boost libraries are used:
+   * filesystem
+   * graph
+   * iostreams
+   * regex
+   * signals
+   * system
+   * thread
+* Hugin requires a libtiff library with LZW support.
+* Hugin depends on libpano13 version >=2.9.18
+* Hugin requires GLEW the OpenGL Extension Wrangler Library,
+  freeglut the OpenGL utility toolkit, and libGLU the OpenGL utility library.
+* Building the Python module is optional.  SWIG>2.0 and Python are required.
+  To build it, configure BUILD_HSI=ON before compiling.
+  The Python module is currently not supported on Mac OS X for lack of
+  development resources but we hope to get it working during the current
+  release cycle or shortly thereafter.
+* On Linux/Unix systems, libaries are installed in a private location.
+  This simplifies things for users who want to run multiple versions of Hugin
+  simultaneously.
+* On Linux/Unix systems, Hugin can be compiled with gcc-4.4.4, gcc-4.5.1,
+  and gcc-4.6.
+* On Windows, Hugin can be compiled with MSVC 2008 and MSVC 2010.
+  The (free) Express Edition is enough, although it lacks OpenMP support.
+
+For more information, see the README and INSTALL_cmake files and
+http://wiki.panotools.org/Development_of_Open_Source_tools#Build_your_Own_Test_Builds
+
+Thanks to all the contributors to this release and members of the hugin-ptx
+mailing list, too many to mention here.
+
+Hugin can be found at http://hugin.sourceforge.net/ and at https://launchpad.net/hugin
+
+
+A DETAILED CHANGELOG SINCE THE LAST RELEASE FOLLOWS
+
+2011-02-27 08:50 -0500  Yuval Levy <yuv@...>  (c27d2767632b)
+
+  Bumped up version number
+
+  > CMakeLists.txt
+  > mac/Version.xcconfig
+
+2011-02-27 08:58 -0500  Yuval Levy <yuv@...>  (26732503e5dd)
+
+  Updated ChangeLog
+
+  > ChangeLog
+
+2011-02-27 16:00 +0100  dmakreshanski <dmakreshanski@...>  (f1663f841086)
+
+  grid checkbox now disables panosphere grid as well
+
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+  > src/hugin1/hugin/ToolHelper.cpp
+  > src/hugin1/hugin/ToolHelper.h
+
+2011-02-27 16:24 +0100  dmakreshanski <dmakreshanski@...>  (7d0a3d8b9a8b)
+
+  separated transparent semi transparent sphere from panosphere
+  projection grid tool
+
+  + src/hugin1/hugin/PanosphereSphereTool.cpp
+  + src/hugin1/hugin/PanosphereSphereTool.h
+  > src/hugin1/hugin/CMakeLists.txt
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+  > src/hugin1/hugin/GLPreviewFrame.h
+  > src/hugin1/hugin/ProjectionGridTool.cpp
+
+2011-02-27 17:29 +0100  dmakreshanski <dmakreshanski@...>  (14ed34ea2488)
+
+  toggle buttons for images in fast preview now have variable width
+  from 0-9, 10-99 and 100+
+
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+
+2011-02-27 18:09 +0100  dmakreshanski <dmakreshanski@...>  (b966fc504f32)
+
+  memory free for the new panosphere_sphere_tool missed in previous
+  commit
+
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+
+2011-02-27 20:52 +0100  tmodes  (a75bf1b21008)
+
+  [Windows] Improved mouse event handling to get mouse wheel events in
+  GLCanvas [725667]
+
+  > src/hugin1/hugin/GLViewer.cpp
+
+2011-02-27 18:34 -0500  Yuval Levy <yuv@...>  (98d677602999)
+
+  2011.0beta1 release notes
+
+  + doc/releases/hugin-2011.0.0_beta1.txt
+
+2011-02-27 21:21 -0500  Yuval Levy <yuv@...>  (d46e33136b9b)
+
+  release notes for 2011.0beta2
+
+  + doc/releases/hugin-2011.0.0_beta2.txt
+
+2011-02-28 18:58 +0100  tmodes  (00c4a9ed694f)
+
+  Only probe active images with grey picker
+
+  > src/hugin1/hugin/PreviewColorPickerTool.cpp
+
+2011-02-28 22:18 +0100  tmodes  (c8a5cbef68c5)
+
+  Remove unused files
+
+  > src/hugin_base/CMakeLists.txt
+  - src/hugin_base/algorithms/nona/NonaImageStitcher.cpp
+  - src/hugin_base/algorithms/nona/NonaImageStitcher.h
+
+2011-02-28 22:48 +0100  tmodes  (3ed08b21b77b)
+
+  Save also ICC profile in output [709561]
+
+  > src/hugin_base/nona/Stitcher.h
+
+2011-02-28 18:58 -0500  Yuval Levy <yuv@...>  (98653ef258be)
+
+  CMake 2.8 is now required (Peter Suetterlin)
+
+  > CMakeLists.txt
+
+2011-02-28 19:06 -0500  Yuval Levy <yuv@...>  (561401a00cc2)
+
+  Updated en_GB translation (Gareth Jones)
+
+  > src/translations/en_GB.po
+
+2011-02-28 19:06 -0500  Yuval Levy <yuv@...>  (464db7608fe8)
+
+  Updated de translation (Carl von Einem)
+
+  > src/translations/de.po
+
+2011-02-28 20:28 -0500  Yuval Levy <yuv@...>  (2ce39763d5c3)
+
+  edit of release notes draft for 2011.0beta3
+
+  + doc/releases/hugin-2011.0.0_beta3.txt
+
+2011-02-28 20:13 +0100  harryvanderwolf <hvdwolf@...>  (62021532ebe6)
+
+  [OSX] lots of minor changes to XCode project to make it compilable
+  again after many trunk changes
+
+  > mac/Hugin.xcodeproj/project.pbxproj
+
+2011-03-01 12:57 +0100  harryvanderwolf <hvdwolf@...>  (758aa5e076ea)
+
+  local merge neccessary
+
+  + doc/releases/hugin-2011.0.0_beta3.txt
+  > CMakeLists.txt
+  > src/hugin_base/CMakeLists.txt
+  > src/hugin_base/nona/Stitcher.h
+  > src/translations/de.po
+  > src/translations/en_GB.po
+  - src/hugin_base/algorithms/nona/NonaImageStitcher.cpp
+  - src/hugin_base/algorithms/nona/NonaImageStitcher.h
+
+2011-03-01 13:53 +0100  mcri  (9f2028d8e929)
+
+  Updated Italian translation
+
+  > src/translations/it.po
+
+2011-03-01 18:30 +0100  harryvanderwolf <hvdwolf@...>  (3accf12d8a20)
+
+  Updated dutch translation
+
+  > src/translations/nl.po
+
+2011-03-01 19:34 +0100  tmodes  (15a38d2dc3e7)
+
+  Added small hints for using gray picker tool
+
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+  > src/hugin1/hugin/PreviewColorPickerTool.cpp
+  > src/hugin1/hugin/xrc/preview_frame.xrc
+
+2011-03-01 19:54 +0100  tmodes  (f1c0b98e9ece)
+
+  Small typo in german translation
+
+  > src/translations/de.po
+
+2011-03-01 19:55 +0100  tmodes  (842824d33b0a)
+
+  Fixes background color for wxWidgets 2.9
+
+  > src/hugin1/hugin/PreferencesDialog.cpp
+
+2011-03-01 19:55 +0100  tmodes  (4941adbe2ef7)
+
+  Set explicit focus for main window for GTK Should improve keyboard
+  handling
+
+  > src/hugin1/hugin/MainFrame.cpp
+
+2011-03-01 21:04 +0100  tmodes  (b1d007ca6815)
+
+  Added reset crop button
+
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+  > src/hugin1/hugin/GLPreviewFrame.h
+  > src/hugin1/hugin/xrc/preview_frame.xrc
+
+2011-03-02 18:36 +0100  tmodes  (f3a428981466)
+
+  Fixes crash in gray color picker [727449]
+
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+
+2011-03-06 14:15 +0100  tmodes  (8c47403bf194)
+
+  Draw panosphere above images and not below [726186]
+
+  > src/hugin1/hugin/PanosphereSphereTool.cpp
+  > src/hugin1/hugin/PanosphereSphereTool.h
+
+2011-03-06 14:16 +0100  tmodes  (76eed195797b)
+
+  Fixes some color/intensity issue in overview window
+
+  > src/hugin1/hugin/OverviewOutlinesTool.cpp
+  > src/hugin1/hugin/PanosphereSphereTool.cpp
+  > src/hugin1/hugin/TextureManager.cpp
+
+2011-03-06 14:16 +0100  tmodes  (a7775fb68068)
+
+  Update layout scale also for overview window after switching mode
+
+  > src/hugin1/hugin/GLPreviewFrame.cpp
+
+2011-03-06 14:17 +0100  tmodes  (fe15b679764f)
+
+  Use bounding box for faster mask calculation This speeds up only
+  masks which does not cover the whole image
+
+  > src/hugin_base/panodata/Mask.cpp
+  > src/hugin_base/panodata/Mask.h
+
+2011-03-06 20:35 +0100  tmodes  (2683c1a1ba37)
+
+  Use external tclap library [703735] Patch by Andreas Metzler,
+  extended for Windows
+
+  + CMakeModules/FindTclap.cmake
+  > CMakeLists.txt
+  > src/hugin_cpfind/CMakeLists.txt
+  - src/foreign/tclap/Arg.h
+  - src/foreign/tclap/ArgException.h
+  - src/foreign/tclap/CmdLine.h
+  - src/foreign/tclap/CmdLineInterface.h
+  - src/foreign/tclap/CmdLineOutput.h
+  - src/foreign/tclap/Constraint.h
+  - src/foreign/tclap/DocBookOutput.h
+  - src/foreign/tclap/HelpVisitor.h
+  - src/foreign/tclap/IgnoreRestVisitor.h
+  - src/foreign/tclap/MultiArg.h
+  - src/foreign/tclap/MultiSwitchArg.h
+  - src/foreign/tclap/OptionalUnlabeledTracker.h
+  - src/foreign/tclap/StdOutput.h
+  - src/foreign/tclap/SwitchArg.h
+  - src/foreign/tclap/UnlabeledMultiArg.h
+  - src/foreign/tclap/UnlabeledValueArg.h
+  - src/foreign/tclap/ValueArg.h
+  - src/foreign/tclap/ValuesConstraint.h
+  - src/foreign/tclap/VersionVisitor.h
+  - src/foreign/tclap/Visitor.h
+  - src/foreign/tclap/XorHandler.h
+
+2011-03-06 16:52 -0500  Yuval Levy <yuv@...>  (10a38df6dfa1)
+
+  Fix syntax and formatting errors in the man pages (Andreas Metzler)
+
+  > doc/align_image_stack.pod
+  > doc/autooptimiser.pod
+  > doc/celeste_standalone.pod
+  > doc/deghosting_mask.pod
+  > doc/fulla.pod
+  > doc/hugin.pod
+  > doc/hugin_hdrmerge.pod
+  > doc/hugin_stitch_project.pod
+  > doc/nona.pod
+  > doc/nona_gui.pod
+  > doc/pto2mk.pod
+  > doc/tca_correct.pod
+  > doc/vig_optimize.pod
+
+2011-03-07 18:04 +0100  tmodes  (c23f16903996)
+
+  Fixes reset exposure on Lens panel The introduction of the
+  CombinedPanoCommand in f71ccb911ead does not correctly reset the
+  output exposure value of the panorama. Fixes this by an extra
+  ResetMeanExposure PanoCommand.