SourceForge.net: Hugin: hugin-cvs

Home / Browse / Hugin / Mail / Archive

Email Archive: hugin-cvs (read-only)

2005:	_Jan (84)	_Feb (83)	_Mar (36)	_Apr (15)	_May (250)	_Jun (81)	_Jul (29)	_Aug (62)	_Sep (22)	_Oct (13)	_Nov (62)	_Dec (30)
2006:	_Jan (67)	_Feb (68)	_Mar (149)	_Apr (51)	_May (8)	_Jun (23)	_Jul (87)	_Aug (132)	_Sep (9)	_Oct (1)	_Nov (22)	_Dec (163)
2007:	_Jan (74)	_Feb (71)	_Mar (2)	_Apr (121)	_May (57)	_Jun (168)	_Jul (151)	_Aug (73)	_Sep (4)	_Oct (91)	_Nov (30)	_Dec (38)
2008:	_Jan (178)	_Feb (159)	_Mar (49)	_Apr (65)	_May (43)	_Jun (56)	_Jul (99)	_Aug (132)	_Sep (71)	_Oct (57)	_Nov (42)	_Dec (11)
2009:	_Jan (40)	_Feb (74)	_Mar (80)	_Apr (45)	_May (86)	_Jun (76)	_Jul (160)	_Aug (170)	_Sep (227)	_Oct (161)	_Nov (49)	_Dec (108)
2010:	_Jan (108)	_Feb (82)	_Mar (62)	_Apr (33)	_May (60)	_Jun (38)	_Jul (46)	_Aug (69)	_Sep (157)	_Oct (123)	_Nov (130)	_Dec (154)
2011:	_Jan (138)	_Feb (112)	_Mar (128)	_Apr (4)	_May (86)	_Jun (81)	_Jul (128)	_Aug (98)	_Sep (69)	_Oct (32)	_Nov (50)	_Dec (41)
2012:	_Jan (10)	_Feb (6)	_Mar (17)	_Apr (10)	_May (67)	_Jun (57)	_Jul (41)	_Aug (54)	_Sep (17)	_Oct (15)	_Nov (34)	_Dec (45)
2013:	_Jan (62)	_Feb (47)	_Mar (71)	_Apr (25)	_May (11)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
				1	2	3
				(3)		(3)
4	5	6	7	8	9	10
	(2)		(1)		(1)	(3)
11	12	13	14	15	16	17
(3)		(1)	(1)	(3)		(3)
18	19	20	21	22	23	24
					(1)
25	26	27	28	29	30
(1)	(1)		(3)

[Hugin-cvs] SF.net SVN: hugin: [2545] hugin/trunk/src/hugin1/hugin/po/it.po

From: <brunopostle@us...> - 2007-11-28 23:43

Revision: 2545
          http://hugin.svn.sourceforge.net/hugin/?rev=2545&view=rev
Author:   brunopostle
Date:     2007-11-28 15:43:26 -0800 (Wed, 28 Nov 2007)

Log Message:
-----------
Build fix, remove surplus \n

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/po/it.po

Modified: hugin/trunk/src/hugin1/hugin/po/it.po
===================================================================
--- hugin/trunk/src/hugin1/hugin/po/it.po	2007-11-28 21:04:29 UTC (rev 2544)
+++ hugin/trunk/src/hugin1/hugin/po/it.po	2007-11-28 23:43:26 UTC (rev 2545)
@@ -1032,7 +1032,7 @@
 "to add any finishing touches."
 msgstr ""
 "Assemblare ora l'immagine panoramica finale, usare poi un editor\n"
-"di immagini come GIMP per fare gli ultimi ritocchi.\n"
+"di immagini come GIMP per fare gli ultimi ritocchi."
 
 #: src/hugin/PanoDruid.cpp:63 src/hugin/PanoDruid.cpp:443
 msgid "Warning:  you haven't saved the current project."


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

[Hugin-cvs] SF.net SVN: hugin: [2529] hugin/trunk

From: <dangelo@us...> - 2007-11-11 01:02

Revision: 2529
          http://hugin.svn.sourceforge.net/hugin/?rev=2529&view=rev
Author:   dangelo
Date:     2007-11-10 17:02:09 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
Added improved CMake Find scripts by Thomas Sharpless.
The *_DEBUG_* variables are however not yet used in the
MSVC build, this needs further changes to the CMakeLists.txt
files inside the source directories

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt
    hugin/trunk/CMakeModules/FindMSGFMT.cmake
    hugin/trunk/CMakeModules/FindOpenEXR.cmake
    hugin/trunk/CMakeModules/FindPANO13.cmake

Added Paths:
-----------
    hugin/trunk/CMakeModules/FindJPEG.cmake
    hugin/trunk/CMakeModules/FindPNG.cmake
    hugin/trunk/CMakeModules/FindTIFF.cmake
    hugin/trunk/CMakeModules/FindZLIB.cmake

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-11-10 07:24:09 UTC (rev 2528)
+++ hugin/trunk/CMakeLists.txt	2007-11-11 01:02:09 UTC (rev 2529)
@@ -23,10 +23,34 @@
 ENDIF (UNIX)
 
 ##
+## The directory that contains the hugin source root is a good
+## place to look for support packages, so post it in cache.
+## 
+## Our FIND_PACKAGE calls modules will search SOURCE_BASE_DIR
+## after the local standard places  
+##
+# extract pathname from CMAKE_SOURCE_DIR (note result must be a local var)
+STRING( REGEX REPLACE "(.*)/[^/]+$" "\\1" work "${CMAKE_SOURCE_DIR}" )
+# create the cache entry
+SET( SOURCE_BASE_DIR ${work} CACHE FILEPATH "parent dir of hugin source root" )
+
+##
+## wxWidgets
+##
+#  This must come before FINDs for tiff, jpeg, png, zlib to enable
+#  finding the wxWidgets distributions of those packages.
+
+SET(wxWidgets_USE_LIBS base core xrc html xml adv)
+FIND_PACKAGE(wxWidgets REQUIRED)
+IF(NOT wxWidgets_FOUND)
+  MESSAGE("wxWidgets was not found, GUI programs (hugin, nona_gui) disabled")
+ENDIF(NOT wxWidgets_FOUND) 
+
+##
 ## Graphics libraries
 ##
+# wxWidgets sub-packages will be used if native ones aren't found
 
-
 FIND_PACKAGE(TIFF REQUIRED)
 INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
 FIND_PACKAGE(JPEG REQUIRED)
@@ -63,19 +87,6 @@
 
 FIND_PACKAGE(Boost REQUIRED)
 
-
-##
-## wxWidgets
-##
-
-SET(wxWidgets_USE_LIBS base core xrc html xml adv)
-FIND_PACKAGE(wxWidgets REQUIRED)
-IF(NOT wxWidgets_FOUND)
-  MESSAGE("wxWidgets was not found, GUI programs (hugin, nona_gui) disabled")
-ENDIF(NOT wxWidgets_FOUND) 
-
-
-
 IF (WIN32)
   # todo: check for vips (not needed right now)
 ELSE (WIN32)
@@ -149,7 +160,6 @@
   MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})")
 ENDIF(MSGFMT_FOUND)
 
-
 #This namespace workaround is not needed for CMake >= 2.5.x
 IF (APPLE) 
    ## Add needed Compiler and Linker flags for OSX

Added: hugin/trunk/CMakeModules/FindJPEG.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindJPEG.cmake	                        (rev 0)
+++ hugin/trunk/CMakeModules/FindJPEG.cmake	2007-11-11 01:02:09 UTC (rev 2529)
@@ -0,0 +1,39 @@
+# - Find JPEG for Hugin 0.7 01Nov2007 TKSharpless
+# Added to support Windows build but should work anywhere.
+# After looking in UNIX standard places, tries wxWidgets build 
+# tree, which should have this package.
+#
+# Call FIND_PACKAGE(wxWidgets REQUIRED) before calling this!
+# 
+# reads cache variables
+#  wxWidgets_ROOT_DIR
+#  wxWidgets_LIB_DIR
+# defines cache variables
+#  JPEG_INCLUDE_DIR, where to find headers
+#  JPEG_LIBRARIES, list of release link libraries
+#  JPEG_DEBUG_LIBRARIES, list of debug link libraries
+#  JPEG_FOUND, If != "YES", do not try to use JPEG
+
+FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
+  /usr/local/include
+  /usr/include
+  ${wxWidgets_ROOT_DIR}/src/jpeg
+)
+
+FIND_LIBRARY( JPEG_LIBRARIES
+  NAMES jpeg wxjpeg
+  PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+)
+
+IF(JPEG_INCLUDE_DIR)
+  IF(JPEG_LIBRARIES)
+    SET( JPEG_FOUND "YES" )
+    FIND_LIBRARY( JPEG_DEBUG_LIBRARIES
+      NAMES jpegd wxjpegd
+      PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+    )
+  ENDIF(JPEG_LIBRARIES)
+ENDIF(JPEG_INCLUDE_DIR)
+
+
+

Modified: hugin/trunk/CMakeModules/FindMSGFMT.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindMSGFMT.cmake	2007-11-10 07:24:09 UTC (rev 2528)
+++ hugin/trunk/CMakeModules/FindMSGFMT.cmake	2007-11-11 01:02:09 UTC (rev 2529)
@@ -1,7 +1,8 @@
-#
+# - FindMSGFMT.cmake for Hugin 0.7
 # file taken from rosegarden
 #
-# Find the msgfmt program
+# Find the gnu gettext msgfmt program and define
+# a macro that calls it to add message translations
 #
 # Defined variables:
 #  MSGFMT_FOUND
@@ -10,13 +11,17 @@
 # Macro:
 #  ADD_TRANSLATIONS
 #
+# mod for Windows build 07Nov2007 TKSharpless --
+#   look in C:\MinGW after std. Unix places, that's where 
+#   gettext automatically installed itself on my system.
+# TODO find where else on Windows, Mac, etc gettext might be
 
 IF(MSGFMT_EXECUTABLE)
     SET(MSGFMT_FOUND TRUE)
 ELSE(MSGFMT_EXECUTABLE)
     FIND_PROGRAM(MSGFMT_EXECUTABLE
-	NAMES msgfmt gmsgfmt
-	PATHS /bin /usr/bin /usr/local/bin )
+	NAMES msgfmt gmsgfmt msgfmt.exe
+	PATHS /bin /usr/bin /usr/local/bin c:/MinGW/bin)
     IF(MSGFMT_EXECUTABLE)
         SET(MSGFMT_FOUND TRUE)
     ELSE(MSGFMT_EXECUTABLE)

Modified: hugin/trunk/CMakeModules/FindOpenEXR.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindOpenEXR.cmake	2007-11-10 07:24:09 UTC (rev 2528)
+++ hugin/trunk/CMakeModules/FindOpenEXR.cmake	2007-11-11 01:02:09 UTC (rev 2529)
@@ -70,9 +70,11 @@
   if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
      set(OPENEXR_FOUND TRUE)
      if (OPENEXR_ILMTHREAD_LIBRARY)
+#       set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBARY} CACHE STRING "The libraries needed to use OpenEXR")
+       set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} )
+     else (OPENEXR_ILMTHREAD_LIBRARY)
        set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
-     else (OPENEXR_ILMTHREAD_LIBRARY)
-       set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBARY} CACHE STRING "The libraries needed to use OpenEXR")
+       MESSAGE(ERROR "Not using OpenEXR thread library")
      endif (OPENEXR_ILMTHREAD_LIBRARY)
   endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
   

Modified: hugin/trunk/CMakeModules/FindPANO13.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindPANO13.cmake	2007-11-10 07:24:09 UTC (rev 2528)
+++ hugin/trunk/CMakeModules/FindPANO13.cmake	2007-11-11 01:02:09 UTC (rev 2529)
@@ -1,27 +1,46 @@
-# - Find PANO13 library
-# Find the native PANO13 includes and library
-# This module defines
+# - Find PANO13 headers and libraries
+# modified for Hugin 0.7 Windows build 02Nov2007 TKSharpless
+# reads cache variable
+#  SOURCE_BASE_DIR -- directory that contains hugin source root
+# defines cache vars
 #  PANO13_INCLUDE_DIR, where to find pano13/panorama.h, etc.
-#  PANO13_LIBRARIES, libraries to link against to use PANO13.
-#  PANO13_FOUND, If false, do not try to use PANO13.
-# also defined, but not for general use are
-#  PANO13_LIBRARY, where to find the PANO13 library.
+#  PANO13_LIBRARIES, release link library list.
+#  PANO13_DEBUG_LIBRARIES, debug ditto.
+#  PANO13_FOUND, If != "YES", do not try to use PANO13.
 
+# In Pablo's Windows setup ${SOURCE_BASE_DIR}/libpano contains pano12
+# and pano13.  This code also works if pano13 is in ${SOURCE_BASE_DIR}
+## NOTE the form "pano13/panorama.h" is used in #includes in some
+## Hugin source files, so we are stuck with that for now.
 FIND_PATH(PANO13_INCLUDE_DIR pano13/panorama.h
   /usr/local/include
   /usr/include
+  ${SOURCE_BASE_DIR}/libpano
+  ${SOURCE_BASE_DIR}
 )
 
-SET(PANO13_NAMES ${PANO13_NAMES} pano13)
-FIND_LIBRARY(PANO13_LIBRARY
-  NAMES ${PANO13_NAMES}
-  PATHS /usr/lib /usr/local/lib
+# Pablo's Windows setup has the link libs in subdirs Debug
+# and Release of libpano/pano13, as "Panotools.lib".  This 
+# code will also find them in pano13 or in pano13/lib, and
+# with names pano13 or pano13d.
+FIND_LIBRARY(PANO13_LIBRARIES
+  NAMES Panotools pano13
+  PATHS /usr/lib /usr/local/lib 
+        ${PANO13_INCLUDE_DIR}/pano13/Release
+        ${SOURCE_BASE_DIR}/pano13/lib
+        ${SOURCE_BASE_DIR}/pano13
   )
 
 IF(PANO13_INCLUDE_DIR)
-  IF(PANO13_LIBRARY)
+  IF(PANO13_LIBRARIES)
     SET( PANO13_FOUND "YES" )
-    SET( PANO13_LIBRARIES ${PANO13_LIBRARY} )
-  ENDIF(PANO13_LIBRARY)
+    FIND_LIBRARY( PANO13_DEBUG_LIBRARIES
+      NAMES Panotools pano13d pano13
+      PATHS /usr/lib /usr/local/lib 
+            ${PANO13_INCLUDE_DIR}/pano13/Debug
+            ${SOURCE_BASE_DIR}/pano13/lib
+            ${SOURCE_BASE_DIR}/pano13
+    )
+  ENDIF(PANO13_LIBRARIES)
 ENDIF(PANO13_INCLUDE_DIR)
 

Added: hugin/trunk/CMakeModules/FindPNG.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindPNG.cmake	                        (rev 0)
+++ hugin/trunk/CMakeModules/FindPNG.cmake	2007-11-11 01:02:09 UTC (rev 2529)
@@ -0,0 +1,58 @@
+# - Find PNG for Hugin 0.7 01Nov2007 TKSharpless
+# Added to support Windows build but should work anywhere.
+# After looking in UNIX standard places, tries wxWidgets build 
+# tree, which should have this package.
+#
+# Call FIND_PACKAGE(wxWidgets REQUIRED) before calling this!
+# 
+# reads cache variables
+#  wxWidgets_ROOT_DIR
+#  wxWidgets_LIB_DIR
+# defines cache variables
+#  PNG_INCLUDE_DIR, where to find headers
+#  PNG_LIBRARIES, list of release link libraries.
+#  PNG_DEBUG_LIBRARIES, list of release link libraries.
+#  PNG_FOUND, If != "YES", do not try to use PNG.
+# None of the above will be defined unless ZLIB can be found
+
+INCLUDE(FindZLIB)
+
+SET(PNG_FOUND "NO")
+
+IF (ZLIB_FOUND)
+  FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
+    /usr/local/include
+    /usr/include
+    ${wxWidgets_ROOT_DIR}/src/png
+  )
+
+  FIND_LIBRARY(PNG_LIBRARY
+    NAMES png libpng wxpng
+    PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+  )
+
+  IF(PNG_PNG_INCLUDE_DIR AND PNG_LIBRARY)
+      SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+      SET(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
+
+      SET( PNG_FOUND "YES" )
+      FIND_LIBRARY( PNG_DEBUG_LIBRARY
+        NAMES pngd wxpngd
+        PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+      )
+      SET(PNG_DEBUG_LIBRARIES ${PNG_DEBUGLIBRARY} ${ZLIB_DEBUG_LIBRARY})
+  ENDIF(PNG_PNG_INCLUDE_DIR AND PNG_LIBRARY)
+ENDIF(ZLIB_FOUND)
+
+IF (PNG_FOUND)
+  IF (NOT PNG_FIND_QUIETLY)
+    MESSAGE(STATUS "Found PNG: ${PNG_LIBRARY}")
+  ENDIF (NOT PNG_FIND_QUIETLY)
+ELSE (PNG_FOUND)
+  IF (PNG_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find PNG library")
+  ENDIF (PNG_FIND_REQUIRED)
+ENDIF (PNG_FOUND)
+
+MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )
+

Added: hugin/trunk/CMakeModules/FindTIFF.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindTIFF.cmake	                        (rev 0)
+++ hugin/trunk/CMakeModules/FindTIFF.cmake	2007-11-11 01:02:09 UTC (rev 2529)
@@ -0,0 +1,39 @@
+# - Find TIFF for Hugin 0.7 01Nov2007 TKSharpless
+# Added to support Windows build but should work anywhere.
+# After looking in UNIX standard places, tries wxWidgets build 
+# tree, which should have this package.
+#
+# Call FIND_PACKAGE(wxWidgets REQUIRED) before calling this!
+# 
+# reads cache variables
+#  wxWidgets_ROOT_DIR
+#  wxWidgets_LIB_DIR
+# defines cache variables
+#  TIFF_INCLUDE_DIR, where to find headers
+#  TIFF_LIBRARIES, list of link libraries for release
+#  TIFF_DEBUG_LIBRARIES ditto for debug
+#  TIFF_FOUND, If != "YES", do not try to use TIFF.
+
+FIND_PATH(TIFF_INCLUDE_DIR tiff.h
+  /usr/local/include
+  /usr/include
+  ${wxWidgets_ROOT_DIR}/src/tiff
+)
+
+FIND_LIBRARY( TIFF_LIBRARIES
+  NAMES tiff wxtiff
+  PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+)
+
+IF(TIFF_INCLUDE_DIR)
+  IF(TIFF_LIBRARIES)
+    SET( TIFF_FOUND "YES" )
+    FIND_LIBRARY( TIFF_DEBUG_LIBRARIES 
+      NAMES tiffd wxtiffd
+      PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+    )
+  ENDIF(TIFF_LIBRARIES)
+ENDIF(TIFF_INCLUDE_DIR)
+
+
+

Added: hugin/trunk/CMakeModules/FindZLIB.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindZLIB.cmake	                        (rev 0)
+++ hugin/trunk/CMakeModules/FindZLIB.cmake	2007-11-11 01:02:09 UTC (rev 2529)
@@ -0,0 +1,68 @@
+# - Find zlib
+# Find the native ZLIB includes and library
+#
+#  ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
+#  ZLIB_LIBRARIES   - List of libraries when using zlib.
+#  ZLIB_FOUND       - True if zlib found.
+
+# - Find TIFF for Hugin 0.7 01Nov2007 TKSharpless
+# Added to support Windows build but should work anywhere.
+# After looking in UNIX standard places, tries wxWidgets build 
+# tree, which should have this package.
+#
+# reads cache variables
+#  wxWidgets_ROOT_DIR
+#  wxWidgets_LIB_DIR
+# 
+
+IF (ZLIB_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(ZLIB_FIND_QUIETLY TRUE)
+ENDIF (ZLIB_INCLUDE_DIR)
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+  /usr/local/include
+  /usr/include
+  ${wxWidgets_ROOT_DIR}/src/zlib
+)
+
+SET(ZLIB_NAMES z zlib zdll wxzlib)
+FIND_LIBRARY(ZLIB_LIBRARY
+  NAMES ${ZLIB_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  ${wxWidgets_ROOT_DIR}/src/zlib
+)
+
+SET(ZLIB_DEBUG_NAMES zd zlibd zdlld wxzlibd)
+FIND_LIBRARY(ZLIB_DEBUG_LIBRARY
+  NAMES ${ZLIB_DEBUG_NAMES}
+  PATHS /usr/lib /usr/local/lib
+)
+
+IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+    SET(ZLIB_FOUND TRUE)
+    SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
+    IF (ZLIB_DEBUG_LIBRARY)
+        SET(ZLIB_DEBUG_LIBRARIES ${ZLIB_DEBUG_LIBRARY})
+    ENDIF(ZLIB_DEBUG_LIBRARY)
+ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+   SET(ZLIB_FOUND FALSE)
+   SET( ZLIB_LIBRARIES )
+ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+
+IF (ZLIB_FOUND)
+   IF (NOT ZLIB_FIND_QUIETLY)
+      MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}")
+   ENDIF (NOT ZLIB_FIND_QUIETLY)
+ELSE (ZLIB_FOUND)
+   IF (ZLIB_FIND_REQUIRED)
+      MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.")
+      MESSAGE(FATAL_ERROR "Could NOT find z library")
+   ENDIF (ZLIB_FIND_REQUIRED)
+ENDIF (ZLIB_FOUND)
+
+MARK_AS_ADVANCED(
+  ZLIB_LIBRARY
+  ZLIB_DEBUG_LIBRARY
+  ZLIB_INCLUDE_DIR
+  )


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

[Hugin-cvs] SF.net SVN: hugin: [2536] hugin/trunk

From: <dangelo@us...> - 2007-11-15 23:27

Revision: 2536
          http://hugin.svn.sourceforge.net/hugin/?rev=2536&view=rev
Author:   dangelo
Date:     2007-11-15 15:27:44 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
merged in some CMakeLists changes for easier MSVC build from Tom Sharpless

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt
    hugin/trunk/CMakeModules/FindOpenEXR.cmake
    hugin/trunk/CMakeModules/FindZLIB.cmake

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-11-15 22:49:24 UTC (rev 2535)
+++ hugin/trunk/CMakeLists.txt	2007-11-15 23:27:44 UTC (rev 2536)
@@ -58,10 +58,8 @@
 FIND_PACKAGE(PNG REQUIRED)
 INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
 
-FIND_PACKAGE(OpenEXR)
-IF (OPENEXR_FOUND)
+FIND_PACKAGE(OpenEXR REQUIRED)
 include_directories(${OPENEXR_INCLUDE_DIR})
-ENDIF (OPENEXR_FOUND)
 
 ##
 ## Panotools
@@ -87,17 +85,19 @@
 
 FIND_PACKAGE(Boost REQUIRED)
 
-IF (WIN32)
-  # todo: check for vips (not needed right now)
-ELSE (WIN32)
-  pkg_check_modules(VIPS vips-7.12)
-  LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING)
-  LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING)
 
-  pkg_check_modules(VIPSCC vipsCC-7.12)
-  LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING)
-  LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING)
-ENDIF (WIN32)
+# vips is not used right now
+#IF (WIN32)
+#  # todo: check for vips (not needed right now)
+#ELSE (WIN32)
+#  pkg_check_modules(VIPS vips-7.12)
+#  LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING)
+#  LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING)
+#
+#  pkg_check_modules(VIPSCC vipsCC-7.12)
+#  LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING)
+#  LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING)
+#ENDIF (WIN32)
 
 
 #BUILD SETUP
@@ -126,7 +126,7 @@
 #  SET(CMAKE_C_FLAGS_DEBUG "-g3 -O0 -Wall -DDEBUG" CACHE)
 #ENDIF(UNIX)
 
-IF (UNIX OR APPLE)
+IF (UNIX)
   # define destination dirs (relative to prefix)
   SET(HUGINDATADIR share/hugin)
   SET(DATADIR share)
@@ -142,7 +142,7 @@
     SET(HUGIN_SHARED_LIBS 1)
   ENDIF (${HUGIN_SHARED})
   MESSAGE("Using shared libraries")
-ELSE (UNIX OR APPLE)
+ELSE (UNIX)
   # Windows
   SET(BINDIR ${CMAKE_INSTALL_PREFIX})
   SET(DATADIR ${CMAKE_INSTALL_PREFIX})
@@ -153,8 +153,27 @@
   # no shared libs DLL on windows. The code is just
   # not set up for that..
   ADD_DEFINITIONS(-DVIGRA_STATIC_LIB)
-ENDIF (UNIX OR APPLE)
 
+  IF (MSVC)
+    # Stop MSVC8 from bitching about the C library
+    ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE)
+    # compile everything for the static C runtime
+    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL})
+    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
+    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
+    # link only with the static C runtime !! THIS IS A MUST !!
+    SET( CMAKE_EXE_LINKER_FLAGS
+        ${CMAKE_EXE_LINKER_FLAGS} /noDefaultLib:MSVCRT /noDefaultLib:MSVCRTd
+       CACHE STRING "for MSVC"
+    )
+  ENDIF(MSVC)
+ENDIF (UNIX)
+
 FIND_PACKAGE(MSGFMT REQUIRED)
 IF(MSGFMT_FOUND)
   MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})")
@@ -172,6 +191,7 @@
       ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 ENDIF (APPLE)
 
+
 # create config.h file
 configure_file(src/hugin_config.h.in.cmake ${CMAKE_BINARY_DIR}/src/hugin_config.h)
 

Modified: hugin/trunk/CMakeModules/FindOpenEXR.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindOpenEXR.cmake	2007-11-15 22:49:24 UTC (rev 2535)
+++ hugin/trunk/CMakeModules/FindOpenEXR.cmake	2007-11-15 23:27:44 UTC (rev 2536)
@@ -28,6 +28,7 @@
      ${_OpenEXRIncDir}/OpenEXR/
      /usr/include
      /usr/local/include
+     ${SOURCE_BASE_DIR}/Deploy/include
   )
   
   FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half
@@ -35,14 +36,19 @@
     ${_OPENEXRLinkDir}
     /usr/lib
     /usr/local/lib
+    ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
+    ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
   
   
-  FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex
+  FIND_LIBRARY(OPENEXR_IEX_LIBRARY
+    NAMES Iex
     PATHS
     ${_OPENEXRLinkDir}
     /usr/lib
     /usr/local/lib
+    ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
+    ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
 
   FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread
@@ -50,6 +56,8 @@
     ${_OPENEXRLinkDir}
     /usr/lib
     /usr/local/lib
+    ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
+    ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
   
   FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath
@@ -57,6 +65,8 @@
     ${_OPENEXRLinkDir}
     /usr/lib
     /usr/local/lib
+    ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
+    ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
   
   
@@ -65,6 +75,8 @@
     ${_OPENEXRLinkDir}
     /usr/lib
     /usr/local/lib
+    ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
+    ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
   
   if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)

Modified: hugin/trunk/CMakeModules/FindZLIB.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindZLIB.cmake	2007-11-15 22:49:24 UTC (rev 2535)
+++ hugin/trunk/CMakeModules/FindZLIB.cmake	2007-11-15 23:27:44 UTC (rev 2536)
@@ -29,14 +29,13 @@
 SET(ZLIB_NAMES z zlib zdll wxzlib)
 FIND_LIBRARY(ZLIB_LIBRARY
   NAMES ${ZLIB_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  ${wxWidgets_ROOT_DIR}/src/zlib
+  PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
 )
 
 SET(ZLIB_DEBUG_NAMES zd zlibd zdlld wxzlibd)
 FIND_LIBRARY(ZLIB_DEBUG_LIBRARY
   NAMES ${ZLIB_DEBUG_NAMES}
-  PATHS /usr/lib /usr/local/lib
+  PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
 )
 
 IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)


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

[Hugin-cvs] SF.net SVN: hugin: [2537] hugin/trunk

From: <dangelo@us...> - 2007-11-17 20:30

Revision: 2537
          http://hugin.svn.sourceforge.net/hugin/?rev=2537&view=rev
Author:   dangelo
Date:     2007-11-17 12:30:58 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
Use different FindBoost macro, should detect the boost_thread library
with -mt suffix.

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt
    hugin/trunk/CMakeModules/FindOpenEXR.cmake
    hugin/trunk/INSTALL_cmake
    hugin/trunk/src/CMakeLists.txt

Added Paths:
-----------
    hugin/trunk/CMakeModules/FindBoost.cmake

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-11-15 23:27:44 UTC (rev 2536)
+++ hugin/trunk/CMakeLists.txt	2007-11-17 20:30:58 UTC (rev 2537)
@@ -83,9 +83,13 @@
 ## Boost
 ##
 
-FIND_PACKAGE(Boost REQUIRED)
 
+FIND_PACKAGE(Boost REQUIRED thread)
+IF (NOT Boost_thread_FOUND)
+  MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBoost_LIB_SUFFIX=<suffix>")
+ENDIF (NOT Boost_thread_FOUND)
 
+
 # vips is not used right now
 #IF (WIN32)
 #  # todo: check for vips (not needed right now)
@@ -201,8 +205,8 @@
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
+INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} )
 LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} )
-INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} )
 
 
 add_subdirectory(src)

Added: hugin/trunk/CMakeModules/FindBoost.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindBoost.cmake	                        (rev 0)
+++ hugin/trunk/CMakeModules/FindBoost.cmake	2007-11-17 20:30:58 UTC (rev 2537)
@@ -0,0 +1,277 @@
+# - Find the Boost includes and libraries.
+# The following variables are set if Boost is found.  If Boost is not
+# found, Boost_FOUND is set to false.
+#  Boost_FOUND                  - True when the Boost include directory is found.
+#  Boost_INCLUDE_DIRS           - the path to where the boost include files are.
+#  Boost_LIBRARY_DIRS           - The path to where the boost library files are.
+#  Boost_LIB_DIAGNOSTIC_DEFINITIONS - Only set if using Windows.
+#  Boost_<library>_FOUND        - True if the Boost <library> is found.
+#  Boost_<library>_INCLUDE_DIRS - The include path for Boost <library>.
+#  Boost_<library>_LIBRARIES    - The libraries to link to to use Boost <library>.
+#  Boost_LIBRARIES              - The libraries to link to to use all Boost libraries.
+#
+# The following variables can be set to configure how Boost is found:
+#  Boost_LIB_PREFIX             - Look for Boost libraries prefixed with this, e.g. "lib"
+#  Boost_LIB_SUFFIX             - Look for Boost libraries ending with this, e.g. "vc80-mt"
+#  Boost_LIB_SUFFIX_DEBUG       - As for Boost_LIB_SUFFIX but for debug builds, e.g. "vs80-mt-gd"
+
+# ----------------------------------------------------------------------------
+# If you have installed Boost in a non-standard location or you have
+# just staged the boost files using bjam then you have three
+# options. In the following comments, it is assumed that <Your Path>
+# points to the root directory of the include directory of Boost. e.g
+# If you have put boost in C:\development\Boost then <Your Path> is
+# "C:/development/Boost" and in this directory there will be two
+# directories called "include" and "lib".
+# 1) After CMake runs, set Boost_INCLUDE_DIR to <Your Path>/include/boost<-version>
+# 2) Use CMAKE_INCLUDE_PATH to set a path to <Your Path>/include. This will allow FIND_PATH()
+#    to locate Boost_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g.
+#    SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "<Your Path>/include")
+# 3) Set an environment variable called ${BOOST_ROOT} that points to the root of where you have
+#    installed Boost, e.g. <Your Path>. It is assumed that there is at least a subdirectory called
+#    include in this path.
+#
+# Note:
+#  1) If you are just using the boost headers, then you do not need to use
+#     Boost_LIBRARY_DIRS in your CMakeLists.txt file.
+#  2) If Boost has not been installed, then when setting Boost_LIBRARY_DIRS
+#     the script will look for /lib first and, if this fails, then for /stage/lib.
+#
+# Usage:
+# In your CMakeLists.txt file do something like this:
+# ...
+# # Boost
+# FIND_PACKAGE(Boost)
+# ...
+# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+#
+# In Windows, we make the assumption that, if the Boost files are installed, the default directory
+# will be C:\boost.
+
+#
+# TODO:
+#
+# 1) Automatically find the Boost library files and eliminate the need
+#    to use Link Directories.
+#
+
+IF(WIN32)
+  # In windows, automatic linking is performed, so you do not have to specify the libraries.
+  # If you are linking to a dynamic runtime, then you can choose to link to either a static or a
+  # dynamic Boost library, the default is to do a static link.  You can alter this for a specific
+  # library "whatever" by defining BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to
+  # be linked dynamically.  Alternatively you can force all Boost libraries to dynamic link by
+  # defining BOOST_ALL_DYN_LINK.
+
+  # This feature can be disabled for Boost library "whatever" by defining BOOST_WHATEVER_NO_LIB,
+  # or for all of Boost by defining BOOST_ALL_NO_LIB.
+
+  # If you want to observe which libraries are being linked against then defining
+  # BOOST_LIB_DIAGNOSTIC will cause the auto-linking code to emit a #pragma message each time
+  # a library is selected for linking.
+  SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
+ENDIF(WIN32)
+
+
+SET(BOOST_INCLUDE_PATH_DESCRIPTION "directory containing the boost include files. E.g /usr/local/include/boost-1_33_1 or c:\\boost\\include\\boost-1_33_1")
+
+SET(BOOST_DIR_MESSAGE "Set the Boost_INCLUDE_DIR cmake cache entry to the ${BOOST_INCLUDE_PATH_DESCRIPTION}")
+
+SET(BOOST_DIR_SEARCH $ENV{BOOST_ROOT})
+IF(BOOST_DIR_SEARCH)
+  FILE(TO_CMAKE_PATH ${BOOST_DIR_SEARCH} BOOST_DIR_SEARCH)
+  SET(BOOST_DIR_SEARCH ${BOOST_DIR_SEARCH}/include)
+ENDIF(BOOST_DIR_SEARCH)
+
+IF(WIN32)
+  SET(BOOST_DIR_SEARCH
+    ${BOOST_DIR_SEARCH}
+    C:/boost/include
+    D:/boost/include
+  )
+ENDIF(WIN32)
+
+# Add in some path suffixes. These will have to be updated whenever a new Boost version comes out.
+SET(SUFFIX_FOR_PATH
+ boost-1_35_1
+ boost-1_35_0
+ boost-1_35
+ boost-1_34_1
+ boost-1_34_0
+ boost-1_34
+ boost-1_33_1
+ boost-1_33_0
+)
+
+#
+# Look for an installation.
+#
+FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
+
+  # Look in other places.
+  ${BOOST_DIR_SEARCH}
+
+  # Help the user find it if we cannot.
+  DOC "The ${BOOST_INCLUDE_PATH_DESCRIPTION}"
+)
+
+# Assume we didn't find it.
+SET(Boost_FOUND 0)
+
+# Now try to get the include and library path.
+IF(Boost_INCLUDE_DIR)
+
+  # Look for the boost library path.
+  # Note that the user may not have installed any libraries
+  # so it is quite possible the Boost_LIBRARY_PATH may not exist.
+  SET(Boost_LIBRARY_DIR ${Boost_INCLUDE_DIR})
+
+  IF("${Boost_LIBRARY_DIR}" MATCHES "boost-[0-9]+")
+    GET_FILENAME_COMPONENT(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR} PATH)
+  ENDIF ("${Boost_LIBRARY_DIR}" MATCHES "boost-[0-9]+")
+
+  IF("${Boost_LIBRARY_DIR}" MATCHES "/include$")
+    # Strip off the trailing "/include" in the path.
+    GET_FILENAME_COMPONENT(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR} PATH)
+  ENDIF("${Boost_LIBRARY_DIR}" MATCHES "/include$")
+
+  IF(EXISTS "${Boost_LIBRARY_DIR}/lib")
+    SET (Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/lib)
+  ELSE(EXISTS "${Boost_LIBRARY_DIR}/lib")
+    IF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib")
+      SET(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/stage/lib)
+    ELSE(EXISTS "${Boost_LIBRARY_DIR}/stage/lib")
+      SET(Boost_LIBRARY_DIR "")
+    ENDIF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib")
+  ENDIF(EXISTS "${Boost_LIBRARY_DIR}/lib")
+
+  IF(EXISTS "${Boost_INCLUDE_DIR}")
+    SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
+    # We have found boost. It is possible that the user has not
+    # compiled any libraries so we set Boost_FOUND to be true here.
+    SET(Boost_FOUND 1)
+    MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
+  ENDIF(EXISTS "${Boost_INCLUDE_DIR}")
+
+  IF(Boost_LIBRARY_DIR AND EXISTS "${Boost_LIBRARY_DIR}")
+    SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIR})
+  ENDIF(Boost_LIBRARY_DIR AND EXISTS "${Boost_LIBRARY_DIR}")
+ENDIF(Boost_INCLUDE_DIR)
+
+#
+# Find boost libraries
+#
+
+# List of library suffixes to search, e.g. libboost_date_time-gcc
+SET(BOOST_SUFFIX_SEARCH 
+  gcc
+  mt
+  il
+)
+
+# List of all boost libraries
+SET(BOOST_ALL_LIBRARIES 
+  date_time
+  filesystem
+  graph
+  iostreams
+  program_options
+  python
+  regex
+  serialization
+  signals
+  test
+  thread
+  unit_test_framework    
+  wave
+)
+
+# Macro to find boost library called name
+MACRO(BOOST_FIND_LIBRARY name)
+
+  # User can specify a particular build variant via the variables:
+  #   Boost_LIB_PREFIX, Boost_LIB_SUFFIX, Boost_LIB_SUFFIX_DEBUG
+  # otherwise we'll search the BOOST_SUFFIX_SEARCH list
+
+  IF (Boost_LIB_SUFFIX)
+    SET(BOOST_LIB_NAMES ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX})
+  ELSE (Boost_LIB_SUFFIX)
+    SET(BOOST_LIB_NAMES ${Boost_LIB_PREFIX}boost_${name})
+    FOREACH(suffix ${BOOST_SUFFIX_SEARCH})
+      SET(BOOST_LIB_NAMES ${BOOST_LIB_NAMES} ${Boost_LIB_PREFIX}boost_${name}-${suffix})
+    ENDFOREACH(suffix)
+  ENDIF(Boost_LIB_SUFFIX)
+
+  # Find the library in the Boost_LIBRARY_DIRS
+  FIND_LIBRARY(Boost_${name}_LIBRARY 
+    NAMES ${BOOST_LIB_NAMES}
+    PATHS ${Boost_LIBRARY_DIRS})
+
+  # For MSVC builds find debug library
+  IF(WIN32 AND MSVC AND Boost_${name}_LIBRARY)
+    FIND_LIBRARY(Boost_${name}_LIBRARY_DEBUG ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX_DEBUG})
+
+    IF(MSVC_IDE)
+      IF(Boost_${name}_LIBRARY AND Boost_${name}_LIBRARY_DEBUG)
+        SET(Boost_${name}_LIBRARIES debug ${Boost_${name}_LIBRARY_DEBUG} optimized ${Boost_${name}_LIBRARY})
+      ELSE(Boost_${name}_LIBRARY AND Boost_${name}_LIBRARY_DEBUG)
+        MESSAGE(FATAL_ERROR "Could not find the debug and release version of Boost ${name} library.")
+      ENDIF(Boost_${name}_LIBRARY AND Boost_${name}_LIBRARY_DEBUG)
+    ELSE(MSVC_IDE)
+      STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
+      IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+        SET(Boost_${name}_LIBRARIES ${Boost_${name}_LIBRARY_DEBUG})
+      ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+        SET(Boost_${name}_LIBRARIES ${Boost_${name}_LIBRARY})
+      ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+    ENDIF(MSVC_IDE)
+  ELSE(WIN32 AND MSVC AND Boost_${name}_LIBRARY)
+    SET(Boost_${name}_LIBRARIES ${Boost_${name}_LIBRARY})
+  ENDIF(WIN32 AND MSVC AND Boost_${name}_LIBRARY)
+
+  # If we've got it setup appropriate variables or issue error message
+  IF(Boost_${name}_LIBRARY)
+    SET(Boost_${name}_FOUND 1)
+    SET(Boost_${name}_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
+    MARK_AS_ADVANCED(Boost_${name}_LIBRARY Boost_${name}_LIBRARY_DEBUG)
+  ELSE(Boost_${name}_LIBRARY)
+    IF(NOT Boost_FIND_QUIETLY)
+      MESSAGE(STATUS "Boost ${name} library was not found.")
+    ELSE(NOT Boost_FIND_QUIETLY)
+      IF(Boost_FIND_REQUIRED_${name})
+        MESSAGE(FATAL_ERROR "Could NOT find required Boost ${name} library.")
+      ENDIF(Boost_FIND_REQUIRED_${name})
+    ENDIF(NOT Boost_FIND_QUIETLY)  
+  ENDIF(Boost_${name}_LIBRARY)
+ENDMACRO(BOOST_FIND_LIBRARY)
+
+IF(Boost_LIBRARY_DIRS)
+
+  # If the user specified required components e.g. via 
+  # FIND_PACKAGE(Boost REQUIRED date_time regex)
+  # find (just) those libraries. Otherwise find all libraries.
+  IF(Boost_FIND_COMPONENTS)
+    SET(Boost_FIND_LIBRARIES ${Boost_FIND_COMPONENTS})
+  ELSE(Boost_FIND_COMPONENTS)
+    SET(Boost_FIND_LIBRARIES ${BOOST_ALL_LIBRARIES})
+  ENDIF(Boost_FIND_COMPONENTS)
+
+  SET(Boost_LIBRARIES)
+  FOREACH(library ${Boost_FIND_LIBRARIES})
+    BOOST_FIND_LIBRARY(${library})
+    IF(Boost_${library}_FOUND)
+      SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${library}_LIBRARIES})
+    ENDIF(Boost_${library}_FOUND)
+  ENDFOREACH(library)
+ENDIF(Boost_LIBRARY_DIRS)
+
+IF(NOT Boost_FOUND)
+  IF(NOT Boost_FIND_QUIETLY)
+    MESSAGE(STATUS "Boost was not found. ${BOOST_DIR_MESSAGE}")
+  ELSE(NOT Boost_FIND_QUIETLY)
+    IF(Boost_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Boost was not found. ${BOOST_DIR_MESSAGE}")
+    ENDIF(Boost_FIND_REQUIRED)
+  ENDIF(NOT Boost_FIND_QUIETLY)
+ENDIF(NOT Boost_FOUND)

Modified: hugin/trunk/CMakeModules/FindOpenEXR.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindOpenEXR.cmake	2007-11-15 23:27:44 UTC (rev 2536)
+++ hugin/trunk/CMakeModules/FindOpenEXR.cmake	2007-11-17 20:30:58 UTC (rev 2537)
@@ -86,7 +86,6 @@
        set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} )
      else (OPENEXR_ILMTHREAD_LIBRARY)
        set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
-       MESSAGE(ERROR "Not using OpenEXR thread library")
      endif (OPENEXR_ILMTHREAD_LIBRARY)
   endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
   

Modified: hugin/trunk/INSTALL_cmake
===================================================================
--- hugin/trunk/INSTALL_cmake	2007-11-15 23:27:44 UTC (rev 2536)
+++ hugin/trunk/INSTALL_cmake	2007-11-17 20:30:58 UTC (rev 2537)
@@ -39,6 +39,11 @@
 [some failure]
 $ ccmake .
 
+If CMake failes to recognize the boost thread library, the boost library suffix
+might need to be given in the Boost_LIB_SUFFIX CMake variable. For example:
+$ cmake -DBoost_LIB_SUFFIX=gcc41-mt-1_34_1
+if the boost thread suffix is gcc41-mt-1_34_1
+
 Configuring the build
 =====================
 
@@ -55,6 +60,7 @@
                       functions. (Unix and OSX, Windows is always statically linked)
 
 
+
 For distributors:
 =================
 CMake supports the DESTDIR variable during make install, this

Modified: hugin/trunk/src/CMakeLists.txt
===================================================================
--- hugin/trunk/src/CMakeLists.txt	2007-11-15 23:27:44 UTC (rev 2536)
+++ hugin/trunk/src/CMakeLists.txt	2007-11-17 20:30:58 UTC (rev 2537)
@@ -5,22 +5,18 @@
 include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/vigra )
 
 # define common sets of libraries, used by different subdirectories
-IF (WIN32 AND NOT MINGW)
+IF (MSVC)
   # boost_thread is linked automatically
   # additionally link to our getopt
   set(common_libs huginbase huginjhead hugingetopt
       ${PANO_LIBRARIES} huginlevmar)
   include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/getopt/include )
-ELSEIF (MINGW)
+ELSE (MSVC)
   # need to specify boost thread library
-  set(common_libs huginbase huginjhead boost_thread-mgw-mt
-      ${PANO_LIBRARIES} huginlevmar)
-ELSE (WIN32 AND NOT MINGW)
-  # need to specify boost thread library
   set(common_libs huginbase huginjhead
-      boost_thread ${PANO_LIBRARIES} huginlevmar)
+      ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)
+ENDIF (MSVC)
 
-ENDIF (WIN32 AND NOT MINGW)
 set(image_libs huginvigraimpex ${OPENEXR_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES}
     ${PNG_LIBRARIES})
 


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

[Hugin-cvs] SF.net SVN: hugin: [2542] hugin/trunk

From: <pcrowley5286@us...> - 2007-11-26 21:53

Revision: 2542
          http://hugin.svn.sourceforge.net/hugin/?rev=2542&view=rev
Author:   pcrowley5286
Date:     2007-11-26 13:53:15 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Initial add of mac build files for release.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/CMakeLists.txt

Added Paths:
-----------
    hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake
    hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in

Added: hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake
===================================================================
--- hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake	                        (rev 0)
+++ hugin/trunk/CMakeModules/AppleRELEASEOptions.cmake	2007-11-26 21:53:15 UTC (rev 2542)
@@ -0,0 +1,65 @@
+
+# --- If we are on OS X copy all the embedded libraries to the app bundle
+IF (APPLE)
+   MESSAGE ( "Building Standalone release" )
+#  IF ( NOT DEP_QT_LIBS )
+#    SET (DEP_QT_LIBS "QtCore QtGui" )
+#
+#  ENDIF ( NOT DEP_QT_LIBS )
+#    
+#   IF ( NOT QT_PREFIX )
+#    SET (QT_PREFIX "")
+#  ENDIF ( NOT QT_PREFIX )
+#
+#  IF ( NOT QT_SUFFIX )
+#    SET (QT_SUFFIX "framework")
+#  ENDIF ( NOT QT_SUFFIX )
+#
+#  IF ( NOT QT_VERSION )
+#    SET (QT_VERSION "4.2.3")
+#  ENDIF ( NOT QT_VERSION )
+#
+#
+  # -- This script will take care of files that the application is dependent on
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CMakeModules/PackageMacAppBundleLibs.sh.in
+                 ${CMAKE_INSTALL_PREFIX}/${BINDIR}/PackageMacAppBundleLibs.sh @ONLY IMMEDIATE)
+
+#  CONFIGURE_FILE(${CMAKE_PROJECT_DIR}/CMakeModules/PackageQt4ForOSXAppBundle.sh.in
+#                 ${BINDIR}/PackageQt4ForOSXAppBundle.sh @ONLY IMMEDIATE)
+
+  GET_TARGET_PROPERTY(EXE_LOC ${PROGNAME} LOCATION)
+
+  ADD_CUSTOM_COMMAND(
+    TARGET ${PROGNAME}
+    POST_BUILD
+    COMMAND "/bin/chmod"
+    ARGS ugo+x ${CMAKE_INSTALL_PREFIX}/${BINDIR}/PackageMacAppBundleLibs.sh
+    )
+
+  #-- Copy and adjust install_names on the Supporting Libraries
+  #
+  ADD_CUSTOM_COMMAND (
+    TARGET  ${PROGNAME}
+    POST_BUILD
+    COMMAND ${CMAKE_INSTALL_PREFIX}/${BINDIR}/PackageMacAppBundleLibs.sh
+    ARGS
+  )
+  
+#  ADD_CUSTOM_COMMAND(
+#     TARGET ${OS_X_APP_NAME}
+#     POST_BUILD
+#     COMMAND "/bin/chmod"
+#     ARGS ugo+x ${BINDIR}/PackageQt4ForOSXAppBundle.sh
+#     )
+        
+  #-- Use the generated Shell script to copy and correct the QtLibs
+#  ADD_CUSTOM_COMMAND (
+#    TARGET  ${OS_X_APP_NAME}
+#    POST_BUILD
+#    COMMAND ${BINDIR}/PackageQt4ForOSXAppBundle.sh
+#    ARGS
+#  )
+  
+
+ENDIF (APPLE)
+

Added: hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in
===================================================================
--- hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in	                        (rev 0)
+++ hugin/trunk/CMakeModules/PackageMacAppBundleLibs.sh.in	2007-11-26 21:53:15 UTC (rev 2542)
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# //TODO: Add Icon File and copy it to the bundle
+# This script attempts to copy needed 3rd party libraries and frameworks into 
+# the application bundle. It will then attempt to set the 'install_name' for 
+# each library so that it references either the PlugIns or Frameworks directory.
+# The Script will change the JPEG, TIFF, and PNG, and Boost libraries. Each of these
+# libraries is assumed to have been built with some sort of rpath already. We are
+# dependant on that fact.
+
+BASE_DIR="@CMAKE_CURRENT_BINARY_DIR@"
+cd ${BASE_DIR}
+
+dylib=".dylib"
+PLUGINS_DIR_NAME="Lib"
+APPLICATION_APP_BUNDLE="@PROGNAME@..."
+APPLICATION_BINDIR="${APPLICATION_APP_BUNDLE}/Contents/MacOS"
+APPLICATION_APP_NAME="${APPLICATION_BINDIR}/@PROGNAME@"
+PLUGINS_PATH="${APPLICATION_APP_BUNDLE}/Contents/${PLUGINS_DIR_NAME}"
+FRAMEWORKS_PATH="${APPLICATION_APP_BUNDLE}/Contents/Frameworks"
+RPATH_PLUGIN_PATH="@executable_path/../${PLUGINS_DIR_NAME}"
+RPATH_FRAMEWORK_PATH="@executable_path/../Frameworks"
+
+DEBUG=0
+
+echo "*-----------------------------------------------------------*"
+echo "* Copying Support Libraries for ${APPLICATION_APP_BUNDLE}"
+echo "* Located in ${BASE_DIR}"
+
+# Create the PlugIns and Frameworks Directories
+mkdir -p "${PLUGINS_PATH}"
+mkdir -p "${FRAMEWORKS_PATH}"
+
+get_libraries() {
+  #echo "-----------getting libraries for $1"
+  LIBRARIES=$(echo $(otool -X -L $1 | grep -v ${RPATH_PLUGIN_PATH} | grep -v \/System\/Library | grep -v \/usr\/lib | sed -e 's/(.*)//' | sort -u))
+  if [ -n "$LIBRARIES" ]; then
+    for library in $LIBRARIES
+    do
+      update_library $library $1
+    done
+  fi
+  #echo "----finished getting libraries for $1"
+}
+
+update_library() {
+   lib="$1"
+   path=$(dirname ${lib})
+   file=$(basename ${lib})
+   if [ ! -f "${BASE_DIR}/${PLUGINS_PATH}/${file}" ] 
+   then 
+     echo "* Installing Library -->$1<-- into ${APPLICATION_APP_BUNDLE} " 
+     cp "${lib}" "${BASE_DIR}/${PLUGINS_PATH}"
+     #chmod 755 "${BASE_DIR}/${PLUGINS_PATH}/${file}"
+     install_name_tool -id "${RPATH_PLUGIN_PATH}/${file}" "${BASE_DIR}/${PLUGINS_PATH}/${file}"
+     install_name_tool -change "${lib}" "${RPATH_PLUGIN_PATH}/${file}" "$2"
+     get_libraries "${BASE_DIR}/${PLUGINS_PATH}/${file}"
+   else
+     # Change internal id of the Library
+     install_name_tool -id "${RPATH_PLUGIN_PATH}/${file}" "${BASE_DIR}/${PLUGINS_PATH}/${file}"
+     # Change the hugin executable to have the proper rpath for the Library
+     #echo "updating $2 to use ${RPATH_PLUGIN_PATH}/${file} for ${lib}"
+     install_name_tool -change "${lib}" "${RPATH_PLUGIN_PATH}/${file}" "$2"
+   fi
+}
+
+add_executable() {
+  # -----------------------------------------------------------------------------
+  # Copy the executable into the App package 
+  # -----------------------------------------------------------------------------
+  echo "* Installing Binary -->$1<-- into ${APPLICATION_APP_BUNDLE} " 
+  cp "$1" "${BASE_DIR}/${APPLICATION_BINDIR}"
+  get_libraries "${BASE_DIR}/${APPLICATION_BINDIR}/$(basename $1)"
+}
+
+get_libraries "${BASE_DIR}/${APPLICATION_BINDIR}/@PROGNAME@"
+add_executable "${BASE_DIR}/../../tools/nona"
+add_executable "${BASE_DIR}/../../deghosting/hugin_hdrmerge"
+add_executable "$(which msgfmt)"
+add_executable "$(which PTroller)"
+add_executable "$(which PTmasker)"
+add_executable "$(which PTtiff2psd)"
+add_executable "$(which enblend)"
+
+echo "*-----------------------------------------------------------*"
+echo "* Creating DMG file: @CMAKE_INSTALL_PREFIX@... "
+mkdmg -zlib -s "${BASE_DIR}/${APPLICATION_APP_BUNDLE}" -i "@CMAKE_INSTALL_PREFIX@..."
+echo ""

Modified: hugin/trunk/src/hugin1/hugin/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/hugin/CMakeLists.txt	2007-11-25 00:10:39 UTC (rev 2541)
+++ hugin/trunk/src/hugin1/hugin/CMakeLists.txt	2007-11-26 21:53:15 UTC (rev 2542)
@@ -94,6 +94,9 @@
 # install further stuff (icons etc.)
 
 IF (APPLE)
+  IF(${CMAKE_BUILD_TYPE} STREQUAL "Release")
+    INCLUDE (${CMAKE_SOURCE_DIR}/CMakeModules/AppleRELEASEOptions.cmake)
+  ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Release")
 # already done by bundle
 ELSEIF(UNIX)
   INSTALL(FILES hugin.desktop DESTINATION ${DATADIR}/applications)


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

[Hugin-cvs] SF.net SVN: hugin: [2544] hugin/trunk

From: <dangelo@us...> - 2007-11-28 21:04

Revision: 2544
          http://hugin.svn.sourceforge.net/hugin/?rev=2544&view=rev
Author:   dangelo
Date:     2007-11-28 13:04:29 -0800 (Wed, 28 Nov 2007)

Log Message:
-----------
updated italian translation (Milo Casagrande). Changed paths to source files
to allow usage of intltool-update. That cannot yet deal with the strings
inside the .xrc files, though.

Modified Paths:
--------------
    hugin/trunk/AUTHORS
    hugin/trunk/src/hugin1/hugin/po/POTFILES.in
    hugin/trunk/src/hugin1/hugin/po/it.po
    hugin/trunk/src/hugin1/hugin/xrc/data/about.htm
    hugin/trunk/src/hugin1/nona_gui/po/LINGUAS
    hugin/trunk/src/hugin1/nona_gui/po/POTFILES.in

Added Paths:
-----------
    hugin/trunk/src/hugin1/nona_gui/po/it.po

Modified: hugin/trunk/AUTHORS
===================================================================
--- hugin/trunk/AUTHORS	2007-11-28 20:42:56 UTC (rev 2543)
+++ hugin/trunk/AUTHORS	2007-11-28 21:04:29 UTC (rev 2544)
@@ -41,6 +41,7 @@
    Ulf Wilhelmson                               Swedish
    Jozef Riha                                   Slovak 
    Jorge González González                      Spanish
+   Milo Casagrande                              Italian
 
 The camera response estimation uses the EMoR response model developed
 at the Computer Vision Laboratory of the Columbia University.

Modified: hugin/trunk/src/hugin1/hugin/po/POTFILES.in
===================================================================
--- hugin/trunk/src/hugin1/hugin/po/POTFILES.in	2007-11-28 20:42:56 UTC (rev 2543)
+++ hugin/trunk/src/hugin1/hugin/po/POTFILES.in	2007-11-28 21:04:29 UTC (rev 2544)
@@ -1,63 +1,63 @@
 # Files containing translateable strings
 
-src/hugin/AssistantPanel.cpp
-src/hugin/AutoCtrlPointCreator.cpp
-src/hugin/CommandHistory.cpp
-src/hugin/CPEditorPanel.cpp
-src/hugin/CPFineTuneFrame.cpp
-src/hugin/CPImageCtrl.cpp
-src/hugin/CPListFrame.cpp
-src/hugin/huginApp.cpp
-src/hugin/ImageCache.cpp
-src/hugin/ImagesList.cpp
-src/hugin/ImagesPanel.cpp
-src/hugin/LensPanel.cpp
-src/hugin/MainFrame.cpp
-src/hugin/MyExternalCmdExecDialog.cpp
-src/hugin/MyProgressDialog.cpp
-src/hugin/NonaStitcherPanel.cpp
-src/hugin/OptimizePanel.cpp
-src/hugin/PanoDruid.cpp
-src/hugin/PanoPanel.cpp
-src/hugin/Plot2D.cpp
-src/hugin/PreferencesDialog.cpp
-src/hugin/PreviewFrame.cpp
-src/hugin/PreviewPanel.cpp
-src/hugin/PTStitcherPanel.cpp
-src/hugin/RunStitcherFrame.cpp
-src/hugin/LocalizedFileTipProvider.cpp
-src/hugin/VigCorrDialog.cpp
-src/hugin/wxPanoCommand.cpp
-src/include/hugin/MyProgressDialog.h
-src/include/hugin/wxPanoCommand.h
+AssistantPanel.cpp
+AutoCtrlPointCreator.cpp
+CommandHistory.cpp
+CPEditorPanel.cpp
+CPFineTuneFrame.cpp
+CPImageCtrl.cpp
+CPListFrame.cpp
+huginApp.cpp
+../base_wx/ImageCache.cpp
+ImagesList.cpp
+ImagesPanel.cpp
+LensPanel.cpp
+MainFrame.cpp
+../base_wx/MyExternalCmdExecDialog.cpp
+../base_wx/MyProgressDialog.cpp
+NonaStitcherPanel.cpp
+OptimizePanel.cpp
+PanoDruid.cpp
+PanoPanel.cpp
+../base_wx/Plot2D.cpp
+PreferencesDialog.cpp
+PreviewFrame.cpp
+PreviewPanel.cpp
+PTStitcherPanel.cpp
+RunStitcherFrame.cpp
+LocalizedFileTipProvider.cpp
+VigCorrDialog.cpp
+wxPanoCommand.cpp
+../base_wx/MyProgressDialog.h
+wxPanoCommand.h
 
 # XRC resource files
-src/hugin/xrc/assistant_panel.xrs
-src/hugin/xrc/about.xrs
-src/hugin/xrc/anchor_orientation.xrs
-src/hugin/xrc/cp_editor_panel.xrs
-src/hugin/xrc/cp_list_frame.xrs
-src/hugin/xrc/crop_panel.xrs
-src/hugin/xrc/edit_script_dialog.xrs
-src/hugin/xrc/edit_text.xrs
-src/hugin/xrc/help.xrs
-src/hugin/xrc/images_panel.xrs
-src/hugin/xrc/keyboard_help.xrs
-src/hugin/xrc/lens_panel.xrs
-src/hugin/xrc/main_frame.xrs
-src/hugin/xrc/main_menubar.xrs
-src/hugin/xrc/main_menu.xrs
-src/hugin/xrc/main_tool.xrs
-src/hugin/xrc/nona_panel.xrs
-src/hugin/xrc/optimize_panel.xrs
-src/hugin/xrc/pano_panel.xrs
-src/hugin/xrc/pref_dialog.xrs
-src/hugin/xrc/preview_frame.xrs
-src/hugin/xrc/ptstitcher_panel.xrs
-src/hugin/xrc/run_optimizer_frame.xrs
-src/hugin/xrc/run_stitcher_frame.xrs
-src/hugin/xrc/vig_corr_dlg.xrs
+xrc/assistant_panel.xrs
+xrc/about.xrs
+xrc/anchor_orientation.xrs
+xrc/cp_editor_panel.xrs
+xrc/cp_list_frame.xrs
+xrc/crop_panel.xrs
+xrc/edit_script_dialog.xrs
+xrc/edit_text.xrs
+xrc/help.xrs
+xrc/images_panel.xrs
+xrc/keyboard_help.xrs
+xrc/lens_panel.xrs
+xrc/main_frame.xrs
+xrc/main_menubar.xrs
+xrc/main_menu.xrs
+xrc/main_tool.xrs
+xrc/nona_panel.xrs
+xrc/optimize_panel.xrs
+xrc/pano_panel.xrs
+xrc/pref_dialog.xrs
+xrc/preview_frame.xrs
+xrc/ptstitcher_panel.xrs
+xrc/run_optimizer_frame.xrs
+xrc/run_stitcher_frame.xrs
+xrc/vig_corr_dlg.xrs
 
 # tip of the day
-src/hugin/xrc/data/tips.txt
+xrc/data/tips.txt
 

Modified: hugin/trunk/src/hugin1/hugin/po/it.po
===================================================================
--- hugin/trunk/src/hugin1/hugin/po/it.po	2007-11-28 20:42:56 UTC (rev 2543)
+++ hugin/trunk/src/hugin1/hugin/po/it.po	2007-11-28 21:04:29 UTC (rev 2544)
@@ -2,62 +2,84 @@
 # Copyright (C) 2004 Pablo dAngelo
 # This file is distributed under the same license as the hugin package.
 # Luca Vascon <crimsonkingit@...>, 2005.
+# Milo Casagrande <milo_casagrande@...>, 2007
 #
+# stitch -> propriamente sarebbe cucire, ma indica l'azione di unire le immagini,
+# visto che viene anche usato blend all'interno del file per questo ho messo 'assemblare'
+#
+# fine-tune -> regolazione precisa
+#
+# yaw -> imbardata
+# pitch -> inclinazione
+# roll -> rollio
+#
+# Ho eliminato volutamente quei riferimenti tipo (a) o cose così...
+# Ce ne sono molti e a mio parere non servono a molto: in alcuni casi indicano una colonna di una tabella
+# e sono riportati anche nell'opzione che li modifica, ma modificando l'opzione si modifica anche la cella
+# quindi si capisce lo stesso...
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: hugin 0.4\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
 "POT-Creation-Date: 2007-07-17 21:08+0200\n"
-"PO-Revision-Date: 2005-08-05 21:43+0100\n"
-"Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
+"PO-Revision-Date: 2007-11-15 22:39+0100\n"
+"Last-Translator: Milo Casagrande <milo_casagrande@..."
 "Language-Team: Italian <tp@..."
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/hugin/AssistantPanel.cpp:229
 msgid "Please load images by pressing on the Load images button."
-msgstr ""
+msgstr "Caricare immagini premendo il pulsante «Carica immagini»."
 
 #: src/hugin/AssistantPanel.cpp:259
 #, c-format
 msgid "%d images loaded."
-msgstr ""
+msgstr "%d immagini caricate."
 
 #: src/hugin/AssistantPanel.cpp:293
-#, fuzzy, c-format
+#, c-format
 msgid "Images are connected by %d control points.\n"
-msgstr "Eliminare veramente %d punti di controllo?"
+msgstr "Le immagini sono collegate da %d punti di controllo.\n"
 
 #: src/hugin/AssistantPanel.cpp:302
 #, c-format
 msgid "%d unconnected image groups found: "
-msgstr ""
+msgstr "Trovati %d gruppi non connessi: "
 
 #: src/hugin/AssistantPanel.cpp:303
 msgid ""
 "Please use the Control Points tab to connect all images with control "
 "points.\n"
 msgstr ""
+"Usare la scheda Punti di controllo per collegare tutte le immagini "
+"attraverso i punti di controllo.\n"
 
 #: src/hugin/AssistantPanel.cpp:306
 msgid "Images or control points have changed, new alignment is needed."
 msgstr ""
+"Le immagini o i punti di controllo sono cambiati, è necessario un nuovo "
+"allineamento."
 
 #: src/hugin/AssistantPanel.cpp:317
 msgid "Very good fit."
-msgstr ""
+msgstr "Adattamento ottimo."
 
 #: src/hugin/AssistantPanel.cpp:319
 msgid "Good fit."
-msgstr ""
+msgstr "Adattamento buono."
 
 #: src/hugin/AssistantPanel.cpp:321
 msgid ""
 "Bad fit, some control points might be bad, or there are parallax and "
 "movement errors"
 msgstr ""
+"Adattamento sufficiente, alcuni punti di controllo potrebbero essere errati "
+"o sono presenti errori di parallasse e di movimento"
 
 #: src/hugin/AssistantPanel.cpp:323
 msgid ""
@@ -65,36 +87,39 @@
 "parallax or movement. The optimizer might have failed. Manual intervention "
 "required."
 msgstr ""
+"Adattamento insufficiente. Controllare i punti di controllo errati, i "
+"parametri della lente o immagini con parallasse o movimento. L'ottimizzatore "
+"potrebbe aver fallito, è necessario un intervento manuale."
 
 #: src/hugin/AssistantPanel.cpp:325
 #, c-format
 msgid "Mean error after optimization: %.1f pixel, max: %.1f\n"
-msgstr ""
+msgstr "Errore medio dopo l'ottimizzazione: %.1f pixel, massimo: %.1f\n"
 
 #: src/hugin/AssistantPanel.cpp:362
 msgid ""
 "At least two images are required.\n"
 "Please add more images."
 msgstr ""
+"Sono richieste almeno due immagini.\n"
+"Caricare altre immagini."
 
 #: src/hugin/AssistantPanel.cpp:362 src/hugin/AssistantPanel.cpp:522
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
 #: src/hugin/AssistantPanel.cpp:382
-#, fuzzy
 msgid "Aligning images"
-msgstr "Immagine scalata %s"
+msgstr "Allineamento immagini"
 
 #: src/hugin/AssistantPanel.cpp:382
-#, fuzzy
 msgid "Finding corresponding points"
-msgstr "Nessuna corrispondenza trovata"
+msgstr "Ricerca punti corrispondenti"
 
 #: src/hugin/AssistantPanel.cpp:407
 #, c-format
 msgid "Warning %d unconnected image groups found:"
-msgstr ""
+msgstr "Attenzione, trovati %d gruppi non collegati:"
 
 #: src/hugin/AssistantPanel.cpp:408
 msgid ""
@@ -103,20 +128,22 @@
 "\n"
 "After adding the points, press the \"Align\" button again"
 msgstr ""
+"Creare dei punti di controllo tra le immagini non collegate utilizzando la "
+"scheda Punti di controllo.\n"
+"\n"
+"Fatto questo, premere nuovamente il pulsante «Allinea»"
 
 #: src/hugin/AssistantPanel.cpp:522
-#, fuzzy
 msgid "Error: could not load all images"
-msgstr "Caricamento dll fallito"
+msgstr "Errore: impossibile caricare tutte le immagini"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:103
 msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
-msgstr ""
-"Autopano (a partire dalla versione  1.03), da http://autopano.kolor.com"
+msgstr "Autopano (versione 1.03 o superiore), http://autopano.kolor.com"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:104
 msgid "Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
-msgstr "Autopano-Sift, da: http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
+msgstr "Autopano-Sift, http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:106
 msgid "Choose which autopano program should be used\n"
@@ -128,15 +155,15 @@
 
 #: src/hugin/AutoCtrlPointCreator.cpp:119
 msgid "Autopano from http://autopano.kolor.com is not available for OSX"
-msgstr ""
+msgstr "Autopano non è disponibile per OSX"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:120
 msgid "Would you like to use Autopano-Sift instead?"
-msgstr ""
+msgstr "Utilizzare Autopano-Sift?"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:157
 msgid "Select autopano program / frontend script"
-msgstr "Scegliere il programma Autopano / script"
+msgstr "Scegliere il programma / script frontend di autopano"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:159
 #: src/hugin/AutoCtrlPointCreator.cpp:345 src/hugin/PreferencesDialog.cpp:257
@@ -149,38 +176,37 @@
 #: src/hugin/AutoCtrlPointCreator.cpp:201
 #: src/hugin/AutoCtrlPointCreator.cpp:351
 msgid "No autopano selected"
-msgstr "Non e' stata selezionata una versione di Autopano"
+msgstr "Non è stata selezionata una versione di autopano"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:188
 msgid "Autopano-SIFT is not installed."
-msgstr ""
+msgstr "Autopano-SIFT non è installato."
 
 #: src/hugin/AutoCtrlPointCreator.cpp:193
 msgid "Select autopano frontend script"
-msgstr "Selezionare uno script per autopano-sift"
+msgstr "Selezionare uno script frontend per autopano"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:195
 msgid "Shell Scripts (*.sh)|*.sh"
-msgstr ""
+msgstr "Script shell (*.sh)|*.sh"
 
+# (ndt) non ho idea di che dicitura sia '%namefile'...
 #: src/hugin/AutoCtrlPointCreator.cpp:239
 #, c-format
 msgid "Please use either %namefile or %i in the autopano-sift command line."
-msgstr ""
-"Per favore, usare %namefile o %i nella linea di comando di autopano-sift."
+msgstr "Usare o %namefile o %i alla riga di comando di autopano-sift."
 
 #: src/hugin/AutoCtrlPointCreator.cpp:240
 #: src/hugin/AutoCtrlPointCreator.cpp:245
 msgid "Error in Autopano command"
-msgstr "Erore di comando in Autopano"
+msgstr "Errore nel comando di Autopano"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:244
 #, c-format
 msgid ""
 "Please use  %namefile or %i to specify the input files for autopano-sift"
 msgstr ""
-"Per favore, usare %namefile o %i per specificare i files da usare in "
-"autopano-sift."
+"Usare %namefile o %i per specificare i file di input per autopano-sift."
 
 #: src/hugin/AutoCtrlPointCreator.cpp:283
 #: src/hugin/AutoCtrlPointCreator.cpp:389
@@ -190,10 +216,10 @@
 "Please select less images, or place the images in a folder with\n"
 "a shorter pathname"
 msgstr ""
-"La linea di comando per Autopano e' troppo lunga.\n"
-"E' un limite di Windows.\n"
-"Usare meno immagini, un nome piu' breve per l'immagine\n"
-"finale, un percorso path piu' corto nell'HD."
+"Riga di comando di Autopano troppo lunga.\n"
+"È una limitazione di Windows.\n"
+"Usare meno immagini o posizionare le immagini in una cartella\n"
+"con un percorso più corto"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:284
 #: src/hugin/AutoCtrlPointCreator.cpp:390 src/hugin/NonaStitcherPanel.cpp:434
@@ -206,7 +232,7 @@
 #: src/hugin/MyExternalCmdExecDialog.cpp:100
 #: src/hugin/NonaStitcherPanel.cpp:446 src/hugin/PanoPanel.cpp:724
 msgid "Could not execute command: "
-msgstr "Comando non eseguito:"
+msgstr "Impossibile eseguire il comando:"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:299
 #: src/hugin/AutoCtrlPointCreator.cpp:304
@@ -218,7 +244,7 @@
 #: src/hugin/AutoCtrlPointCreator.cpp:302
 #: src/hugin/AutoCtrlPointCreator.cpp:406 src/hugin/NonaStitcherPanel.cpp:449
 msgid "command: "
-msgstr "command:"
+msgstr "Comando: "
 
 #: src/hugin/AutoCtrlPointCreator.cpp:303
 #: src/hugin/AutoCtrlPointCreator.cpp:407 src/hugin/NonaStitcherPanel.cpp:450
@@ -227,12 +253,12 @@
 "failed with error code: "
 msgstr ""
 "\n"
-"fallito, codice errore:"
+"Fallito con codice di errore:"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:310
 #: src/hugin/AutoCtrlPointCreator.cpp:415
 msgid "Could not open "
-msgstr "Apertura fallita"
+msgstr "Impossibile aprire "
 
 #: src/hugin/AutoCtrlPointCreator.cpp:310
 #: src/hugin/AutoCtrlPointCreator.cpp:415
@@ -243,20 +269,20 @@
 "\n"
 "Autopano command: "
 msgstr ""
-"per lettura\n"
-"Questo indica che Autopano e' schiattato,\n"
-"oppure che hai sbagliato qualcosa \n"
-"nel dargli la linea di comando."
+" in lettura\n"
+"Questo indica che la chiamata ad autopano è fallita\n"
+"oppure sono stati usati parametri per la riga di comando errati.\n"
+"\n"
+"Comando Autopano:"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:311
 #: src/hugin/AutoCtrlPointCreator.cpp:418
 msgid "autopano failure"
-msgstr "autopano in palla."
+msgstr "Fallimento di autopano"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:343
-#, fuzzy
 msgid "Select autopano program"
-msgstr "Selezionare il tipo di autopano"
+msgstr "Selezionare il programma autopano"
 
 #: src/hugin/AutoCtrlPointCreator.cpp:416
 msgid ""
@@ -264,15 +290,15 @@
 " current directory:"
 msgstr ""
 "\n"
-"directory corrente:"
+"Directory attuale:"
 
 #: src/hugin/CommandHistory.cpp:94
 msgid "no command in undo history"
-msgstr "nessun comando da annullare"
+msgstr "Nessun comando da annullare"
 
 #: src/hugin/CommandHistory.cpp:106
 msgid "no command in redo history"
-msgstr "Non ci sono comandi da ripristinare"
+msgstr "Nessun comando da ripetere"
 
 #: src/hugin/CPEditorPanel.cpp:169 src/hugin/CPListFrame.cpp:282
 #: src/hugin/CPListFrame.cpp:292 src/hugin/ImagesList.cpp:58
@@ -281,19 +307,19 @@
 
 #: src/hugin/CPEditorPanel.cpp:170
 msgid "left x"
-msgstr "sinistra x"
+msgstr "x sinistra"
 
 #: src/hugin/CPEditorPanel.cpp:171
 msgid "left y"
-msgstr "sinistra y"
+msgstr "y sinistra"
 
 #: src/hugin/CPEditorPanel.cpp:172
 msgid "right x"
-msgstr "destra x"
+msgstr "x destra"
 
 #: src/hugin/CPEditorPanel.cpp:173
 msgid "right y"
-msgstr "destra y"
+msgstr "y destra"
 
 #: src/hugin/CPEditorPanel.cpp:174 src/hugin/CPListFrame.cpp:289
 #: src/hugin/CPListFrame.cpp:295
@@ -307,11 +333,11 @@
 
 #: src/hugin/CPEditorPanel.cpp:562
 msgid "No corresponding point found"
-msgstr "Nessuna corrispondenza trovata"
+msgstr "Nessuna punto corrispondente trovato"
 
 #: src/hugin/CPEditorPanel.cpp:649
 msgid "new control point added"
-msgstr "nessun punto di controllo aggiunto."
+msgstr "Aggiunto punto di controllo"
 
 #: src/hugin/CPEditorPanel.cpp:751 src/hugin/CPEditorPanel.cpp:975
 msgid "searching similar point..."
@@ -319,7 +345,7 @@
 
 #: src/hugin/CPEditorPanel.cpp:770 src/hugin/CPEditorPanel.cpp:893
 msgid "Error during Fine-tune"
-msgstr "Errore  durante la calibrazione"
+msgstr "Errore durante la regolazione precisa"
 
 #: src/hugin/CPEditorPanel.cpp:784 src/hugin/CPEditorPanel.cpp:913
 #: src/hugin/CPEditorPanel.cpp:1049
@@ -328,16 +354,18 @@
 "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
 "%0.3f %0.3f "
 msgstr ""
-"Punto calibrato, angolo: %.0f grad, coefficente correlazionet: %0.3f, "
+"Punto calibrato, angolo: %.0f gradi, coefficiente correlazione: %0.3f, "
 "curvatura: %0.3f %0.3f "
 
 #: src/hugin/CPEditorPanel.cpp:787 src/hugin/CPEditorPanel.cpp:916
 msgid "change points, or press right mouse button to add the pair"
-msgstr "Cambiare i punti, o premere tasto DX per aggiungere la coppia"
+msgstr ""
+"Modificare i punti o premere il pulsante destro del mouse per aggiungere la "
+"coppia"
 
 #: src/hugin/CPEditorPanel.cpp:807
 msgid "Estimated point outside image"
-msgstr "Punto stimato fuori dall'immagine"
+msgstr "Punto stimato al di fuori dell'immagine"
 
 #: src/hugin/CPEditorPanel.cpp:1055
 #, c-format
@@ -347,23 +375,22 @@
 "peak curvature: (%.3f, %.3f) ( should be > %.3f)"
 msgstr ""
 "Nessun punto simile trovato.\n"
-"Coeff. correlazione: %.3f (dovrebbe essere > %.3f)\n"
-"Curvatura picco: (%.3f, %.3f) ( dovrebbe essere > %.3f)"
+"Coefficiente correlazione: %.3f (dovrebbe essere > %.3f)\n"
+"Curvatura picco: (%.3f, %.3f)  (dovrebbe essere > %.3f)"
 
 #: src/hugin/CPEditorPanel.cpp:1057
 msgid "No similar point found"
 msgstr "Nessun punto simile trovato"
 
 #: src/hugin/CPEditorPanel.cpp:1209 src/hugin/CPEditorPanel.cpp:1220
-#, fuzzy
 msgid "Add new Line"
-msgstr "Aggiungi Punto"
+msgstr "Aggiungi nuova riga"
 
 #: src/hugin/CPEditorPanel.cpp:1215 src/hugin/CPEditorPanel.cpp:1218
 #: src/hugin/CPEditorPanel.cpp:1496 src/hugin/CPListFrame.cpp:406
 #, c-format
 msgid "Line %d"
-msgstr ""
+msgstr "Riga %d"
 
 #: src/hugin/CPEditorPanel.cpp:1487 src/hugin/CPListFrame.cpp:397
 #: src/hugin/PreviewFrame.cpp:240 src/hugin/xrc/cp_editor_panel.xrs:8
@@ -372,7 +399,7 @@
 
 #: src/hugin/CPEditorPanel.cpp:1490 src/hugin/CPListFrame.cpp:400
 msgid "vert. Line"
-msgstr "linea vert."
+msgstr "Linea vert."
 
 #: src/hugin/CPEditorPanel.cpp:1493 src/hugin/CPListFrame.cpp:403
 msgid "horiz. Line"
@@ -380,7 +407,8 @@
 
 #: src/hugin/CPEditorPanel.cpp:1795
 msgid "Cannot estimate image position without control points"
-msgstr "Senza punti di controllo non posso posizionare le immagini "
+msgstr ""
+"Impossibile stimare la posizione dell'immagine senza punti di controllo"
 
 #: src/hugin/CPEditorPanel.cpp:1816
 msgid ""
@@ -388,52 +416,51 @@
 "To create less points,\n"
 "enter a higher number."
 msgstr ""
+"Creare punti di controllo.\n"
+"Per creare meno punti,\n"
+"inserire un numero maggiore."
 
 #: src/hugin/CPEditorPanel.cpp:1816
-#, fuzzy
 msgid "Corner Detection threshold"
-msgstr "Soglia di correlazione"
+msgstr "Soglia rilevamento angoli"
 
 #: src/hugin/CPEditorPanel.cpp:1816 src/hugin/CPEditorPanel.cpp:1820
 #: src/hugin/xrc/images_panel.xrs:23
-#, fuzzy
 msgid "Create control points"
 msgstr "Crea punti di controllo"
 
 #: src/hugin/CPEditorPanel.cpp:1820
-#, fuzzy
 msgid "Corner Detection scale"
 msgstr "Insieme immagini"
 
 #: src/hugin/CPEditorPanel.cpp:1832
-#, fuzzy
 msgid "Error during control point creation:\n"
-msgstr "Errore durante lo Stitching"
+msgstr "Errore durante la creazione dei punti di controllo:\n"
 
 #: src/hugin/CPEditorPanel.cpp:1963
 msgid "Select Point in right image"
-msgstr "Scelglere punto in immagine dx"
+msgstr "Scegliere punto in immagine destra"
 
 #: src/hugin/CPEditorPanel.cpp:1975
 msgid "Select Point in left image"
-msgstr "Scelglere punto in immagine sx"
+msgstr "Scegliere punto in immagine sinistra"
 
 #: src/hugin/CPFineTuneFrame.cpp:38
 msgid "Control point finetune"
-msgstr "Calibrazione punti di controllo"
+msgstr "Regolazione precisa punti di controllo"
 
 #: src/hugin/CPImageCtrl.cpp:332
-#, fuzzy
 msgid "new"
 msgstr "Nuovo"
 
+# (ndt) non mi viene di meglio
 #: src/hugin/CPImageCtrl.cpp:1143
 msgid "Could not process event!"
-msgstr "Could not process event!"
+msgstr "Impossibile controllare l'evento."
 
 #: src/hugin/CPListFrame.cpp:283 src/hugin/CPListFrame.cpp:293
 msgid "left Img."
-msgstr "Imm. SX"
+msgstr "Imm. sinistra"
 
 #: src/hugin/CPListFrame.cpp:284 src/hugin/CPListFrame.cpp:287
 #: src/hugin/xrc/assistant_panel.xrs:14 src/hugin/xrc/assistant_panel.xrs:37
@@ -446,7 +473,7 @@
 
 #: src/hugin/CPListFrame.cpp:286 src/hugin/CPListFrame.cpp:294
 msgid "right Img."
-msgstr "Imm DX"
+msgstr "Imm. destra"
 
 #: src/hugin/CPListFrame.cpp:604 src/hugin/CPListFrame.cpp:613
 msgid ""
@@ -462,18 +489,18 @@
 
 #: src/hugin/CPListFrame.cpp:612
 msgid "Error: please enter a valid number."
-msgstr "Errore: Inserire un numero valido"
+msgstr "Errore: inserire un numero valido."
 
 #: src/hugin/CPListFrame.cpp:612
 msgid "Could not read number"
-msgstr "Numero non leggibile"
+msgstr "Impossibile leggere il numero"
 
 #: src/hugin/huginApp.cpp:50 src/hugin/ImagesPanel.cpp:315
 #: src/hugin/ImagesPanel.cpp:336 src/hugin/ImagesPanel.cpp:356
 #: src/hugin/PanoPanel.cpp:301 src/hugin/PanoPanel.cpp:332
 #: src/hugin/PreviewFrame.cpp:748 src/hugin/PreviewFrame.cpp:764
 msgid "Value must be numeric."
-msgstr "Il valore deve essere numerico"
+msgstr "Il valore deve essere numerico."
 
 #: src/hugin/ImageCache.cpp:535
 #, c-format
@@ -481,28 +508,28 @@
 msgstr "Caricamento immagine %s"
 
 #: src/hugin/ImageCache.cpp:679
-#, fuzzy, c-format
+#, c-format
 msgid "Error during image reading: %s"
-msgstr "Errore durante lo Stitching"
+msgstr "Errore nel leggere l'immagine: %s"
 
 #: src/hugin/ImageCache.cpp:687
 msgid "Cannot load image: "
-msgstr "Immagine non caricata:"
+msgstr "Impossibile caricare immagine: "
 
 #: src/hugin/ImageCache.cpp:715
 #, c-format
 msgid "Scaling image %s"
-msgstr "Immagine scalata %s"
+msgstr "Riduzione immagine %s"
 
 #: src/hugin/ImageCache.cpp:816
 #, c-format
 msgid "Creating grayscale %s"
-msgstr "Costruzione scala di grigi %s"
+msgstr "Creazione scala di grigi %s"
 
 #: src/hugin/ImageCache.cpp:834
 #, c-format
 msgid "Creating pyramid image for %s, level %d"
-msgstr "Creating pyramid image for %s, level %d"
+msgstr "Creazione immagine piramide per %s, livello %d"
 
 #: src/hugin/ImagesList.cpp:307 src/hugin/ImagesList.cpp:366
 msgid "Filename"
@@ -510,7 +537,7 @@
 
 #: src/hugin/ImagesList.cpp:308
 msgid "width"
-msgstr "largh."
+msgstr "larghezza"
 
 #: src/hugin/ImagesList.cpp:309
 msgid "height"
@@ -518,35 +545,35 @@
 
 #: src/hugin/ImagesList.cpp:310
 msgid "yaw (y)"
-msgstr "yaw (y)"
+msgstr "Imbardata"
 
 #: src/hugin/ImagesList.cpp:311
 msgid "pitch (p)"
-msgstr "pitch (p)"
+msgstr "Inclinazione"
 
 #: src/hugin/ImagesList.cpp:312
 msgid "roll (r)"
-msgstr "roll (r)"
+msgstr "Rollio"
 
 #: src/hugin/ImagesList.cpp:313
 msgid "Anchor"
-msgstr "Rif."
+msgstr "Ancora"
 
 #: src/hugin/ImagesList.cpp:314
 msgid "# Ctrl Pnts"
-msgstr "# Pnti Ctrl"
+msgstr "# Punti di controllo"
 
 #: src/hugin/ImagesList.cpp:367
 msgid "Lens no."
-msgstr "Obiett. no."
+msgstr "Obiettivo n°"
 
 #: src/hugin/ImagesList.cpp:368
 msgid "Lens type (f)"
-msgstr "Tipo obiett (f)"
+msgstr "Tipo obiettivo"
 
 #: src/hugin/ImagesList.cpp:369
 msgid "hfov (v)"
-msgstr "hfov (v)"
+msgstr "HFOV"
 
 #: src/hugin/ImagesList.cpp:370
 msgid "a"
@@ -579,7 +606,7 @@
 #: src/hugin/ImagesList.cpp:399 src/hugin/xrc/assistant_panel.xrs:6
 #: src/hugin/xrc/assistant_panel.xrs:25 src/hugin/xrc/lens_panel.xrs:14
 msgid "Normal (rectilinear)"
-msgstr "Normale (rettilineare)"
+msgstr "Normale (rettilinea)"
 
 #: src/hugin/ImagesList.cpp:400 src/hugin/xrc/assistant_panel.xrs:7
 #: src/hugin/xrc/assistant_panel.xrs:26 src/hugin/xrc/lens_panel.xrs:15
@@ -589,12 +616,12 @@
 #: src/hugin/ImagesList.cpp:401 src/hugin/xrc/assistant_panel.xrs:8
 #: src/hugin/xrc/assistant_panel.xrs:27 src/hugin/xrc/lens_panel.xrs:16
 msgid "Circular fisheye"
-msgstr "Fisheye circolare"
+msgstr "Grandangolo circolare"
 
 #: src/hugin/ImagesList.cpp:402 src/hugin/xrc/assistant_panel.xrs:9
 #: src/hugin/xrc/assistant_panel.xrs:28 src/hugin/xrc/lens_panel.xrs:17
 msgid "Full frame fisheye"
-msgstr "Fisheye full-frame"
+msgstr "Grandangolo full-frame"
 
 #: src/hugin/ImagesList.cpp:403 src/hugin/PreviewFrame.cpp:616
 #: src/hugin/xrc/assistant_panel.xrs:10 src/hugin/xrc/assistant_panel.xrs:29
@@ -605,7 +632,7 @@
 #: src/hugin/ImagesList.cpp:421 src/hugin/xrc/images_panel.xrs:31
 #: src/hugin/xrc/main_frame.xrs:5
 msgid "Crop"
-msgstr ""
+msgstr "Ritaglio"
 
 #: src/hugin/ImagesPanel.cpp:294
 #, c-format
@@ -623,25 +650,25 @@
 
 #: src/hugin/ImagesPanel.cpp:686
 msgid "Delete Control Points"
-msgstr "Eliminare Punti di Controllo"
+msgstr "Elimina punti di controllo"
 
 #: src/hugin/LensPanel.cpp:827
 msgid "Not a jpeg file:"
-msgstr "Non e' un jpeg valido"
+msgstr "Non è un file jpeg:"
 
 #: src/hugin/LensPanel.cpp:831 src/hugin/LensPanel.cpp:935
 #: src/hugin/LensPanel.cpp:968 src/hugin/LensPanel.cpp:1083
 #: src/hugin/LensPanel.cpp:1101
 msgid "Please select an image and try again"
-msgstr "Selezionare un'immagine prima di eseguire il comando"
+msgstr "Selezionare un'immagine e riprovare"
 
 #: src/hugin/LensPanel.cpp:849
 msgid "Save lens parameters file"
-msgstr "Salva un file i parametri dell'obiettivo"
+msgstr "Salva file parametri obiettivo"
 
 #: src/hugin/LensPanel.cpp:851
 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
-msgstr "File parametri obiettivo (*.ini)|*.ini|Tutti i files (*)|*"
+msgstr "File progetto obiettivo (*.ini)|*.ini|Tutti i file (*)|*"
 
 #: src/hugin/LensPanel.cpp:977
 msgid "Load lens parameters"
@@ -649,18 +676,20 @@
 
 #: src/hugin/LensPanel.cpp:979
 msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
-msgstr "File parametri obiettivo (*.ini)|*.ini|Tutti i files (*.*)|*.*"
+msgstr "File progetto obiettivo (*.ini)|*.ini|Tutti i file (*.*)|*.*"
 
 #: src/hugin/LensPanel.cpp:997
 msgid ""
 "Incompatible lens parameter file, image sizes do not match\n"
 "Apply settings anyway?"
 msgstr ""
+"File parametro obiettivo non compatibile, dimensioni immagine non "
+"corrispondenti\n"
+"Applicare le impostazioni?"
 
 #: src/hugin/LensPanel.cpp:997
-#, fuzzy
 msgid "Error loading lens parameters"
-msgstr "Carica parametri obiettivo"
+msgstr "Errore nel caricare i parametri dell'obiettivo"
 
 #: src/hugin/LensPanel.cpp:1091
 msgid "Enter new lens number"
@@ -672,7 +701,7 @@
 
 #: src/hugin/LensPanel.cpp:1092
 msgid "Change lens number"
-msgstr "Cambia numetro obiettivo"
+msgstr "Cambia numero obiettivo"
 
 #: src/hugin/MainFrame.cpp:225
 msgid ""
@@ -681,25 +710,25 @@
 "Please ensure it is placed in the same directory as hugin.exe"
 msgstr ""
 "Errore di installazione fatale\n"
-"Non trovata la directory xrc.\n"
+"Impossibile trovare la directory xrc.\n"
 "Assicurarsi che sia nella stessa directory di hugin.exe"
 
 #: src/hugin/MainFrame.cpp:245 src/hugin/xrc/main_menubar.xrs:4
 #: src/hugin/xrc/main_menu.xrs:33 src/hugin/xrc/main_menu.xrs:36
 msgid "&Help"
-msgstr "&Aiuto"
+msgstr "A&iuto"
 
 #: src/hugin/MainFrame.cpp:347
 msgid "Started"
-msgstr "Partenza"
+msgstr "Inizio"
 
 #: src/hugin/MainFrame.cpp:473
 msgid ""
 "The panorama has been changed\n"
 "Save changes?"
 msgstr ""
-"Il panorama e' stato modificato\n"
-"Salvare i cambiamenti?"
+"Il panorama è stato modificato\n"
+"Salvare le modifiche?"
 
 #: src/hugin/MainFrame.cpp:473
 msgid "Save Panorama?"
@@ -707,12 +736,12 @@
 
 #: src/hugin/MainFrame.cpp:506
 msgid "forced close"
-msgstr "chiusura forzata"
+msgstr "Chiusura forzata"
 
 #: src/hugin/MainFrame.cpp:559
 #, c-format
 msgid "saved project %s"
-msgstr "Salva progetto %s"
+msgstr "Progetto %s salvato"
 
 #: src/hugin/MainFrame.cpp:572
 msgid "Save project file"
@@ -720,7 +749,7 @@
 
 #: src/hugin/MainFrame.cpp:574
 msgid "Project files (*.pto)|*.pto|All files (*)|*"
-msgstr "files di progetto (*.pto)|*.pto|All files (*)|*"
+msgstr "File progetto (*.pto)|*.pto|Tutti i file (*)|*"
 
 #: src/hugin/MainFrame.cpp:595
 msgid "Save PTStitcher script file"
@@ -728,11 +757,11 @@
 
 #: src/hugin/MainFrame.cpp:597
 msgid "PTStitcher files (*.txt)|*.txt"
-msgstr "Files di PTStitcher (*.txt)|*.txt"
+msgstr "File di PTStitcher (*.txt)|*.txt"
 
 #: src/hugin/MainFrame.cpp:626
 msgid "Open project:   "
-msgstr "Apri progetto:"
+msgstr "Apri progetto:   "
 
 #: src/hugin/MainFrame.cpp:638
 msgid "Project opened"
@@ -740,7 +769,7 @@
 
 #: src/hugin/MainFrame.cpp:648
 msgid "Error opening project:   "
-msgstr "Errore nell'aprire il progetto"
+msgstr "Errore nell'aprire il progetto:  "
 
 #: src/hugin/MainFrame.cpp:680
 msgid "Open project file"
@@ -751,8 +780,8 @@
 "Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
 "(*)|*"
 msgstr ""
-"Files progetto (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
-"(*)|*"
+"File progetto (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|Tutti i "
+"file (*)|*"
 
 #: src/hugin/MainFrame.cpp:696
 msgid "Open project: cancel"
@@ -765,6 +794,9 @@
 "BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg)|*."
 "jpg;*.JPG;*.jpeg;*.JPEG|All files (*)|*"
 msgstr ""
+"Tutti file immagini|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;"
+"*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|File JPEG (*.jpg,*.jpeg)|*."
+"jpg;*.JPG;*.jpeg;*.JPEG|Tutti i file (*)|*"
 
 #: src/hugin/MainFrame.cpp:725 src/hugin/wxPanoCommand.cpp:304
 #: src/hugin/wxPanoCommand.cpp:370
@@ -777,18 +809,18 @@
 
 #: src/hugin/MainFrame.cpp:1125
 msgid "Choose template project"
-msgstr ""
+msgstr "Scelta modello progetto"
 
 #: src/hugin/MainFrame.cpp:1177
 msgid "Fine-tuning all points"
-msgstr "Ricalibra tutti i punti "
+msgstr "Regolazione precisa di tutti i punti "
 
 #: src/hugin/MainFrame.cpp:1179
 msgid "Finetuning"
-msgstr "Calibrazione"
+msgstr "Regolazione precisa"
 
 #: src/hugin/MainFrame.cpp:1267
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%d points fine-tuned, %d points not updated due to low correlation\n"
 "\n"
@@ -802,113 +834,113 @@
 "\n"
 "Use the Control Point list (F3) to see all point of the current project\n"
 msgstr ""
-"%d punti calibrati, %d punti non modificati per corrispondenza "
-"insufficiente\n"
+"%d punti regolati precisamente, %d punti non modificati per corrispondenze "
+"insufficienti\n"
 "\n"
-"Hint: The errors of the fine-tuned points have been set to the, correlation "
-"coefficient\n"
-"Problematic point can be spotted (just after fine-tune, before optimizing)\n"
-"by an error <= %.3f.\n"
-"The error of points without a well defined peak (typically in regions with "
-"uniform color)\n"
-"will be set to 0\n"
+"Suggerimento: gli errori dei punti di regolazione precisa sono stati "
+"impostati al coefficiente di correlazione\n"
+"I punti problematici possono essere rilevati (subito dopo la regolazione, "
+"prima dell'ottimizzazione)\n"
+"con un errore <= %.3f.\n"
+"Gli errori dei punti senza un picco ben definito (di solito in regioni con "
+"colori uniformi)\n"
+"saranno impostati a zero\n"
 "\n"
-"Use the Control Point list (F3) to see all point of the current project\n"
+"Usare l'elenco Punto di controllo (F3) per visualizzare tutti i punti del "
+"progetto attuale.\n"
 
 #: src/hugin/MainFrame.cpp:1269
 msgid "Fine-tune result"
-msgstr "Risultato calibrazione"
+msgstr "Risultati regolazione precisa"
 
 #: src/hugin/MyExternalCmdExecDialog.cpp:62 src/hugin/PanoPanel.cpp:724
 msgid "ShellExecuteEx failed"
-msgstr "ShellExecuteEx fallito"
+msgstr "ShellExecuteEx fallita"
 
 #: src/hugin/MyExternalCmdExecDialog.cpp:100
 msgid "CreateProcess Error"
-msgstr "CreateProcess Error"
+msgstr "Errore CreateProcess"
 
 #: src/hugin/MyExternalCmdExecDialog.cpp:115
-#, fuzzy, c-format
+#, c-format
 msgid "Running %s"
-msgstr "Enblend in esecuzione"
+msgstr "Esecuzione di %s"
 
 #: src/hugin/MyExternalCmdExecDialog.cpp:115
-#, fuzzy
 msgid "You can watch the enblend progress in the command window"
 msgstr ""
-"Enblend impiegher\xE0 del tempo a terminare il panorama\n"
-"e' possibile sorvegliare il processo nella finestra di comando"
+"È possibile visualizzare l'avanzamento di enblend nella finestra dei comandi"
 
 #: src/hugin/MyExternalCmdExecDialog.cpp:119
 msgid ""
 "Could not execute enblend, system() failed: \n"
 "Command was :"
 msgstr ""
-"Enblend non eseguito, system() failed: \n"
-"Il comando era :"
+"Impossibile eseguire enblend, system() fallita:\n"
+"Il comando era: "
 
 #: src/hugin/MyExternalCmdExecDialog.cpp:120
 msgid "Error returned was :"
-msgstr "L'errore riportato e' :"
+msgstr "Errore restituito: "
 
 #: src/hugin/MyProgressDialog.cpp:36
 msgid "Elapsed time : "
-msgstr "Tempo trascorso :"
+msgstr "Tempo trascorso: "
 
 #: src/hugin/NonaStitcherPanel.cpp:307
 msgid "Stitching Panorama"
-msgstr "Stitching del Panorama"
+msgstr "Assemblatura panorama"
 
 #: src/hugin/NonaStitcherPanel.cpp:344
 msgid ""
 "Out of memory.\n"
 "Try again with a smaller panorama image size\n"
 msgstr ""
+"Memoria esaurita.\n"
+"Provare con un'immagine panoramica più piccola\n"
 
 #: src/hugin/NonaStitcherPanel.cpp:345 src/hugin/NonaStitcherPanel.cpp:350
-#, fuzzy
 msgid "Error during stitching"
-msgstr "Errore durante lo Stitching"
+msgstr "Errore durante l'assemblatura"
 
 #: src/hugin/NonaStitcherPanel.cpp:365
 msgid "Select enblend.exe"
-msgstr "Seleziona Enblend.exe"
+msgstr "Seleziona enblend.exe"
 
 #: src/hugin/NonaStitcherPanel.cpp:373
 msgid "No enblend.exe selected"
-msgstr "Non hai selezionato il percorso di Enblend.exe"
+msgstr "Nessun enblend.exe selezionato"
 
 #: src/hugin/NonaStitcherPanel.cpp:384
 msgid "Select enblend commandline tool"
-msgstr "Imposta una linea di comando per Enblend"
+msgstr "Imposta uno strumento a riga di comando enblend"
 
 #: src/hugin/NonaStitcherPanel.cpp:392
 msgid "No enblend commandline tool selected"
-msgstr "Non e' stato impostato alcun comando per Enblend"
+msgstr "Nessun strumento a riga di comando enblend selezionato"
 
 #: src/hugin/NonaStitcherPanel.cpp:433
-#, fuzzy
 msgid ""
 "Can not call enblend with a command line > 32766 characters.\n"
 "This is a Windows limitation\n"
 "Please use less images, or place the images in a folder with\n"
 "a shorter pathname"
 msgstr ""
-"La linea di comando per Autopano e' troppo lunga > 2000 caratteri.\n"
-"E' un limite di Windows.\n"
-"Usare meno immagini, un nome piu' breve per l'immagine\n"
-"finale, un percorso path piu' corto nell'HD."
+"Impossibile invocare enblend con una riga di comando maggiore di 32766 "
+"caratteri.\n"
+"È una limitazione di Windows.\n"
+"Usare meno immagini o posizionare le immagini in una cartella\n"
+"con un percorso minore"
 
 #: src/hugin/NonaStitcherPanel.cpp:451
 msgid "enblend error"
-msgstr "errore in Enblend"
+msgstr "Errore di enblend"
 
 #: src/hugin/NonaStitcherPanel.cpp:525 src/hugin/PTStitcherPanel.cpp:310
 msgid "gamma must be a number"
 msgstr "Il valore gamma deve essere numerico"
 
 #: src/hugin/OptimizePanel.cpp:553
-#, fuzzy
 msgid ""
 "Optimizer run finished.\n"
 "WARNING: a very small Field of View (v) has been estimated\n"
@@ -921,15 +953,15 @@
 "\n"
 "Apply the changes anyway?"
 msgstr ""
-"Otttimizzazione completata.\n"
-"ATTENZIONE: e' stato stimato un angolo di campo (v) molto piccolo\n"
+"Ottimizzazione completata.\n"
+"Attenzione: è stato stimato un campo inquadrato molto piccolo\n"
 "\n"
-"I risultati sono probabilmente scorretti.\n"
-"Ottimizzate (v) solo per panorami completi, con piu' punti di controllo.\n"
+"I risultati non sono probabilmente validi.\n"
+"L'ottimizzazione del campo inquadrato di panorami parziali può portare a "
+"risultati non corretti.\n"
+"Provare ad aggiungere più immagini e punti di controllo.\n"
 "\n"
-"The Field of View (v) can sometimes be optimized for partial panoramas as "
-"well,\n"
-"when the images are already aligned well."
+"Applicare le modifiche in ogni caso?"
 
 #: src/hugin/OptimizePanel.cpp:556
 #, c-format
@@ -948,6 +980,19 @@
 "\n"
 "Apply the changes anyway?"
 msgstr ""
+"Ottimizzazione completata.\n"
+"Risultati:\n"
+" distanza media punti di controllo: %f\n"
+" deviazione standard: %f\n"
+" massimo: %f\n"
+"\n"
+"Attenzione: sono stati stimati coefficienti di distorsione molto elevati.\n"
+"I risultati probabilmente non sono validi.\n"
+"Ottimizzare i parametri di distorsione solo quando sono usati punti di "
+"controllo ben distanziati.\n"
+"Reimpostare i parametri a zero e aggiungere ulteriori punti di controllo\n"
+"\n"
+"Applicare le modifiche in ogni caso?"
 
 #: src/hugin/OptimizePanel.cpp:560
 #, c-format
@@ -962,23 +1007,23 @@
 msgstr ""
 "Ottimizzazione completata.\n"
 "Risultati:\n"
-" distanza media tra punti di controllo: %f\n"
+" distanza media punti di controllo: %f\n"
 " deviazione standard: %f\n"
-" distanza massima: %f\n"
+" massimo: %f\n"
 "\n"
-"Applicare i cambiamenti?"
+"Applicare le modifiche in ogni caso?"
 
 #: src/hugin/OptimizePanel.cpp:565
 msgid "Optimisation result"
-msgstr ""
+msgstr "Risultati ottimizzazione"
 
 #: src/hugin/PanoDruid.cpp:43
 msgid "The druid has no advice."
-msgstr "Il Druido scuote la testa."
+msgstr "L'assistente non ha alcun consiglio."
 
 #: src/hugin/PanoDruid.cpp:53 src/hugin/PanoDruid.cpp:423
 msgid "The druid finds no problems with your panorama."
-msgstr "Il druido non ha rilevato problemi nel tuo panorama."
+msgstr "L'assistente non ha rilevato alcun problema nel panorama."
 
 #: src/hugin/PanoDruid.cpp:54 src/hugin/PanoDruid.cpp:424
 msgid ""
@@ -986,12 +1031,12 @@
 "such as the GNU Image Manipulation Program (the GIMP)\n"
 "to add any finishing touches."
 msgstr ""
-"Assembla ora l'immagine panoramica finale, usa poi un editor\n"
-"di immagini come GIMP per fare gli ultimi ritocchi."
+"Assemblare ora l'immagine panoramica finale, usare poi un editor\n"
+"di immagini come GIMP per fare gli ultimi ritocchi.\n"
 
 #: src/hugin/PanoDruid.cpp:63 src/hugin/PanoDruid.cpp:443
 msgid "Warning:  you haven't saved the current project."
-msgstr "Attenzione: il progetto corrente non e' stato salvato."
+msgstr "Attenzione: il progetto attuale non è stato salvato."
 
 #: src/hugin/PanoDruid.cpp:64 src/hugin/PanoDruid.cpp:444
 msgid ""
@@ -999,16 +1044,15 @@
 "don't forget to save your project file so you can\n"
 "experiment or adjust the settings later."
 msgstr ""
-"Quando tutto sembra pronto per lo stitch,\n"
-"non dimenticare di salvare il file di progetto\n"
-"per poter correggere i valori in un secondo tempo."
+"Quando tutto sembra pronto per l'assemblatura,\n"
+"non dimenticarsi di salvare il file del progetto\n"
+"per poter regolare i valori in un secondo tempo."
 
 #: src/hugin/PanoDruid.cpp:73 src/hugin/PanoDruid.cpp:439
 msgid "Warning:  current stitch has huge dimensions."
-msgstr "Attenzione : il file da assemblare ha dimensioni considerevoli."
+msgstr "Attenzione: il file da assemblare ha dimensioni considerevoli."
 
 #: src/hugin/PanoDruid.cpp:74
-#, fuzzy
 msgid ""
 "Very large pixel dimensions are currently entered.\n"
 "Some computers may take an excessively long time\n"
@@ -1018,15 +1062,15 @@
 "pixel dimensions which will give the best quality."
 msgstr ""
 "Le dimensioni in pixel impostate sono molto elevate.\n"
-"Alcuni computer possono impiegere tempi biblici\n"
-"per renderizzare un'immagine cosi' grande.\n"
-"Per un risultato migliore usate il pulsante di calcolo\n"
-"automatico nelle Opzioni Panorama per determinare\n"
-"le dimensioni in pixel che daranno la qualit\xE0 migliore."
+"Alcuni computer potrebbero impiegare molto tempo\n"
+"per rendere un'immagine così grande.\n"
+"Per un risultato migliore usare il pulsante di calcolo\n"
+"automatico nelle opzioni per determinare le dimensioni\n"
+"in pixel che daranno la qualità migliore."
 
 #: src/hugin/PanoDruid.cpp:104 src/hugin/PanoDruid.cpp:435
 msgid "The Horizontal Field of View (HFOV) may be too low."
-msgstr "L' Angolo di campo orizzontale (HFOV) potrebbe essere troppo piccolo"
+msgstr "L'angolo di campo orizzontale (HFOV) potrebbe essere troppo basso."
 
 #: src/hugin/PanoDruid.cpp:105 src/hugin/PanoDruid.cpp:436
 msgid ""
@@ -1037,17 +1081,16 @@
 "5 and 120 degrees per image unless using specialized\n"
 "lenses."
 msgstr ""
-"Controllare che le lunghezze focali e/o hfov di ogni\n"
-"immagine siano corrispondenti.\n"
-"Poi ricalcolare l'angolo di campo visibile.\n"
-"HFOV e' espresso in gradi, di solito tra 5 e 120\n"
-"gradi per immagine, salvo l'uso di ottiche particolari."
+"Controllare che le lunghezze focali e/o HFOV di ogni\n"
+"immagine siano corretti per le impostazioni della fotocamera.\n"
+"Quindi calcolare il campo inquadrato nuovamente.\n"
+"HFOV è misurato in gradi d'arco, di solito tra 5 e 120\n"
+"gradi per immagine, a meno che non siano usate ottiche\n"
+"particolari."
 
 #: src/hugin/PanoDruid.cpp:114
 msgid "Consider adding a vertical or horizontal guide."
-msgstr ""
-"Si consideri se e' il caso di aggiungere dei riferimenti verticali o "
-"orizzontali."
+msgstr "Considerare l'aggiunta di una guida verticale od orizzontale."
 
 #: src/hugin/PanoDruid.cpp:115
 msgid ""
@@ -1056,14 +1099,14 @@
 "appear vertical in the final result.  A horizontal\n"
 "guide can help ensure that a horizon does not bend."
 msgstr ""
-"Aggiungendo riferimenti verticali, l'optimizer assicura\n"
-"la verticalit\xE0 di edifici, alberi ecc. nell'immagine finale\n"
-"Un riferimento orizzontale puo' aiutare a correggere\n"
-"la linea dell'orizzonte."
+"Aggiungendo riferimenti verticali, l'ottimizzatore assicura\n"
+"la verticalità di edifici, alberi o altro nell'immagine finale.\n"
+"Un riferimento orizzontale può aiutare affinché l'orizzonte\n"
+"non risulti inclinato."
 
 #: src/hugin/PanoDruid.cpp:137
 msgid "Run the Optimizer to estimate the image positions."
-msgstr "Ottimizza per stimare il posizionamento delle immagini."
+msgstr "Eseguire l'ottimizzatore per stimare le posizioni dell'immagine."
 
 #: src/hugin/PanoDruid.cpp:138
 msgid ""
@@ -1072,15 +1115,15 @@
 "\n"
 "The optimizer can be invoked in the Optimizer tab.\n"
 msgstr ""
-"L' Optimizer si basa sui punti di contollo per stimare\n"
-"le posizioni delle immagini bel panorama finale\n"
+"L'ottimizzatore si basa sui punti di controllo per stimare\n"
+"le posizioni delle immagini nel panorama finale\n"
 "\n"
-"L'optimizer puo' essere richiamato nel pannello Optimizer.\n"
+"L'ottimizzatore può essere richiamato nella scheda Ottimizzatore.\n"
 
 #: src/hugin/PanoDruid.cpp:165
 msgid "Add more control points to improve the stitch quality."
 msgstr ""
-"Aggiungere piu' punti di controllo per aumentare la qualit\xE0 del risultato."
+"Aggiungere più punti di controllo per aumentare la qualità del risultato."
 
 #: src/hugin/PanoDruid.cpp:166
 msgid ""
@@ -1091,11 +1134,11 @@
 "Per migliorare i risultati ci dovrebbero essere almeno\n"
 "quattro coppie di punti di controllo per ogni coppia\n"
 "di immagini. Un numero maggiore di punti, accuratamente\n"
-"posizionati, migliorer\xE0 la sovrapposizione."
+"posizionati, migliorerà la corrispondenza."
 
 #: src/hugin/PanoDruid.cpp:184
 msgid "At least one image has no control points at all."
-msgstr "Almeno una immagine e' priva di punti di controllo."
+msgstr "Almeno un'immagine è priva di punti di controllo."
 
 #: src/hugin/PanoDruid.cpp:185
 msgid ""
@@ -1105,8 +1148,8 @@
 msgstr ""
 "Per migliorare i risultati ci dovrebbero essere almeno\n"
 "quattro coppie di punti di controllo per ogni coppia\n"
-"di immagini. Un'immagine senza punti di controllo non\n"
-"puo' essere posizionata."
+"di immagini. Un'immagine senza punti di controllo non \n"
+"può essere allineata."
 
 #: src/hugin/PanoDruid.cpp:203
 msgid "Add stitching control points to each pair of images."
@@ -1119,10 +1162,10 @@
 "tab, add pairs of points that correspond to identical\n"
 "visual features in each pair of overlapping images."
 msgstr ""
-"L' Optimizer si basa sui punti di contollo per posizionare\n"
-"ed unire le immagini nel migliore dei modi. Nel pannello\n"
-"dei punti di controllo, si aggiungano coppie di punti che\n"
-"indichino luoghi di sovrapposizione tra immagini contigue."
+"L'ottimizzatore si basa sui punti di controllo per posizionare\n"
+"e unire le immagini nel migliore dei modi. Nella scheda Punti\n"
+"di controllo, aggiungere coppie di punti che corrispondano a\n"
+"caratteristiche identiche per ogni immagini sovrapposta."
 
 #: src/hugin/PanoDruid.cpp:213 src/hugin/PanoDruid.cpp:431
 msgid "Add at least one more image."
@@ -1130,25 +1173,25 @@
 
 #: src/hugin/PanoDruid.cpp:214 src/hugin/PanoDruid.cpp:432
 msgid "You should have at least two files listed in the Images tab."
-msgstr "E' necesario avere almeno due files selezionati nella tab immagini."
+msgstr "È necessario avere almeno due file presenti nella scheda Immagini."
 
 #: src/hugin/PanoDruid.cpp:228 src/hugin/PanoDruid.cpp:427
 msgid "To get started, add some image files."
-msgstr "Per cominciare, aggiungere delle immagini da file."
+msgstr "Per iniziare, aggiungere delle immagini."
 
 #: src/hugin/PanoDruid.cpp:229 src/hugin/PanoDruid.cpp:428
 msgid "You can add any number of images using the Images tab."
 msgstr ""
-"E' possibile aggiungere immagini in qualsiasi numero, usando il pannello "
-"immagini"
+"È possibile aggiungere un numero qualsiasi di immagini utilizzando la scheda "
+"Immagini."
 
 #: src/hugin/PanoDruid.cpp:276
 msgid "the Panorama druid"
-msgstr "il druido Panoramix"
+msgstr "L'assistente panoramico"
 
 #: src/hugin/PanoDruid.cpp:420
 msgid "The druid has no advice at this time."
-msgstr "Il Druido non sa che pesci pigliare, stavolta."
+msgstr "L'assistente non ha alcun consiglio da dare."
 
 #: src/hugin/PanoDruid.cpp:440
 msgid ""
@@ -1160,34 +1203,33 @@
 "pixel dimensions which will give the best quality."
 msgstr ""
 "Le dimensioni in pixel impostate sono molto elevate.\n"
-"Alcuni computer possono impiegere tempi biblici\n"
-"per renderizzare un'immagine cosi' grande.\n"
-"Per un risultato migliore usate il pulsante di calcolo\n"
-"automatico nelle Opzioni Panorama per determinare\n"
-"le dimensioni in pixel che daranno la qualit\xE0 migliore."
+"Alcuni computer potrebbero impiegare molto tempo\n"
+"per rendere un'immagine così grande.\n"
+"Per un risultato migliore usare il pulsante di calcolo\n"
+"automatico nelle opzioni, per determinare le dimensioni\n"
+"in pixel che daranno la qualità migliore."
 
 #: src/hugin/PanoPanel.cpp:307
 #, c-format
 msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf."
-msgstr ""
+msgstr "Valore HFOV non valido. Il valore massimo per questa proiezione è %lf."
 
 #: src/hugin/PanoPanel.cpp:338
 #, c-format
 msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf."
-msgstr ""
+msgstr "Valore VFOV non valido. Il valore massimo per questa proiezione è %lf."
 
 #: src/hugin/PanoPanel.cpp:384
 msgid "width needs to be an integer bigger than 0"
-msgstr "la larghezza deve essere un intero maggiore di 0"
+msgstr "La larghezza deve essere un intero maggiore di 0"
 
 #: src/hugin/PanoPanel.cpp:401
-#, fuzzy
 msgid "height needs to be an integer bigger than 0"
-msgstr "la larghezza deve essere un intero maggiore di 0"
+msgstr "L'altezza deve essere un intero maggiore di 0"
 
 #: src/hugin/PanoPanel.cpp:666
 msgid "Create panorama image"
-msgstr "Crea l'immagine panoramica"
+msgstr "Crea immagine panoramica"
 
 #: src/hugin/PanoPanel.cpp:681
 #, c-format
@@ -1196,31 +1238,34 @@
 "\n"
 "Overwrite?"
 msgstr ""
+"Il file %s esiste già\n"
+"\n"
+"Sovrascriverlo?"
 
 #: src/hugin/PanoPanel.cpp:682
 msgid "Overwrite file?"
-msgstr ""
+msgstr "Sovrascrivere file?"
 
+# (ndt) intende la lingua del programma
 #: src/hugin/PreferencesDialog.cpp:124
 msgid "System default"
-msgstr "default di sistema"
+msgstr "Predefinita di sistema"
 
 #: src/hugin/PreferencesDialog.cpp:127
-#, fuzzy
 msgid "Catalan"
-msgstr "Italiano"
+msgstr "Catalano"
 
 #: src/hugin/PreferencesDialog.cpp:130
 msgid "Chinese (Simplified)"
-msgstr ""
+msgstr "Cinese (semplificato)"
 
 #: src/hugin/PreferencesDialog.cpp:133
 msgid "Czech"
-msgstr ""
+msgstr "Ceco"
 
 #: src/hugin/PreferencesDialog.cpp:136
 msgid "Dutch"
-msgstr ""
+msgstr "Olandese"
 
 #: src/hugin/PreferencesDialog.cpp:139
 msgid "English"
@@ -1236,7 +1281,7 @@
 
 #: src/hugin/PreferencesDialog.cpp:148
 msgid "Hungarian"
-msgstr ""
+msgstr "Ungherese"
 
 #: src/hugin/PreferencesDialog.cpp:151
 msgid "Italian"
@@ -1244,7 +1289,7 @@
 
 #: src/hugin/PreferencesDialog.cpp:154
 msgid "Japanese"
-msgstr ""
+msgstr "Giapponese"
 
 #: src/hugin/PreferencesDialog.cpp:157
 msgid "Polish"
@@ -1252,36 +1297,36 @@
 
 #: src/hugin/PreferencesDialog.cpp:160
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portoghese (brasiliano)"
 
 #: src/hugin/PreferencesDialog.cpp:163
 msgid "Russian"
-msgstr ""
+msgstr "Russo"
 
 #: src/hugin/PreferencesDialog.cpp:166
 msgid "Slovak"
-msgstr ""
+msgstr "Slovacco"
 
 #: src/hugin/PreferencesDialog.cpp:169
 msgid "Spanish"
-msgstr ""
+msgstr "Spagnolo"
 
 #: src/hugin/PreferencesDialog.cpp:172
 msgid "Swedish"
-msgstr ""
+msgstr "Svedese"
 
 #: src/hugin/PreferencesDialog.cpp:175
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ucraino"
 
+# (ndt) titolo
 #: src/hugin/PreferencesDialog.cpp:253
 msgid "Select PTStitcher"
-msgstr "Seleziona  PTStitcher.exe"
+msgstr "Seleziona PTStitcher"
 
 #: src/hugin/PreferencesDialog.cpp:272
-#, fuzzy
 msgid "Select image editor"
-msgstr "coppia succ."
+msgstr "Seleziona editor immagini"
 
 #: src/hugin/PreferencesDialog.cpp:289
 msgid "Select Enblend"
@@ -1292,9 +1337,8 @@
 msgstr "Seleziona Autopano"
 
 #: src/hugin/PreferencesDialog.cpp:321
-#, fuzzy
 msgid "Select Autopano-SIFT"
-msgstr "Seleziona Autopano"
+msgstr "Seleziona Autopano-SIFT"
 
 #: src/hugin/PreferencesDialog.cpp:324
 msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
@@ -1302,7 +1346,7 @@
 
 #: src/hugin/PreferencesDialog.cpp:363
 msgid "Panotools details"
-msgstr "Panotools, dettagli."
+msgstr "Dettagli Panotools"
 
 #: src/hugin/PreferencesDialog.cpp:745
 msgid "Unknown Version"
@@ -1310,11 +1354,11 @@
 
 #: src/hugin/PreferencesDialog.cpp:755
 msgid "Really reset displayed preferences to default values?"
-msgstr ""
+msgstr "Ripristinare le preferenze visualizzate ai valori predefiniti?"
 
 #: src/hugin/PreferencesDialog.cpp:755 src/hugin/xrc/pref_dialog.xrs:95
 msgid "Load Defaults"
-msgstr "Carica Defaults"
+msgstr "Carica predefiniti"
 
 #: src/hugin/PreviewFrame.cpp:110
 msgid "Panorama preview"
@@ -1322,36 +1366,37 @@
 
 #: src/hugin/PreviewFrame.cpp:125
 msgid "displayed images"
-msgstr "immagini visibili"
+msgstr "Immagini visualizzate"
 
 #: src/hugin/PreviewFrame.cpp:160
 msgid "VFOV"
 msgstr "VFOV"
 
+# (ndt) suggerimento su un controllo scorrevole
 #: src/hugin/PreviewFrame.cpp:164
 msgid "drag to change the vertical field of view"
-msgstr "trascina per cambiare l'angolo di campo vert."
+msgstr "Trascinare per modificare il campo inquadrato verticalmente"
 
 #: src/hugin/PreviewFrame.cpp:173
 msgid "HFOV"
 msgstr "HFOV"
 
+# (ndt) suggerimento su un controllo scorrevole
 #: src/hugin/PreviewFrame.cpp:178
 msgid "drag to change the horizontal field of view"
-msgstr "trascina per cambiare l'angolo di campo orizz."
+msgstr "Trascinare per modificare il campo inquadrato orizzontale"
 
 #: src/hugin/PreviewFrame.cpp:189
 msgid "Preview Options"
-msgstr "Opzioni Anteprima"
+msgstr "Opzioni anteprima"
 
 #: src/hugin/PreviewFrame.cpp:192 src/hugin/xrc/pano_panel.xrs:2
-#, fuzzy
 msgid "projection (f):"
-msgstr "Approssimazione (f)"
+msgstr "Proiezione:"
 
 #: src/hugin/PreviewFrame.cpp:235
 msgid "Blend mode:"
-msgstr "Unione:"
+msgstr "Modalità unione:"
 
 #: src/hugin/PreviewFrame.cpp:241
 msgid "difference"
@@ -1359,70 +1404,68 @@
 
 #: src/hugin/PreviewFrame.cpp:257
 msgid "Output:"
-msgstr ""
+msgstr "Output:"
 
 #: src/hugin/PreviewFrame.cpp:262
 msgid "LDR"
-msgstr ""
+msgstr "LDR"
 
 #: src/hugin/PreviewFrame.cpp:263 src/hugin/xrc/nona_panel.xrs:20
 msgid "HDR"
-msgstr ""
+msgstr "HDR"
 
 #: src/hugin/PreviewFrame.cpp:275
 msgid "EV:"
-msgstr ""
+msgstr "EV:"
 
 #: src/hugin/PreviewFrame.cpp:288 src/hugin/PreviewFrame.cpp:322
 msgid "0"
 msgstr "0"
 
 #: src/hugin/PreviewFrame.cpp:308
-#, fuzzy
 msgid "Projection Parameters"
-msgstr "Parametri di correzione obiettivo"
+msgstr "Parametri di proiezione"
 
 #: src/hugin/PreviewFrame.cpp:317
 msgid "param:"
-msgstr ""
+msgstr "Parametro:"
 
+# (ndt) sarebbe da tenere il più corto possibile...
 #: src/hugin/PreviewFrame.cpp:349 src/hugin/PreviewPanel.cpp:663
 msgid ""
 "Left click to define new center point, right click to move point to horizon."
 msgstr ""
+"Clic sinistro definisce nuovo punto centrale, destro sposta il punto "
+"all'orizzonte."
 
 #: src/hugin/PreviewFrame.cpp:384 src/hugin/PreviewFrame.cpp:499
-#, fuzzy
 msgid "Center panorama with left mouse button, set horizon with right button"
 msgstr ""
-"Imposta Yaw e Pitch col tasto sx. Usa il tasto dx per impostare il Roll"
+"Centra il panorama col pulsante sinistro, imposta l'orizzonte col destro"
 
 #: src/hugin/PreviewFrame.cpp:614
 msgid "Rectilinear"
-msgstr "Rettilineare"
+msgstr "Rettilinea"
 
 #: src/hugin/PreviewFrame.cpp:615
 msgid "Cylindrical"
 msgstr "Cilindrica"
 
 #: src/hugin/PreviewFrame.cpp:713
-#, fuzzy
 msgid "Yaw value must be numeric."
-msgstr "Il valore deve essere numerico"
+msgstr "Il valore dell'imbardata deve essere numerico."
 
 #: src/hugin/PreviewFrame.cpp:719
-#, fuzzy
 msgid "Pitch value must be numeric."
-msgstr "Il valore deve essere numerico"
+msgstr "Il valore dell'inclinazione deve essere numerico."
 
 #: src/hugin/PreviewFrame.cpp:725
-#, fuzzy
 msgid "Roll value must be numeric."
-msgstr "Il valore deve essere numerico"
+msgstr "Il valore del rollio deve essere numerico."
 
 #: src/hugin/PreviewPanel.cpp:467
 msgid "Error during Stitching"
-msgstr "Errore durante lo Stitching"
+msgstr "Errore durante l'assemblatura"
 
 #: src/hugin/PTStitcherPanel.cpp:279
 msgid "Bicubic"
@@ -1471,11 +1514,14 @@
 "\n"
 "Do you want to continue anyway?"
 msgstr ""
+"PTStitcher non supporta nomi di file con un carattere punto (.).\n"
+"Salvare i progetti in una directory senza un punto nel nome.\n"
+"\n"
+"Continuare?"
 
 #: src/hugin/PTStitcherPanel.cpp:451
-#, fuzzy
 msgid "PTStitcher problem"
-msgstr "nota PTStitcher"
+msgstr "Problema di PTStitcher"
 
 #: src/hugin/PTStitcherPanel.cpp:460
 msgid "PTStitcher.exe does not support QTVR output on Windows and Linux"
@@ -1483,25 +1529,23 @@
 
 #: src/hugin/PTStitcherPanel.cpp:460
 msgid "PTStitcher note"
-msgstr "nota PTStitcher"
+msgstr "Nota PTStitcher"
 
 #: src/hugin/PTStitcherPanel.cpp:481
 msgid "Select PTStitcher.exe"
-msgstr "Cerca PTStitcher.exe"
+msgstr "Seleziona PTStitcher.exe"
 
 #: src/hugin/PTStitcherPanel.cpp:489
 msgid "No PTStitcher.exe selected"
-msgstr "Non hai selezionato il percorso di PTStitcher.exe"
+msgstr "Nessun PTStitcher.exe selezionato"
 
 #: src/hugin/PTStitcherPanel.cpp:498
-#, fuzzy
 msgid "Select PTStitcher commandline tool"
-msgstr "Imposta una linea di comando per Enblend"
+msgstr "Seleziona strumento riga di comando PTStitcher"
 
 #: src/hugin/PTStitcherPanel.cpp:506
-#, fuzzy
 msgid "No PTStitcher commandline tool selected"
-msgstr "Non e' stato impostato alcun comando per Enblend"
+msgstr "Nessun strumento a riga di comando PTStitcher selezionato"
 
 #: src/hugin/PTStitcherPanel.cpp:518
 msgid ""
@@ -1512,10 +1556,16 @@
 "\n"
 "Continue anyway?"
 msgstr ""
+"Attenzione: PTmender (da panotools 2.9 o superiore) supporta solamente "
+"l'output TIFF_m.\n"
+"Per la regolazione del colore e della luminosità, il file risultante deve "
+"essere processato con PTblender.\n"
+"\n"
+"Continuare?"
 
 #: src/hugin/PTStitcherPanel.cpp:519
 msgid "PTmender creates only plain TIFF_m files"
-msgstr ""
+msgstr "PTmender crea solamente file TIFF_m normali"
 
 #: src/hugin/RunStitcherFrame.cpp:127
 msgid "Failed to launch the PTStitcher."
@@ -1523,55 +1573,55 @@
 
 #: src/hugin/RunStitcherFrame.cpp:141
 msgid "Could not obtain PTStitcher output"
-msgstr "PTStitcher output non ottenuto"
+msgstr "Impossibile ottenere l'output di PTStitcher"
 
 #: src/hugin/RunStitcherFrame.cpp:270
 msgid ""
 "Stitching failed\n"
 "PTStitcher exited with nonzero error code."
 msgstr ""
-"Stitching fallito\n"
-"PTStitcher exited with nonzero error code\n"
-"cazzi tuoi."
+"Assemblatura fallita\n"
+"PTStitcher è uscito con un codice di errore diverso da zero."
 
 #: src/hugin/RunStitcherFrame.cpp:271
-#, fuzzy, c-format
+#, c-format
 msgid "Error executing %s"
-msgstr "Errore di esecuzione PTStitcher.exe"
+msgstr "Errore nell'eseguire %s"
 
 #: src/hugin/LocalizedFileTipProvider.cpp:48
 msgid "Tips not available, sorry!"
-msgstr ""
+msgstr "Suggerimenti non disponibili."
 
 #: src/hugin/VigCorrDialog.cpp:174
-#, fuzzy
 msgid "Select flatfield image"
-msgstr "Scelglere punto in immagine sx"
+msgstr "Scegliere immagine flatfield"
 
 #: src/hugin/VigCorrDialog.cpp:267
 msgid "Error: could not find flatfile image file."
-msgstr ""
+msgstr "Errore: impossibile trovare immagine flatfile."
 
 #: src/hugin/VigCorrDialog.cpp:267
-#, fuzzy
 msgid "File not found"
-msgstr "Immagine non trovata"
+msgstr "File non trovato"
 
 #: src/hugin/wxPanoCommand.cpp:188
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not decode image:\n"
 "%s\n"
 "Abort"
-msgstr "Dimensioni immagine sconosciute"
+msgstr ""
+"Impossibile decodificare l'immagine:\n"
+"%s\n"
+"Terminato"
 
 #: src/hugin/wxPanoCommand.cpp:188
 msgid "Unsupported image file format"
-msgstr ""
+msgstr "Formato immagine non supportato"
 
 #: src/hugin/wxPanoCommand.cpp:224
 msgid "Could not read image size"
-msgstr "Dimensioni immagine sconosciute"
+msgstr "Impossibile leggere la dimensione dell'immagine"
 
 #: src/hugin/wxPanoCommand.cpp:297
 #, c-format
@@ -1582,7 +1632,7 @@
 msgstr ""
 "Immagine non trovata:\n"
 "%s\n"
-"Scegli l'immagine giusta"
+"Selezionare l'immagine corretta"
 
 #: src/hugin/wxPanoCommand.cpp:297
 msgid "Image file not found"
@@ -1594,6 +1644,9 @@
 "BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg)|*.jpg;*."
 "JPG;*.jpeg;*.jpg|All files (*)|*"
 msgstr ""
+"Tutti i file immagine|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*."
+"bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|File JPEG (*.jpg)|*.jpg;"
+"*.JPG;*.jpeg;*.jpg|Tutti i file (*)|*"
 
 #: src/hugin/wxPanoCommand.cpp:428
 #, c-format
@@ -1601,72 +1654,71 @@
 "Error, template expects %d images,\n"
 "current project contains %d images\n"
 msgstr ""
+"Errore, il modello attende %d immagini,\n"
+"il progetto attuale ne contiene %d\n"
 
 #: src/hugin/wxPanoCommand.cpp:429 src/hugin/wxPanoCommand.cpp:455
-#, fuzzy
 msgid "Could not apply template"
-msgstr "Numero non leggibile"
+msgstr "Impossibile applicare il modello"
 
 #: src/hugin/wxPanoCommand.cpp:455
-#, fuzzy
 msgid "Error loading project file"
-msgstr "Errore nell'aprire il progetto"
+msgstr "Errore nel caricare il progetto"
 
 #: src/include/hugin/MyProgressDialog.h:98
 msgid "Optimizing Panorama"
-msgstr "Ottimizzazione del Panorama"
+msgstr "Ottimizzazione del panorama"
 
 #: src/hugin/xrc/assistant_panel.xrs:1
-#, fuzzy
 msgid "1. Load images..."
-msgstr "Caricamento immagine %s"
+msgstr "1. Carica immagini..."
 
 #: src/hugin/xrc/assistant_panel.xrs:2
 msgid "load a series of photos"
-msgstr ""
+msgstr "Carica una serie di fotografie"
 
 #: src/hugin/xrc/assistant_panel.xrs:3
 msgid "no images loaded"
-msgstr ""
+msgstr "Nessuna immagine caricata"
 
 #: src/hugin/xrc/assistant_panel.xrs:4
 msgid "Automatic (use EXIF data)"
-msgstr ""
+msgstr "Automatico (usare dati EXIF)"
 
 #: src/hugin/xrc/assistant_panel.xrs:5 src/hugin/xrc/assistant_panel.xrs:24
 msgid "Lens type:"
-msgstr "Tipo di obiettivo"
+msgstr "Tipo obiettivo:"
 
 #: src/hugin/xrc/assistant_panel.xrs:11 src/hugin/xrc/assistant_panel.xrs:34
-#, fuzzy
 msgid "Focal length:"
-msgstr "lunghezza focale:"
+msgstr "Lunghezza focale:"
 
 #: src/hugin/xrc/assistant_panel.xrs:12 src/hugin/xrc/assistant_panel.xrs:35
 msgid "mm"
-msgstr ""
+msgstr "mm"
 
 #: src/hugin/xrc/assistant_panel.xrs:13 src/hugin/xrc/assistant_panel.xrs:36
-#, fuzzy
 msgid "Focal length multiplier:"
-msgstr "lunghezza focale:"
+msgstr "Moltiplicatore lunghezza focale:"
 
 #: src/hugin/xrc/assistant_panel.xrs:15 src/hugin/xrc/lens_panel.xrs:1
 msgid "Load lens..."
-msgstr ""
+msgstr "Carica obiettivo..."
 
 #: src/hugin/xrc/assistant_panel.xrs:16 src/hugin/xrc/main_frame.xrs:4
 msgid "Camera and Lens"
-msgstr "Fotocamera e Ottica"
+msgstr "Fotocamera e obiettivo"
 
 #: src/hugin/xrc/assistant_panel.xrs:17
 msgid "2. Align..."
-msgstr ""
+msgstr "2. Allinea..."
 
 #: src/hugin/xrc/assistant_panel.xrs:18
 msgid ""
 "Align all images. Creates control points and optimizes the image positions"
 msgstr ""
+"Allinea tutte le immagini. Crea punti di controllo e ottimizza le posizioni "
+"dell'immagine"
 
 #: src/hugin/xrc/assistant_panel.xrs:19
 msgid ""
@@ -1675,20 +1727,22 @@
 "\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"\n"
+"\n"
 
 #: src/hugin/xrc/assistant_panel.xrs:20
-#, fuzzy
 msgid "3. Create panorama..."
-msgstr "Crea l'immagine panoramica"
+msgstr "3. Crea panorama..."
 
 #: src/hugin/xrc/assistant_panel.xrs:21
 msgid "Create a high resolution panorama."
-msgstr ""
+msgstr "Crea un panorama ad alta risoluzione."
 
 #: src/hugin/xrc/assistant_panel.xrs:22
-#, fuzzy
 msgid "Camera and Lens data"
-msgstr "Fotocamera e Ottica"
+msgstr "Dati fotocamera e obiettivo"
 
 #: src/hugin/xrc/assistant_panel.xrs:23
 msgid ""
@@ -1697,21 +1751,24 @@
 "c\n"
 "d"
 msgstr ""
+"a\n"
+"b\n"
+"c\n"
+"d"
 
 #: src/hugin/xrc/assistant_panel.xrs:30
-#, fuzzy
 msgid "Load lens data..."
-msgstr "Carica parametri obiettivo"
+msgstr "Carica dati obiettivo..."
 
 #: src/hugin/xrc/assistant_panel.xrs:31
-#, fuzzy
 msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:"
-msgstr "L' Angolo di campo orizzontale (HFOV) potrebbe essere troppo piccolo"
+msgstr ""
+"Inserire l'angolo di campo orizzontale (HFOV), la lunghezza focale o il crop "
+"factor:"
 
 #: src/hugin/xrc/assistant_panel.xrs:32
-#, fuzzy
 msgid "HFOV (v):"
-msgstr "HFOV"
+msgstr "HFOV:"
 
 #: src/hugin/xrc/assistant_panel.xrs:33 src/hugin/xrc/pref_dialog.xrs:40
 #: src/hugin/xrc/pref_dialog.xrs:42
@@ -1720,7 +1777,7 @@
 
 #: src/hugin/xrc/about.xrs:1 src/hugin/xrc/main_tool.xrs:31
 msgid "About Hugin"
-msgstr "Info su Hugin"
+msgstr "Informazioni su Hugin"
 
 #: src/hugin/xrc/about.xrs:2 src/hugin/xrc/pref_dialog.xrs:98
 msgid "OK"
@@ -1728,25 +1785,26 @@
 
 #: src/hugin/xrc/anchor_orientation.xrs:1
 msgid "Anchor Image"
-msgstr "Immagine di Riferimento"
+msgstr "Ancora immagine"
 
 #: src/hugin/xrc/anchor_orientation.xrs:2
 msgid ""
 "Set Yaw and Pitch with left mouse button. Use right mouse button to set roll"
 msgstr ""
-"Imposta Yaw e Pitch col tasto sx. Usa il tasto dx per impostare il Roll"
+"Imposta imbardata e inclinazione col pulsante sinistro, col destro il rollio"
 
+# (ndt) boh...
 #: src/hugin/xrc/anchor_orientation.xrs:3
 msgid "Set Anchor Image Orientation"
-msgstr "Imposta orientamento immagine di riferimento"
+msgstr "Imposta orientazione ancora immagine"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:1
 msgid "previous image pair"
-msgstr "coppia prec."
+msgstr "Coppia immagine precedente"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:2
 msgid "next image pair"
-msgstr "coppia succ."
+msgstr "Coppia immagine successiva"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:3 src/hugin/xrc/cp_editor_panel.xrs:5
 #: src/hugin/xrc/lens_panel.xrs:57
@@ -1761,7 +1819,7 @@
 
 #: src/hugin/xrc/cp_editor_panel.xrs:7
 msgid "mode:"
-msgstr "modalit\xE0:"
+msgstr "Modalità:"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:9
 msgid "vertical line"
@@ -1773,7 +1831,7 @@
 
 #: src/hugin/xrc/cp_editor_panel.xrs:11
 msgid "Zoom:"
-msgstr "Zoom:"
+msgstr "Ingrandimento:"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:12
 msgid "100%"
@@ -1781,7 +1839,7 @@
 
 #: src/hugin/xrc/cp_editor_panel.xrs:13
 msgid "fit to window"
-msgstr "adatta alla finestra"
+msgstr "Adatta alla finestra"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:14
 msgid "200%"
@@ -1805,37 +1863,35 @@
 
 #: src/hugin/xrc/cp_editor_panel.xrs:19
 msgid "Fine-tune"
-msgstr "Calibrazione"
+msgstr "Regolazione precisa"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:20
 msgid "tries to optimize the currently active point."
-msgstr "ottimizza il punto di controllo attivo."
+msgstr "Cerca di ottimizzare i punti attivi attuali."
 
 #: src/hugin/xrc/cp_editor_panel.xrs:21
 msgid "auto fine-&tune"
-msgstr "auto fine-&tune"
+msgstr "Regolazione &precisa automatica"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:22
 msgid "auto add"
-msgstr "agg. automatica"
+msgstr "Aggiunta automatica"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:23
 msgid "immediately add control point when selecting a second point"
-msgstr ""
-"aggiunge immadiatamente un punto di controllo alla selezione del secondo "
-"punto"
+msgstr "Aggiunge un punto di controllo quando ne viene selezionato un secondo"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:24
 msgid "auto estimate"
-msgstr "stima automatica"
+msgstr "Stima automatica"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:25
 msgid ""
 "tries to estimate shift between the images and use it while placing control "
 "points"
 msgstr ""
-"cerca di stimare la distanza tra le immagini e la usa per piazzare i punti "
-"di controllo"
+"Cerca di stimare spostamento tra le immagini e di usarlo durante il "
+"posizionamento dei punti di controllo"
 
 #: src/hugin/xrc/cp_editor_panel.xrs:26 src/hugin/xrc/cp_list_frame.xrs:2
 msgid "Delete"
@@ -1847,11 +1903,11 @@
 
 #: src/hugin/xrc/cp_editor_panel.xrs:28
 msgid "add a new Point"
-msgstr "Aggiungi Punto"
+msgstr "Aggiunge un nuovo punto"
 
 #: src/hugin/xrc/cp_list_frame.xrs:1 src/hugin/xrc/main_frame.xrs:6
 msgid "Control Points"
-msgstr "Punti di Controllo"
+msgstr "Punti di controllo"
 
 #: src/hugin/xrc/cp_list_frame.xrs:3
 msgid "Select by Distance"
@@ -1859,23 +1915,27 @@
 
 #: src/hugin/xrc/crop_panel.xrs:1
 msgid "Top:"
-msgstr ""
+msgstr "Superiore:"
 
 #: src/hugin/xrc/crop_panel.xrs:2
 msgid "Left:"
-msgstr ""
+msgstr "Sinistra:"
 
 #: src/hugin/xrc/crop_panel.xrs:3
 msgid "Right:"
-msgstr ""
+msgstr "Destra:"
 
 #: src/hugin/xrc/crop_panel.xrs:4
 msgid "Bottom:"
-msgstr ""
+msgstr "Inferiore:"
 
+# (ndt) siccome ho eliminato tutte le lettere
+# in questo caso d ed e indica Orizzontale e Verticale, ma in un'altra scheda
+# non è che sia chiaro molto in ogni caso...
+# E centrare sullo spostamento verticale e orizzontale... non vorrebbe dire centrare e basta?
 #: src/hugin/xrc/crop_panel.xrs:5
 msgid "Always center Crop on d,e"
-msgstr ""
+msgstr "Centrare sempre il ritaglio"
 
 #: src/hugin/xrc/crop_panel.xrs:6 src/hugin/xrc/images_panel.xrs:18
 msgid "Reset"
@@ -1883,27 +1943,27 @@
 
 #: src/hugin/xrc/edit_script_dialog.xrs:1
 msgid "Edit Panorama Tools Script"
-msgstr "Cambia lo script di Panorama Tools"
+msgstr "Modifica script panorama"
 
 #: src/hugin/xrc/edit_script_dialog.xrs:2
 msgid ""
 "This is the script which will be sent to the Panorama Tools engine.  Editing "
 "these lines is an advanced technique."
 msgstr ""
-"Questo e' lo script che verr\xE0 passato a Panorama Tools. Cambiare queste "
-"linee solo se si sa bene quel che si sta facendo."
+"Questo è lo script che verrà inviato al motore dei panorami. La modifica di "
+"queste righe è adatta a utenti esperti."
 
 #: src/hugin/xrc/edit_script_dialog.xrs:3
 msgid "Continue with these changes"
-msgstr "Continua con queste  modifiche"
+msgstr "Continuare con le modifiche"
 
 #: src/hugin/xrc/edit_script_dialog.xrs:4
 msgid "Discard changes and cancel"
-msgstr "Scarta modifiche e cancella"
+msgstr "Tralasciare le modifiche e annullare"
 
 #: src/hugin/xrc/edit_text.xrs:1
 msgid "Text mode"
-msgstr "Modalit\xE0 testo"
+msgstr "Modalità testo"
 
 #: src/hugin/xrc/edit_text.xrs:2 src/hugin/xrc/main_tool.xrs:23
 #: src/hugin/xrc/optimize_panel.xrs:2
@@ -1912,11 +1972,11 @@
 
 #: src/hugin/xrc/edit_text.xrs:3 src/hugin/xrc/pref_dialog.xrs:97
 msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
 
 #: src/hugin/xrc/help.xrs:1
 msgid "Hugin Reference"
-msgstr "Guida di Hugin"
+msgstr "Riferimento Hugin"
 
 #: src/hugin/xrc/help.xrs:2 src/hugin/xrc/keyboard_help.xrs:2
 msgid "Close"
@@ -1924,11 +1984,11 @@
 
 #: src/hugin/xrc/images_panel.xrs:1
 msgid "Add individual images..."
-msgstr "Aggiungi immagini..."
+msgstr "Aggiungi immagini individuali..."
 
 #: src/hugin/xrc/images_panel.xrs:2
 msgid "load one or more photos for this project"
-msgstr "Carica una o piu' fotografie per questo progetto"
+msgstr "Carica una o più foto per questo progetto"
 
 #: src/hugin/xrc/images_panel.xrs:3
 msgid "Add time-series of images..."
@@ -1936,15 +1996,15 @@
 
 #: src/hugin/xrc/images_panel.xrs:4
 msgid "load a set of photos taken at the same time"
-msgstr "Aggiunge una serie di foto scattate nello stesso momento"
+msgstr "Carica un insieme di fotografie scattate alla stessa ora"
 
 #: src/hugin/xrc/images_panel.xrs:5
 msgid "Move up"
-msgstr ""
+msgstr "Sposta su"
 
 #: src/hugin/xrc/images_panel.xrs:6
 msgid "Move down"
-msgstr ""
+msgstr "Sposta giù"
 
 #: src/hugin/xrc/images_panel.xrs:7
 msgid "Remove this image"
@@ -1952,44 +2012,43 @@
 
 #: src/hugin/xrc/images_panel.xrs:8
 msgid "dismiss the current photo from this project"
-msgstr "Non usare l'immagine corrente in questo progetto"
+msgstr "Rimuove la foto attuale dal progetto"
 
 #: src/hugin/xrc/images_panel.xrs:9
-#, fuzzy
 msgid "Remove points"
 msgstr "Rimuovi punti"
 
 #: src/hugin/xrc/images_panel.xrs:10
 msgid "Remove control points connecting the selected images"
-msgstr "Rimuovi i punti di controllo che connettono le immagini selezionate"
+msgstr "Rimuove i punti di controllo che collegano le immagini selezionata"
 
 #: src/hugin/xrc/images_panel.xrs:11 src/hugin/xrc/optimize_panel.xrs:13
 msgid "Image Orientation"
-msgstr "Orientazione immagini"
+msgstr "Orientazione immagine"
 
 #: src/hugin/xrc/images_panel.xrs:12
 msgid "yaw:"
-msgstr "yaw:"
+msgstr "Imbardata:"
 
 #: src/hugin/xrc/images_panel.xrs:13
 msgid "set yaw for selected image(s)"
-msgstr "imposta yaw delle immagini selezionate"
+msgstr "Imposta l'imbardata per le immagini selezionate"
 
 #: src/hugin/xrc/images_panel.xrs:14
 msgid "pitch:"
-msgstr "pitch:"
+msgstr "Inclinazione:"
 
 #: src/hugin/xrc/images_panel.xrs:15
 msgid "set pitch for selected image(s)"
-msgstr "imposta pitch delle immagini selezionate"
+msgstr "Imposta l'inclinazione per le immagini selezionate"
 
 #: src/hugin/xrc/images_panel.xrs:16
 msgid "roll:"
-msgstr "roll:"
+msgstr "Rollio:"
 
 #: src/hugin/xrc/images_panel.xrs:17
 msgid "set roll for selected image(s)"
-msgstr "imposta roll delle immagini selezionate"
+msgstr "Imposta il rollio per le immagini selezionate"
 
 #: src/hugin/xrc/images_panel.xrs:19
 msgid "Reset position of selected image(s)"
@@ -1997,118 +2056,123 @@
 
 #: src/hugin/xrc/images_panel.xrs:20
 msgid "Feature Matching (Autopano)"
-msgstr "Ricerca sovrapposizione (Autopano)"
+msgstr "Corrispondenza caratteristiche (Autopano)"
 
 #: src/hugin/xrc/images_panel.xrs:21
 msgid "Points per Overlap:"
-msgstr "Punti per Coppia:"
+msgstr "Punti per sovrapposizione:"
 
 #: src/hugin/xrc/images_panel.xrs:22
 msgid "number of points created at each overlap"
-msgstr "Numero punti di controllo per ogni coppia di immagini"
+msgstr "Numero di punti per ogni sovrapposizione"
 
 #: src/hugin/xrc/images_panel.xrs:24
 msgid "Run external autopano program on the selected images"
-msgstr "Passa ad Autopano le immagini selezionate"
+msgstr "Eseguire programma autopano esterno sulle immagini selezionate"
 
 #: src/hugin/xrc/images_panel.xrs:25
 msgid "Reference Image"
-msgstr "Immagine di riferimento"
+msgstr "Immagine riferimento"
 
 #: src/hugin/xrc/images_panel.xrs:26
 msgid "Anchor this image for position"
-msgstr "Ancora la posizione di questa immagine"
+msgstr "Blocca quest'immagine per la posizione"
 
 #: src/hugin/xrc/images_panel.xrs:27
 msgid ""
 "use currently selected image as anchor image. That is, do not optimize the "
 "(complete) position of this image."
 msgstr ""
-"Usa l'immagine selezionata come riferimento di posizione. Non ottimizzare "
-"quindi i valori di posizione di questa immagine tutti assieme."
+"Usa le immagini selezionate come immagine bloccata. Non ottimizza la "
+"posizione (completa) dell'immagine."
 
 #: src/hugin/xrc/images_panel.xrs:28
 msgid "Anchor this image for exposure"
-msgstr "Immagine riferimento esposizione"
+msgstr "Blocca quest'immagine per l'esposizione"
 
 #: src/hugin/xrc/images_panel.xrs:29
 msgid "use the currently selected images as color correction anchor image"
-msgstr "Usa le immagini selezionate come riferimento di correzione colore"
+msgstr "Usa le immagini selezionate come immagine di correzione del colore"
 
 #: src/hugin/xrc/images_panel.xrs:30
 msgid "This Image"
-msgstr "Questa Immagine"
+msgstr "Questa immagine"
 
 #: src/hugin/xrc/images_panel.xrs:32
 msgid "Crop..."
-msgstr ""
+msgstr "Ritaglia..."
 
 #: src/hugin/xrc/images_panel.xrs:33
 msgid "Open a dialog to select the image area to be used while stitching"
 msgstr ""
+"Apre un dialogo per selezionare l'area dell'immagine da usare durante "
+"l'assemblatura"
 
 #: src/hugin/xrc/keyboard_help.xrs:1
 msgid "Keyboard Shortcuts"
-msgstr "Scorciatoie Tastiera"
+msgstr "Scorciatoie da tastiera"
 
 #: src/hugin/xrc/lens_panel.xrs:2
 msgid "Load lens parameters from a file"
-msgstr "Carica i parametri dell'obiettivo da file"
+msgstr "Carica i parametri dell'obiettivo da un file"
 
 #: src/hugin/xrc/lens_panel.xrs:3
-#, fuzzy
 msgid "Save lens..."
-msgstr "Salva con nome"
+msgstr "Salva obiettivo..."
 
 #: src/hugin/xrc/lens_panel.xrs:4
 msgid "Save lens parameters to an file"
-msgstr "Salva i parametri dell'obiettivo"
+msgstr "Salva parametri obiettivo su file"
 
+# (ndt) pulsante
 #: src/hugin/xrc/lens_panel.xrs:5
 msgid "Load EXIF"
-msgstr "Leggi EXIF"
+msgstr "Carica EXIF"
 
+# (ndt) suggerimento
 #: src/hugin/xrc/lens_panel.xrs:6
 msgid "Try to read HFOV from the EXIF data"
-msgstr "Leggere angolo di campo orizzontale dai dati EXIF"
+msgstr "Prova a leggere HFOV dai dati EXIF"
 
+# (ndt) pulsante
 #: src/hugin/xrc/lens_panel.xrs:7
 msgid "New Lens"
-msgstr "Nuovo Obiettivo"
+msgstr "Nuovo obiettivo"
 
+# (ndt) suggerimento
 #: src/hugin/xrc/lens_panel.xrs:8
 msgid "Create a new lens and assign it to selected images"
-msgstr "Crea un nuovo obiettivo ed assegnalo alle immagini selezionate"
+msgstr "Crea un nuovo obiettivo e lo assegna alle immagini selezionate"
 
+# (ndt) pulsante
 #: src/hugin/xrc/lens_panel.xrs:9
-#, fuzzy
 msgid "Change lens..."
-msgstr "Cambia obiettivo"
+msgstr "Cambia obiettivo..."
 
+# (ndt) suggerimento
 #: src/hugin/xrc/lens_panel.xrs:10
 msgid "change lens of selected images"
-msgstr "cambia obiettivo pel le immagini selezionate"
+msgstr "Modifica l'obiettivo delle immagini selezionate"
 
 #: src/hugin/xrc/lens_panel.xrs:11
 msgid "Geometric"
-msgstr ""
+msgstr "Geometrico"
 
 #: src/hugin/xrc/lens_panel.xrs:12
-#, fuzzy
 msgid "Lens"
-msgstr "Obiett. no."
+msgstr "Obiettivo"
 
 #: src/hugin/xrc/lens_panel.xrs:13 src/hugin/xrc/lens_panel.xrs:61
 msgid "Type:"
-msgstr ""
+msgstr "Tipo:"
 
 #: src/hugin/xrc/lens_panel.xrs:19
 msgid "degrees of view (v):"
-msgstr "angolo di campo (v):"
+msgstr "Gradi di vista:"
 
 #: src/hugin/xrc/lens_panel.xrs:20
 msgid "Horizontal Field of View"
-msgstr "Angolo di campo orizzontale"
+msgstr "Campo inquadrato orizzontale"
 
 #: src/hugin/xrc/lens_panel.xrs:21 src/hugin/xrc/lens_panel.xrs:28
 #: src/hugin/xrc/lens_panel.xrs:30 src/hugin/xrc/lens_panel.xrs:32
@@ -2118,208 +2182,197 @@
 #: src/hugin/xrc/lens_panel.xrs:50 src/hugin/xrc/lens_panel.xrs:55
 #: src/hugin/xrc/lens_panel.xrs:59 src/hugin/xrc/lens_panel.xrs:64
 msgid "Link"
-msgstr ""
+msgstr "Collegamento"
 
 #: src/hugin/xrc/lens_panel.xrs:22
 msgid "focal length:"
-msgstr "lunghezza focale:"
+msgstr "Lunghezza focale:"
 
 #: src/hugin/xrc/lens_panel.xrs:23
 msgid "true focal length in mm"
 msgstr "Lunghezza focale reale in mm"
 
+# (ndt) questo è proprio degli obiettivi, è il rapporto tra la dimensione
+# del fotogramma 35mm e quella del sensore. In effetti è proprio un fattore di ritaglio
 #: src/hugin/xrc/lens_panel.xrs:24
 msgid "crop factor:"
-msgstr "fattore di moltiplicazione:"
+msgstr "Crop factor:"
 
+# (ndt) suggerimento
 #: src/hugin/xrc/lens_panel.xrs:25
 msgid "35mm film diameter / ccd diameter"
-msgstr "diametro su formato 35mm / diametro su ccd"
+msgstr "Diametro pellicola 35mm / diametro CCD"
 
 #: src/hugin/xrc/lens_panel.xrs:26
-#, fuzzy
 msgid "Radial Distortion"
-msgstr "distorsione (a):"
+msgstr "Distorsione radiale"
 
 #: src/hugin/xrc/lens_panel.xrs:27 src/hugin/xrc/optimize_panel.xrs:25
 msgid "distortion (a):"
-msgstr "distorsione (a):"
+msgstr "Distorsione (a):"
 
+# (ndt) ho trovato proprio così...
 #: src/hugin/xrc/lens_panel.xrs:29 src/hugin/xrc/optimize_panel.xrs:26
 msgid "barrel (b):"
-msgstr "distorsione princ. (b):"
+msgstr "Barilotto:"
 
 #: src/hugin/xrc/lens_panel.xrs:31 src/hugin/xrc/optimize_panel.xrs:27
 msgid "distortion (c):"
-msgstr "distorsione (c):"
+msgstr "Distorsione:"
 
 #: src/hugin/xrc/lens_panel.xrs:33
 msgid "Image Center Shift"
-msgstr "Shift asse ottico"
+msgstr "Spostamento centrale immagine"
 
 #: src/hugin/xrc/lens_panel.xrs:34
 msgid "horizontal (d):"
-msgstr "orizzontale (d):"
+msgstr "Orizzontale:"
 
 #: src/hugin/xrc/lens_panel.xrs:36
 msgid "vertical (e):"
-msgstr "verticale (e):"
+msgstr "Verticale:"
 
+# (ndt) in giro per la rete ho trovato deformazione
 #: src/hugin/xrc/lens_panel.xrs:38
 msgid "Image Shearing"
-msgstr "Shearing immagine"
+msgstr "Deformazione immagine"
 
 #: src/hugin/xrc/lens_panel.xrs:39
 msgid "horizontal (g):"
-msgstr "orizzontale (g):"
+msgstr "Orizzontale:"
 
 #: src/hugin/xrc/lens_panel.xrs:41
 msgid "vertical (t):"
-msgstr "verticale (t):"
+msgstr "Verticale:"
 
 #: src/hugin/xrc/lens_panel.xrs:43
 msgid "Photometric"
-msgstr ""
+msgstr "Fotometrico"
 
 #: src/hugin/xrc/lens_panel.xrs:44
-#, fuzzy
 msgid "Exposure and Color"
-msgstr "riferimento esposizione:"
+msgstr "Esposizione e colore"
 
 #: src/hugin/xrc/lens_panel.xrs:45
-#, fuzzy
 msgid "Exposure (EV)"
-msgstr "riferimento esposizione:"
+msgstr "Esposizione (EV)"
 
 #: src/hugin/xrc/lens_panel.xrs:47
-#, fuzzy
 msgid "Red multiplier:"
-msgstr "lunghezza focale:"
+msgstr "Moltiplicatore rosso:"
 
 #: src/hugin/xrc/lens_panel.xrs:49
-#, fuzzy
 msgid "Blue multiplier:"
-msgstr "lunghezza focale:"
+msgstr "Moltiplicatore blu:"
 
 #: src/hugin/xrc/lens_panel.xrs:51
-#, fuzzy
 msgid "Vignetting"
-msgstr "Calibrazione"
+msgstr "Vignettatura"
 
 #: src/hugin/xrc/lens_panel.xrs:52
 msgid "* r^2"
-msgstr ""
+msgstr "* r^2"
 
 #: src/hugin/xrc/lens_panel.xrs:53
 msgid "* r^4"
-msgstr ""
+msgstr "* r^4"
 
 #: src/hugin/xrc/lens_panel.xrs:54
 msgid "* r^6"
-msgstr ""
+msgstr "* r^6"
 
 #: src/hugin/xrc/lens_panel.xrs:56
-#, fuzzy
 msgid "Vignetting Center Shift"
-msgstr "Shift asse ottico"
+msgstr "Spostamento centrale vignettatura"
 
 #: src/hugin/xrc/lens_panel.xrs:60
-#, fuzzy
 msgid "Camera Response"
-msgstr "Fotocamera e Ottica"
+msgstr "Risposta fotocamera"
 
 #: src/hugin/xrc/lens_panel.xrs:62
 msgid "custom (EMoR)"
-msgstr ""
+msgstr "Personalizzato (EMoR)"
 
 #: src/hugin/xrc/lens_panel.xrs:63
-#, fuzzy
 msgid "Linear"
-msgstr "Bilineare"
+msgstr "Lineare"
 
 #: src/hugin/xrc/lens_panel.xrs:65
-#, fuzzy
 msgid "Parameters:"
-msgstr "Parametri obiettivo"
+msgstr "Parametri:"
 
+# (ndt) titolo
 #: src/hugin/xrc/lens_panel.xrs:66 src/hugin/xrc/vig_corr_dlg.xrs:1
 msgid "Vignetting correction"
-msgstr ""
+msgstr "Correzione vignettatura"
 
 #: src/hugin/xrc/lens_panel.xrs:67 src/hugin/xrc/vig_corr_dlg.xrs:2
-#, fuzzy
 msgid "Type of Correction"
-msgstr "Correzione esposizione:"
+msgstr "Tipo di correzione"
 
 #: src/hugin/xrc/lens_panel.xrs:68 src/hugin/xrc/vig_corr_dlg.xrs:3
-#, fuzzy
 msgid "No correction"
-msgstr "Correzione esposizione:"
+msgstr "Nessuna correzione"
 
 #: src/hugin/xrc/lens_panel.xrs:69 src/hugin/xrc/vig_corr_dlg.xrs:4
-#, fuzzy
 msgid "Addition ( I=I+c )"
-msgstr "distorsione (c):"
+msgstr "Somma (I=I+c)"
 
 #: src/hugin/xrc/lens_panel.xrs:70 src/hugin/xrc/vig_corr_dlg.xrs:5
 msgid "Division ( I=I/c )"
-msgstr ""
+msgstr "Divisione (I=I/c)"
 
 #: src/hugin/xrc/lens_panel.xrs:71 src/hugin/xrc/vig_corr_dlg.xrs:6
-#, fuzzy
 msgid "Correction"
-msgstr "Insieme immagini"
+msgstr "Correzione"
 
 #: src/hugin/xrc/lens_panel.xrs:72 src/hugin/xrc/vig_corr_dlg.xrs:7
 msgid "Flatfield"
-msgstr ""
+msgstr "Flatfield"
 
 #: src/hugin/xrc/lens_panel.xrs:73 src/hugin/xrc/vig_corr_dlg.xrs:8
-#, fuzzy
 msgid "Image file:"
-msgstr "Immagine non trovata"
+msgstr "File immagine:"
 
 #: src/hugin/xrc/lens_panel.xrs:74 src/hugin/xrc/vig_corr_dlg.xrs:9
 msgid "..."
 msgstr "..."
 
 #: src/hugin/xrc/lens_panel.xrs:75 src/hugin/xrc/vig_corr_dlg.xrs:10
-#, fuzzy
 msgid "Polynomial"
-msgstr "normale"
+msgstr "Polinomiale"
 
 #: src/hugin/xrc/lens_panel.xrs:76 src/hugin/xrc/vig_corr_dlg.xrs:11
 msgid "c = "
-msgstr ""
+msgstr "c = "
 
 #: src/hugin/xrc/lens_panel.xrs:77 src/hugin/xrc/vig_corr_dlg.xrs:12
 msgid " + "
-msgstr ""
+msgstr " + "
 
 #: src/hugin/xrc/lens_panel.xrs:78 src/hugin/xrc/vig_corr_dlg.xrs:13
 msgid "*r^2 + "
-msgstr ""
+msgstr "*r^2 + "
 
 #: src/hugin/xrc/lens_panel.xrs:79 src/hugin/xrc/vig_corr_dlg.xrs:14
 msgid "*r^4 + "
-msgstr ""
+msgstr "*r^4 + "
 
 #: src/hugin/xrc/lens_panel.xrs:80 src/hugin/xrc/vig_corr_dlg.xrs:15
 msgid "*r^6"
-msgstr ""
+msgstr "*r^6"
 
 #: src/hugin/xrc/lens_panel.xrs:81 src/hugin/xrc/vig_corr_dlg.xrs:16
-#, fuzzy
 msgid "center shift x:"
-msgstr "Shift asse ottico"
+msgstr "Spostamento centrale x:"
 
 #: src/hugin/xrc/main_frame.xrs:1
 msgid "Hugin - Panorama Tools Frontend"
-msgstr "Hugin - Interfaccia di Panorama Tools"
+msgstr "Hugin - Strumento per panorami"
 
 #: src/hugin/xrc/main_frame.xrs:2 src/hugin/xrc/pref_dialog.xrs:12
 msgid "Assistant"
-msgstr ""
+msgstr "Assistente"
 
 #: src/hugin/xrc/main_frame.xrs:3
 msgid "Images"
@@ -2327,16 +2380,15 @@
 
 #: src/hugin/xrc/main_frame.xrs:7
 msgid "Optimizer"
-msgstr "Optimizer"
+msgstr "Ottimizzatore"
 
 #: src/hugin/xrc/main_frame.xrs:8
-#, fuzzy
 msgid "Exposure"
-msgstr "riferimento esposizione:"
+msgstr "Esposizione"
 
 #: src/hugin/xrc/main_frame.xrs:9
 msgid "Stitcher"
-msgstr "Stitcher"
+msgstr "Assemblatore"
 
 #: src/hugin/xrc/main_menubar.xrs:1 src/hugin/xrc/main_menu.xrs:1
 msgid "&File"
@@ -2344,19 +2396,19 @@
 
 #: src/hugin/xrc/main_menubar.xrs:2
 msgid "E&xit\tAlt-X"
-msgstr "E&xit\tAlt-X"
+msgstr "E&sci\tAlt-X"
 
 #: src/hugin/xrc/main_menubar.xrs:3
 msgid "Exit this application"
-msgstr "Esci da questa applicazione"
+msgstr "Esce da questa applicazione"
 
 #: src/hugin/xrc/main_menubar.xrs:5
 msgid "&About..."
-msgstr "&Info..."
+msgstr "I&nformazioni..."
 
 #: src/hugin/xrc/main_menubar.xrs:6
 msgid "About this application"
-msgstr "Info su questa applicazione"
+msgstr "Informazioni riguardo questa applicazione"
 
 #: src/hugin/xrc/main_menu.xrs:2
 msgid "&New"
@@ -2372,7 +2424,7 @@
 
 #: src/hugin/xrc/main_menu.xrs:5 src/hugin/xrc/main_tool.xrs:4
 msgid "Open project"
-msgstr "Apri progetto"
+msgstr "Apre un progetto"
 
 #: src/hugin/xrc/main_menu.xrs:6
 msgid "&Save"
@@ -2380,48 +2432,48 @@
 
 #: src/hugin/xrc/main_menu.xrs:7 src/hugin/xrc/main_tool.xrs:9
 msgid "Save current project file"
-msgstr "Salva il progetto corrente"
+msgstr "Salva il progetto attuale"
 
 #: src/hugin/xrc/main_menu.xrs:8
 msgid "S&ave as"
-msgstr "S&alva come"
+msgstr "Sa&lva come"
 
 #: src/hugin/xrc/main_menu.xrs:9 src/hugin/xrc/main_tool.xrs:12
 msgid "Save current project to a new file"
-msgstr "Salva il progetto corrente in un nuovo file"
+msgstr "Salva il progetto attuale in un nuovo file"
 
 #: src/hugin/xrc/main_menu.xrs:10
 msgid "&Write PTStitcher script"
-msgstr "&Trasforma in script PTStitcher"
+msgstr "Salva script per &PTStitcher"
 
 #: src/hugin/xrc/main_menu.xrs:11
 msgid ""
 "Write current project to a PTStitcher compatible script file, useful for "
 "batch processing"
 msgstr ""
-"Trasforma il progetto corrente in uno script compatibile con PTStitcher, "
-"Utile nei batch processing"
+"Scrive il progetto attuale in un file PTStitcher compatibile, utile per i "
+"processi batch"
 
 #: src/hugin/xrc/main_menu.xrs:12
 msgid "Apply &Template"
-msgstr ""
+msgstr "Applica &modello"
 
 #: src/hugin/xrc/main_menu.xrs:13
 msgid ""
 "Assign the settings of a previously saved project to the current images."
-msgstr ""
+msgstr "Applica le impostazioni di un progetto salvato alle immagini attuali."
 
 #: src/hugin/xrc/main_menu.xrs:14
 msgid "&Preferences"
-msgstr "&Preferenze"
+msgstr "Preferen&ze"
 
 #: src/hugin/xrc/main_menu.xrs:15
 msgid "&Quit"
-msgstr "&Quit"
+msgstr "&Chiudi"
 
 #: src/hugin/xrc/main_menu.xrs:16
 msgid "Exit program"
-msgstr "Esci dal programma"
+msgstr "Chiude il programma"
 
 #: src/hugin/xrc/main_menu.xrs:17
 msgid "&Edit"
@@ -2429,11 +2481,11 @@
 
 #: src/hugin/xrc/main_menu.xrs:18
 msgid "&Undo"
-msgstr "Annulla"
+msgstr "&Annulla"
 
 #: src/hugin/xrc/main_menu.xrs:19 src/hugin/xrc/main_tool.xrs:15
 msgid "Undo the last action"
-msgstr "Annulla ultima modifica"
+msgstr "Annulla l'ultima azione"
 
 #: src/hugin/xrc/main_menu.xrs:20
 msgid "&Redo"
@@ -2441,19 +2493,19 @@
 
 #: src/hugin/xrc/main_menu.xrs:21 src/hugin/xrc/main_tool.xrs:18
 msgid "Redo the last action"
-msgstr "Ripeti ultima modifica"
+msgstr "Ripete l'ultima azione"
 
 #: src/hugin/xrc/main_menu.xrs:22
 msgid "Fine-&tune all Points"
-msgstr "Ricalibra tutti i punti"
+msgstr "&Regolazione precisa di tutti i punti"
 
 #: src/hugin/xrc/main_menu.xrs:23
 msgid ""
 "Runs fine-tune on all control points. useful for projects created with other "
 "tools, like PTGui or PTAssembler"
 msgstr ""
-"Esegue una ricalibrazione di tutti i punti di controllo. Utile in progetti "
-"creati con altri programmi, come PTGui o PTAssembler."
+"Esegue la regolazione precisa di tutti i punti, utile per i progetti creati "
+"con altri strumenti come PTGui o PTAssembler"
 
 #: src/hugin/xrc/main_menu.xrs:24
 msgid "&Optimize"
@@ -2461,7 +2513,7 @@
 
 #: src/hugin/xrc/main_menu.xrs:25 src/hugin/xrc/main_tool.xrs:24
 msgid "Re-run the optimizer with current settings"
-msgstr "Ri-ottimizza con le impostazioni correnti"
+msgstr "Esegue nuovamente l'ottimizzatore con le impostazioni attuali"
 
 #: src/hugin/xrc/main_menu.xrs:26
 msgid "&Add Image"
@@ -2469,11 +2521,11 @@
 
 #: src/hugin/xrc/main_menu.xrs:27 src/hugin/xrc/main_tool.xrs:21
 msgid "Add another image to the current project"
-msgstr "Aggiungi immagine al progetto corrente"
+msgstr "Aggiunge un'altra immagine al progetto attuale"
 
 #: src/hugin/xrc/main_menu.xrs:28
 msgid "&View"
-msgstr "&Vista"
+msgstr "&Visualizza"
 
 #: src/hugin/xrc/main_menu.xrs:29
 msgid "&Control point table"
@@ -2481,43 +2533,43 @@
 
 #: src/hugin/xrc/main_menu.xrs:30
 msgid "Shows all control point distances"
-msgstr "Mostra distanze di tutti i punti di controllo"
+msgstr "Mostra le distanze di tutti i punti di controllo"
 
 #: src/hugin/xrc/main_menu.xrs:31
 msgid "&Preview window"
-msgstr "&Finestra di Anteprima"
+msgstr "&Anteprima"
 
 #: src/hugin/xrc/main_menu.xrs:32
 msgid "Show the preview window"
-msgstr "Mostra la finestra anteprima"
+msgstr "Mostra la finestra dell'anteprima"
 
 #: src/hugin/xrc/main_menu.xrs:34
 msgid "&About"
-msgstr "&Info"
+msgstr "I&nformazioni"
 
 #: src/hugin/xrc/main_menu.xrs:35
 msgid "About program"
-msgstr "Info sul programma"
+msgstr "Informazioni sul programma"
 
 #: src/hugin/xrc/main_menu.xrs:37
 msgid "Some information on the different buttons and so on."
-msgstr "Qualche informazione sui pulsanti e cose cosi'"
+msgstr "Informazioni sui diversi pulsanti e altre cose."
 
 #: src/hugin/xrc/main_menu.xrs:38
 msgid "&Tip of the day"
-msgstr "& Pillola del giorno"
+msgstr "&Suggerimento del giorno"
 
 #: src/hugin/xrc/main_menu.xrs:39
 msgid "Show one of the tips of the day."
-msgstr "Mostra una delle pillole del giorno"
+msgstr "Mostra uno dei suggerimenti del giorno"
 
 #: src/hugin/xrc/main_menu.xrs:40
 msgid "&Keyboard Shortcuts"
-msgstr "& Scorciatoie Tastiera"
+msgstr "Scorciatoie da &tastiera"
 
 #: src/hugin/xrc/main_menu.xrs:41
 msgid "keyboard shortcuts"
-msgstr "Scorciatoie tastiera"
+msgstr "Scorciatoie da tastiera"
 
 #: src/hugin/xrc/main_menu.xrs:42
 msgid "&FAQ"
@@ -2525,7 +2577,7 @@
 
 #: src/hugin/xrc/main_menu.xrs:43
 msgid "Frequently Asked Questions"
-msgstr "Domande frequenti"
+msgstr "Domande poste di frequente"
 
 #: src/hugin/xrc/main_tool.xrs:2
 msgid "New"
@@ -2533,7 +2585,7 @@
 
 #: src/hugin/xrc/main_tool.xrs:3
 msgid "Start a new project"
-msgstr "Nuovo progetto"
+msgstr "Inizia un nuovo progetto"
 
 #: src/hugin/xrc/main_tool.xrs:5
 msgid "Open"
@@ -2541,11 +2593,11 @@
 
 #: src/hugin/xrc/main_tool.xrs:6
 msgid "Open a project file"
-msgstr "Apri progetto"
+msgstr "Apre un file progetto"
 
 #: src/hugin/xrc/main_tool.xrs:7
 msgid "Save project"
-msgstr "Salva progetto"
+msgstr "Salva il progetto"
 
 #: src/hugin/xrc/main_tool.xrs:8
 msgid "Save"
@@ -2553,15 +2605,15 @@
 
 #: src/hugin/xrc/main_tool.xrs:10
 msgid "Save project as"
-msgstr "Salve progetto con nome"
+msgstr "Salva il progetto come"
 
 #: src/hugin/xrc/main_tool.xrs:11
 msgid "Save As"
-msgstr "Salva con nome"
+msgstr "Salva come"
 
 #: src/hugin/xrc/main_tool.xrs:13 src/hugin/xrc/main_tool.xrs:14
 msgid "Undo"
-msgstr "Indietro"
+msgstr "Annulla"
 
 #: src/hugin/xrc/main_tool.xrs:16 src/hugin/xrc/main_tool.xrs:17
 msgid "Redo"
@@ -2577,7 +2629,7 @@
 
 #: src/hugin/xrc/main_tool.xrs:22
 msgid "Re-optimize"
-msgstr "Ri-ottimizza"
+msgstr "Riottimizza"
 
 #: src/hugin/xrc/main_tool.xrs:25
 msgid "Preview panorama"
@@ -2590,7 +2642,7 @@
 
 #: src/hugin/xrc/main_tool.xrs:27
 msgid "Show the preview image and the Panorama Druid"
-msgstr "Mostra  l'immagine di anteprima ed il Druido "
+msgstr "Mostra l'anteprima dell'immagine e l'assistente"
 
 #: src/hugin/xrc/main_tool.xrs:28
 msgid "Show control points"
@@ -2602,35 +2654,35 @@
 
 #: src/hugin/xrc/main_tool.xrs:30
 msgid "Show all control points in a single table"
-msgstr "Mostra tutti i punti di controllo in una sola tabella"
+msgstr "Mostra tutti i punti di controllo in una tabella"
 
 #: src/hugin/xrc/main_tool.xrs:32
 msgid "About"
-msgstr "Info"
+msgstr "Informazioni"
 
 #: src/hugin/xrc/main_tool.xrs:33
 msgid "Display credits for the creators of Hugin"
-msgstr "Mostra i credits per i creatori di Hugiin"
+msgstr "Visualizza i ringraziamenti per i programmatori di Hugin"
 
 #: src/hugin/xrc/nona_panel.xrs:1 src/hugin/xrc/ptstitcher_panel.xrs:1
 msgid "Stitching Options"
-msgstr "Opzioni di stitching"
+msgstr "Opzioni di assemblatura"
 
 #: src/hugin/xrc/nona_panel.xrs:2 src/hugin/xrc/ptstitcher_panel.xrs:2
 msgid "interpolator (i):"
-msgstr "interpolazione (i):"
+msgstr "Interpolatore:"
 
 #: src/hugin/xrc/nona_panel.xrs:3 src/hugin/xrc/ptstitcher_panel.xrs:3
 msgid "Poly3 (Bicubic)"
-msgstr "Poly3 (Bicubica)"
+msgstr "Bicubica"
 
 #: src/hugin/xrc/nona_panel.xrs:11
 msgid "approximation of values beetwen source pixels"
-msgstr "approssimazione dei valori tra i pixel sorgenti"
+msgstr "Approssimazione dei valori tra i pixel sorgenti"
 
 #: src/hugin/xrc/nona_panel.xrs:12 src/hugin/xrc/ptstitcher_panel.xrs:12
 msgid "gamma (g):"
-msgstr "gamma (g):"
+msgstr "Gamma:"
 
 #: src/hugin/xrc/nona_panel.xrs:13 src/hugin/xrc/ptstitcher_panel.xrs:28
 msgid "Output File Options"
@@ -2638,7 +2690,7 @@
 
 #: src/hugin/xrc/nona_panel.xrs:14 src/hugin/xrc/ptstitcher_panel.xrs:29
 msgid "image format:"
-msgstr "formato immagine:"
+msgstr "Formato immagine:"
 
 #: src/hugin/xrc/nona_panel.xrs:15 src/hugin/xrc/ptstitcher_panel.xrs:30
 msgid "JPG"
@@ -2654,15 +2706,15 @@
 
 #: src/hugin/xrc/nona_panel.xrs:18 src/hugin/xrc/ptstitcher_panel.xrs:33
 msgid "Multiple TIFF"
-msgstr "TIFF multipli"
+msgstr "TIFF multiplo"
 
 #: src/hugin/xrc/nona_panel.xrs:19
 msgid "Multilayer TIFF"
-msgstr "TIFF multilivello"
+msgstr "TIFF multi-livello"
 
 #: src/hugin/xrc/nona_panel.xrs:21 src/hugin/xrc/ptstitcher_panel.xrs:44
 msgid "compression:"
-msgstr "compressione:"
+msgstr "Compressione:"
 
 #: src/hugin/xrc/nona_panel.xrs:22 src/hugin/xrc/ptstitcher_panel.xrs:45
 msgid "JPEG compression (0-100)"
@@ -2675,56 +2727,56 @@
 
 #: src/hugin/xrc/nona_panel.xrs:24
 msgid "LZW"
-msgstr ""
+msgstr "LZW"
 
 #: src/hugin/xrc/nona_panel.xrs:25
-#, fuzzy
 msgid "Deflate"
-msgstr "Cancella"
+msgstr "Deflate"
 
 #: src/hugin/xrc/nona_panel.xrs:26
 msgid "Save cropped images (only TIFF&m)"
-msgstr ""
+msgstr "Salva immagini ritagliate (solo TIFF&m)"
 
 #: src/hugin/xrc/nona_panel.xrs:27
 msgid "Save cropped tiff output. Useful for enblend 2.4 and higher."
 msgstr ""
+"Salva le immagini ritagliate in TIFF. Utile per enblend 2.4 o superiore."
 
 #: src/hugin/xrc/nona_panel.xrs:28
 msgid "Soft Blending (requires enblend, only TIFF output)"
-msgstr "Blending morbido (richiede Enblend, solo files TIFF)"
+msgstr "Unione morbida (richiede enblend, output solo TIFF)"
 
 #: src/hugin/xrc/nona_panel.xrs:29
 msgid ""
 "Use the external enblend program for seamless blending. Can only produce "
 "TIFF output. Select TIFF to enable this option"
 msgstr ""
-"Usa il software esterno Enblend per la fusione accurata delle immagini. "
-"Produce solo TIFF. Selezionare TIFF output per abilitare questa opzione."
+"Usa il programma esterno enblend per l'unione uniforme. Può creare solo "
+"immagini TIFF. Selezionare TIFF per abilitare questa opzione"
 
 #: src/hugin/xrc/optimize_panel.xrs:1
 msgid "Quick Optimizer"
-msgstr "Ottimizzazione rapida"
+msgstr "Ottimizzatore veloce"
 
 #: src/hugin/xrc/optimize_panel.xrs:3
 msgid "Positions (incremental, starting from anchor)"
-msgstr "Posizione (incrementale, a partire dal riferimento)"
+msgstr "Posizioni (incrementale, a partire dal blocco)"
 
 #: src/hugin/xrc/optimize_panel.xrs:4
 msgid "Positions (y,p,r)"
-msgstr "Posizione"
+msgstr "Posizioni"
 
 #: src/hugin/xrc/optimize_panel.xrs:5
 msgid "Positions and View (y,p,r,v)"
-msgstr "Posizioni e Angolo di Campo (y,p,r,v)"
+msgstr "Posizioni e vista"
 
 #: src/hugin/xrc/optimize_panel.xrs:6
 msgid "Positions and Barrel Distortion (y,p,r,b)"
-msgstr "Posizioni e Distorsione (y,p,r,b)"
+msgstr "Posizioni e distorsione barilotto"
 
 #: src/hugin/xrc/optimize_panel.xrs:7
 msgid "Positions, View and Barrel (y,p,r,v,b)"
-msgstr "Posizioni, Campo e Distorsione (y,p,r,v,b)"
+msgstr "Posizioni, vista e barilotto"
 
 #: src/hugin/xrc/optimize_panel.xrs:8
 msgid "Everything"
@@ -2732,45 +2784,49 @@
 
 #: src/hugin/xrc/optimize_panel.xrs:9
 msgid "the Custom parameters below"
-msgstr "i seguenti parametri personalizzati"
+msgstr "I parametri personalizzati sottostanti"
 
+# (ndt) pulsante
 #: src/hugin/xrc/optimize_panel.xrs:10
 msgid "Optimize now!"
-msgstr "Ottimizza ora!"
+msgstr "Ottimizza"
 
+# (ndt) suggerimento
 #: src/hugin/xrc/optimize_panel.xrs:11
 msgid "execute the PTOptimizer engine"
-msgstr "Eseguire PTOptimizer"
+msgstr "Esegue il motore PTOptimizer"
 
 #: src/hugin/xrc/optimize_panel.xrs:12
 msgid ""
 "Any variables below which are marked [x] will be optimized.\n"
 "Variables which are cleared [ ] will act as references or anchors."
 msgstr ""
-"Le variabili spuntate [x] sono libere e saranno ottimizzate.\n"
-"Quelle non selezionate [ ] fungono da riferimento e resteranno invariate."
+"Qualsiasi variabile selezionata [x] verrà ottimizzata.\n"
+"Le variabili non selezionate [] sono i riferimenti o i blocchi."
 
 #: src/hugin/xrc/optimize_panel.xrs:14
 msgid "yaw (y):"
-msgstr "yaw (y):"
+msgstr "Imbardata:"
 
+# (ndt) pulsante
 #: src/hugin/xrc/optimize_panel.xrs:15 src/hugin/xrc/optimize_panel.xrs:18
 #: src/hugin/xrc/optimize_panel.xrs:21
 msgid "select"
-msgstr "seleziona"
+msgstr "Seleziona"
 
+# (ndt) pulsante
 #: src/hugin/xrc/optimize_panel.xrs:16 src/hugin/xrc/optimize_panel.xrs:19
 #: src/hugin/xrc/optimize_panel.xrs:22
 msgid "clear"
-msgstr "cancella"
+msgstr "Azzera"
 
 #: src/hugin/xrc/optimize_panel.xrs:17
 msgid "pitch (p):"
-msgstr "pitch (p):"
+msgstr "Inclinazione:"
 
 #: src/hugin/xrc/optimize_panel.xrs:20
 msgid "roll (r):"
-msgstr "roll (r):"
+msgstr "Rollio:"
 
 #: src/hugin/xrc/optimize_panel.xrs:23
 msgid "Lens Parameters"
@@ -2778,123 +2834,122 @@
 
 #: src/hugin/xrc/optimize_panel.xrs:24
 msgid "view (v):"
-msgstr "view (v):"
+msgstr "Vista:"
 
 #: src/hugin/xrc/optimize_panel.xrs:28
 msgid "x shift (d):"
-msgstr "x shift (d):"
+msgstr "Spostamento x:"
 
 #: src/hugin/xrc/optimize_panel.xrs:29
 msgid "y shift (e):"
-msgstr "y shift (e):"
+msgstr "Spostamento y:"
 
 #: src/hugin/xrc/optimize_panel.xrs:30
 msgid "edit script before optimizing"
-msgstr "Modifica lo script prima di ottimizzare"
+msgstr "Modifica script prima dell'ottimizzazione"
 
 #: src/hugin/xrc/optimize_panel.xrs:31 src/hugin/xrc/ptstitcher_panel.xrs:47
 msgid "for advanced users"
-msgstr "per utenti avanzati"
+msgstr "Per utenti avanzati"
 
 #: src/hugin/xrc/pano_panel.xrs:1
-#, fuzzy
 msgid "Panorama"
-msgstr "panorama."
+msgstr "Panorama"
 
 #: src/hugin/xrc/pano_panel.xrs:3
 msgid "Field of View"
-msgstr "Angolo di Campo"
+msgstr "Campo inquadrato"
 
 #: src/hugin/xrc/pano_panel.xrs:4
 msgid "horizontal (v):"
-msgstr "orizzontale (v):"
+msgstr "Orizzontale:"
 
 #: src/hugin/xrc/pano_panel.xrs:5
-#, fuzzy
 msgid "Calculate Field of View"
-msgstr "Calcolare angolo di campo"
+msgstr "Calcola campo inquadrato"
 
 #: src/hugin/xrc/pano_panel.xrs:6
 msgid "vertical:"
-msgstr "verticale:"
+msgstr "Verticale:"
 
 #: src/hugin/xrc/pano_panel.xrs:7
 msgid "Quick Stitcher"
-msgstr "Stitcher rapido"
+msgstr "Assemblatore rapido"
 
 #: src/hugin/xrc/pano_panel.xrs:8
 msgid "Stitch the images"
-msgstr "Unisci le immagini"
+msgstr "Assembla le immagini"
 
 #: src/hugin/xrc/pano_panel.xrs:9
 msgid "with custom settings below"
-msgstr "Personalizzando le impostazioni sotto."
+msgstr "con le impostazioni personalizzate sotto"
 
 #: src/hugin/xrc/pano_panel.xrs:10
 msgid "into a high quality TIFF file"
-msgstr "in formato TIFF di qualit\xE0 alta"
+msgstr "in un file TIFF ad alta qualità"
 
 #: src/hugin/xrc/pano_panel.xrs:11
 msgid "into a high-quality JPEG file"
-msgstr "in formato JPG di qualit\xE0 alta"
+msgstr "in un file JPEG ad alta qualità"
 
 #: src/hugin/xrc/pano_panel.xrs:12
 msgid "into a draft-quality JPEG file"
-msgstr "in formato JPG di qualit\xE0 bassa"
+msgstr "in un file JPEG di anteprima"
 
 #: src/hugin/xrc/pano_panel.xrs:13
 msgid "into a layered TIFF file"
-msgstr "in formato TIFF multilivello"
+msgstr "in un file TIFF a livelli"
 
 #: src/hugin/xrc/pano_panel.xrs:14
 msgid "into a layered Photoshop file"
-msgstr "in formato Photoshop multilivello"
+msgstr "in un file Photoshop a livelli"
 
+# (ndt) pulsante
 #: src/hugin/xrc/pano_panel.xrs:15
 msgid "Stitch now!"
-msgstr "Stitcha adesso!"
+msgstr "Assembla"
 
+# (ndt) suggerimento
 #: src/hugin/xrc/pano_panel.xrs:16
 msgid "execute the PTStitcher engine"
-msgstr "avviare PTStitcher"
+msgstr "Esegue il motore PTStitcher"
 
 #: src/hugin/xrc/pano_panel.xrs:17
 msgid "Panorama Image Size"
-msgstr "Dimensioni dell'immagine panoramica"
+msgstr "Dimensione immagine panoramica"
 
 #: src/hugin/xrc/pano_panel.xrs:18
-#, fuzzy
 msgid "width:"
-msgstr "largh."
+msgstr "Larghezza:"
 
 #: src/hugin/xrc/pano_panel.xrs:19
-#, fuzzy
 msgid "height:"
-msgstr "altezza"
+msgstr "Altezza:"
 
 #: src/hugin/xrc/pano_panel.xrs:20
 msgid "Calculate Optimal Size"
-msgstr "Calcola dimensioni ottimali"
+msgstr "Calcola dimensione ottimale"
 
 #: src/hugin/xrc/pano_panel.xrs:21
 msgid "calculate highest sensible width. (uses every image pixel)"
-msgstr "Calcola la massima grandezza utile (nessun ricampionamento)"
+msgstr "Calcola la larghezza più grande (usa ogni pixel)"
 
 #: src/hugin/xrc/pano_panel.xrs:22
 msgid "Stitching engine:"
-msgstr "Motore di stitching:"
+msgstr "Motore di assemblazione:"
 
 #: src/hugin/xrc/pano_panel.xrs:23 src/hugin/xrc/run_stitcher_frame.xrs:1
 msgid "PTStitcher"
 msgstr "PTStitcher"
 
+# (ndt) è il nome di un motore...
 #: src/hugin/xrc/pano_panel.xrs:24
 msgid "nona"
 msgstr "nona"
 
 #: src/hugin/xrc/pref_dialog.xrs:1
 msgid "Preferences - hugin"
-msgstr "Preferenze - hugin"
+msgstr "Preferenze di Hugin"
 
 #: src/hugin/xrc/pref_dialog.xrs:2 src/hugin/xrc/pref_dialog.xrs:10
 msgid "Panotools"
@@ -2902,11 +2957,11 @@
 
 #: src/hugin/xrc/pref_dialog.xrs:3
 msgid "Panorama Tools"
-msgstr "Panorama Tools"
+msgstr "Strumenti panorama"
 
 #: src/hugin/xrc/pref_dialog.xrs:4
 msgid "Use alternative PTStitcher program"
-msgstr ""
+msgstr "Usare programma PTStitcher alternativo"
 
 #: src/hugin/xrc/pref_dialog.xrs:5
 msgid "PTStitcher:"
@@ -2916,12 +2971,11 @@
 #: src/hugin/xrc/pref_dialog.xrs:77 src/hugin/xrc/pref_dialog.xrs:82
 #: src/hugin/xrc/pref_dialog.xrs:89
 msgid "Choose..."
-msgstr ""
+msgstr "Scegli..."
 
 #: src/hugin/xrc/pref_dialog.xrs:7
-#, fuzzy
 msgid "Scriptfile:"
-msgstr "File script"
+msgstr "File script:"
 
 #: src/hugin/xrc/pref_dialog.xrs:8
 msgid "Name of the temporary script file used by Panotools"
@@ -2936,53 +2990,53 @@
 msgstr "Dettagli"
 
 #: src/hugin/xrc/pref_dialog.xrs:13
-#, fuzzy
 msgid "Image loading"
-msgstr "Shearing immagine"
+msgstr "Caricamento immagini"
 
+# (ndt) opzione
 #: src/hugin/xrc/pref_dialog.xrs:14
 msgid "Automatically align images after loading"
-msgstr ""
+msgstr "Allineare automaticamente le immagini dopo il caricamento"
 
 #: src/hugin/xrc/pref_dialog.xrs:15
-#, fuzzy
 msgid "Auto align"
-msgstr "Autopano"
+msgstr "Allineamento automatico"
 
 #: src/hugin/xrc/pref_dialog.xrs:16
-#, fuzzy
 msgid ""
 "Number of Ctrl Points\n"
 "per overlap"
-msgstr "Numero punti di controllo per ogni coppia di immagini"
+msgstr ""
+"Numero punti di controllo\n"
+"per sovrapposizione"
 
 #: src/hugin/xrc/pref_dialog.xrs:17
 msgid "Downscale final pano"
-msgstr ""
+msgstr "Ridurre panorama finale del"
 
 #: src/hugin/xrc/pref_dialog.xrs:18
-#, fuzzy
 msgid "percent of max. width"
-msgstr "percentuale della larghezza dell'immagine"
+msgstr "% della larghezza massima"
 
+# (ndt) è nel dialogo delle preferenze,
+# identifica una sezione delle preferenze
 #: src/hugin/xrc/pref_dialog.xrs:19
-#, fuzzy
 msgid "Create"
-msgstr "Centra"
+msgstr "Creazione"
 
+# (ndt) opzione
 #: src/hugin/xrc/pref_dialog.xrs:20
 msgid "Open final panorama in external editor"
-msgstr ""
+msgstr "Aprire il panorama con un editor esterno"
 
 #: src/hugin/xrc/pref_dialog.xrs:21
-#, fuzzy
 msgid "Editor:"
-msgstr "&Modifica"
+msgstr "Editor:"
 
 #: src/hugin/xrc/pref_dialog.xrs:23 src/hugin/xrc/pref_dialog.xrs:78
 #: src/hugin/xrc/pref_dialog.xrs:83
 msgid "Arguments:"
-msgstr "Valori:"
+msgstr "Argomenti:"
 
 #: src/hugin/xrc/pref_dialog.xrs:24
 #, c-format
@@ -2991,18 +3045,25 @@
 "%f  -- final panorama\n"
 "%i  -- first input image"
 msgstr ""
+"I seguenti modelli saranno sostituiti prima dell'esecuzione:\n"
+"%f -- panorama finale\n"
+"%i -- prima immagine di input"
 
 #: src/hugin/xrc/pref_dialog.xrs:25
 msgid "Finetune"
-msgstr "Finetune"
+msgstr "Regolazione precisa"
 
 #: src/hugin/xrc/pref_dialog.xrs:26
 msgid "Basic Settings"
-msgstr "impostazioni fondamentali"
+msgstr "Impostazioni di base"
 
+# (ndt) non capisco bene cosa vogliano dire

@@ Diff output truncated at 100000 characters. @@

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

[Hugin-cvs] SF.net SVN: hugin: [2543] hugin/trunk/src/hugin1/hugin

From: <dangelo@us...> - 2007-11-28 20:42

Revision: 2543
          http://hugin.svn.sourceforge.net/hugin/?rev=2543&view=rev
Author:   dangelo
Date:     2007-11-28 12:42:56 -0800 (Wed, 28 Nov 2007)

Log Message:
-----------
forgot to add

Added Paths:
-----------
    hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.cpp
    hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.h

Added: hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.cpp	                        (rev 0)
+++ hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.cpp	2007-11-28 20:42:56 UTC (rev 2543)
@@ -0,0 +1,132 @@
+// -*- c-basic-offset: 4 -*-
+
+/** @file NonaOptionsDialog.cpp
+ *
+ *  @brief implementation of NonaOptionsDialog Class
+ *
+ *  @author Kai-Uwe Behrmann <web@...> and
+ *          Pablo d'Angelo <pablo.dangelo@...>
+ *
+ *  $Id: NonaOptionsDialog.cpp 2510 2007-10-28 22:24:11Z dangelo $
+ *
+ *  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 <config.h>
+#include <errno.h>
+#include "panoinc_WX.h"
+
+#include "panoinc.h"
+
+#include "PT/Stitcher.h"
+
+#include "common/wxPlatform.h"
+#include "hugin/config_defaults.h"
+#include "hugin/CommandHistory.h"
+#include "hugin/NonaOptionsDialog.h"
+
+using namespace PT;
+using namespace std;
+using namespace utils;
+
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(NonaOptionsDialog, wxDialog)
+    EVT_CHOICE ( XRCID("nona_choice_interpolator"),NonaOptionsDialog::InterpolatorChanged)
+    EVT_CHECKBOX( XRCID("nona_cb_cropped"), NonaOptionsDialog::OnSaveCropped)
+END_EVENT_TABLE()
+
+
+// Define a constructor for the Pano Panel
+NonaOptionsDialog::NonaOptionsDialog(wxWindow *parent, Panorama & pano)
+    : wxDialog(parent, 1, _("Nona options")),
+      pano(pano),
+      updatesDisabled(false)
+{
+
+    // loading xrc resources in selfcreated this panel
+    wxXmlResource::Get()->LoadPanel ( this, wxT("nona_options_dialog"));
+
+    // converts KILL_FOCUS events to usable TEXT_ENTER events
+    // get gui controls
+    m_InterpolatorChoice = XRCCTRL(*this, "nona_choice_interpolator",
+                                   wxChoice);
+    DEBUG_ASSERT(m_InterpolatorChoice);
+
+    m_SaveCroppedCB = XRCCTRL(*this, "nona_cb_cropped", wxCheckBox);
+    DEBUG_ASSERT(m_SaveCroppedCB);
+
+    UpdateDisplay(pano.getOptions());
+
+    // observe the panorama
+    pano.addObserver (this);
+
+    Fit();
+    wxSize sz = GetSize();
+    SetSizeHints(sz.GetWidth(), sz.GetHeight());
+
+    DEBUG_DEBUG("setting minsize to:" << sz.GetWidth() << "x" << sz.GetHeight());
+}
+
+
+NonaOptionsDialog::~NonaOptionsDialog(void)
+{
+    DEBUG_TRACE("dtor");
+    pano.removeObserver(this);
+    DEBUG_TRACE("dtor end");
+}
+
+
+void NonaOptionsDialog::panoramaChanged (PT::Panorama &pano)
+{
+	DEBUG_TRACE("");
+    PanoramaOptions opt = pano.getOptions();
+    // update all options for dialog and notebook tab
+    UpdateDisplay(opt);
+    m_oldOpt = opt;
+}
+
+void NonaOptionsDialog::UpdateDisplay(const PanoramaOptions & opt)
+{
+    m_InterpolatorChoice->SetSelection(opt.interpolator);
+    m_SaveCroppedCB->SetValue(opt.tiff_saveROI);
+}
+
+
+void NonaOptionsDialog::InterpolatorChanged ( wxCommandEvent & e )
+{
+    if (updatesDisabled) return;
+    PanoramaOptions opt = pano.getOptions();
+    //Interpolator from PanoramaMemento.h
+    int lt = m_InterpolatorChoice->GetSelection();
+
+    opt.interpolator = (vigra_ext::Interpolator) lt;
+    GlobalCmdHist::getInstance().addCommand(
+        new PT::SetPanoOptionsCmd( pano, opt )
+        );
+    DEBUG_DEBUG ("Interpolator changed to: " << lt );
+}
+
+void NonaOptionsDialog::OnSaveCropped(wxCommandEvent & e)
+{
+    PanoramaOptions opt = pano.getOptions();
+
+    opt.tiff_saveROI= m_SaveCroppedCB->GetValue();
+
+    GlobalCmdHist::getInstance().addCommand(
+            new PT::SetPanoOptionsCmd( pano, opt )
+                                           );
+}

Added: hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.h	                        (rev 0)
+++ hugin/trunk/src/hugin1/hugin/NonaOptionsDialog.h	2007-11-28 20:42:56 UTC (rev 2543)
@@ -0,0 +1,91 @@
+// -*- c-basic-offset: 4 -*-
+/** @file NonaOptionsDialog.h
+ *
+ *  @author Pablo d'Angelo <pablo.dangelo@...>
+ *
+ *  $Id: NonaOptionsDialog.h 2510 2007-10-28 22:24:11Z dangelo $
+ *
+ *  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
+ *
+ */
+
+#ifndef _NONASTITCHERPANEL_H
+#define _NONASTITCHERPANEL_H
+
+#include "hugin/StitcherPanel.h"
+//#include "hugin/MainFrame.h"
+
+//using namespace PT;
+class PanoDialog;
+class wxSpinCtrl;
+class wxTextCtrl;
+class wxChoice;
+class wxComboBox;
+
+/** Define the nona stitcher options panel
+ *
+ *  - This window will contain the stitcher specific options.
+ */
+class NonaOptionsDialog: public wxDialog, public PT::PanoramaObserver
+{
+public:
+    NonaOptionsDialog(wxWindow *parent, PT::Panorama & pano);
+    virtual ~NonaOptionsDialog();
+
+    /** this is called whenever the panorama has changed.
+     *
+     *  This function must now update all the gui representations
+     *  of the panorama to display the new state.
+     *
+     *  Functions that change the panororama must not update
+     *  the GUI directly. The GUI should always be updated
+     *  to reflect the current panorama state in this function.
+     *
+     *  This avoids unnessecary close coupling between the
+     *  controller and the view (even if they sometimes
+     *  are in the same object). See model view controller
+     *  pattern.
+     *
+     *  @todo   react on different update signals more special
+     */
+    virtual void panoramaChanged(PT::Panorama &pano);
+
+
+ private:
+
+    // apply changes from the model
+    void UpdateDisplay(const PT::PanoramaOptions & opt);
+
+    // apply changes to the model. (gui values -> Panorama)
+    void InterpolatorChanged(wxCommandEvent & e);
+    void OnSaveCropped(wxCommandEvent & e);
+
+    // the model
+    PT::Panorama &pano;
+
+    // don't listen to input on gui elements during
+    // updating the gui from the model, to prevent recursion,
+    // because the gui might report changes as well.
+    bool updatesDisabled;
+    PT::PanoramaOptions m_oldOpt;
+
+    wxChoice    * m_InterpolatorChoice;
+
+    wxCheckBox  * m_SaveCroppedCB;
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // _NONASTITCHERPANEL_H


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

[Hugin-cvs] SF.net SVN: hugin: [2541] hugin/trunk/src

From: <dangelo@us...> - 2007-11-25 00:10

Revision: 2541
          http://hugin.svn.sourceforge.net/hugin/?rev=2541&view=rev
Author:   dangelo
Date:     2007-11-24 16:10:39 -0800 (Sat, 24 Nov 2007)

Log Message:
-----------
Reorganized Panorama panel, clarify output modes, allow choosing
output image type, support for new enfuse utility.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/CMakeLists.txt
    hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp
    hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.h
    hugin/trunk/src/hugin1/hugin/PanoPanel.cpp
    hugin/trunk/src/hugin1/hugin/PanoPanel.h
    hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc
    hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
    hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h
    hugin/trunk/src/hugin_base/nona/Stitcher.h
    hugin/trunk/src/hugin_base/panodata/Panorama.cpp
    hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h

Modified: hugin/trunk/src/hugin1/hugin/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/hugin/CMakeLists.txt	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin1/hugin/CMakeLists.txt	2007-11-25 00:10:39 UTC (rev 2541)
@@ -24,7 +24,7 @@
 set(hugin_SOURCES
 huginApp.cpp ImagesList.cpp AutoCtrlPointCreator.cpp
 MainFrame.cpp CPImageCtrl.cpp CPEditorPanel.cpp LensPanel.cpp 
-ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp
+ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp NonaOptionsDialog.cpp
 PreviewFrame.cpp PreviewPanel.cpp CropPanel.cpp OptimizePhotometricPanel.cpp
 OptimizePanel.cpp RunStitcherFrame.cpp CPListFrame.cpp
 TextKillFocusHandler.cpp PanoDruid.cpp PreferencesDialog.cpp

Modified: hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.cpp	2007-11-25 00:10:39 UTC (rev 2541)
@@ -52,50 +52,31 @@
 
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(NonaStitcherPanel, wxWindow)
+BEGIN_EVENT_TABLE(NonaOptionsDialog, wxDialog)
     EVT_CHOICE ( XRCID("nona_choice_interpolator"),NonaStitcherPanel::InterpolatorChanged)
-    EVT_TEXT_ENTER ( XRCID("nona_text_gamma"),NonaStitcherPanel::GammaChanged )
-    EVT_SPINCTRL(XRCID("nona_jpeg_quality"), NonaStitcherPanel::OnSetQuality)
-    EVT_CHECKBOX( XRCID("nona_check_enblend"), NonaStitcherPanel::OnEnblendChanged)
-    EVT_CHECKBOX( XRCID("nona_save_cropped"), NonaStitcherPanel::OnSaveCropped)
-    EVT_CHOICE   ( XRCID("nona_choice_format_final"),NonaStitcherPanel::FileFormatChanged)
-    EVT_CHOICE ( XRCID("nona_comp_type"),NonaStitcherPanel::OnCompTypeChanged)
+    EVT_CHECKBOX( XRCID("nona_cb_cropped"), NonaStitcherPanel::OnSaveCropped)
 END_EVENT_TABLE()
 
 
 // Define a constructor for the Pano Panel
 NonaStitcherPanel::NonaStitcherPanel(wxWindow *parent, Panorama & pano)
-    : StitcherPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxEXPAND|wxGROW),
+    : wxDialog(parent, -1, wxDefaultPosition, wxDefaultSize, wxEXPAND|wxGROW),
       pano(pano),
       updatesDisabled(false)
 {
 
     // loading xrc resources in selfcreated this panel
-    wxXmlResource::Get()->LoadPanel ( this, wxT("nona_panel"));
+    wxXmlResource::Get()->LoadPanel ( this, wxT("nona_options_dialog"));
 
     // converts KILL_FOCUS events to usable TEXT_ENTER events
     // get gui controls
     m_InterpolatorChoice = XRCCTRL(*this, "nona_choice_interpolator",
                                    wxChoice);
     DEBUG_ASSERT(m_InterpolatorChoice);
-    m_gammaTxt = XRCCTRL(*this, "nona_text_gamma", wxTextCtrl);
-    DEBUG_ASSERT(m_gammaTxt);
-    m_gammaTxt->PushEventHandler(new TextKillFocusHandler(this));
-    m_FormatChoice = XRCCTRL(*this, "nona_choice_format_final", wxChoice);
-    DEBUG_ASSERT(m_FormatChoice);
-    m_JPEGQualitySpin = XRCCTRL(*this, "nona_jpeg_quality", wxSpinCtrl);
-    DEBUG_ASSERT(m_JPEGQualitySpin);
-    m_JPEGQualitySpin->PushEventHandler(new TextKillFocusHandler(this));
 
-    m_EnblendCheckBox = XRCCTRL(*this, "nona_check_enblend", wxCheckBox);
-    DEBUG_ASSERT(m_EnblendCheckBox);
-
-    m_SaveCroppedCB = XRCCTRL(*this, "nona_save_cropped", wxCheckBox);
+    m_SaveCroppedCB = XRCCTRL(*this, "nona_cb_cropped", wxCheckBox);
     DEBUG_ASSERT(m_SaveCroppedCB);
 
-    m_CompTypeChoice = XRCCTRL(*this, "nona_comp_type", wxChoice);
-    DEBUG_ASSERT(m_CompTypeChoice);
-
     UpdateDisplay(pano.getOptions());
 
     // observe the panorama

Modified: hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.h	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin1/hugin/NonaStitcherPanel.h	2007-11-25 00:10:39 UTC (rev 2541)
@@ -1,5 +1,5 @@
 // -*- c-basic-offset: 4 -*-
-/** @file PanoPanel.h
+/** @file NonaOptionsDialog.h
  *
  *  @author Pablo d'Angelo <pablo.dangelo@...>
  *
@@ -38,11 +38,11 @@
  *
  *  - This window will contain the stitcher specific options.
  */
-class NonaStitcherPanel: public StitcherPanel, public PT::PanoramaObserver
+class NonaStitcherDialog: public wxDialog, public PT::PanoramaObserver
 {
 public:
-    NonaStitcherPanel(wxWindow *parent, PT::Panorama & pano);
-    virtual ~NonaStitcherPanel(void) ;
+    NonaStitcherDialog(wxWindow *parent, PT::Panorama & pano);
+    virtual ~NonaStitcherDialog();
 
     /** this is called whenever the panorama has changed.
      *
@@ -61,11 +61,7 @@
      *  @todo   react on different update signals more special
      */
     virtual void panoramaChanged(PT::Panorama &pano);
-//    void panoramaImageChanged(PT::Panorama &pano, const PT::UIntSet & imgNr);
 
-    /** set the image */
-// TODO remove
-//    void previewSingleChanged(wxCommandEvent & e);
 
  private:
 
@@ -74,18 +70,8 @@
 
     // apply changes to the model. (gui values -> Panorama)
     void InterpolatorChanged(wxCommandEvent & e);
-    void OnEnblendChanged( wxCommandEvent & e );
-    void OnCompTypeChanged( wxCommandEvent & e );
-    void OnSetQuality(wxSpinEvent & e);
     void OnSaveCropped(wxCommandEvent & e);
-    void GammaChanged ( wxCommandEvent & e );
 
-    void FileFormatChanged(wxCommandEvent & e);
-
-    // actions
-    virtual bool Stitch(const PT::Panorama & pano,
-                        PT::PanoramaOptions opts);
-
     // the model
     PT::Panorama &pano;
 
@@ -94,17 +80,10 @@
     // because the gui might report changes as well.
     bool updatesDisabled;
     PT::PanoramaOptions m_oldOpt;
-    double m_oldVFOV;
 
     wxChoice    * m_InterpolatorChoice;
 
-//    wxTextCtrl  * m_WidthTxt;
-    wxTextCtrl  * m_gammaTxt;
-    wxChoice    * m_FormatChoice;
-    wxSpinCtrl  * m_JPEGQualitySpin;
-    wxCheckBox  * m_EnblendCheckBox;
     wxCheckBox  * m_SaveCroppedCB;
-    wxChoice    * m_CompTypeChoice;
 
     DECLARE_EVENT_TABLE()
 };

Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin1/hugin/PanoPanel.cpp	2007-11-25 00:10:39 UTC (rev 2541)
@@ -84,17 +84,21 @@
     EVT_CHECKBOX ( XRCID("pano_cb_ldr_output_blended"), PanoPanel::OnOutputFilesChanged)
     EVT_CHECKBOX ( XRCID("pano_cb_ldr_output_layers"), PanoPanel::OnOutputFilesChanged)
     EVT_CHECKBOX ( XRCID("pano_cb_ldr_output_exposure_layers"), PanoPanel::OnOutputFilesChanged)
+    EVT_CHECKBOX ( XRCID("pano_cb_ldr_output_exposure_blended"), PanoPanel::OnOutputFilesChanged)
+    EVT_CHECKBOX ( XRCID("pano_cb_ldr_output_exposure_remapped"), PanoPanel::OnOutputFilesChanged)
     EVT_CHECKBOX ( XRCID("pano_cb_hdr_output_blended"), PanoPanel::OnOutputFilesChanged)
     EVT_CHECKBOX ( XRCID("pano_cb_hdr_output_stacks"), PanoPanel::OnOutputFilesChanged)
     EVT_CHECKBOX ( XRCID("pano_cb_hdr_output_layers"), PanoPanel::OnOutputFilesChanged)
 
     EVT_CHOICE ( XRCID("pano_choice_remapper"),PanoPanel::RemapperChanged )
+    EVT_BUTTON ( XRCID("pano_button_remapper_opts"),PanoPanel::OnRemapperOptions )
     EVT_CHOICE ( XRCID("pano_choice_blender"),PanoPanel::BlenderChanged )
-    EVT_CHOICE ( XRCID("pano_choice_interpolator"),PanoPanel::InterpolatorChanged)
-    EVT_CHECKBOX( XRCID("pano_cb_remapper_cropped"), PanoPanel::OnRemapperCropped)
+    EVT_BUTTON ( XRCID("pano_button_blender_opts"),PanoPanel::OnBlenderOptions )
+    EVT_CHOICE ( XRCID("pano_choice_file_format"),PanoPanel::FileFormatChanged )
+    EVT_CHOICE ( XRCID("pano_choice_hdr_file_format"),PanoPanel::HDRFileFormatChanged )
+    EVT_BUTTON ( XRCID("pano_button_file_format_opts"),PanoPanel::OnFileFormatOpts )
+    EVT_BUTTON ( XRCID("pano_button_hdr_file_format_opts"),PanoPanel::OnHDRFileFormatOpts )
 
-
-
 END_EVENT_TABLE()
 
 
@@ -186,10 +190,11 @@
     m_StitchButton = XRCCTRL(*this, "pano_button_stitch", wxButton);
     DEBUG_ASSERT(m_StitchButton);
 
-    m_InterpolatorChoice = XRCCTRL(*this, "pano_choice_interpolator",
-                                    wxChoice);
-    DEBUG_ASSERT(m_InterpolatorChoice);
-
+    m_FileFormatChoice = XRCCTRL(*this, "pano_choice_file_format", wxChoice);
+    DEBUG_ASSERT(m_FileFormatChoice);
+    m_HDRFileFormatChoice = XRCCTRL(*this, "pano_choice_hdr_file_format", wxChoice);
+    DEBUG_ASSERT(m_HDRFileFormatChoice);
+    
 #ifdef USE_WX253
     m_pano_ctrls = XRCCTRL(*this, "pano_controls_panel", wxScrolledWindow);
     DEBUG_ASSERT(m_pano_ctrls);
@@ -299,12 +304,38 @@
     // output types
     XRCCTRL(*this, "pano_cb_ldr_output_blended", wxCheckBox)->SetValue(opt.outputLDRBlended);
     XRCCTRL(*this, "pano_cb_ldr_output_layers", wxCheckBox)->SetValue(opt.outputLDRLayers);
+    XRCCTRL(*this, "pano_cb_ldr_output_exposure_blended", wxCheckBox)->SetValue(opt.outputLDRExposureBlended);
     XRCCTRL(*this, "pano_cb_ldr_output_exposure_layers", wxCheckBox)->SetValue(opt.outputLDRExposureLayers);
+    XRCCTRL(*this, "pano_cb_ldr_output_exposure_remapped", wxCheckBox)->SetValue(opt.outputLDRExposureRemapped);
     XRCCTRL(*this, "pano_cb_hdr_output_blended", wxCheckBox)->SetValue(opt.outputHDRBlended);
     XRCCTRL(*this, "pano_cb_hdr_output_stacks", wxCheckBox)->SetValue(opt.outputHDRStacks);
     XRCCTRL(*this, "pano_cb_hdr_output_layers", wxCheckBox)->SetValue(opt.outputHDRLayers);
 
-    XRCCTRL(*this, "pano_cb_remapper_cropped", wxCheckBox)->SetValue(opt.tiff_saveROI);
+    // output file mode
+    long i=0;
+    if (opt.outputImageType == "tif")
+        i = 0;
+    else if (opt.outputImageType == "jpg")
+        i = 1;
+    else if (opt.outputImageType == "png")
+        i = 2;
+    else if (opt.outputImageType == "exr")
+        i = 3;
+    else
+        wxLogError(wxT("INTERNAL error: unknown output image type"));
+
+    m_FileFormatChoice->SetSelection(i);
+
+    i=0;
+    if (opt.outputImageTypeHDR == "exr")
+        i = 0;
+    else if (opt.outputImageTypeHDR == "tif")
+        i = 1;
+    else
+        wxLogError(wxT("INTERNAL error: unknown hdr output image type"));
+
+    m_HDRFileFormatChoice->SetSelection(i);
+
 }
 
 void PanoPanel::ProjectionChanged ( wxCommandEvent & e )
@@ -485,7 +516,6 @@
 {
     int remapper = m_RemapperChoice->GetSelection();
     DEBUG_DEBUG("changing remapper to " << remapper);
-    // TODO: change panorama options..
 
     PanoramaOptions opt = pano.getOptions();
     if (remapper == 1) {
@@ -499,6 +529,12 @@
             );
 }
 
+void PanoPanel::OnRemapperOptions(wxCommandEvent & e)
+{
+    wxLogError(_("Not yet implemented"));
+}
+
+
 void PanoPanel::BlenderChanged(wxCommandEvent & e)
 {
     int blender = m_BlenderChoice->GetSelection();
@@ -527,34 +563,12 @@
             );
 }
 
-// Stitcher options
-void PanoPanel::InterpolatorChanged(wxCommandEvent & e)
+void PanoPanel::OnBlenderOptions(wxCommandEvent & e)
 {
-    // TODO: check panotools interpolators if PTmender is
-    // is used
-    PanoramaOptions opt = pano.getOptions();
-    //Interpolator from PanoramaMemento.h
-    int lt = m_InterpolatorChoice->GetSelection();
-
-    opt.interpolator = (vigra_ext::Interpolator) lt;
-    GlobalCmdHist::getInstance().addCommand(
-        new PT::SetPanoOptionsCmd( pano, opt )
-        );
-    DEBUG_DEBUG ("Interpolator changed to: " << lt )
+    wxLogError(_("Not yet implemented"));
 }
 
-void PanoPanel::OnRemapperCropped(wxCommandEvent & e)
-{
-    PanoramaOptions opt = pano.getOptions();
-    //Interpolator from PanoramaMemento.h
-    opt.tiff_saveROI = e.IsChecked();
-    GlobalCmdHist::getInstance().addCommand(
-        new PT::SetPanoOptionsCmd( pano, opt )
-        );
-}
 
-
-
 void PanoPanel::DoCalcFOV(wxCommandEvent & e)
 {
     DEBUG_TRACE("");
@@ -656,6 +670,68 @@
     DoStitch();
 }
 
+void PanoPanel::FileFormatChanged(wxCommandEvent & e)
+{
+
+    int fmt = m_FileFormatChoice->GetSelection();
+    DEBUG_DEBUG("changing file format to " << fmt);
+
+    PanoramaOptions opt = pano.getOptions();
+    switch (fmt) {
+        case 1:
+            opt.outputImageType ="jpg";
+            break;
+        case 2:
+            opt.outputImageType ="png";
+            break;
+        case 3:
+            opt.outputImageType ="exr";
+            break;
+        default:
+        case 0:
+            opt.outputImageType ="tif";
+            break;
+    }
+
+    GlobalCmdHist::getInstance().addCommand(
+            new PT::SetPanoOptionsCmd( pano, opt )
+            );
+}
+
+void PanoPanel::OnFileFormatOpts(wxCommandEvent & e)
+{
+    wxMessageBox(_("Not yet implemented"));
+}
+
+void PanoPanel::HDRFileFormatChanged(wxCommandEvent & e)
+{
+
+    int fmt = m_HDRFileFormatChoice->GetSelection();
+    DEBUG_DEBUG("changing file format to " << fmt);
+
+    PanoramaOptions opt = pano.getOptions();
+    switch (fmt) {
+        case 1:
+            opt.outputImageTypeHDR ="tif";
+            break;
+        default:
+        case 0:
+            opt.outputImageTypeHDR ="exr";
+            break;
+    }
+
+    GlobalCmdHist::getInstance().addCommand(
+            new PT::SetPanoOptionsCmd( pano, opt )
+            );
+}
+
+
+void PanoPanel::OnHDRFileFormatOpts(wxCommandEvent & e)
+{
+    wxMessageBox(_("Not yet implemented"));
+}
+
+
 void PanoPanel::OnOutputFilesChanged(wxCommandEvent & e)
 {
     int id = e.GetId();
@@ -667,6 +743,11 @@
         opts.outputLDRLayers = e.IsChecked();
     } else if (id == XRCID("pano_cb_ldr_output_exposure_layers") ) {
         opts.outputLDRExposureLayers = e.IsChecked();
+    } else if (id == XRCID("pano_cb_ldr_output_exposure_blended") ) {
+        opts.outputLDRExposureBlended = e.IsChecked();
+    } else if (id == XRCID("pano_cb_ldr_output_exposure_remapped") ) {
+        opts.outputLDRExposureRemapped = e.IsChecked();
+        wxMessageBox(wxT("Setting exp remapped"));
     } else if (id == XRCID("pano_cb_hdr_output_blended") ) {
         opts.outputHDRBlended = e.IsChecked();
     } else if (id == XRCID("pano_cb_hdr_output_stacks") ) {

Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/PanoPanel.h	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin1/hugin/PanoPanel.h	2007-11-25 00:10:39 UTC (rev 2541)
@@ -103,12 +103,17 @@
 
     void OnOutputFilesChanged(wxCommandEvent & e);
     void RemapperChanged(wxCommandEvent & e);
+    void OnRemapperOptions(wxCommandEvent & e);
     void BlenderChanged(wxCommandEvent & e);
+    void OnBlenderOptions(wxCommandEvent & e);
 
-    // Stitcher options
-    void InterpolatorChanged(wxCommandEvent & e);
-    void OnRemapperCropped(wxCommandEvent & e);
+    // File format options
+    void FileFormatChanged(wxCommandEvent & e);
+    void OnFileFormatOpts(wxCommandEvent & e);
+    void HDRFileFormatChanged(wxCommandEvent & e);
+    void OnHDRFileFormatOpts(wxCommandEvent & e);
 
+
     void WidthChanged(wxCommandEvent & e);
     void HeightChanged(wxCommandEvent & e);
     void ROIChanged(wxCommandEvent & e);
@@ -155,12 +160,13 @@
     wxButton    * m_CalcHFOVButton;
     wxButton    * m_CalcOptWidthButton;
 
+    wxChoice    * m_FileFormatChoice;
+    wxChoice    * m_HDRFileFormatChoice;
+
 #ifdef USE_WX253
     wxScrolledWindow *m_pano_ctrls;
 #endif
 
-    wxChoice    * m_InterpolatorChoice;
-
     DECLARE_EVENT_TABLE()
 };
 

Modified: hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc
===================================================================
--- hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc	2007-11-25 00:10:39 UTC (rev 2541)
@@ -260,14 +260,15 @@
                       <size platform="mac">12</size>
                     </font>
                   </object>
-                  <flag>wxTOP</flag>
+                  <flag>wxTOP|wxBOTTOM</flag>
                   <border>6</border>
                   <cellpos>6,0</cellpos>
                   <cellspan>0,4</cellspan>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="pano_rb_ldr_enabled">
-                    <label>LDR</label>
+                  <object class="wxStaticText" name="">
+                    <label>Normal</label>
+                    <tooltip>For panoramas consisting of images with similar exposure</tooltip>
                   </object>
                   <flag>wxLEFT</flag>
                   <border>6</border>
@@ -275,34 +276,67 @@
                   <cellspan>0,2</cellspan>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="pano_rb_hdr_enabled">
-                    <label>HDR</label>
+                  <object class="wxStaticText" name="">
+                    <label>Exposure Blending</label>
+                    <tooltip>For panoramas consisting of images with varying exposure</tooltip>
                   </object>
                   <cellpos>7,2</cellpos>
                   <cellspan>0,2</cellspan>
                 </object>
                 <object class="sizeritem">
+                  <object class="wxStaticText" name="">
+                    <label>Merge to HDR</label>
+                    <tooltip>For panoramas consisting of images with varying exposure</tooltip>
+                  </object>
+                  <cellpos>7,4</cellpos>
+                  <cellspan>0,2</cellspan>
+                </object>
+                <object class="sizeritem">
                   <object class="wxBoxSizer">
                     <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="pano_cb_ldr_output_blended">
                         <label>Blended panorama</label>
+                        <tooltip>Use blend the individual layers using the selected blender</tooltip>
                       </object>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="pano_cb_ldr_output_layers">
-                        <label>Individual layers</label>
+                        <label>Remapped images</label>
+                        <tooltip>Output remapped images with exposure correction</tooltip>
                       </object>
                     </object>
+                  </object>
+                  <flag>wxLEFT</flag>
+                  <border>12</border>
+                  <cellpos>8,0</cellpos>
+                  <cellspan>0,2</cellspan>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxBoxSizer">
+                    <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
+                      <object class="wxCheckBox" name="pano_cb_ldr_output_exposure_blended">
+                        <label>Blended panorama (enfuse)</label>
+                        <tooltip>Fully automatic exposure blending</tooltip>
+                      </object>
+                    </object>
+                    <object class="sizeritem">
                       <object class="wxCheckBox" name="pano_cb_ldr_output_exposure_layers">
                         <label>Blended exposure layers</label>
+                        <tooltip>Output a complete blended panorama of each exposure. Useful for manual exposure blending, for example in Photoshop or Gimp</tooltip>
                       </object>
                     </object>
+                    <object class="sizeritem">
+                      <object class="wxCheckBox" name="pano_cb_ldr_output_exposure_remapped">
+                        <label>Remapped images</label>
+                        <tooltip>Output remapped images with original exposure</tooltip>
+                      </object>
+                    </object>
                   </object>
                   <flag>wxLEFT</flag>
                   <border>12</border>
-                  <cellpos>8,0</cellpos>
+                  <cellpos>8,2</cellpos>
                   <cellspan>0,2</cellspan>
                 </object>
                 <object class="sizeritem">
@@ -310,24 +344,27 @@
                     <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="pano_cb_hdr_output_blended">
-                        <label>Blended panorama</label>
+                        <label>Blended HDR panorama</label>
+                        <tooltip>Output a blended high dynamic range panorama</tooltip>
                       </object>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="pano_cb_hdr_output_stacks">
                         <label>Stacked HDR images</label>
+                        <tooltip>Output the individual, remapped HDR stacks</tooltip>
                       </object>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="pano_cb_hdr_output_layers">
-                        <label>Individual layers</label>
+                        <label>Individual non merged images</label>
+                        <tooltip>Output remapped images in a linear color space</tooltip>
                       </object>
                     </object>
                   </object>
                   <flag>wxLEFT</flag>
                   <border>12</border>
-                  <cellpos>8,2</cellpos>
-                  <cellspan>0,3</cellspan>
+                  <cellpos>8,4</cellpos>
+                  <cellspan>0,2</cellspan>
                 </object>
               </object>
               <flag>wxLEFT|wxEXPAND</flag>
@@ -360,164 +397,199 @@
               <option>0</option>
             </object>
             <object class="sizeritem">
-              <object class="wxStaticText">
-                <label>Processing</label>
-                <font>
-                  <style platform="mac">normal</style>
-                  <family platform="mac">swiss</family>
-                  <weight>bold</weight>
-                  <size platform="mac">12</size>
-                </font>
-              </object>
-              <flag>wxTOP</flag>
-              <border>6</border>
-              <cellpos>4,0</cellpos>
-              <cellspan>0,4</cellspan>
-            </object>
-            <object class="sizeritem">
               <object class="wxBoxSizer">
-                <orient>wxVERTICAL</orient>
+                <orient>wxHORIZONTAL</orient>
                 <object class="sizeritem">
                   <object class="wxBoxSizer">
-                    <orient>wxHORIZONTAL</orient>
+                    <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                        <orient>wxVERTICAL</orient>
+                      <object class="wxStaticText">
+                        <label>Processing</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                      <flag>wxTOP</flag>
+                      <border>6</border>
+                      <cellpos>4,0</cellpos>
+                      <cellspan>0,4</cellspan>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxFlexGridSizer">
+                        <cols>3</cols>
+                        <rows>2</rows>
                         <object class="sizeritem">
-                          <object class="wxBoxSizer">
-                            <orient>wxHORIZONTAL</orient>
-                            <object class="sizeritem">
-                              <object class="wxStaticText">
-                                <label>Remapper:</label>
-                              </object>
-                              <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                            </object>
-                            <object class="sizeritem">
-                              <object class="wxChoice" name="pano_choice_remapper">
-                                <content>
-                                  <item>Nona</item>
-                                  <item>PTmender</item>
-                                </content>
-                                <selection>0</selection>
-                              </object>
-                              <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                              <border>6</border>
-                            </object>
+                          <object class="wxStaticText">
+                            <label>Remapper:</label>
                           </object>
+                          <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                         </object>
                         <object class="sizeritem">
-                          <object class="wxPanel" name="pano_stitcher_opts">
-                            <object class="wxBoxSizer">
-                              <orient>wxVERTICAL</orient>
-                              <object class="sizeritem">
-                                <object class="wxPanel" name="pano_stitcher_nona">
-                                  <object class="wxBoxSizer">
-                                    <orient>wxVERTICAL</orient>
-                                    <object class="sizeritem">
-                                      <object class="wxFlexGridSizer">
-                                        <cols>2</cols>
-                                        <rows>1</rows>
-                                        <object class="sizeritem">
-                                          <object class="wxStaticText">
-                                            <label>interpolator (i):</label>
-                                          </object>
-                                          <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                                        </object>
-                                        <object class="sizeritem">
-                                          <object class="wxChoice" name="pano_choice_interpolator">
-                                            <content>
-                                              <item>Poly3 (Bicubic)</item>
-                                              <item>Spline 16</item>
-                                              <item>Spline 36</item>
-                                              <item>Sinc 256</item>
-                                              <item>Spline 64</item>
-                                              <item>Bilinear</item>
-                                              <item>Nearest neighbour</item>
-                                              <item>Sinc 1024</item>
-                                            </content>
-                                            <selection>0</selection>
-                                            <tooltip>approximation of values beetwen source pixels</tooltip>
-                                          </object>
-                                          <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                                        </object>
-                                        <vgap>6</vgap>
-                                        <hgap>6</hgap>
-                                      </object>
-                                    </object>
-                                    <object class="sizeritem">
-                                      <object class="wxCheckBox" name="pano_cb_remapper_cropped">
-                                        <label>save cropped layers</label>
-                                      </object>
-                                      <flag>wxALL</flag>
-                                      <border>6</border>
-                                    </object>
-                                  </object>
-                                </object>
-                              </object>
-                            </object>
+                          <object class="wxChoice" name="pano_choice_remapper">
+                            <content>
+                              <item>Nona</item>
+                              <item>PTmender</item>
+                            </content>
+                            <selection>0</selection>
                           </object>
-                          <flag>wxALL|wxEXPAND</flag>
+                          <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                           <border>6</border>
                         </object>
+                        <object class="sizeritem">
+                          <object class="wxButton" name="pano_button_remapper_opts">
+                            <label>Options</label>
+                          </object>
+                          <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          <border>6</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Blender:</label>
+                          </object>
+                          <flag>wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          <border>14</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxChoice" name="pano_choice_blender">
+                            <content>
+                              <item>enblend</item>
+                              <item>none</item>
+                            </content>
+                            <selection>0</selection>
+                          </object>
+                          <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          <border>6</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxButton" name="pano_button_blender_opts">
+                            <label>Options</label>
+                            <enabled>0</enabled>
+                          </object>
+                          <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          <border>6</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>HDR merger:</label>
+                          </object>
+                          <flag>wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          <border>14</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxChoice" name="pano_choice_blender">
+                            <content>
+                              <item>builtin</item>
+                            </content>
+                            <selection>0</selection>
+                          </object>
+                          <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          <border>6</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxButton" name="pano_button_hdrmerge_opts">
+                            <label>Options</label>
+                            <enabled>0</enabled>
+                          </object>
+                          <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          <border>6</border>
+                        </object>
                       </object>
                     </object>
+                  </object>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxBoxSizer">
+                    <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
                       <object class="wxBoxSizer">
                         <orient>wxVERTICAL</orient>
                         <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>File formats</label>
+                            <font>
+                              <style platform="mac">normal</style>
+                              <family platform="mac">swiss</family>
+                              <weight>bold</weight>
+                              <size platform="mac">12</size>
+                            </font>
+                          </object>
+                          <flag>wxTOP</flag>
+                          <border>6</border>
+                          <cellpos>4,0</cellpos>
+                          <cellspan>0,4</cellspan>
+                        </object>
+                        <object class="sizeritem">
                           <object class="wxBoxSizer">
                             <orient>wxHORIZONTAL</orient>
                             <object class="sizeritem">
-                              <object class="wxStaticText">
-                                <label>Blender</label>
-                              </object>
-                              <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                              <border>14</border>
-                            </object>
-                            <object class="sizeritem">
-                              <object class="wxChoice" name="pano_choice_blender">
-                                <content>
-                                  <item>enblend</item>
-                                  <item>none</item>
-                                </content>
-                                <selection>0</selection>
-                              </object>
-                              <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                              <border>6</border>
-                            </object>
-                          </object>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxPanel" name="pano_blender_opts">
-                            <object class="wxBoxSizer">
-                              <orient>wxVERTICAL</orient>
-                              <object class="sizeritem">
-                                <object class="wxPanel" name="pano_blender_enblend">
-                                  <object class="wxBoxSizer">
-                                    <orient>wxVERTICAL</orient>
+                              <object class="wxFlexGridSizer">
+                                <cols>3</cols>
+                                <rows>2</rows>
+                                <object class="sizeritem">
+                                  <object class="wxStaticText">
+                                    <label>Normal Output:</label>
                                   </object>
+                                  <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>14</border>
                                 </object>
-                              </object>
-                              <object class="sizeritem">
-                                <object class="wxPanel" name="pano_blender_PTmasker">
-                                  <object class="wxBoxSizer">
-                                    <orient>wxVERTICAL</orient>
+                                <object class="sizeritem">
+                                  <object class="wxChoice" name="pano_choice_file_format">
+                                    <content>
+                                      <item>TIFF</item>
+                                      <item>JPEG</item>
+                                      <item>PNG</item>
+                                      <item>EXR</item>
+                                    </content>
+                                    <selection>0</selection>
                                   </object>
+                                  <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>6</border>
                                 </object>
+                                <object class="sizeritem">
+                                  <object class="wxButton" name="pano_button_file_format_opts">
+                                    <label>Options</label>
+                                  </object>
+                                  <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>6</border>
+                                </object>
+                                <object class="sizeritem">
+                                  <object class="wxStaticText">
+                                    <label>HDR Output:</label>
+                                  </object>
+                                  <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>14</border>
+                                </object>
+                                <object class="sizeritem">
+                                  <object class="wxChoice" name="pano_choice_hdr_file_format">
+                                    <content>
+                                      <item>EXR</item>
+                                      <item>TIFF</item>
+                                    </content>
+                                    <selection>0</selection>
+                                  </object>
+                                  <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>6</border>
+                                </object>
+                                <object class="sizeritem">
+                                  <object class="wxButton" name="pano_button_hdr_file_format_opts">
+                                    <label>Options</label>
+                                  </object>
+                                  <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                                  <border>6</border>
+                                </object>
                               </object>
                             </object>
                           </object>
-                          <flag>wxEXPAND</flag>
+                          <flag>wxLEFT|wxEXPAND|wxADJUST_MINSIZE</flag>
+                          <border>6</border>
                         </object>
                       </object>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxADJUST_MINSIZE</flag>
-                  <border>6</border>
                 </object>
-                <object class="spacer">
-                  <size>0,10</size>
-                </object>
               </object>
             </object>
           </object>
@@ -528,4 +600,57 @@
       </object>
     </object>
   </object>
+  <object class="wxDialog" name="nona_options_dialog">
+    <title>Nona options</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <cols>2</cols>
+          <rows>1</rows>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>interpolator (i):</label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxChoice" name="nona_choice_interpolator">
+              <content>
+                <item>Poly3 (Bicubic)</item>
+                <item>Spline 16</item>
+                <item>Spline 36</item>
+                <item>Sinc 256</item>
+                <item>Spline 64</item>
+                <item>Bilinear</item>
+                <item>Nearest neighbour</item>
+                <item>Sinc 1024</item>
+              </content>
+              <selection>0</selection>
+              <tooltip>approximation of values beetwen source pixels</tooltip>
+            </object>
+            <flag>wxALIGN_CENTRE_VERTICAL</flag>
+          </object>
+          <vgap>6</vgap>
+          <hgap>6</hgap>
+        </object>
+        <flag>wxALL</flag>
+        <border>6</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckBox" name="nona_cb_cropped">
+          <label>save cropped layers</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>6</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxButton" name="wxID_OK">
+          <label></label>
+        </object>
+        <flag>wxALL|wxALIGN_RIGHT</flag>
+        <border>6</border>
+      </object>
+    </object>
+  </object>
 </resource>
\ No newline at end of file

Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp	2007-11-25 00:10:39 UTC (rev 2541)
@@ -143,6 +143,7 @@
       << "PTMASKER=" << quoteString(progs.PTmasker) << endl
       << "PTROLLER=" << quoteString(progs.PTroller) << endl
       << "ENBLEND=" << quoteString(progs.enblend) << endl
+      << "ENFUSE=" << quoteString(progs.enfuse) << endl
       << "SMARTBLEND=" << quoteString(progs.smartblend) << endl
       << "HDRMERGE=" << "hugin_hdrmerge" << endl
       << "RM=rm" << endl
@@ -167,8 +168,15 @@
 
     o << endl;
 
-    string hdrExt(".exr");
-    string ldrExt(".tif");
+    o << "ENFUSE_OPTS=" << progs.enfuse_opts;
+    if (opts.getHFOV() == 360.0) {
+        // blend over the border
+        o << " -w";
+    }
+    o << endl;
+
+    string hdrExt = string(".") + opts.outputImageTypeHDR;
+    string ldrExt = string(".") + opts.outputImageType;
     string ldrRemappedExt(".tif");
     string ldrRemappedMode("TIFF_m");
     string hdrRemappedExt = ".exr";
@@ -197,6 +205,7 @@
     << "LDR_EXPOSURE_REMAPPED_PREFIX=" << quoteString(output + "_exposure_layers_") << endl
     << "PROJECT_FILE=" << quoteString(ptofile) << endl
     << "LDR_BLENDED=" << quoteString(output + ldrExt) << endl
+    << "LDR_STACKED_BLENDED=" << quoteString(output + "_fused" + ldrExt) << endl
     << "HDR_BLENDED=" << quoteString(output + "_hdr" + hdrExt) << endl
     << endl
     << "# Input images" << endl
@@ -209,9 +218,9 @@
 
     vector<string> remappedImages;
     o << endl
-    << endl
-    << "# remapped images" << endl
-    << "LDR_LAYERS=";
+      << endl
+      << "# remapped images" << endl
+      << "LDR_LAYERS=";
     for (UIntSet::iterator it = images.begin(); it != images.end();) {
         std::ostringstream fns;
         fns << output << std::setfill('0') << std::setw(4) << *it << ldrRemappedExt;
@@ -253,8 +262,8 @@
     vector<UIntSet> stacks = getHDRStacks(pano, images);
     DEBUG_DEBUG( stacks.size() << " stacks found");
     o << endl
-    << "# stacked images" << endl
-    << "HDR_STACKS_NUMBERS = ";
+      << "# stacked images" << endl
+      << "HDR_STACKS_NUMBERS = ";
     for (unsigned i=0; i < stacks.size(); i++)
         o << i << " ";
     o << endl;
@@ -306,7 +315,7 @@
         for (UIntSet::iterator it = similarExposures[i].begin(); it != similarExposures[i].end();) {
             exposure += pano.getSrcImage(*it).getExposureValue();
             std::ostringstream fns;
-            fns << output << "_exposure_layers_" << std::setfill('0') << std::setw(4) << *it << ldrExt;
+            fns << output << "_exposure_layers_" << std::setfill('0') << std::setw(4) << *it << ldrRemappedExt;
             similarExposureRemappedImages.push_back(fns.str());
             o << quoteString(fns.str());
             ++it;
@@ -317,15 +326,15 @@
         o << expImgVar.str() << "_INPUT_PTMENDER = ";
         for (UIntSet::iterator it = similarExposures[i].begin(); it != similarExposures[i].end();) {
             std::ostringstream fns;
-            fns << output << std::setfill('0') << std::setw(4) << *it << ldrExt;
+            fns << output << std::setfill('0') << std::setw(4) << *it << ldrRemappedExt;
             o << quoteString(fns.str());
             ++it;
             if (it != similarExposures[i].end()) o << "\\" << endl;
         }
         // calculate output exposure value for this set.
         o << endl
-        << "LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE = "
-        << exposure / similarExposures[i].size() << endl;
+          << "LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE = "
+          << exposure / similarExposures[i].size() << endl;
     }
     o << endl;
     o << "LDR_EXPOSURE_LAYERS = ";
@@ -340,6 +349,38 @@
     }
     o << endl << endl;
 
+	
+    vector<string> ldrStackedImages;
+    o << endl
+      << "# stacked images for enfuse or other automatic exposure blending tools" << endl
+      << "LDR_STACKS_NUMBERS = ";
+    for (unsigned i=0; i < stacks.size(); i++)
+        o << i << " ";
+    o << endl;
+    for (unsigned i=0; i < stacks.size(); i++) {
+        std::ostringstream fns;
+        fns << output << "_stack_ldr_" << std::setfill('0') << std::setw(4) << i << ldrRemappedExt;
+        ldrStackedImages.push_back(fns.str());
+        std::ostringstream stackedImgVar;
+        stackedImgVar << "LDR_STACK_" << i;
+        o << stackedImgVar.str() << " = " << quoteString(fns.str()) << endl;
+        o << stackedImgVar.str() << "_INPUT = ";
+        for (UIntSet::iterator it = stacks[i].begin(); it != stacks[i].end();) {
+            std::ostringstream fns;
+            fns << output << "_exposure_layers_" << std::setfill('0') << std::setw(4) << *it << ldrRemappedExt;
+            o << quoteString(fns.str());
+            ++it;
+            if (it != stacks[i].end()) o << "\\" << endl;
+        }
+        o << endl << endl;
+    }
+    o << endl;
+    o << "LDR_STACKS = ";
+    for (unsigned i=0; i < stacks.size(); i++)
+        o << "$(LDR_STACK_" << i << ") ";
+    o << endl;
+
+	
     // TODO: include custom makefile here
     if (includePath.size() > 0) {
         o << "include " <<  quoteString(includePath) <<  endl << endl;
@@ -366,6 +407,12 @@
         } else
             cleanTargets += "$(LDR_EXPOSURE_LAYERS) ";
 
+        if (opts.outputLDRExposureBlended) {
+            targets += " $(LDR_STACKED_BLENDED) ";
+            cleanTargets += "$(LDR_EXPOSURE_LAYERS_REMAPPED) ";
+        } else
+            cleanTargets += "$(LDR_STACKED_BLENDED) ";
+
         if (opts.outputHDRBlended)
             targets += "$(HDR_BLENDED) ";
         else
@@ -430,10 +477,16 @@
                         {
                             string destImg = quoteString(similarExposureRemappedImages[j]);
                             string srcImg = quoteString(pano.getImage(*it).getFilename());
+							/*
                             o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl
-                            << "\t$(NONA) -r ldr -e $(LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE) -m "
-                            << ldrRemappedMode << " -o $(LDR_EXPOSURE_REMAPPED_PREFIX) -i " << *it
-                            << " $(PROJECT_FILE)" << endl << endl;
+                              << "\t$(NONA) -r ldr -e $(LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE) -m "
+                              << ldrRemappedMode << " -o $(LDR_EXPOSURE_REMAPPED_PREFIX) -i " << *it
+                              << " $(PROJECT_FILE)" << endl << endl;
+							*/
+                            o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl
+                              << "\t$(NONA) -r ldr -e " << pano.getSrcImage(*it).getExposureValue()
+                              << " -m " << ldrRemappedMode << " -o $(LDR_EXPOSURE_REMAPPED_PREFIX) -i " << *it
+                              << " $(PROJECT_FILE)" << endl << endl;
                             j++;
                         }
                     }
@@ -456,6 +509,15 @@
             << endl << endl;
         }
 
+        // ====================================
+        // output rules for LDR stack merging
+
+        for (unsigned i=0; i < stacks.size(); i++) {
+            o << "$(LDR_STACK_" << i << ") : $(LDR_STACK_" << i << "_INPUT)" << endl
+            << "\t$(ENFUSE) -o $(LDR_STACK_" << i << ") $(LDR_STACK_" << i << "_INPUT)"
+            << endl << endl;
+        }
+
         switch(opts.blendMode) {
             case PanoramaOptions::ENBLEND_BLEND:
                 // write rules for blending with enblend
@@ -468,12 +530,16 @@
 					<< "\t$(ENBLEND) $(ENBLEND_OPTS) -o $@ $^" << endl << endl;
 				}
 
+				// rules for enfuse blending
+                o << "$(LDR_STACKED_BLENDED) : $(LDR_STACKS)" << endl;
+                o << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $(LDR_STACKED_BLENDED) $(LDR_STACKS) " << endl << endl;
+
+				// rules for hdr blending
                 o << "$(HDR_BLENDED) : $(HDR_STACKS)" << endl;
                 o << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $(HDR_BLENDED) $(HDR_STACKS) " << endl << endl;
 
                 break;
             case PanoramaOptions::NO_BLEND:
-                // write rules for blending with enblend
                 o << "$(LDR_BLENDED) : $(LDR_LAYERS)" << endl
 				  << "\t-$(RM) $@" << endl
                   << "\t$(PTROLLER) -o $@ $^ " << endl << endl;
@@ -485,6 +551,10 @@
                   << "\t$(PTROLLER) -o $@ $^ " << endl << endl;
 				}
 
+                o << "$(LDR_STACKED_BLENDED) : $(LDR_STACKS)" << endl
+                  << "\t-$(RM) $@" << endl
+                  << "\t$(PTROLLER) -o $@ $^ " << endl << endl;
+
                 // rules for non-blended HDR panoramas
                 o << "$(HDR_BLENDED) : $(HDR_LAYERS)" << endl;
                 o << "\t$(HDRMERGE) -m avg -o $@ $^"   << endl << endl;
@@ -530,5 +600,5 @@
 #endif
 
 }
-        
+
 } //namespace

Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h	2007-11-25 00:10:39 UTC (rev 2541)
@@ -51,9 +51,11 @@
             std::string PTroller;
             std::string enblend;
             std::string enblend_opts;
+            std::string enfuse;
+            std::string enfuse_opts;
             std::string smartblend;
             std::string smartblend_opts;
-            
+
             PTPrograms()
             {
                     // default programs
@@ -64,6 +66,7 @@
                     PTmasker = "PTmasker";
                     PTroller = "PTroller";
                     enblend = "enblend";
+                    enfuse = "enfuse";
                     smartblend = "smartblend.exe";
             }
         };

Modified: hugin/trunk/src/hugin_base/nona/Stitcher.h
===================================================================
--- hugin/trunk/src/hugin_base/nona/Stitcher.h	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin_base/nona/Stitcher.h	2007-11-25 00:10:39 UTC (rev 2541)
@@ -273,9 +273,20 @@
             std::ostringstream greyname;
             greyname << m_basename << std::setfill('0') << std::setw(4) << imgNr << "_gray.pgm";
             vigra::ImageExportInfo exinfo1(greyname.str().c_str());
-            exinfo1.setPosition(remapped.boundingBox().upperLeft());
-            exinfo1.setCanvasSize(vigra::Size2D(opts.getWidth(), opts.getHeight()));
-            vigra::exportImage(srcImageRange(remapped.m_mask), exinfo1);
+            if (! opts.tiff_saveROI) {
+                alpha.resize(opts.getROI().size());
+                vigra::Rect2D newOutRect = remapped.boundingBox();
+                newOutRect.moveBy(-opts.getROI().upperLeft());
+                vigra::copyImage(vigra_ext::applyRect(remapped.boundingBox(),
+                                 vigra_ext::srcMaskRange(remapped)),
+                                 vigra_ext::applyRect(newOutRect,
+                                 destImage(alpha)));
+                vigra::exportImage(srcImageRange(alpha), exinfo1);
+            } else {
+                exinfo1.setPosition(remapped.boundingBox().upperLeft());
+                exinfo1.setCanvasSize(vigra::Size2D(opts.getWidth(), opts.getHeight()));
+                vigra::exportImage(srcImageRange(remapped.m_mask), exinfo1);
+            }
 
             // calculate real alpha for saving with the image
             Base::m_progress.setMessage("Calculating mask");

Modified: hugin/trunk/src/hugin_base/panodata/Panorama.cpp
===================================================================
--- hugin/trunk/src/hugin_base/panodata/Panorama.cpp	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin_base/panodata/Panorama.cpp	2007-11-25 00:10:39 UTC (rev 2541)
@@ -779,14 +779,21 @@
             o << "nona" << endl;
             break;
     }
-    
+
     o << "#hugin_outputLDRBlended " << (output.outputLDRBlended ? "true" : "false") << endl;
     o << "#hugin_outputLDRLayers " << (output.outputLDRLayers ? "true" : "false") << endl;
+    o << "#hugin_outputLDRExposureRemapped " << (output.outputLDRExposureRemapped ? "true" : "false") << endl;
     o << "#hugin_outputLDRExposureLayers " << (output.outputLDRExposureLayers ? "true" : "false") << endl;
+    o << "#hugin_outputLDRExposureBlended " << (output.outputLDRExposureBlended ? "true" : "false") << endl;
     o << "#hugin_outputHDRBlended " << (output.outputHDRBlended ? "true" : "false") << endl;
     o << "#hugin_outputHDRLayers " << (output.outputHDRLayers ? "true" : "false") << endl;
     o << "#hugin_outputHDRStacks " << (output.outputHDRStacks ? "true" : "false") << endl;    
 
+    o << "#hugin_outputImageType" << output.outputImageType << endl;
+    o << "#hugin_outputImageTypeCompression" << output.outputImageTypeCompression << endl;
+    o << "#hugin_outputImageTypeHDR" << output.outputImageTypeHDR << endl;
+    o << "#hugin_outputImageTypeHDRCompression" << output.outputImageTypeHDRCompression << endl;
+
 #ifdef __unix__
     // reset locale
     setlocale(LC_NUMERIC,old_locale);
@@ -2033,14 +2040,27 @@
                         options.outputLDRBlended = (value == "true");
                     } else if (var == "#hugin_outputLDRLayers") {
                         options.outputLDRLayers = (value == "true");
+                    } else if (var == "#hugin_outputLDRExposureRemapped") {
+                        options.outputLDRExposureRemapped = (value == "true");
                     } else if (var == "#hugin_outputLDRExposureLayers") {
                         options.outputLDRExposureLayers = (value == "true");
+                    } else if (var == "#hugin_outputLDRExposureBlended") {
+                        options.outputLDRExposureBlended = (value == "true");
                     } else if (var == "#hugin_outputHDRBlended") {
                         options.outputHDRBlended = (value == "true");
                     } else if (var == "#hugin_outputHDRLayers") {
                         options.outputHDRLayers = (value == "true");
                     } else if (var == "#hugin_outputHDRStacks") {
                         options.outputHDRStacks = (value == "true");
+
+                    } else if (var == "#hugin_outputImageType") {
+                        options.outputImageType = value;
+                    } else if (var == "#hugin_outputImageTypeCompression") {
+                        options.outputImageTypeCompression = value;
+                    } else if (var == "#hugin_outputImageTypeHDR") {
+                        options.outputImageTypeHDR = value;
+                    } else if (var == "#hugin_outputImageTypeHDRCompression") {
+                        options.outputImageTypeHDRCompression = value;
                     }
                 }
             }

Modified: hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h
===================================================================
--- hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h	2007-11-23 07:11:26 UTC (rev 2540)
+++ hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h	2007-11-25 00:10:39 UTC (rev 2541)
@@ -82,7 +82,6 @@
 #include <vigra_ext/Interpolators.h>
 #include <panodata/DestPanoImage.h>
 
-
 namespace HuginBase {
 
 /** Panorama image options
@@ -148,12 +147,12 @@
             OUTPUT_LDR=0,
             OUTPUT_HDR
         };
-        
+
         enum HDRMergeType {
             HDRMERGE_AVERAGE=0,
             HDRMERGE_DEGHOST=1
         };
-        
+
         /** blenders */
         enum BlendingMechanism {
             NO_BLEND=0,
@@ -178,15 +177,14 @@
             COLOR
         };
 
-        
     public:
         PanoramaOptions()
         {
             reset();
         };
-        
+
         virtual ~PanoramaOptions() {};
-        
+
         virtual void reset()
         {
             m_projectionFormat = EQUIRECTANGULAR;
@@ -196,7 +194,7 @@
             m_hfov = 360;
             m_size = vigra::Size2D(3000, 1500);
             m_roi = vigra::Rect2D(m_size);
-            outfile = "panorama.JPG";
+            outfile = "panorama";
             quality = 90;
             tiff_saveROI = false;
             tiffCompression = "NONE";
@@ -206,7 +204,7 @@
             gamma = 1.0;
             interpolator = vigra_ext::INTERP_CUBIC;
             featherWidth = 10;
-            outputFormat = JPEG;
+            outputFormat = TIFF_m;
             remapAcceleration = MAX_SPEEDUP;
             blendMode = NO_BLEND;
             hdrMergeMode = HDRMERGE_AVERAGE;
@@ -216,18 +214,26 @@
             photometricHuberSigma = 2/255.0;
             photometricSymmetricError = false;
             outputMode = OUTPUT_LDR;
+
             outputLDRBlended = true;
             outputLDRLayers = false;
+            outputLDRExposureRemapped = false;
             outputLDRExposureLayers = false;
+            outputLDRExposureBlended = false;
             outputHDRBlended = false;
             outputHDRLayers = false;
             outputHDRStacks = false;
-            
+
+            outputImageType = "tif";
+            outputImageTypeCompression = "LZW";
+            outputImageTypeHDR= "exr";
+            outputImageTypeHDRCompression = "";
+
             outputEMoRParams.resize(5,0.0);
             outputExposureValue = 0.0;
             outputPixelType = "";
         }
-        
+
     public:
         ///
         void printScriptLine(std::ostream & o,bool forPTOptimizer=false) const;
@@ -313,25 +319,23 @@
 
         /** get maximum possible hfov with current projection */
         double getMaxHFOV() const;
-        
+
         /** get maximum possible vfov with current projection */
         double getMaxVFOV() const;
 
         ///
         DestPanoImage getDestImage() const;
 
-
-        
     public:
         // they are public, because they need to be set through
         // get/setOptions in Panorama.
 
         std::string outfile;
         FileFormat outputFormat;
-        
+
         // jpeg options
         int quality;
-        
+
         // TIFF options
         std::string tiffCompression;
         bool tiff_saveROI;
@@ -360,14 +364,21 @@
 
         // modes related to high dynamic range output
         OutputMode outputMode;
-        
+
         bool outputLDRBlended;         ///< save blended panorama (LDR)
         bool outputLDRLayers;          ///< save remapped layers (LDR)
-        bool outputLDRExposureLayers;  ///< save blended exposure layers (actually LDR images)
+        bool outputLDRExposureRemapped;///< save remapped layers (no exposure adjustment)
+        bool outputLDRExposureLayers;  ///< save blended exposure layers (no exposure adjustment)
+        bool outputLDRExposureBlended; ///< save blended exposure layers (no exposure adjustment)
         bool outputHDRBlended;         ///< save blended panorama (HDR)
         bool outputHDRLayers;          ///< save remapped layers (HDR)
         bool outputHDRStacks;          ///< save image stacks (HDR)
 
+        std::string outputImageType;
+        std::string outputImageTypeCompression;
+        std::string outputImageTypeHDR;
+        std::string outputImageTypeHDRCompression;
+
         // select the exposure of the output images in LDR mode.
         double outputExposureValue;
         std::vector<float> outputEMoRParams;


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

[Hugin-cvs] SF.net SVN: hugin: [2540] hugin/trunk/src/hugin_base/nona/Stitcher.h

From: <dangelo@us...> - 2007-11-23 07:11

Revision: 2540
          http://hugin.svn.sourceforge.net/hugin/?rev=2540&view=rev
Author:   dangelo
Date:     2007-11-22 23:11:26 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
fixed failure on JPEG, TIFF and PNG output types, bug #1833833

Modified Paths:
--------------
    hugin/trunk/src/hugin_base/nona/Stitcher.h

Modified: hugin/trunk/src/hugin_base/nona/Stitcher.h
===================================================================
--- hugin/trunk/src/hugin_base/nona/Stitcher.h	2007-11-17 22:06:26 UTC (rev 2539)
+++ hugin/trunk/src/hugin_base/nona/Stitcher.h	2007-11-23 07:11:26 UTC (rev 2540)
@@ -582,17 +582,21 @@
         exinfo.setXResolution(150);
         exinfo.setYResolution(150);
         exinfo.setICCProfile(iccProfile);
+        if (opts.outputPixelType.size() > 0) {
+            exinfo.setPixelType(opts.outputPixelType.c_str());
+        }
+
         // set compression quality for jpeg images.
         if (opts.outputFormat == PanoramaOptions::JPEG) {
             char jpgCompr[4];
             snprintf(jpgCompr,4,"%d", opts.quality);
             exinfo.setCompression(jpgCompr);
             vigra::exportImage(srcImageRange(pano), exinfo);
-	} else if (opts.outputFormat == PanoramaOptions::TIFF) {
-	        exinfo.setCompression(opts.tiffCompression.c_str());
+        } else if (opts.outputFormat == PanoramaOptions::TIFF) {
+            exinfo.setCompression(opts.tiffCompression.c_str());
             vigra::exportImageAlpha(srcImageRange(pano),
                                            srcImage(panoMask), exinfo);
-	} else {
+        } else {
             vigra::exportImageAlpha(srcImageRange(pano),
                                            srcImage(panoMask), exinfo);
         }


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

[Hugin-cvs] SF.net SVN: hugin: [2539] hugin/trunk/src/hugin1/hugin/MainFrame.cpp

From: <dangelo@us...> - 2007-11-17 22:06

Revision: 2539
          http://hugin.svn.sourceforge.net/hugin/?rev=2539&view=rev
Author:   dangelo
Date:     2007-11-17 14:06:26 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
ask before overwriting existing project files with "Save as" function

Modified Paths:
--------------
    hugin/trunk/src/hugin1/hugin/MainFrame.cpp

Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2007-11-17 22:02:00 UTC (rev 2538)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2007-11-17 22:06:26 UTC (rev 2539)
@@ -547,12 +547,20 @@
                      wxSAVE, wxDefaultPosition);
     dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")));
     if (dlg.ShowModal() == wxID_OK) {
-        m_filename = dlg.GetPath();
-	if (m_filename.Right(4) != wxT(".pto")) {
-	    m_filename.Append(wxT(".pto"));
-	}
+        wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory());  // remember for later
+        wxString fn = dlg.GetPath();
+        if (fn.Right(4) != wxT(".pto")) {
+            fn.Append(wxT(".pto"));
+        }
+        if (wxFile::Exists(fn)) {
+            int d = wxMessageBox(wxString::Format(_("File %s exists. Overwrite?"), fn.c_str()),
+                                 _("Save project"), wxYES_NO | wxICON_QUESTION);
+            if (d != wxYES) {
+                return;
+            }
+        }
+        m_filename = fn;
         OnSaveProject(e);
-        wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory());  // remember for later
     }
 }
 


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

[Hugin-cvs] SF.net SVN: hugin: [2531] hugin/trunk/src/hugin1/CMakeLists.txt

From: <dangelo@us...> - 2007-11-11 01:09

Revision: 2531
          http://hugin.svn.sourceforge.net/hugin/?rev=2531&view=rev
Author:   dangelo
Date:     2007-11-10 17:09:43 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
fixed CMake error on non Win32 platforms

Modified Paths:
--------------
    hugin/trunk/src/hugin1/CMakeLists.txt

Modified: hugin/trunk/src/hugin1/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/CMakeLists.txt	2007-11-11 01:04:55 UTC (rev 2530)
+++ hugin/trunk/src/hugin1/CMakeLists.txt	2007-11-11 01:09:43 UTC (rev 2531)
@@ -6,10 +6,11 @@
 #  INCLUDE(${wxWidgets_USE_FILE})
 
   # do we need to define _UNICODE on windows?
-  IF(WIN32 AND ${wxWidgets_CONFIGURATION} STREQUAL "mswu")
-    ADD_DEFINITIONS("-D_UNICODE")
-    MESSAGE("Defining -D_UNICODE")
-  ENDIF(WIN32 AND ${wxWidgets_CONFIGURATION} STREQUAL "mswu")
+  IF(WIN32)
+    IF (${wxWidgets_CONFIGURATION} STREQUAL "mswu")
+      ADD_DEFINITIONS("-D_UNICODE")
+    ENDIF(${wxWidgets_CONFIGURATION} STREQUAL "mswu")
+  ENDIF(WIN32)
 
   add_subdirectory(base_wx)
   add_subdirectory(stitch_project)


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

[Hugin-cvs] SF.net SVN: hugin: [2538] hugin/trunk/src/hugin1/CMakeLists.txt

From: <dangelo@us...> - 2007-11-17 22:02

Revision: 2538
          http://hugin.svn.sourceforge.net/hugin/?rev=2538&view=rev
Author:   dangelo
Date:     2007-11-17 14:02:00 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
fixed possible CMake parse error (Kornel Benko)

Modified Paths:
--------------
    hugin/trunk/src/hugin1/CMakeLists.txt

Modified: hugin/trunk/src/hugin1/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/CMakeLists.txt	2007-11-17 20:30:58 UTC (rev 2537)
+++ hugin/trunk/src/hugin1/CMakeLists.txt	2007-11-17 22:02:00 UTC (rev 2538)
@@ -7,9 +7,9 @@
 
   # do we need to define _UNICODE on windows?
   IF(WIN32)
-    IF (${wxWidgets_CONFIGURATION} STREQUAL "mswu")
+    IF ("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
       ADD_DEFINITIONS("-D_UNICODE")
-    ENDIF(${wxWidgets_CONFIGURATION} STREQUAL "mswu")
+    ENDIF("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")
   ENDIF(WIN32)
 
   add_subdirectory(base_wx)


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

[Hugin-cvs] SF.net SVN: hugin: [2535] hugin/trunk/src/hugin1/base_wx/ MyExternalCmdExecDialog.cpp

From: <dangelo@us...> - 2007-11-15 22:49

Revision: 2535
          http://hugin.svn.sourceforge.net/hugin/?rev=2535&view=rev
Author:   dangelo
Date:     2007-11-15 14:49:24 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
fixed crash when cancelling the execution of the process

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp

Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp	2007-11-15 22:27:54 UTC (rev 2534)
+++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp	2007-11-15 22:49:24 UTC (rev 2535)
@@ -117,19 +117,22 @@
 
 void MyExecDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
-    wxKillError rc = wxProcess::Kill(m_pidLast, wxSIGTERM);
-    if ( rc != wxKILL_OK ) {
-        static const wxChar *errorText[] =
-        {
-            _T(""), // no error
-            _T("signal not supported"),
-            _T("permission denied"),
-            _T("no such process"),
-            _T("unspecified error"),
-        };
+    if (m_pidLast) {
+        DEBUG_DEBUG("Killing process " << m_pidLast << " with sigterm");
+        wxKillError rc = wxProcess::Kill(m_pidLast, wxSIGTERM, wxKILL_CHILDREN);
+        if ( rc != wxKILL_OK ) {
+            static const wxChar *errorText[] =
+            {
+                _T(""), // no error
+                _T("signal not supported"),
+                _T("permission denied"),
+                _T("no such process"),
+                _T("unspecified error"),
+            };
 
-        wxLogStatus(_("Failed to kill process %ld with sigterm: %s"),
-                    m_pidLast, errorText[rc]);
+            wxLogStatus(_("Failed to kill process %ld with sigterm: %s"),
+                        m_pidLast, errorText[rc]);
+        }
     }
 }
 
@@ -140,10 +143,10 @@
         return -1;
 
     MyPipedProcess *process = new MyPipedProcess(this, cmd);
-    if ( !wxExecute(cmd, wxEXEC_ASYNC, process) )
+    m_pidLast = wxExecute(cmd, wxEXEC_ASYNC|wxEXEC_MAKE_GROUP_LEADER, process);
+    if ( m_pidLast == 0 )
     {
         wxLogError(_T("Execution of '%s' failed."), cmd.c_str());
-
         delete process;
         return -1;
     }


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

[Hugin-cvs] SF.net SVN: hugin: [2522] hugin/trunk/src/hugin1/base_wx

From: <dangelo@us...> - 2007-11-05 06:37

Revision: 2522
          http://hugin.svn.sourceforge.net/hugin/?rev=2522&view=rev
Author:   dangelo
Date:     2007-11-04 22:36:59 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
forgot to add new files...

Added Paths:
-----------
    hugin/trunk/src/hugin1/base_wx/platform.cpp
    hugin/trunk/src/hugin1/base_wx/platform.h

Added: hugin/trunk/src/hugin1/base_wx/platform.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.cpp	                        (rev 0)
+++ hugin/trunk/src/hugin1/base_wx/platform.cpp	2007-11-05 06:36:59 UTC (rev 2522)
@@ -0,0 +1,111 @@
+// -*- c-basic-offset: 4 -*-
+
+/** @file platform_osx.cpp
+ *
+ *  @brief implementation of huginApp Class
+ *
+ *  @author Pablo d'Angelo <pablo.dangelo@...>
+ *
+ *  $Id: huginApp.cpp 2510 2007-10-28 22:24:11Z dangelo $
+ *
+ *  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 <config.h>
+
+#include "platform.h"
+
+
+#ifdef __WXMAC__
+wxString MacGetPathTOBundledResourceFile(CFStringRef filename)
+{
+    wxString theResult = wxT("");
+
+    CFBundleRef mainbundle = CFBundleGetMainBundle();
+    if(mainbundle == NULL)
+    {
+        DEBUG_INFO("Mac: Not bundled");
+    }
+    else
+    {
+        CFURLRef XRCurl = CFBundleCopyResourceURL(mainbundle, filename, NULL, NULL);
+        if(XRCurl == NULL)
+        {
+            DEBUG_INFO("Mac: Cannot locate the file in bundle.");
+        }
+        else
+        {
+            CFStringRef pathInCFString = CFURLCopyFileSystemPath(XRCurl, kCFURLPOSIXPathStyle);
+            if(pathInCFString == NULL)
+            {
+                DEBUG_INFO("Mac: Failed to get URL in CFString");
+            }
+            else
+            {
+                CFRetain( pathInCFString );
+                theResult = wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding());
+                DEBUG_INFO("Mac: returned the resource file's path in the application bundle");
+            }
+            CFRelease( XRCurl );
+        }
+    }
+    return theResult;
+}
+
+wxString MacGetPathTOBundledExecutableFile(CFStringRef filename)
+{
+    wxString theResult = wxT("");
+
+    CFBundleRef mainbundle = CFBundleGetMainBundle();
+    if(mainbundle == NULL)
+    {
+        DEBUG_INFO("Mac: Not bundled");
+    }
+    else
+    {
+        CFURLRef PTOurl = CFBundleCopyAuxiliaryExecutableURL(mainbundle, filename);
+        if(PTOurl == NULL)
+        {
+            DEBUG_INFO("Mac: Cannot locate the file in the bundle.");
+        }
+        else
+        {
+            CFURLRef PTOAbsURL = CFURLCopyAbsoluteURL( PTOurl );
+            if(PTOAbsURL == NULL)
+            {
+                DEBUG_INFO("Mac: Cannot convert the file path to absolute");
+            }
+            else
+            {
+                CFStringRef pathInCFString = CFURLCopyFileSystemPath(PTOAbsURL, kCFURLPOSIXPathStyle);
+                if(pathInCFString == NULL)
+                {
+                    DEBUG_INFO("Mac: Failed to get URL in CFString");
+                }
+                else
+                {
+                    CFRetain( pathInCFString );
+                    theResult =  wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding());
+                    DEBUG_INFO("Mac: returned the executable's full path in the application bundle");
+                }
+                CFRelease( PTOAbsURL );
+            }
+            CFRelease( PTOurl );
+        }
+    }
+    return theResult;
+}
+#endif

Added: hugin/trunk/src/hugin1/base_wx/platform.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.h	                        (rev 0)
+++ hugin/trunk/src/hugin1/base_wx/platform.h	2007-11-05 06:36:59 UTC (rev 2522)
@@ -0,0 +1,39 @@
+// -*- c-basic-offset: 4 -*-
+
+/** @file platform.cpp
+ *
+ *  @brief implementation of huginApp Class
+ *
+ *  @author Pablo d'Angelo <pablo.dangelo@...>
+ *
+ *  $Id: huginApp.cpp 2510 2007-10-28 22:24:11Z dangelo $
+ *
+ *  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
+ *
+ */
+
+#ifdef HUGIN1_BASE_PLATFORM_H
+#define HUGIN1_BASE_PLATFORM_H
+
+#include "panoinc_WX.h"
+
+#ifdef __WXMAC__
+
+wxString MacGetPathTOBundledResourceFile(CFStringRef filename);
+wxString MacGetPathTOBundledExecutableFile(CFStringRef filename);
+
+#endif
+
+#endif


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

[Hugin-cvs] SF.net SVN: hugin: [2528] hugin/trunk/src/hugin1/base_wx

From: <dangelo@us...> - 2007-11-10 07:24

Revision: 2528
          http://hugin.svn.sourceforge.net/hugin/?rev=2528&view=rev
Author:   dangelo
Date:     2007-11-09 23:24:09 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
another fix for OSX.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/CMakeLists.txt
    hugin/trunk/src/hugin1/base_wx/platform.cpp

Modified: hugin/trunk/src/hugin1/base_wx/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/base_wx/CMakeLists.txt	2007-11-10 00:39:28 UTC (rev 2527)
+++ hugin/trunk/src/hugin1/base_wx/CMakeLists.txt	2007-11-10 07:24:09 UTC (rev 2528)
@@ -1,6 +1,6 @@
 
 SET(HUGIN_WX_BASE_SRC ImageCache.cpp MyProgressDialog.cpp Plot2D.cpp PTWXDlg.cpp
-                      huginConfig.cpp MyExternalCmdExecDialog.cpp platform.h)
+                      huginConfig.cpp MyExternalCmdExecDialog.cpp platform.cpp)
 
 IF ($HUGIN_SHARED_LIBS)
   add_library(huginbasewx SHARED ${HUGIN_WX_BASE_SRC})

Modified: hugin/trunk/src/hugin1/base_wx/platform.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.cpp	2007-11-10 00:39:28 UTC (rev 2527)
+++ hugin/trunk/src/hugin1/base_wx/platform.cpp	2007-11-10 07:24:09 UTC (rev 2528)
@@ -1,8 +1,8 @@
 // -*- c-basic-offset: 4 -*-
 
-/** @file platform_osx.cpp
+/** @file platform.cpp
  *
- *  @brief implementation of huginApp Class
+ *  @brief various platfrom specific wxWidgets functions
  *
  *  @author Pablo d'Angelo <pablo.dangelo@...>
  *
@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "panoinc.h"
 #include "platform.h"
 
 


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

[Hugin-cvs] SF.net SVN: hugin: [2534] hugin/trunk/src/hugin1/base_wx

From: <dangelo@us...> - 2007-11-15 22:28

Revision: 2534
          http://hugin.svn.sourceforge.net/hugin/?rev=2534&view=rev
Author:   dangelo
Date:     2007-11-15 14:27:54 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
use a wxTextCtrl for display command output. There seems to be now way to avoid the flicker on wxGTK,
short of writing a own widget tailored to display this kind of text.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp
    hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h

Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp	2007-11-14 07:08:18 UTC (rev 2533)
+++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp	2007-11-15 22:27:54 UTC (rev 2534)
@@ -1,5 +1,5 @@
 // -*- c-basic-offset: 4 -*-
-/** @file wxExternalCmdExecDial.cpp
+/** @file MyExternalCmdExecDialog.cpp
 *
 *  @author Ippei UKAI <ippei_ukai@...>
 *
@@ -23,7 +23,6 @@
 
 // This class is written based on 'exec' sample of wxWidgets library.
 
-
 #include <config.h>
 #include "panoinc_WX.h"
 #include "panoinc.h"
@@ -32,14 +31,13 @@
 
 #include "common/wxPlatform.h"
 
-#include "wx/ffile.h"
-#include "wx/process.h"
+#include "wx/ffile.h"
+#include "wx/process.h"
 #include "wx/mimetype.h"
-
-#ifdef __WINDOWS__
-    #include "wx/dde.h"
-#endif // __WINDOWS__
 
+#ifdef __WINDOWS__
+    #include "wx/dde.h"
+#endif // __WINDOWS__
 
 #include "MyExternalCmdExecDialog.h"
 #include "hugin/config_defaults.h"
@@ -47,225 +45,342 @@
 #define LINE_IO 1
 
 
-
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
-    // control ids
-    Exec_Btn_Cancel = 1000,
-};
-
-static const wxChar *DIALOG_TITLE = _T("Exec sample");
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWidgets
-// ----------------------------------------------------------------------------
-
-
-BEGIN_EVENT_TABLE(MyExecDialog, wxDialog)
-    EVT_BUTTON(wxID_CANCEL,  MyExecDialog::OnCancel)
-
-    EVT_IDLE(MyExecDialog::OnIdle)
-
-    EVT_TIMER(wxID_ANY, MyExecDialog::OnTimer)
-//    EVT_END_PROCESS(wxID_ANY, MyFrame::OnProcessTerm)
-END_EVENT_TABLE()
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-
-// frame constructor
-MyExecDialog::MyExecDialog(wxWindow * parent, const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxDialog(parent, wxID_ANY, title, pos, size),
-         m_timerIdleWakeUp(this)
-{
-    m_pidLast = 0;
-
-    wxBoxSizer * topsizer = new wxBoxSizer( wxVERTICAL );
-    // create the listbox in which we will show misc messages as they come
-    m_lbox = new wxListBox(this, wxID_ANY);
-    wxFont font(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL,
-                wxFONTWEIGHT_NORMAL);
-    if ( font.Ok() )
-        m_lbox->SetFont(font);
-
-    topsizer->Add(m_lbox, 1, wxEXPAND | wxALL, 10);
-
-    topsizer->Add( new wxButton(this, wxID_CANCEL, _("Cancel")),
-                  0, wxALL, 10);
-
-    SetSizer( topsizer );
-//    topsizer->SetSizeHints( this );
-}
-
-
-void MyExecDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    wxKillError rc = wxProcess::Kill(m_pidLast, wxSIGTERM);
-    if ( rc != wxKILL_OK ) {
-        static const wxChar *errorText[] =
-        {
-            _T(""), // no error
-            _T("signal not supported"),
-            _T("permission denied"),
-            _T("no such process"),
-            _T("unspecified error"),
-        };
-
-        wxLogStatus(_("Failed to kill process %ld with sigterm: %s"),
-                    m_pidLast, errorText[rc]);
-    }
-}
-
-
-int MyExecDialog::ExecWithRedirect(wxString cmd)
-{
-    if ( !cmd )
-        return -1;
-
-    MyPipedProcess *process = new MyPipedProcess(this, cmd);
-    if ( !wxExecute(cmd, wxEXEC_ASYNC, process) )
-    {
-        wxLogError(_T("Execution of '%s' failed."), cmd.c_str());
-
-        delete process;
-        return -1;
-    }
-    else
-    {
-        AddAsyncProcess(process);
-    }
-    m_cmdLast = cmd;
-
-    return ShowModal();
-}
-
-// ----------------------------------------------------------------------------
-// various helpers
-// ----------------------------------------------------------------------------
-
-// input polling
-void MyExecDialog::OnIdle(wxIdleEvent& event)
-{
-    size_t count = m_running.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( m_running[n]->HasInput() )
-        {
-            event.RequestMore();
-        }
-    }
-}
-
-void MyExecDialog::OnTimer(wxTimerEvent& WXUNUSED(event))
-{
-    wxWakeUpIdle();
-}
-
-void MyExecDialog::OnProcessTerminated(MyPipedProcess *process, int pid, int status)
-{
-    RemoveAsyncProcess(process);
-    if (status != 0) {
-        wxMessageBox(_("Error while executing process"),_("Error"));
-    }
-    EndModal(status);
-}
-
-
-void MyExecDialog::ShowOutput(const wxString& cmd,
-                         const wxArrayString& output,
-                         const wxString& title)
-{
-    size_t count = output.GetCount();
-    if ( !count )
-        return;
-
-    m_lbox->Append(wxString::Format(_T("--- %s of '%s' ---"),
-                                    title.c_str(), cmd.c_str()));
-
-    for ( size_t n = 0; n < count; n++ )
-    {
-        m_lbox->Append(output[n]);
-    }
-
-    m_lbox->Append(wxString::Format(_T("--- End of %s ---"),
-                                    title.Lower().c_str()));
-}
-
-
-
-// ----------------------------------------------------------------------------
-// MyProcess
-// ----------------------------------------------------------------------------
-
-void MyProcess::OnTerminate(int pid, int status)
-{
-//    wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."),
-//                pid, m_cmd.c_str(), status);
-
-    // we're not needed any more
-    delete this;
-}
-
-// ----------------------------------------------------------------------------
-// MyPipedProcess
-// ----------------------------------------------------------------------------
-
-bool MyPipedProcess::HasInput()
-{
-    bool hasInput = false;
-
-    if ( IsInputAvailable() )
-    {
-        wxTextInputStream tis(*GetInputStream());
-
-        // this assumes that the output is always line buffered
-        wxString msg;
-        //msg << m_cmd << _T(" (stdout): ") << tis.ReadLine();
-        msg << tis.ReadLine();
-
-        m_parent->GetLogListBox()->Append(msg);
-
-        hasInput = true;
-    }
-
-    if ( IsErrorAvailable() )
-    {
-        wxTextInputStream tis(*GetErrorStream());
-
-        // this assumes that the output is always line buffered
-        wxString msg;
-        //msg << m_cmd << _T(" (stderr): ") << tis.ReadLine();
-        msg << tis.ReadLine();
-
-        m_parent->GetLogListBox()->Append(msg);
-
-        hasInput = true;
-    }
-
-    return hasInput;
-}
-
-void MyPipedProcess::OnTerminate(int pid, int status)
-{
-    // show the rest of the output
-    while ( HasInput() )
-        ;
-
-    m_parent->OnProcessTerminated(this, pid, status);
-
-    MyProcess::OnTerminate(pid, status);
-}
-
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
 
+// IDs for the controls and the menu commands
+enum
+{
+    // control ids
+    Exec_Btn_Cancel = 1000,
+};
+
+// ----------------------------------------------------------------------------
+// event tables and other macros for wxWidgets
+// ----------------------------------------------------------------------------
+
+
+BEGIN_EVENT_TABLE(MyExecDialog, wxDialog)
+    EVT_BUTTON(wxID_CANCEL,  MyExecDialog::OnCancel)
+//    EVT_IDLE(MyExecDialog::OnIdle)
+    EVT_TIMER(wxID_ANY, MyExecDialog::OnTimer)
+//    EVT_END_PROCESS(wxID_ANY, MyFrame::OnProcessTerm)
+END_EVENT_TABLE()
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+
+// frame constructor
+MyExecDialog::MyExecDialog(wxWindow * parent, const wxString& title, const wxPoint& pos, const wxSize& size)
+       : wxDialog(parent, wxID_ANY, title, pos, size, wxRESIZE_BORDER | wxCAPTION | wxCLOSE_BOX | wxSYSTEM_MENU),
+         m_timerIdleWakeUp(this)
+{
+    m_pidLast = 0;
+
+    wxBoxSizer * topsizer = new wxBoxSizer( wxVERTICAL );
+    // create the listbox in which we will show misc messages as they come
+#ifdef HUGIN_EXEC_LISTBOX
+    m_lbox = new wxListBox(this, wxID_ANY);
+    m_lbox->Append(m_currLine);
+#else
+    m_textctrl = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
+    m_lastLineStart = 0;
+#endif
+
+    wxFont font(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL,
+                wxFONTWEIGHT_NORMAL);
+    if ( font.Ok() ) {
+#ifdef HUGIN_EXEC_LISTBOX
+        m_lbox->SetFont(font);
+#else
+        m_textctrl->SetFont(font);
+#endif
+    }
+
+#ifdef HUGIN_EXEC_LISTBOX
+    topsizer->Add(m_lbox, 1, wxEXPAND | wxALL, 10);
+#else
+    topsizer->Add(m_textctrl, 1, wxEXPAND | wxALL, 10);
+#endif
+
+    topsizer->Add( new wxButton(this, wxID_CANCEL, _("Cancel")),
+                  0, wxALL | wxALIGN_RIGHT, 10);
+
+    SetSizer( topsizer );
+//    topsizer->SetSizeHints( this );
+}
+
+
+void MyExecDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
+{
+    wxKillError rc = wxProcess::Kill(m_pidLast, wxSIGTERM);
+    if ( rc != wxKILL_OK ) {
+        static const wxChar *errorText[] =
+        {
+            _T(""), // no error
+            _T("signal not supported"),
+            _T("permission denied"),
+            _T("no such process"),
+            _T("unspecified error"),
+        };
+
+        wxLogStatus(_("Failed to kill process %ld with sigterm: %s"),
+                    m_pidLast, errorText[rc]);
+    }
+}
+
+
+int MyExecDialog::ExecWithRedirect(wxString cmd)
+{
+    if ( !cmd )
+        return -1;
+
+    MyPipedProcess *process = new MyPipedProcess(this, cmd);
+    if ( !wxExecute(cmd, wxEXEC_ASYNC, process) )
+    {
+        wxLogError(_T("Execution of '%s' failed."), cmd.c_str());
+
+        delete process;
+        return -1;
+    }
+    else
+    {
+        AddAsyncProcess(process);
+    }
+    m_cmdLast = cmd;
+
+    return ShowModal();
+}
+
+void MyExecDialog::AddAsyncProcess(MyPipedProcess *process)
+{
+    if ( m_running.IsEmpty() )
+    {
+        // we want to start getting the timer events to ensure that a
+        // steady stream of idle events comes in -- otherwise we
+        // wouldn't be able to poll the child process input
+        m_timerIdleWakeUp.Start(500);
+    }
+    //else: the timer is already running
+
+    m_running.Add(process);
+}
+
+
+void MyExecDialog::RemoveAsyncProcess(MyPipedProcess *process)
+{
+    m_running.Remove(process);
+
+    if ( m_running.IsEmpty() )
+    {
+        // we don't need to get idle events all the time any more
+        m_timerIdleWakeUp.Stop();
+    }
+}
+
+
+// ----------------------------------------------------------------------------
+// various helpers
+// ----------------------------------------------------------------------------
+
+
+
+void MyExecDialog::AddToOutput(wxInputStream & s)
+{
+    DEBUG_TRACE("");
+    wxTextInputStream ts(s);
+#if HUGIN_EXEC_LISTBOX
+    while(s.CanRead()) {
+        wxChar c = ts.GetChar();
+        if (c == '\b') {
+            m_currLine.RemoveLast();
+        } else if (c == 0x0d) {
+            // back to start of line
+            m_currLine.clear();
+        } else if (c == '\n') {
+            // add line to listbox and start new listbox
+            m_lbox->SetString(m_lbox->GetCount()-1, m_currLine);
+            m_currLine.clear();
+            m_lbox->Append(m_currLine);
+        } else {
+            m_currLine.Append(c);
+        }
+    }
+    m_lbox->SetString(m_lbox->GetCount()-1, m_currLine);
+
+#else
+    while(s.CanRead()) {
+        wxChar c = ts.GetChar();
+        if (c == '\b') {
+            // backspace
+            if (m_textctrl->GetLastPosition() != m_lastLineStart) {
+                m_textctrl->Remove(m_textctrl->GetLastPosition(), m_textctrl->GetLastPosition()+1);
+            }
+            /*
+            if (m_output.Last() != '\n') {
+                m_output.RemoveLast();
+            }*/
+        } else if (c == 0x0d) {
+            // back to start of line
+            m_textctrl->Remove(m_lastLineStart, m_textctrl->GetLastPosition()+1);
+            /*
+            if (m_output.Last() != '\n') {
+                m_output = m_output.BeforeLast('\n') + wxT("\n");
+            }
+            */
+        } else if (c == '\n') {
+            (*m_textctrl) << c;
+            m_lastLineStart = m_textctrl->GetLastPosition();
+        } else {
+            (*m_textctrl) << c;
+        }
+    }
+#endif
+}
+
+
+void MyExecDialog::AddToOutput(wxString str)
+{
+#if HUGIN_EXEC_LISTBOX
+    m_lbox->Append(str);
+#else
+    for (size_t i = 0; i < str.length(); i++) {
+        wxChar c = str[i];
+        if (c == '\b') {
+            // backspace
+            if (m_output.Last() != '\n') {
+                m_output.RemoveLast();
+            }
+        } else if (c == 0x0d) {
+            // back to start of line
+            if (m_output.Last() != '\n') {
+                m_output = m_output.BeforeLast('\n') + wxT("\n");
+            }
+        } else {
+            m_output.Append(c);
+        }
+    }
+#endif
+}
+
+void MyExecDialog::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+//    wxWakeUpIdle();
+
+#ifndef HUGIN_EXEC_LISTBOX
+    m_textctrl->Freeze();
+#endif
+    bool changed=false;
+    size_t count = m_running.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        while ( m_running[n]->IsInputAvailable() )
+        {
+            AddToOutput(*(m_running[n]->GetInputStream()));
+            changed=true;
+        }
+        while ( m_running[n]->IsErrorAvailable() )
+        {
+            AddToOutput(*(m_running[n]->GetErrorStream()));
+            changed=true;
+        }
+    }
+#ifdef HUGIN_EXEC_LISTBOX
+//    m_lbox->SetSelection(m_lbox->GetCount() -1);
+#else
+    if (changed) {
+        DEBUG_DEBUG("refreshing textctrl");
+        m_textctrl->ShowPosition(m_textctrl->GetLastPosition ()-1);
+        m_textctrl->SetInsertionPoint(m_textctrl->GetLastPosition()-1);
+    }
+    m_textctrl->Thaw();
+#endif
+}
+
+void MyExecDialog::OnProcessTerminated(MyPipedProcess *process, int pid, int status)
+{
+    // show the rest of the output
+    wxString stderr, stdout;
+    while ( process->HasInput(stdout, stderr) ) {
+        if (stdout.length() > 0) AddToOutput(stdout);
+        if (stderr.length() > 0) AddToOutput(stderr);
+        stdout.clear();
+        stderr.clear();
+    }
+
+    RemoveAsyncProcess(process);
+    if (status != 0) {
+        wxMessageBox(_("Error while executing process"),_("Error"));
+    }
+    EndModal(status);
+}
+
+
+// ----------------------------------------------------------------------------
+// MyProcess
+// ----------------------------------------------------------------------------
+
+void MyProcess::OnTerminate(int pid, int status)
+{
+//    wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."),
+//                pid, m_cmd.c_str(), status);
+
+    // we're not needed any more
+    delete this;
+}
+
+// ----------------------------------------------------------------------------
+// MyPipedProcess
+// ----------------------------------------------------------------------------
+
+bool MyPipedProcess::HasInput(wxString & stdout, wxString & stderr)
+{
+    bool hasInput = false;
+
+    if ( IsInputAvailable() )
+    {
+        wxTextInputStream tis(*GetInputStream());
+
+        // this assumes that the output is always line buffered
+        wxString msg;
+        //msg << m_cmd << _T(" (stdout): ") << tis.ReadLine();
+        stdout << tis.ReadLine();
+
+//        m_parent->GetLogListBox()->Append(msg);
+
+        hasInput = true;
+    }
+
+    if ( IsErrorAvailable() )
+    {
+        wxTextInputStream tis(*GetErrorStream());
+
+        // this assumes that the output is always line buffered
+        wxString msg;
+        //msg << m_cmd << _T(" (stderr): ") << tis.ReadLine();
+        stderr << tis.ReadLine();
+
+//        m_parent->GetLogListBox()->Append(msg);
+
+        hasInput = true;
+    }
+
+    return hasInput;
+}
+
+void MyPipedProcess::OnTerminate(int pid, int status)
+{
+
+    m_parent->OnProcessTerminated(this, pid, status);
+
+    MyProcess::OnTerminate(pid, status);
+}
+
+
 int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent,
                              wxString title)
 {
@@ -350,9 +465,9 @@
     return 0;
 
 #else
-    MyExecDialog dlg(NULL, title,
-                     wxDefaultPosition, wxSize(640, 400));
-    return dlg.ExecWithRedirect(cmdline);
+    MyExecDialog dlg(NULL, title,
+                     wxDefaultPosition, wxSize(640, 400));
+    return dlg.ExecWithRedirect(cmdline);
 #endif
 
 #endif

Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h	2007-11-14 07:08:18 UTC (rev 2533)
+++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h	2007-11-15 22:27:54 UTC (rev 2534)
@@ -31,131 +31,117 @@
 class HuginPipedProcess;
 int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title);
 
+//#define HUGIN_EXEC_LISTBOX 1
 
-// Define an array of process pointers used by MyFrame
-class MyPipedProcess;
-WX_DEFINE_ARRAY_PTR(MyPipedProcess *, MyProcessesArray);
-
+// Define an array of process pointers used by MyFrame
+class MyPipedProcess;
+WX_DEFINE_ARRAY_PTR(MyPipedProcess *, MyProcessesArray);
 
+
 class MyPipedProcess;
 
 class MyProcessListener
 {
 public:
     virtual void OnProcessTerminated(MyPipedProcess *process, int pid, int status) = 0;
-    virtual wxListBox *GetLogListBox() const = 0;
+};
 
+
+// Define a new exec dialog
+class MyExecDialog : public wxDialog, public MyProcessListener
+{
+public:
+    // ctor(s)
+    MyExecDialog(wxWindow * parent, const wxString& title, const wxPoint& pos, const wxSize& size);
+
+    void OnCancel(wxCommandEvent& event);
+
+    void OnExecWithRedirect(wxCommandEvent& event);
+
+    int ExecWithRedirect(wxString command);
+
+    // polling output of async processes
+    void OnTimer(wxTimerEvent& event);
+
+    // for MyPipedProcess
+    void OnProcessTerminated(MyPipedProcess *process, int pid, int status);
+    //wxListBox *GetLogListBox() const { return m_lbox; }
+
+private:
+
+    void AddToOutput(wxString str);
+    void AddToOutput(wxInputStream & s);
+    void AddToOutput(wxChar c);
+
+    void DoAsyncExec(const wxString& cmd);
+
+    void AddAsyncProcess(MyPipedProcess *process);
+
+    void RemoveAsyncProcess(MyPipedProcess *process);
+
+    // the PID of the last process we launched asynchronously
+    long m_pidLast;
+
+    // last command we executed
+    wxString m_cmdLast;
+
+    wxString m_output;
+
+#ifdef HUGIN_EXEC_LISTBOX
+    wxListBox *m_lbox;
+    wxString   m_currLine;
+#else
+    wxTextCtrl *m_textctrl;
+    long m_lastLineStart;
+#endif
+
+    MyProcessesArray m_running;
+
+    // the idle event wake up timer
+    wxTimer m_timerIdleWakeUp;
+
+    // any class wishing to process wxWidgets events must use this macro
+    DECLARE_EVENT_TABLE()
 };
 
+// ----------------------------------------------------------------------------
+// wxProcess-derived classes
+// ----------------------------------------------------------------------------
 
-// Define a new exec dialog
-class MyExecDialog : public wxDialog, public MyProcessListener
-{
-public:
-    // ctor(s)
-    MyExecDialog(wxWindow * parent, const wxString& title, const wxPoint& pos, const wxSize& size);
-
-    void OnCancel(wxCommandEvent& event);
-
-    void OnExecWithRedirect(wxCommandEvent& event);
-
-    int ExecWithRedirect(wxString command);
-
-    // polling output of async processes
-    void OnTimer(wxTimerEvent& event);
-    void OnIdle(wxIdleEvent& event);
-
-    // for MyPipedProcess
-    void OnProcessTerminated(MyPipedProcess *process, int pid, int status);
-    wxListBox *GetLogListBox() const { return m_lbox; }
-
-private:
-    void ShowOutput(const wxString& cmd,
-                    const wxArrayString& output,
-                    const wxString& title);
-
-    void DoAsyncExec(const wxString& cmd);
-
-    void AddAsyncProcess(MyPipedProcess *process)
-    {
-        if ( m_running.IsEmpty() )
-        {
-            // we want to start getting the timer events to ensure that a
-            // steady stream of idle events comes in -- otherwise we
-            // wouldn't be able to poll the child process input
-            m_timerIdleWakeUp.Start(100);
-        }
-        //else: the timer is already running
-
-        m_running.Add(process);
-    }
-
-    void RemoveAsyncProcess(MyPipedProcess *process)
-    {
-        m_running.Remove(process);
-
-        if ( m_running.IsEmpty() )
-        {
-            // we don't need to get idle events all the time any more
-            m_timerIdleWakeUp.Stop();
-        }
-    }
-
-    // the PID of the last process we launched asynchronously
-    long m_pidLast;
-
-    // last command we executed
-    wxString m_cmdLast;
-
-    wxListBox *m_lbox;
-
-    MyProcessesArray m_running;
-
-    // the idle event wake up timer
-    wxTimer m_timerIdleWakeUp;
-
-    // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// wxProcess-derived classes
-// ----------------------------------------------------------------------------
-
-// This is the handler for process termination events
-class MyProcess : public wxProcess
-{
-public:
-    MyProcess(MyProcessListener *parent, const wxString& cmd)
-        : wxProcess(0), m_cmd(cmd)
-    {
-        m_parent = parent;
-    }
-    // instead of overriding this virtual function we might as well process the
-    // event from it in the frame class - this might be more convenient in some
-    // cases
-    virtual void OnTerminate(int pid, int status);
-protected:
-    MyProcessListener *m_parent;
-    wxString m_cmd;
-};
-
-// A specialization of MyProcess for redirecting the output
-class MyPipedProcess : public MyProcess
-{
-public:
-    MyPipedProcess(MyProcessListener *parent, const wxString& cmd)
-        : MyProcess(parent, cmd)
-        {
-            Redirect();
-        }
-
-    virtual void OnTerminate(int pid, int status);
-
-    virtual bool HasInput();
-};
+// This is the handler for process termination events
+class MyProcess : public wxProcess
+{
+public:
+    MyProcess(MyProcessListener *parent, const wxString& cmd)
+        : wxProcess(0), m_cmd(cmd)
+    {
+        m_parent = parent;
+    }
+    // instead of overriding this virtual function we might as well process the
+    // event from it in the frame class - this might be more convenient in some
+    // cases
+    virtual void OnTerminate(int pid, int status);
+protected:
+    MyProcessListener *m_parent;
+    wxString m_cmd;
+};
 
+// A specialization of MyProcess for redirecting the output
+class MyPipedProcess : public MyProcess
+{
+public:
+    MyPipedProcess(MyProcessListener *parent, const wxString& cmd)
+        : MyProcess(parent, cmd)
+        {
+            Redirect();
+        }
 
+    virtual void OnTerminate(int pid, int status);
+
+    virtual bool HasInput(wxString & stdout, wxString & stderr);
+};
+
+
 //----------
 
 


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

[Hugin-cvs] SF.net SVN: hugin: [2521] hugin/trunk/src/hugin1

From: <dangelo@us...> - 2007-11-03 18:40

Revision: 2521
          http://hugin.svn.sourceforge.net/hugin/?rev=2521&view=rev
Author:   dangelo
Date:     2007-11-03 11:40:29 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
Move bundle functions into base_wx, should fix compilation of
hugin_stitch_project on OSX.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/CMakeLists.txt
    hugin/trunk/src/hugin1/hugin/huginApp.cpp
    hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp

Modified: hugin/trunk/src/hugin1/base_wx/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/base_wx/CMakeLists.txt	2007-11-03 10:09:32 UTC (rev 2520)
+++ hugin/trunk/src/hugin1/base_wx/CMakeLists.txt	2007-11-03 18:40:29 UTC (rev 2521)
@@ -1,6 +1,6 @@
 
 SET(HUGIN_WX_BASE_SRC ImageCache.cpp MyProgressDialog.cpp Plot2D.cpp PTWXDlg.cpp
-                      huginConfig.cpp MyExternalCmdExecDialog.cpp)
+                      huginConfig.cpp MyExternalCmdExecDialog.cpp platform.h)
 
 IF ($HUGIN_SHARED_LIBS)
   add_library(huginbasewx SHARED ${HUGIN_WX_BASE_SRC})

Modified: hugin/trunk/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/huginApp.cpp	2007-11-03 10:09:32 UTC (rev 2520)
+++ hugin/trunk/src/hugin1/hugin/huginApp.cpp	2007-11-03 18:40:29 UTC (rev 2521)
@@ -38,7 +38,9 @@
 #include "hugin/CommandHistory.h"
 #include "hugin/wxPanoCommand.h"
 
+#include "base_wx/platform.h"
 
+
 #include <tiffio.h>
 
 using namespace utils;
@@ -65,88 +67,8 @@
     }
 }
 
-#ifdef __WXMAC__
-wxString MacGetPathTOBundledResourceFile(CFStringRef filename)
-{
-    wxString theResult = wxT("");
 
-    CFBundleRef mainbundle = CFBundleGetMainBundle();
-    if(mainbundle == NULL)
-    {
-        DEBUG_INFO("Mac: Not bundled");
-    }
-    else
-    {
-        CFURLRef XRCurl = CFBundleCopyResourceURL(mainbundle, filename, NULL, NULL);
-        if(XRCurl == NULL)
-        {
-            DEBUG_INFO("Mac: Cannot locate the file in bundle.");
-        }
-        else
-        {
-            CFStringRef pathInCFString = CFURLCopyFileSystemPath(XRCurl, kCFURLPOSIXPathStyle);
-            if(pathInCFString == NULL)
-            {
-                DEBUG_INFO("Mac: Failed to get URL in CFString");
-            }
-            else
-            {
-                CFRetain( pathInCFString );
-                theResult = wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding());
-                DEBUG_INFO("Mac: returned the resource file's path in the application bundle");
-            }
-            CFRelease( XRCurl );
-        }
-    }
-    return theResult;
-}
 
-wxString MacGetPathTOBundledExecutableFile(CFStringRef filename)
-{
-    wxString theResult = wxT("");
-
-    CFBundleRef mainbundle = CFBundleGetMainBundle();
-    if(mainbundle == NULL)
-    {
-        DEBUG_INFO("Mac: Not bundled");
-    }
-    else
-    {
-        CFURLRef PTOurl = CFBundleCopyAuxiliaryExecutableURL(mainbundle, filename);
-        if(PTOurl == NULL)
-        {
-            DEBUG_INFO("Mac: Cannot locate the file in the bundle.");
-        }
-        else
-        {
-            CFURLRef PTOAbsURL = CFURLCopyAbsoluteURL( PTOurl );
-            if(PTOAbsURL == NULL)
-            {
-                DEBUG_INFO("Mac: Cannot convert the file path to absolute");
-            }
-            else
-            {
-                CFStringRef pathInCFString = CFURLCopyFileSystemPath(PTOAbsURL, kCFURLPOSIXPathStyle);
-                if(pathInCFString == NULL)
-                {
-                    DEBUG_INFO("Mac: Failed to get URL in CFString");
-                }
-                else
-                {
-                    CFRetain( pathInCFString );
-                    theResult =  wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding());
-                    DEBUG_INFO("Mac: returned the executable's full path in the application bundle");
-                }
-                CFRelease( PTOAbsURL );
-            }
-            CFRelease( PTOurl );
-        }
-    }
-    return theResult;
-}
-#endif
-
-
 // make wxwindows use this class as the main application
 IMPLEMENT_APP(huginApp)
 

Modified: hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp
===================================================================
--- hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2007-11-03 10:09:32 UTC (rev 2520)
+++ hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2007-11-03 18:40:29 UTC (rev 2521)
@@ -39,6 +39,7 @@
 #include "base_wx/huginConfig.h"
 #include "base_wx/MyProgressDialog.h"
 #include "base_wx/MyExternalCmdExecDialog.h"
+#include "base_wx/platform.h"
 #include "common/wxPlatform.h"
 
 #include <tiffio.h>


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

[Hugin-cvs] SF.net SVN: hugin: [2524] hugin/trunk/src/hugin1

From: <dangelo@us...> - 2007-11-07 20:53

Revision: 2524
          http://hugin.svn.sourceforge.net/hugin/?rev=2524&view=rev
Author:   dangelo
Date:     2007-11-07 12:53:26 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
tried to fix compilation on Mac

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/platform.h
    hugin/trunk/src/hugin1/hugin/huginApp.h

Modified: hugin/trunk/src/hugin1/base_wx/platform.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.h	2007-11-05 06:57:33 UTC (rev 2523)
+++ hugin/trunk/src/hugin1/base_wx/platform.h	2007-11-07 20:53:26 UTC (rev 2524)
@@ -30,10 +30,10 @@
 #include "panoinc_WX.h"
 
 #ifdef __WXMAC__
-
+#include <CoreFoundation/CFBundle.h>
+#include "wx/mac/private.h"
 wxString MacGetPathTOBundledResourceFile(CFStringRef filename);
 wxString MacGetPathTOBundledExecutableFile(CFStringRef filename);
-
 #endif
 
 #endif

Modified: hugin/trunk/src/hugin1/hugin/huginApp.h
===================================================================
--- hugin/trunk/src/hugin1/hugin/huginApp.h	2007-11-05 06:57:33 UTC (rev 2523)
+++ hugin/trunk/src/hugin1/hugin/huginApp.h	2007-11-07 20:53:26 UTC (rev 2524)
@@ -28,17 +28,8 @@
 
 #include "hugin/MainFrame.h"
 
-#ifdef __WXMAC__
-#include <CoreFoundation/CFBundle.h>
-#include "wx/mac/private.h"
-#endif
-
 // utility functions
 bool str2double(wxString s, double & d);
-#ifdef __WXMAC__
-wxString MacGetPathTOBundledResourceFile(CFStringRef filename);
-wxString MacGetPathTOBundledExecutableFile(CFStringRef filename);
-#endif
 
 /// Store window size and position in configfile/registry
 void StoreFramePosition(wxTopLevelWindow * frame, const wxString & basename);


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

[Hugin-cvs] SF.net SVN: hugin: [2527] hugin/trunk/src/hugin1

From: <dangelo@us...> - 2007-11-10 00:39

Revision: 2527
          http://hugin.svn.sourceforge.net/hugin/?rev=2527&view=rev
Author:   dangelo
Date:     2007-11-09 16:39:28 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
fixed compilation error on OSX, thanks to Brent for the patch.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/platform.h
    hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
    hugin/trunk/src/hugin1/hugin/MainFrame.cpp

Modified: hugin/trunk/src/hugin1/base_wx/platform.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.h	2007-11-10 00:38:17 UTC (rev 2526)
+++ hugin/trunk/src/hugin1/base_wx/platform.h	2007-11-10 00:39:28 UTC (rev 2527)
@@ -24,7 +24,7 @@
  *
  */
 
-#ifdef HUGIN1_BASE_PLATFORM_H
+#ifndef HUGIN1_BASE_PLATFORM_H
 #define HUGIN1_BASE_PLATFORM_H
 
 #include "panoinc_WX.h"

Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2007-11-10 00:38:17 UTC (rev 2526)
+++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2007-11-10 00:39:28 UTC (rev 2527)
@@ -39,6 +39,7 @@
 #include "hugin/CommandHistory.h"
 
 #include "base_wx/MyExternalCmdExecDialog.h"
+#include "base_wx/platform.h"
 #include "common/wxPlatform.h"
 #include <wx/utils.h>
 

Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2007-11-10 00:38:17 UTC (rev 2526)
+++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp	2007-11-10 00:39:28 UTC (rev 2527)
@@ -54,6 +54,7 @@
 #include "base_wx/MyProgressDialog.h"
 #include "base_wx/ImageCache.h"
 #include "base_wx/huginConfig.h"
+#include "base_wx/platform.h"
 #include "hugin/LocalizedFileTipProvider.h"
 #include "hugin/HFOVDialog.h"
 


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

[Hugin-cvs] SF.net SVN: hugin: [2530] hugin/trunk/src/hugin1

From: <dangelo@us...> - 2007-11-11 01:04

Revision: 2530
          http://hugin.svn.sourceforge.net/hugin/?rev=2530&view=rev
Author:   dangelo
Date:     2007-11-10 17:04:55 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
(MSVC) fixed compilation against unicode wxWidgets

Modified Paths:
--------------
    hugin/trunk/src/hugin1/CMakeLists.txt
    hugin/trunk/src/hugin1/panoinc_WX.h

Modified: hugin/trunk/src/hugin1/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/CMakeLists.txt	2007-11-11 01:02:09 UTC (rev 2529)
+++ hugin/trunk/src/hugin1/CMakeLists.txt	2007-11-11 01:04:55 UTC (rev 2530)
@@ -4,6 +4,13 @@
 # build gui only if wxWidgets was found
 IF(wxWidgets_FOUND)
 #  INCLUDE(${wxWidgets_USE_FILE})
+
+  # do we need to define _UNICODE on windows?
+  IF(WIN32 AND ${wxWidgets_CONFIGURATION} STREQUAL "mswu")
+    ADD_DEFINITIONS("-D_UNICODE")
+    MESSAGE("Defining -D_UNICODE")
+  ENDIF(WIN32 AND ${wxWidgets_CONFIGURATION} STREQUAL "mswu")
+
   add_subdirectory(base_wx)
   add_subdirectory(stitch_project)
   add_subdirectory(hugin)

Modified: hugin/trunk/src/hugin1/panoinc_WX.h
===================================================================
--- hugin/trunk/src/hugin1/panoinc_WX.h	2007-11-11 01:02:09 UTC (rev 2529)
+++ hugin/trunk/src/hugin1/panoinc_WX.h	2007-11-11 01:04:55 UTC (rev 2530)
@@ -83,7 +83,7 @@
 
 // remove stupid #defines from the evil windows.h
 #ifdef __WXMSW__
-#include <wx/msw/winundef.h>
+//#include <wx/msw/winundef.h>
 #undef DIFFERENCE
 #undef FindWindow
 #undef min


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

[Hugin-cvs] SF.net SVN: hugin: [2533] hugin/trunk/src/hugin1

From: <dangelo@us...> - 2007-11-14 07:08

Revision: 2533
          http://hugin.svn.sourceforge.net/hugin/?rev=2533&view=rev
Author:   dangelo
Date:     2007-11-13 23:08:18 -0800 (Tue, 13 Nov 2007)

Log Message:
-----------
Reworked cmd line execute dialog. Works under windows, but probably consumes 100% cpu under
linux.

Modified Paths:
--------------
    hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp
    hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h
    hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
    hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp

Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp	2007-11-13 21:13:01 UTC (rev 2532)
+++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp	2007-11-14 07:08:18 UTC (rev 2533)
@@ -32,12 +32,242 @@
 
 #include "common/wxPlatform.h"
 
+#include "wx/ffile.h"
+#include "wx/process.h"
+#include "wx/mimetype.h"
+
+#ifdef __WINDOWS__
+    #include "wx/dde.h"
+#endif // __WINDOWS__
+
+
 #include "MyExternalCmdExecDialog.h"
 #include "hugin/config_defaults.h"
 
 #define LINE_IO 1
 
-int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent)
+
+
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+enum
+{
+    // control ids
+    Exec_Btn_Cancel = 1000,
+};
+
+static const wxChar *DIALOG_TITLE = _T("Exec sample");
+
+// ----------------------------------------------------------------------------
+// event tables and other macros for wxWidgets
+// ----------------------------------------------------------------------------
+
+
+BEGIN_EVENT_TABLE(MyExecDialog, wxDialog)
+    EVT_BUTTON(wxID_CANCEL,  MyExecDialog::OnCancel)
+
+    EVT_IDLE(MyExecDialog::OnIdle)
+
+    EVT_TIMER(wxID_ANY, MyExecDialog::OnTimer)
+//    EVT_END_PROCESS(wxID_ANY, MyFrame::OnProcessTerm)
+END_EVENT_TABLE()
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+
+// frame constructor
+MyExecDialog::MyExecDialog(wxWindow * parent, const wxString& title, const wxPoint& pos, const wxSize& size)
+       : wxDialog(parent, wxID_ANY, title, pos, size),
+         m_timerIdleWakeUp(this)
+{
+    m_pidLast = 0;
+
+    wxBoxSizer * topsizer = new wxBoxSizer( wxVERTICAL );
+    // create the listbox in which we will show misc messages as they come
+    m_lbox = new wxListBox(this, wxID_ANY);
+    wxFont font(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL,
+                wxFONTWEIGHT_NORMAL);
+    if ( font.Ok() )
+        m_lbox->SetFont(font);
+
+    topsizer->Add(m_lbox, 1, wxEXPAND | wxALL, 10);
+
+    topsizer->Add( new wxButton(this, wxID_CANCEL, _("Cancel")),
+                  0, wxALL, 10);
+
+    SetSizer( topsizer );
+//    topsizer->SetSizeHints( this );
+}
+
+
+void MyExecDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
+{
+    wxKillError rc = wxProcess::Kill(m_pidLast, wxSIGTERM);
+    if ( rc != wxKILL_OK ) {
+        static const wxChar *errorText[] =
+        {
+            _T(""), // no error
+            _T("signal not supported"),
+            _T("permission denied"),
+            _T("no such process"),
+            _T("unspecified error"),
+        };
+
+        wxLogStatus(_("Failed to kill process %ld with sigterm: %s"),
+                    m_pidLast, errorText[rc]);
+    }
+}
+
+
+int MyExecDialog::ExecWithRedirect(wxString cmd)
+{
+    if ( !cmd )
+        return -1;
+
+    MyPipedProcess *process = new MyPipedProcess(this, cmd);
+    if ( !wxExecute(cmd, wxEXEC_ASYNC, process) )
+    {
+        wxLogError(_T("Execution of '%s' failed."), cmd.c_str());
+
+        delete process;
+        return -1;
+    }
+    else
+    {
+        AddAsyncProcess(process);
+    }
+    m_cmdLast = cmd;
+
+    return ShowModal();
+}
+
+// ----------------------------------------------------------------------------
+// various helpers
+// ----------------------------------------------------------------------------
+
+// input polling
+void MyExecDialog::OnIdle(wxIdleEvent& event)
+{
+    size_t count = m_running.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( m_running[n]->HasInput() )
+        {
+            event.RequestMore();
+        }
+    }
+}
+
+void MyExecDialog::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+    wxWakeUpIdle();
+}
+
+void MyExecDialog::OnProcessTerminated(MyPipedProcess *process, int pid, int status)
+{
+    RemoveAsyncProcess(process);
+    if (status != 0) {
+        wxMessageBox(_("Error while executing process"),_("Error"));
+    }
+    EndModal(status);
+}
+
+
+void MyExecDialog::ShowOutput(const wxString& cmd,
+                         const wxArrayString& output,
+                         const wxString& title)
+{
+    size_t count = output.GetCount();
+    if ( !count )
+        return;
+
+    m_lbox->Append(wxString::Format(_T("--- %s of '%s' ---"),
+                                    title.c_str(), cmd.c_str()));
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_lbox->Append(output[n]);
+    }
+
+    m_lbox->Append(wxString::Format(_T("--- End of %s ---"),
+                                    title.Lower().c_str()));
+}
+
+
+
+// ----------------------------------------------------------------------------
+// MyProcess
+// ----------------------------------------------------------------------------
+
+void MyProcess::OnTerminate(int pid, int status)
+{
+//    wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."),
+//                pid, m_cmd.c_str(), status);
+
+    // we're not needed any more
+    delete this;
+}
+
+// ----------------------------------------------------------------------------
+// MyPipedProcess
+// ----------------------------------------------------------------------------
+
+bool MyPipedProcess::HasInput()
+{
+    bool hasInput = false;
+
+    if ( IsInputAvailable() )
+    {
+        wxTextInputStream tis(*GetInputStream());
+
+        // this assumes that the output is always line buffered
+        wxString msg;
+        //msg << m_cmd << _T(" (stdout): ") << tis.ReadLine();
+        msg << tis.ReadLine();
+
+        m_parent->GetLogListBox()->Append(msg);
+
+        hasInput = true;
+    }
+
+    if ( IsErrorAvailable() )
+    {
+        wxTextInputStream tis(*GetErrorStream());
+
+        // this assumes that the output is always line buffered
+        wxString msg;
+        //msg << m_cmd << _T(" (stderr): ") << tis.ReadLine();
+        msg << tis.ReadLine();
+
+        m_parent->GetLogListBox()->Append(msg);
+
+        hasInput = true;
+    }
+
+    return hasInput;
+}
+
+void MyPipedProcess::OnTerminate(int pid, int status)
+{
+    // show the rest of the output
+    while ( HasInput() )
+        ;
+
+    m_parent->OnProcessTerminated(this, pid, status);
+
+    MyProcess::OnTerminate(pid, status);
+}
+
+
+int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent,
+                             wxString title)
 {
 
 /*
@@ -52,7 +282,7 @@
     MyExternalCmdExecDialog dlg(parent, wxID_ANY);
     return dlg.ShowModal(cmdline);
 */
-#if defined __WXMSW__
+#if defined DISABLED__WXMSW__
     int ret = -1;
     wxFileName tname(command);
     wxString ext = tname.GetExt();
@@ -110,11 +340,22 @@
     }
     return ret;
 #else
+
     command = utils::wxQuoteFilename(command);
     wxString cmdline = command + wxT(" ") + args;
+#if 0
     MyExternalCmdExecDialog dlg(parent, wxID_ANY);
-    return dlg.ShowModal(cmdline);
+    dlg.ShowModal(cmdline);
+    wxMessageBox(_("program finished"), _("ExecuteProcess"));
+    return 0;
+
+#else
+    MyExecDialog dlg(NULL, title,
+                     wxDefaultPosition, wxSize(640, 400));
+    return dlg.ExecWithRedirect(cmdline);
 #endif
+
+#endif
 }
 
 //----------
@@ -128,8 +369,8 @@
 MyExternalCmdExecDialog::MyExternalCmdExecDialog(wxWindow* parent, 
                                                  wxWindowID id, 
                                                  const wxString& title, 
-                                                 const wxPoint& pos, 
-                                                 const wxSize& size, 
+                                                 const wxPoint& pos,
+                                                 const wxSize& size,
                                                  long style,
                                                  const wxString& name)
 : wxDialog(parent, id, title, pos, size, style, name),
@@ -153,7 +394,7 @@
 
 int MyExternalCmdExecDialog::ShowModal(const wxString &cmd)
 {
-    process = new MyPipedProcess(this, cmd);
+    process = new HuginPipedProcess(this, cmd);
 
     processID = wxExecute(cmd, wxEXEC_ASYNC, process);
     if (!processID)
@@ -170,7 +411,7 @@
 
 int MyExternalCmdExecDialog::Execute(const wxString & cmd)
 {
-    process = new MyPipedProcess(this, cmd);
+    process = new HuginPipedProcess(this, cmd);
 
     m_exitCode = 0;
     processID = wxExecute(cmd, wxEXEC_ASYNC, process);
@@ -218,7 +459,7 @@
 
 //----------
 
-bool MyPipedProcess::HasInput()
+bool HuginPipedProcess::HasInput()
 {
     bool hasInput = false;
 
@@ -292,7 +533,7 @@
     return hasInput;
 }
 
-void MyPipedProcess::OnTerminate(int pid, int status)
+void HuginPipedProcess::OnTerminate(int pid, int status)
 {
     // show the rest of the output
     while ( HasInput() ) ;
@@ -303,3 +544,4 @@
     // we're not needed any more
     delete this;
 }
+

Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h	2007-11-13 21:13:01 UTC (rev 2532)
+++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h	2007-11-14 07:08:18 UTC (rev 2533)
@@ -26,14 +26,140 @@
 
 #ifndef _MYEXTERNALCMDEXECDIALOG__H
 #define _MYEXTERNALCMDEXECDIALOG__H
-#endif
 
 class MyExternalCmdExecDialog;
+class HuginPipedProcess;
+int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title);
+
+
+// Define an array of process pointers used by MyFrame
+class MyPipedProcess;
+WX_DEFINE_ARRAY_PTR(MyPipedProcess *, MyProcessesArray);
+
+
 class MyPipedProcess;
-int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent);
 
+class MyProcessListener
+{
+public:
+    virtual void OnProcessTerminated(MyPipedProcess *process, int pid, int status) = 0;
+    virtual wxListBox *GetLogListBox() const = 0;
+
+};
+
+
+// Define a new exec dialog
+class MyExecDialog : public wxDialog, public MyProcessListener
+{
+public:
+    // ctor(s)
+    MyExecDialog(wxWindow * parent, const wxString& title, const wxPoint& pos, const wxSize& size);
+
+    void OnCancel(wxCommandEvent& event);
+
+    void OnExecWithRedirect(wxCommandEvent& event);
+
+    int ExecWithRedirect(wxString command);
+
+    // polling output of async processes
+    void OnTimer(wxTimerEvent& event);
+    void OnIdle(wxIdleEvent& event);
+
+    // for MyPipedProcess
+    void OnProcessTerminated(MyPipedProcess *process, int pid, int status);
+    wxListBox *GetLogListBox() const { return m_lbox; }
+
+private:
+    void ShowOutput(const wxString& cmd,
+                    const wxArrayString& output,
+                    const wxString& title);
+
+    void DoAsyncExec(const wxString& cmd);
+
+    void AddAsyncProcess(MyPipedProcess *process)
+    {
+        if ( m_running.IsEmpty() )
+        {
+            // we want to start getting the timer events to ensure that a
+            // steady stream of idle events comes in -- otherwise we
+            // wouldn't be able to poll the child process input
+            m_timerIdleWakeUp.Start(100);
+        }
+        //else: the timer is already running
+
+        m_running.Add(process);
+    }
+
+    void RemoveAsyncProcess(MyPipedProcess *process)
+    {
+        m_running.Remove(process);
+
+        if ( m_running.IsEmpty() )
+        {
+            // we don't need to get idle events all the time any more
+            m_timerIdleWakeUp.Stop();
+        }
+    }
+
+    // the PID of the last process we launched asynchronously
+    long m_pidLast;
+
+    // last command we executed
+    wxString m_cmdLast;
+
+    wxListBox *m_lbox;
+
+    MyProcessesArray m_running;
+
+    // the idle event wake up timer
+    wxTimer m_timerIdleWakeUp;
+
+    // any class wishing to process wxWidgets events must use this macro
+    DECLARE_EVENT_TABLE()
+};
+
+// ----------------------------------------------------------------------------
+// wxProcess-derived classes
+// ----------------------------------------------------------------------------
+
+// This is the handler for process termination events
+class MyProcess : public wxProcess
+{
+public:
+    MyProcess(MyProcessListener *parent, const wxString& cmd)
+        : wxProcess(0), m_cmd(cmd)
+    {
+        m_parent = parent;
+    }
+    // instead of overriding this virtual function we might as well process the
+    // event from it in the frame class - this might be more convenient in some
+    // cases
+    virtual void OnTerminate(int pid, int status);
+protected:
+    MyProcessListener *m_parent;
+    wxString m_cmd;
+};
+
+// A specialization of MyProcess for redirecting the output
+class MyPipedProcess : public MyProcess
+{
+public:
+    MyPipedProcess(MyProcessListener *parent, const wxString& cmd)
+        : MyProcess(parent, cmd)
+        {
+            Redirect();
+        }
+
+    virtual void OnTerminate(int pid, int status);
+
+    virtual bool HasInput();
+};
+
+
 //----------
 
+
+
 class MyExternalCmdExecDialog : public wxDialog
 {
 public:
@@ -41,12 +167,12 @@
                             wxWindowID id, 
                             const wxString& title = _("Command Line Progress"), 
                             const wxPoint& pos = wxDefaultPosition, 
+                            const wxSize& size = wxDefaultSize, 
 #ifdef __WXMAC__
-                            const wxSize& size = wxDefaultSize, 
+                            long style = wxRESIZE_BORDER|wxFRAME_FLOAT_ON_PARENT|wxMINIMIZE_BOX,
 #else
-                            const wxSize& size = wxSize(650,480),
+                            long style = wxDEFAULT_DIALOG_STYLE,
 #endif
-                            long style = wxRESIZE_BORDER|wxFRAME_FLOAT_ON_PARENT|wxMINIMIZE_BOX,
                             const wxString& name = wxT("externalCmDialogBox"));
     
     int ShowModal(const wxString &cmd);
@@ -62,7 +188,7 @@
     //wxListBox *m_lbox;
     wxTextCtrl *m_tbox;
     wxTimer m_timerIdleWakeUp;
-    MyPipedProcess *process;
+    HuginPipedProcess *process;
     long processID;
     int m_exitCode;
 
@@ -71,10 +197,10 @@
 
 //----------
 
-class MyPipedProcess : public wxProcess
+class HuginPipedProcess : public wxProcess
 {
 public:
-    MyPipedProcess(MyExternalCmdExecDialog *parent, const wxString& cmd)
+    HuginPipedProcess(MyExternalCmdExecDialog *parent, const wxString& cmd)
     : wxProcess(parent), m_cmd(cmd)
     {
         m_parent = parent;
@@ -88,3 +214,5 @@
     MyExternalCmdExecDialog *m_parent;
     wxString m_cmd;
 };
+
+#endif

Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2007-11-13 21:13:01 UTC (rev 2532)
+++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp	2007-11-14 07:08:18 UTC (rev 2533)
@@ -295,7 +295,7 @@
     int ret = 0;
 
     // use MyExternalCmdExecDialog
-    ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, 0);
+    ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, 0,  _("finding control points"));
 
     if (ret == -1) {
         wxMessageBox( _("Could not execute command: " + cmd), _("wxExecute Error"), wxOK | wxICON_ERROR);
@@ -400,7 +400,7 @@
 
     int ret = 0;
     // use MyExternalCmdExecDialog
-    ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, 0);
+    ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, 0, _("finding control points"));
 
     if (ret == -1) {
         wxMessageBox( _("Could not execute command: " + cmd), _("wxExecute Error"),

Modified: hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp
===================================================================
--- hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2007-11-13 21:13:01 UTC (rev 2532)
+++ hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp	2007-11-14 07:08:18 UTC (rev 2533)
@@ -336,7 +336,7 @@
         wxString cmd = wxT("make ") + args;
 
 #if 1
-        int ret = MyExecuteCommandOnDialog(wxT("make"), args, NULL);
+        int ret = MyExecuteCommandOnDialog(wxT("make"), args, NULL, caption);
 #else
         // This crashes.. Don't know why..
         MyExternalCmdExecDialog execDlg(NULL, wxID_ANY);


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

[Hugin-cvs] SF.net SVN: hugin: [2532] hugin/trunk/CMakeLists.txt

From: <brunopostle@us...> - 2007-11-13 21:13

Revision: 2532
          http://hugin.svn.sourceforge.net/hugin/?rev=2532&view=rev
Author:   brunopostle
Date:     2007-11-13 13:13:01 -0800 (Tue, 13 Nov 2007)

Log Message:
-----------
Don't bundle .so.0.0 files in the source tarball

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-11-11 01:09:43 UTC (rev 2531)
+++ hugin/trunk/CMakeLists.txt	2007-11-13 21:13:01 UTC (rev 2532)
@@ -223,6 +223,7 @@
 "\\\\.lo$"
 "\\\\.so$"
 "\\\\.so\\\\.0$" 
+"\\\\.so\\\\.0\\\\.0$" 
 "\\\\.la$"
 "Makefile\\\\.in$"
  )


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

[Hugin-cvs] SF.net SVN: hugin: [2526] hugin/trunk/src/hugin_base/huginapp/ImageCache. cpp

From: <dangelo@us...> - 2007-11-10 00:38

Revision: 2526
          http://hugin.svn.sourceforge.net/hugin/?rev=2526&view=rev
Author:   dangelo
Date:     2007-11-09 16:38:17 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
fixed reading of 16 bit image files

Modified Paths:
--------------
    hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp

Modified: hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp
===================================================================
--- hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp	2007-11-09 06:07:44 UTC (rev 2525)
+++ hugin/trunk/src/hugin_base/huginapp/ImageCache.cpp	2007-11-10 00:38:17 UTC (rev 2526)
@@ -580,7 +580,7 @@
                 if (strcmp(pixelType, "UINT8") == 0 ) {
                     vigra::importImage(info, destImage(*img8));
                 } else if (strcmp(pixelType, "UINT16") == 0 ) {
-                    importAndConvertImage<vigra::RGBValue<vigra::UInt16> >(info, destImage(*imgFloat), pixelType);
+                    vigra::importImage(info, destImage(*img16));
                 } else if (strcmp(pixelType, "INT16") == 0 ) {
                     importAndConvertImage<vigra::RGBValue<vigra::Int16> > (info, destImage(*imgFloat), pixelType);
                 } else if (strcmp(pixelType, "UINT32") == 0 ) {
@@ -588,9 +588,11 @@
                 } else if (strcmp(pixelType, "INT32") == 0 ) {
                     importAndConvertImage<vigra::RGBValue<vigra::Int32> >(info, destImage(*imgFloat), pixelType);
                 } else if (strcmp(pixelType, "FLOAT") == 0 ) {
-                    importAndConvertImage<vigra::RGBValue<float> >(info, destImage(*imgFloat), pixelType);
+                    vigra::importImage(info, destImage(*imgFloat));
+//                    importAndConvertImage<vigra::RGBValue<float> >(info, destImage(*imgFloat), pixelType);
                 } else if (strcmp(pixelType, "DOUBLE") == 0 ) {
-                    importAndConvertImage<vigra::RGBValue<double> >(info, destImage(*imgFloat), pixelType);
+                    vigra::importImage(info, destImage(*imgFloat));
+//                    importAndConvertImage<vigra::RGBValue<double> >(info, destImage(*imgFloat), pixelType);
                 } else {
                     DEBUG_FATAL("Unsupported pixel type: " << pixelType);
                 }


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

[Hugin-cvs] SF.net SVN: hugin: [2525] hugin/trunk/src/tools/nona.cpp

From: <dangelo@us...> - 2007-11-09 06:07

Revision: 2525
          http://hugin.svn.sourceforge.net/hugin/?rev=2525&view=rev
Author:   dangelo
Date:     2007-11-08 22:07:44 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
applied patch by Seb, slightly extended to allow specification of the
tiff compression type

Modified Paths:
--------------
    hugin/trunk/src/tools/nona.cpp

Modified: hugin/trunk/src/tools/nona.cpp
===================================================================
--- hugin/trunk/src/tools/nona.cpp	2007-11-07 20:53:26 UTC (rev 2524)
+++ hugin/trunk/src/tools/nona.cpp	2007-11-09 06:07:44 UTC (rev 2525)
@@ -27,6 +27,10 @@
 #include <fstream>
 #include <sstream>
 
+#include <algorithm>
+#include <cctype>
+#include <string>
+
 #include <vigra/error.hxx>
 #include <vigra/impex.hxx>
 
@@ -70,7 +74,7 @@
     << "  The following options can be used to override settings in the project file:" << std::endl
     << "      -i num     remap only image with number num" << std::endl
     << "                   (can be specified multiple times)" << std::endl
-    << "      -m str     set output file format (TIFF, TIFF_m, EXR, EXR_m)" << std::endl
+    << "      -m str     set output file format (TIFF, TIFF_m, TIFF_multilayer, EXR, EXR_m)" << std::endl
     << "      -r ldr/hdr set output mode." << std::endl
     << "                   ldr  keep original bit depth and response" << std::endl
     << "                   hdr  merge to hdr" << std::endl
@@ -82,6 +86,11 @@
     << "                  UINT32  32 bit unsigned integer" << std::endl
     << "                  INT32   32 bit signed integer" << std::endl
     << "                  FLOAT   32 bit floating point" << std::endl
+    << "      -z         set compression type." << std::endl
+    << "                  Possible options for tiff output:" << std::endl
+    << "                   NONE      no compression" << std::endl
+    << "                   LZW       lzw compression" << std::endl
+    << "                   DEFLATE   deflate compression" << std::endl
     << std::endl;
 }
 
@@ -89,7 +98,7 @@
 {
     
     // parse arguments
-    const char * optstring = "cho:i:t:m:p:r:e:v";
+    const char * optstring = "z:cho:i:t:m:p:r:e:v";
     int c;
     
     opterr = 0;
@@ -100,6 +109,7 @@
     string basename;
     string outputFormat;
     bool overrideOutputMode = false;
+    std::string compression("NONE");
     PanoramaOptions::OutputMode outputMode = PanoramaOptions::OUTPUT_LDR;
     bool overrideExposure = false;
     double exposure=0;
@@ -150,6 +160,10 @@
             case 'v':
                 ++verbose;
                 break;
+            case 'z':
+                compression = optarg;
+                std::transform(compression.begin(), compression.end(), compression.begin(), (int(*)(int)) toupper);
+                break;
             default:
                 abort ();
         }
@@ -200,12 +214,16 @@
     }
     PanoramaOptions  opts = pano.getOptions();
 
+    opts.tiffCompression=compression;
+
     // save coordinate images, if requested
     opts.saveCoordImgs = doCoord;
     if (outputFormat == "TIFF_m") {
         opts.outputFormat = PanoramaOptions::TIFF_m;
     } else if (outputFormat == "TIFF") {
         opts.outputFormat = PanoramaOptions::TIFF;
+    } else if (outputFormat == "TIFF_multilayer") {
+        opts.outputFormat = PanoramaOptions::TIFF_multilayer;
     } else if (outputFormat == "EXR_m") {
         opts.outputFormat = PanoramaOptions::EXR_m;
     } else if (outputFormat == "EXR") {


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

[Hugin-cvs] SF.net SVN: hugin: [2523] hugin/trunk/src/tools/fulla.cpp

From: <dangelo@us...> - 2007-11-05 06:57

Revision: 2523
          http://hugin.svn.sourceforge.net/hugin/?rev=2523&view=rev
Author:   dangelo
Date:     2007-11-04 22:57:33 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
fulla: fixed crash on saving (patch by Michal)

Modified Paths:
--------------
    hugin/trunk/src/tools/fulla.cpp

Modified: hugin/trunk/src/tools/fulla.cpp
===================================================================
--- hugin/trunk/src/tools/fulla.cpp	2007-11-05 06:36:59 UTC (rev 2522)
+++ hugin/trunk/src/tools/fulla.cpp	2007-11-05 06:57:33 UTC (rev 2523)
@@ -503,6 +503,7 @@
     correctImage(srcImg, flatfield, src, vigra_ext::INTERP_SPLINE_16, output, crop, progress);
     ImageExportInfo outInfo(outfile);
     outInfo.setICCProfile(info.getICCProfile());
+    outInfo.setPixelType(info.getPixelType());
     exportImage(srcImageRange(output), outInfo);
 }
 


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

Next Messages