Revision: 2390
http://hugin.svn.sourceforge.net/hugin/?rev=2390&view=rev
Author: dangelo
Date: 2007-08-14 01:52:08 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
merged changes from branch (hugin GUI code only). not tested
Modified Paths:
--------------
hugin/branches/ippei/src/hugin1/hugin/CMakeLists.txt
hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp
hugin/branches/ippei/src/hugin1/hugin/ImageCache.h
hugin/branches/ippei/src/hugin1/hugin/MainFrame.cpp
hugin/branches/ippei/src/hugin1/hugin/MainFrame.h
hugin/branches/ippei/src/hugin1/hugin/Makefile.am
hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp
hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h
hugin/branches/ippei/src/hugin1/hugin/config_defaults.h
hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp
hugin/branches/ippei/src/hugin1/hugin/huginApp.h
hugin/branches/ippei/src/hugin1/hugin/po/ca_ES.po
hugin/branches/ippei/src/hugin1/hugin/po/cs_CZ.po
hugin/branches/ippei/src/hugin1/hugin/po/de.po
hugin/branches/ippei/src/hugin1/hugin/po/es.po
hugin/branches/ippei/src/hugin1/hugin/po/fr.po
hugin/branches/ippei/src/hugin1/hugin/po/hu.po
hugin/branches/ippei/src/hugin1/hugin/po/hugin.pot
hugin/branches/ippei/src/hugin1/hugin/po/it.po
hugin/branches/ippei/src/hugin1/hugin/po/ja.po
hugin/branches/ippei/src/hugin1/hugin/po/nl.po
hugin/branches/ippei/src/hugin1/hugin/po/pl.po
hugin/branches/ippei/src/hugin1/hugin/po/pt_BR.po
hugin/branches/ippei/src/hugin1/hugin/po/ru.po
hugin/branches/ippei/src/hugin1/hugin/po/sk.po
hugin/branches/ippei/src/hugin1/hugin/po/sv.po
hugin/branches/ippei/src/hugin1/hugin/po/uk.po
hugin/branches/ippei/src/hugin1/hugin/po/zh_CN.po
hugin/branches/ippei/src/hugin1/hugin/xrc/data/help_en_EN/pages.txt
hugin/branches/ippei/src/hugin1/hugin/xrc/data/splash.png
hugin/branches/ippei/src/hugin1/hugin/xrc/pano_panel.xrc
Added Paths:
-----------
hugin/branches/ippei/src/hugin1/hugin/Hugin.icns
hugin/branches/ippei/src/hugin1/hugin/HuginFiles.icns
Property Changed:
----------------
hugin/branches/ippei/src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl
hugin/branches/ippei/src/hugin1/hugin/xrc/data/help_en_EN/fetch.sh
Modified: hugin/branches/ippei/src/hugin1/hugin/CMakeLists.txt
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/CMakeLists.txt 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/CMakeLists.txt 2007-08-14 08:52:08 UTC (rev 2390)
@@ -1,24 +1,98 @@
+# Application name
+IF( APPLE )
+ set( PROGNAME Hugin )
+ set( MACOSX_BUNDLE_EXTENSION pto)
+ set( MACOSX_BUNDLE_ICON_FILE Hugin.icns )
+ set( MACOSX_BUNDLE_TYPE_ICON_FILE HuginFiles.icns )
+ set( MACOSX_BUNDLE_MIME_TYPE application/x-ptoptimizer-script )
+ set( MACOSX_BUNDLE_TYPE_NAME "Hugin Project" )
+ set( MACOSX_BUNDLE_TYPE_ROLE Editor )
+ set( MACOSX_BUNDLE_VERSION ${V_MAJOR}.${V_MINOR}.${V_PATCH} )
+ set( MACOSX_BUNDLE_SHORT_VERSION_STRING ${MACOSX_BUNDLE_VERSION})
+ set( MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${MACOSX_BUNDLE_VERSION}" )
+ set( MACOSX_BUNDLE_GUI_IDENTIFIER net.sourceforge.hugin)
+ set( MACOSX_BUNDLE_INFO_STRING "Hugin ${MACOSX_BUNDLE_VERSION}" )
+ set( MACOSX_BUNDLE_BUNDLE_NAME "Hugin" )
+ set( MACOSX_BUNDLE_COPYRIGHT "Copyright 2007 Pablo d'Angelo" )
+ set( MACOSX_BUNDLE_SIGNATURE "Hgin" )
+ # set( CMAKE_OSX_ARCHITECTURES ppc;i386 ) #Comment out if not universal binary
+ELSE( APPLE )
+ set( PROGNAME hugin )
+ENDIF( APPLE )
+# sources
+set(hugin_SOURCES
+huginApp.cpp ImagesList.cpp AutoCtrlPointCreator.cpp
+MainFrame.cpp CPImageCtrl.cpp CPEditorPanel.cpp LensPanel.cpp
+ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp
+NonaStitcherPanel.cpp PTStitcherPanel.cpp PreviewFrame.cpp
+PreviewPanel.cpp CropPanel.cpp OptimizePhotometricPanel.cpp
+OptimizePanel.cpp RunStitcherFrame.cpp CPListFrame.cpp
+TextKillFocusHandler.cpp PanoDruid.cpp PreferencesDialog.cpp
+LocalizedFileTipProvider.cpp VigCorrDialog.cpp
+wxPanoCommand.cpp MyExternalCmdExecDialog.cpp
+AssistantPanel.cpp HFOVDialog.cpp)
add_library(huginwxutils STATIC
ImageCache.cpp MyProgressDialog.cpp Plot2D.cpp PTWXDlg.cpp)
-add_executable(hugin
- huginApp.cpp ImagesList.cpp AutoCtrlPointCreator.cpp
- MainFrame.cpp CPImageCtrl.cpp CPEditorPanel.cpp LensPanel.cpp
- ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp
- NonaStitcherPanel.cpp PTStitcherPanel.cpp PreviewFrame.cpp
- PreviewPanel.cpp CropPanel.cpp OptimizePhotometricPanel.cpp
- OptimizePanel.cpp RunStitcherFrame.cpp CPListFrame.cpp
- TextKillFocusHandler.cpp PanoDruid.cpp PreferencesDialog.cpp
- LocalizedFileTipProvider.cpp VigCorrDialog.cpp
- wxPanoCommand.cpp MyExternalCmdExecDialog.cpp
- AssistantPanel.cpp HFOVDialog.cpp)
+IF( APPLE )
+ FILE(GLOB TRANSLATION_FILES ${CMAKE_CURRENT_BINARY_DIR}/po/*.lproj/locale/hugin.mo)
+ FILE(GLOB_RECURSE XRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.html
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.htm
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.hhc
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.hhk
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.hhp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xrc
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.ico
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.jpg
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xpm
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.txt
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.mk
+ ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.pl)
-target_link_libraries(hugin ${common_libs} ${image_libs} huginwxutils ${wxWidgets_LIBRARIES})
+ set( ICON_FILES ${MACOSX_BUNDLE_ICON_FILE} ${MACOSX_BUNDLE_TYPE_ICON_FILE} )
+
+ ADD_EXECUTABLE( ${PROGNAME} MACOSX_BUNDLE ${hugin_SOURCES}
+ ${ICON_FILES} ${TRANSLATION_FILES} ${XRC_FILES} )
-install(TARGETS hugin
+ FOREACH(_file ${TRANSLATION_FILES})
+ GET_FILENAME_COMPONENT(_file_dir ${_file} PATH)
+ FILE(RELATIVE_PATH _file_dir ${CMAKE_CURRENT_BINARY_DIR}/po ${_file_dir})
+ SET_SOURCE_FILES_PROPERTIES( ${_file} PROPERTIES
+ MACOSX_PACKAGE_LOCATION
+ "Resources/${_file_dir}" )
+ ENDFOREACH(_file)
+
+ FOREACH(_file ${XRC_FILES})
+ GET_FILENAME_COMPONENT(_file_dir ${_file} PATH)
+ FILE(RELATIVE_PATH _file_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_file_dir})
+ SET_SOURCE_FILES_PROPERTIES( ${_file} PROPERTIES
+ MACOSX_PACKAGE_LOCATION
+ "Resources/${_file_dir}")
+ ENDFOREACH(_file)
+
+ SET_SOURCE_FILES_PROPERTIES(
+ ${ICON_FILES}
+ PROPERTIES
+ MACOSX_PACKAGE_LOCATION Resources
+ )
+
+ ADD_CUSTOM_COMMAND(
+ TARGET ${PROGNAME}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -Dfile="${CMAKE_CURRENT_BINARY_DIR}/${PROGNAME}.app/Contents/Resources/xrc/cp_editor_panel.xrc" -P ${CMAKE_SOURCE_DIR}/CMakeModules/fix_osx_xrc.cmake
+ )
+ELSE( APPLE )
+ ADD_EXECUTABLE( ${PROGNAME} ${hugin_SOURCES} )
+ENDIF( APPLE )
+
+target_link_libraries( ${PROGNAME} ${common_libs} ${image_libs} huginwxutils ${wxWidgets_LIBRARIES})
+
+install(TARGETS ${PROGNAME}
DESTINATION bin)
add_subdirectory(po)
-add_subdirectory(xrc)
\ No newline at end of file
+add_subdirectory(xrc)
Modified: hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/CPEditorPanel.cpp 2007-08-14 08:52:08 UTC (rev 2390)
@@ -858,7 +858,7 @@
} else if (cpCreationState == THIS_POINT) {
thisImg->showPosition(p);
- if (estimate && (thisImgNr != otherImgNr) && currentPoints.size() > 0) {
+ if (estimate && (thisImgNr != otherImgNr) && currentPoints.size() > 0) {
estimateAndAddOtherPoint(p, left,
thisImg, thisImgNr, THIS_POINT, THIS_POINT_RETRY,
otherImg, otherImgNr, OTHER_POINT, OTHER_POINT_RETRY);
Copied: hugin/branches/ippei/src/hugin1/hugin/Hugin.icns (from rev 2389, hugin/trunk/src/hugin/Hugin.icns)
===================================================================
(Binary files differ)
Copied: hugin/branches/ippei/src/hugin1/hugin/HuginFiles.icns (from rev 2389, hugin/trunk/src/hugin/HuginFiles.icns)
===================================================================
(Binary files differ)
Modified: hugin/branches/ippei/src/hugin1/hugin/ImageCache.h
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/ImageCache.h 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/ImageCache.h 2007-08-14 08:52:08 UTC (rev 2390)
@@ -286,7 +286,5 @@
*/
wxImage imageCacheEntry2wxImage(ImageCache::EntryPtr e);
-
-
-#endif
#endif // _IMAGECACHE_H
+
Modified: hugin/branches/ippei/src/hugin1/hugin/MainFrame.cpp
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/MainFrame.cpp 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/MainFrame.cpp 2007-08-14 08:52:08 UTC (rev 2390)
@@ -118,16 +118,14 @@
return true;
}
-static PTPrograms getPTProgramsConfig()
+static PTPrograms getPTProgramsConfig(wxString huginRoot, wxConfigBase * config)
{
PTPrograms progs;
- wxConfigBase *config = wxConfig::Get();
#ifdef __WXMSW__
// use bundled panotools
- wxString t = huginApp::Get()->GetXRCPath();
- std::string root = (const char *) t.mb_str();
- root.append("..\\");
+// wxString t = huginApp::Get()->GetXRCPath();
+ std::string root = huginRoot.mb_str();
progs.PTmender = root + "PTmender.exe";
progs.PTblender = root + "PTblender.exe";
progs.PTmasker = root + "PTblender.exe";
@@ -537,23 +535,20 @@
int createMakefile = 1;
if (createMakefile) {
- PTPrograms progs = getPTProgramsConfig();
-
+ wxString root = huginApp::Get()->GetXRCPath() + wxT("\\..\\");
+ PTPrograms progs = getPTProgramsConfig(root, wxConfigBase::Get());
std::string resultFn;
wxString resultFnwx = scriptName.GetFullPath();
resultFn = resultFnwx.mb_str();
resultFn = utils::stripPath(utils::stripExtension(resultFn));
- wxString t = huginApp::Get()->GetXRCPath();
- std::string mkPath = (const char *) t.mb_str();
- mkPath.append("data/");
-
PT::createMakefile(pano,
- ptoFn,
- resultFn,
- progs,
- mkPath,
- makefile);
+ pano.getActiveImages(),
+ ptoFn,
+ resultFn,
+ progs,
+ "",
+ makefile);
}
}
SetStatusText(wxString::Format(_("saved project %s"), m_filename.c_str()),0);
@@ -648,6 +643,20 @@
SetStatusText( _("Error opening project: ") + filename);
DEBUG_ERROR("Could not open file " << filename);
}
+ // clean up some cruft from older versions
+ // force TIFF_m output
+ PanoramaOptions opts = pano.getOptions();
+ switch (opts.outputMode) {
+ case PanoramaOptions::TIFF:
+ case PanoramaOptions::JPEG:
+ case PanoramaOptions::PNG:
+ opts.outputLDRBlended = true;
+ break;
+ default:
+ break;
+ }
+ opts.outputFormat = PanoramaOptions::TIFF_m;
+
pano.clearDirty();
// force update of preview window
if ( !(preview_frame->IsIconized() ||(! preview_frame->IsShown()) ) ) {
@@ -1458,6 +1467,10 @@
return true;
}
+wxString MainFrame::getProjectName()
+{
+ return m_filename;
+}
void getLensDataFromUser(wxWindow * parent, SrcPanoImage & srcImg,
double & focalLength, double & cropFactor)
Modified: hugin/branches/ippei/src/hugin1/hugin/MainFrame.h
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/MainFrame.h 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/MainFrame.h 2007-08-14 08:52:08 UTC (rev 2390)
@@ -137,7 +137,9 @@
void OnDoStitch(wxCommandEvent & e);
void OnTogglePreviewFrame(wxCommandEvent & e);
void OnAddImages(wxCommandEvent & e);
+ void OnSaveProject(wxCommandEvent & e);
+
void ShowCtrlPointEditor(unsigned int img1, unsigned int img2);
void resetProgress(double max);
@@ -145,6 +147,8 @@
bool increaseProgress(double delta, const std::string & msg);
void setMessage(const std::string & msg);
+ wxString getProjectName();
+
protected:
// called when a progress message should be displayed
/** receive notification about progress. Should not be called directly.
@@ -166,7 +170,6 @@
void OnShowPrefs(wxCommandEvent &e);
void OnUndo(wxCommandEvent & e);
void OnRedo(wxCommandEvent & e);
- void OnSaveProject(wxCommandEvent & e);
void OnSaveProjectAs(wxCommandEvent & e);
void OnSavePTStitcherAs(wxCommandEvent & e);
void OnLoadProject(wxCommandEvent & e);
Modified: hugin/branches/ippei/src/hugin1/hugin/Makefile.am
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/Makefile.am 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/Makefile.am 2007-08-14 08:52:08 UTC (rev 2390)
@@ -10,8 +10,12 @@
RCCOMPILE = $(RC) $(RCFLAGS) \
`echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) |\
+ sed -e 's/-m.*//g'`
+
sed -e 's/-I/--include-dir /g;s/-D/--define /g;s/-m.*//g'`
+#RCCOMPILE = $(RC) $(RCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
+
STD_SRC = huginApp.cpp ImagesList.cpp AutoCtrlPointCreator.cpp MainFrame.cpp CPImageCtrl.cpp CPEditorPanel.cpp LensPanel.cpp \
ImagesPanel.cpp CommandHistory.cpp PanoPanel.cpp NonaStitcherPanel.cpp PTStitcherPanel.cpp PreviewFrame.cpp \
PreviewPanel.cpp CropPanel.cpp OptimizePhotometricPanel.cpp OptimizePanel.cpp \
Modified: hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp 2007-08-14 08:52:08 UTC (rev 2390)
@@ -59,6 +59,7 @@
#include "hugin/PTStitcherPanel.h"
#include "hugin/NonaStitcherPanel.h"
#include "hugin/config_defaults.h"
+#include "hugin/MyExternalCmdExecDialog.h"
#define WX_BROKEN_SIZER_UNKNOWN
@@ -68,7 +69,6 @@
BEGIN_EVENT_TABLE(PanoPanel, wxWindow)
EVT_SIZE ( PanoPanel::OnSize )
- EVT_CHOICE ( XRCID("stitch_quick_mode"),PanoPanel::QuickModeChanged )
EVT_CHOICE ( XRCID("pano_choice_pano_type"),PanoPanel::ProjectionChanged )
EVT_TEXT_ENTER( XRCID("pano_text_hfov"),PanoPanel::HFOVChanged )
EVT_TEXT_ENTER( XRCID("pano_text_vfov"),PanoPanel::VFOVChanged )
@@ -77,7 +77,21 @@
EVT_TEXT_ENTER ( XRCID("pano_val_height"),PanoPanel::HeightChanged )
EVT_BUTTON ( XRCID("pano_button_opt_width"), PanoPanel::DoCalcOptimalWidth)
EVT_BUTTON ( XRCID("pano_button_stitch"),PanoPanel::OnDoStitch )
- EVT_CHOICE ( XRCID("pano_choice_stitcher"),PanoPanel::StitcherChanged )
+
+ 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_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_CHOICE ( XRCID("pano_choice_blender"),PanoPanel::BlenderChanged )
+ EVT_CHOICE ( XRCID("pano_choice_interpolator"),PanoPanel::InterpolatorChanged)
+ EVT_CHECKBOX( XRCID("pano_cb_remapper_cropped"), PanoPanel::OnRemapperCropped)
+
+
+
END_EVENT_TABLE()
@@ -85,7 +99,7 @@
PanoPanel::PanoPanel(wxWindow *parent, Panorama* pano)
: wxPanel (parent, -1, wxDefaultPosition, wxDefaultSize, wxEXPAND|wxGROW),
pano(*pano),
- updatesDisabled(false), m_Stitcher(0)
+ updatesDisabled(false)
{
// opt = new PanoramaOptions();
@@ -146,34 +160,37 @@
DEBUG_ASSERT(m_HeightTxt);
m_HeightTxt->PushEventHandler(new TextKillFocusHandler(this));
- m_StitcherChoice = XRCCTRL(*this, "pano_choice_stitcher", wxChoice);
- DEBUG_ASSERT(m_StitcherChoice);
- m_QuickChoice = XRCCTRL(*this, "stitch_quick_mode", wxChoice);
- DEBUG_ASSERT(m_QuickChoice);
+ m_RemapperChoice = XRCCTRL(*this, "pano_choice_remapper", wxChoice);
+ DEBUG_ASSERT(m_RemapperChoice);
+ m_BlenderChoice = XRCCTRL(*this, "pano_choice_blender", wxChoice);
+ DEBUG_ASSERT(m_BlenderChoice);
m_StitchButton = XRCCTRL(*this, "pano_button_stitch", wxButton);
DEBUG_ASSERT(m_StitchButton);
+ m_InterpolatorChoice = XRCCTRL(*this, "pano_choice_interpolator",
+ wxChoice);
+ DEBUG_ASSERT(m_InterpolatorChoice);
+
#ifdef USE_WX253
m_pano_ctrls = XRCCTRL(*this, "pano_controls_panel", wxScrolledWindow);
DEBUG_ASSERT(m_pano_ctrls);
m_pano_ctrls->SetSizeHints(20, 20);
m_pano_ctrls->FitInside();
m_pano_ctrls->SetScrollRate(10, 10);
- m_pano_ctrls_fixed = XRCCTRL(*this, "pano_ctrl_fixed", wxPanel);
- DEBUG_ASSERT(m_pano_ctrls_fixed);
#endif
// observe the panorama
pano->addObserver (this);
+
// setup the stitcher
#if (defined NO_PTSTITCHER) || (defined __WXMAC__)
// disable stitcher choice and select nona (default),
// since PTStitcher is not available on OSX
- m_StitcherChoice->Disable();
+ m_RemapperChoice->Disable();
#endif
- SetStitcher(pano->getOptions().remapper);
+
/*
// trigger creation of apropriate stitcher control, if
// not already happend.
@@ -189,7 +206,7 @@
PanoPanel::~PanoPanel(void)
{
DEBUG_TRACE("dtor");
- wxConfigBase::Get()->Write(wxT("Stitcher/DefaultStitcher"),m_StitcherChoice->GetSelection());
+ wxConfigBase::Get()->Write(wxT("Stitcher/DefaultRemapper"),m_RemapperChoice->GetSelection());
m_HFOVText->PopEventHandler(true);
m_VFOVText->PopEventHandler(true);
@@ -211,7 +228,6 @@
m_CalcOptWidthButton->Disable();
//m_HeightStaticText->Disable();
//m_StitcherChoice->Disable();
- m_QuickChoice->Disable();
m_StitchButton->Disable();
} else {
//m_ProjectionChoice->Enable();
@@ -221,16 +237,6 @@
//m_WidthTxt->Enable();
m_CalcOptWidthButton->Enable();
//m_HeightStaticText->Enable();
-#if (!defined NO_PTSTITCHER) && (defined __WXMAC__)
- wxString currentPTStitcherExe
- = wxConfigBase::Get()->Read(wxT("/Panotools/PTStitcherExe"),wxT(HUGIN_PT_STITCHER_EXE));
- // only if custom PTStitcher specified, enable PTStitcher
- if (currentPTStitcherExe != wxT(HUGIN_PT_STITCHER_EXE))
- { //TODO: for now, default path triggers non-custom path but to be fixed
- m_StitcherChoice->Enable();
- }
-#endif
- m_QuickChoice->Enable();
m_StitchButton->Enable();
}
PanoramaOptions opt = pano.getOptions();
@@ -262,9 +268,15 @@
m_WidthTxt->SetValue(wxString::Format(wxT("%d"), opt.getWidth()));
m_HeightTxt->SetValue(wxString::Format(wxT("%d"), opt.getHeight()));
- if (opt.remapper != m_oldOpt.remapper) {
- SetStitcher(opt.remapper);
- }
+ // 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_layers", wxCheckBox)->SetValue(opt.outputLDRExposureLayers);
+ 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);
}
void PanoPanel::ProjectionChanged ( wxCommandEvent & e )
@@ -408,211 +420,86 @@
// m_HFOVSpin->Enable(enable);
// m_VFOVSpin->Enable(enable);
m_WidthTxt->Enable(enable);
-#ifndef NO_PTSTITCHER
- m_StitcherChoice->Enable(enable);
-#ifdef __WXMAC__
- wxString currentPTStitcherExe
- = wxConfigBase::Get()->Read(wxT("/Panotools/PTStitcherExe"),wxT(HUGIN_PT_STITCHER_EXE));
- // unless custom PTStitcher specified, disable choice
- if (currentPTStitcherExe == wxT(HUGIN_PT_STITCHER_EXE))
- { //TODO: for now, default path triggers non-custom path but to be fixed
- m_StitcherChoice->Enable(false);
- }
-#endif
-#endif
- m_Stitcher->Enable(enable);
+ m_RemapperChoice->Enable(enable);
+ m_BlenderChoice->Enable(enable);
// m_CalcHFOVButton->Enable(enable);
m_CalcOptWidthButton->Enable(enable);
}
-void PanoPanel::ApplyQuickMode(int preset)
+void PanoPanel::RemapperChanged(wxCommandEvent & e)
{
- PanoramaOptions opts = pano.getOptions();
+ int remapper = m_RemapperChoice->GetSelection();
+ DEBUG_DEBUG("changing remapper to " << remapper);
+ // TODO: change panorama options..
- // resize image for all but manual settings
- if (preset != 0) {
+ PanoramaOptions opt = pano.getOptions();
+ if (remapper == 1) {
+ opt.remapper = PanoramaOptions::PTMENDER;
+ } else {
+ opt.remapper = PanoramaOptions::NONA;
+ }
- // do not play with the panorama fov
- // FDiff2D fov = pano.calcFOV();
- // opts.HFOV = fov.x;
- // opts.VFOV = fov.y;
-
- // resize.
- if (preset == 3) {
- opts.setWidth(1024);
- } else {
- opts.setWidth(pano.calcOptimalWidth());
- }
-
- switch (preset) {
- case 1:
- // high quality tiff file
- // nona + enblend
- opts.outputFormat = PanoramaOptions::TIFF;
- opts.interpolator = vigra_ext::INTERP_CUBIC;
- opts.colorCorrection = PanoramaOptions::NONE;
- opts.gamma = 1.0;
- opts.featherWidth = 10;
- opts.remapAcceleration = PanoramaOptions::MAX_SPEEDUP;
- opts.blendMode = PanoramaOptions::ENBLEND_BLEND;
- m_StitcherChoice->SetSelection(1);
- break;
- case 2:
- // high quality jpeg file
- // nona + jpg output + cubic interpolator
- // fixme: this should be an enblended pano...
- opts.outputFormat = PanoramaOptions::JPEG;
- opts.interpolator = vigra_ext::INTERP_CUBIC;
- opts.colorCorrection = PanoramaOptions::NONE;
- opts.gamma = 1.0;
- opts.featherWidth = 10;
- opts.remapAcceleration = PanoramaOptions::MAX_SPEEDUP;
- opts.blendMode = PanoramaOptions::NO_BLEND;
- m_StitcherChoice->SetSelection(1);
- break;
- case 3:
- // draft quality jpeg file
- // nona + jpg output
- opts.outputFormat = PanoramaOptions::JPEG;
- opts.interpolator = vigra_ext::INTERP_CUBIC;
- opts.colorCorrection = PanoramaOptions::NONE;
- opts.gamma = 1.0;
- opts.featherWidth = 10;
- opts.remapAcceleration = PanoramaOptions::MAX_SPEEDUP;
- m_StitcherChoice->SetSelection(1);
- break;
- case 4:
- // multilayer TIFF file
- opts.outputFormat = PanoramaOptions::TIFF_multilayer;
- opts.interpolator = vigra_ext::INTERP_CUBIC;
- opts.colorCorrection = PanoramaOptions::NONE;
- opts.gamma = 1.0;
- opts.featherWidth = 10;
- opts.remapAcceleration = PanoramaOptions::MAX_SPEEDUP;
- m_StitcherChoice->SetSelection(1);
- break;
- case 5:
- // multilayer PSD file
- opts.outputFormat = PanoramaOptions::PSD_mask;
- opts.interpolator = vigra_ext::INTERP_CUBIC;
- opts.colorCorrection = PanoramaOptions::NONE;
- opts.gamma = 1.0;
- opts.featherWidth = 10;
- opts.remapAcceleration = PanoramaOptions::MAX_SPEEDUP;
- m_StitcherChoice->SetSelection(0);
- break;
- default:
- DEBUG_ERROR("unknown stitcher preset selected");
- break;
- }
-
- GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opts )
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
);
- wxCommandEvent dummy;
- StitcherChanged(dummy);
- }
}
-void PanoPanel::QuickModeChanged(wxCommandEvent & e)
+void PanoPanel::BlenderChanged(wxCommandEvent & e)
{
- int preset = m_QuickChoice->GetSelection();
- DEBUG_DEBUG("changing quick stitch preset to " << preset);
-
-#if (!defined NO_PTSTITCHER) && (defined __WXMAC__)
- wxString currentPTStitcherExe
- = wxConfigBase::Get()->Read(wxT("/Panotools/PTStitcherExe"),wxT(HUGIN_PT_STITCHER_EXE));
- // unless custom PTStitcher specified, disable PTStitcher
- if (currentPTStitcherExe == wxT(HUGIN_PT_STITCHER_EXE))
- { //TODO: for now, default path triggers non-custom path but to be fixed
-#endif
-#if (defined NO_PTSTITCHER) || (defined __WXMAC__)
- if(preset == 5) // photoshop output uses PTStitcher
- {
- wxMessageBox(wxT("This option is not available without PTStitcher program."));
- preset = 0;
- m_QuickChoice->SetSelection(preset);
- }
-#endif
-#if (!defined NO_PTSTITCHER) && (defined __WXMAC__)
- }
-#endif
-
- if(preset != 0) ApplyQuickMode(preset);
-
- switch (preset) {
- case 0:
- // custom
- EnableControls(true);
+ int blender = m_BlenderChoice->GetSelection();
+ DEBUG_DEBUG("changing stitcher to " << blender);
+ // TODO: change panorama options.
+
+ PanoramaOptions opt = pano.getOptions();
+ switch (blender) {
+ case 1:
+ opt.blendMode = PanoramaOptions::NO_BLEND;
break;
+ case 2:
+ opt.blendMode = PanoramaOptions::PTMASKER_BLEND;
+ break;
+ case 3:
+ opt.blendMode = PanoramaOptions::PTBLENDER_BLEND;
+ break;
default:
- EnableControls(false);
+ case 0:
+ opt.blendMode = PanoramaOptions::ENBLEND_BLEND;
+ break;
}
+
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
}
-void PanoPanel::SetStitcher(PanoramaOptions::Remapper stitcher)
+// Stitcher options
+void PanoPanel::InterpolatorChanged(wxCommandEvent & e)
{
- DEBUG_DEBUG("new stitcher: " << stitcher);
- if (m_Stitcher) {
- m_Stitcher->Destroy();
- }
- switch (stitcher) {
- case PanoramaOptions::PTMENDER:
-#ifndef NO_PTSTITCHER
- m_Stitcher = new PTStitcherPanel(this, pano);
- m_StitcherChoice->SetSelection(0);
- break;
-#else
- m_StitcherChoice->SetSelection(1);
-#endif
- default:
- case PanoramaOptions::NONA:
- m_Stitcher = new NonaStitcherPanel(this, pano);
- m_StitcherChoice->SetSelection(1);
- break;
- }
- // show the new stitcher
- wxXmlResource::Get()->AttachUnknownControl (
- wxT("pano_stitcher_unknown"),
- m_Stitcher );
- // redo layout.
-// Layout();
-#ifdef USE_WX253
-// the sizer system doesn't seem to work after AttachUnknownControl...
-// the attached control is not included in the size calculations.
- m_Stitcher->FitInside();
- m_pano_ctrls->FitInside();
-#ifdef WX_BROKEN_SIZER_UNKNOWN
- int w,h,w2,h2;
- m_pano_ctrls_fixed->GetVirtualSize(&w, &h);
- m_Stitcher->GetVirtualSize(&w2, &h2);
- h+=h2;
- w = std::max(w,w2);
- m_pano_ctrls->SetVirtualSize(w,h);
- m_pano_ctrls->SetVirtualSizeHints(w,h,-1,-1);
-#endif
-#endif
+ // 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 )
}
-void PanoPanel::StitcherChanged(wxCommandEvent & e)
+void PanoPanel::OnRemapperCropped(wxCommandEvent & e)
{
- int stitcher = m_StitcherChoice->GetSelection();
- DEBUG_DEBUG("changing stitcher to " << stitcher);
- // todo: change panorama options..
-
PanoramaOptions opt = pano.getOptions();
- if (stitcher == 0) {
- opt.remapper = PanoramaOptions::PTMENDER;
- } else {
- opt.remapper = PanoramaOptions::NONA;
- }
-
+ //Interpolator from PanoramaMemento.h
+ opt.tiff_saveROI = e.IsChecked();
GlobalCmdHist::getInstance().addCommand(
- new PT::SetPanoOptionsCmd( pano, opt )
- );
+ new PT::SetPanoOptionsCmd( pano, opt )
+ );
}
+
+
void PanoPanel::DoCalcFOV(wxCommandEvent & e)
{
DEBUG_TRACE("");
@@ -653,6 +540,35 @@
if (pano.getNrOfImages() == 0) {
return;
}
+
+ wxCommandEvent dummy;
+ MainFrame::Get()->OnSaveProject(dummy);
+
+ // TODO: save project to temporary file and stitch from there.
+#ifdef __WXGTK__
+ wxString terminal = wxConfigBase::Get()->Read(wxT("terminalEmulator"), wxT(HUGIN_STITCHER_TERMINAL));
+ wxString filename = MainFrame::Get()->getProjectName();
+ // cd to project directory
+ wxString oldCWD = wxFileName::GetCwd();
+ wxFileName::SetCwd(wxFileName(filename).GetPath());
+ wxString command = terminal + wxString(wxT("make -f ")) + quoteStringWX(filename + wxT(".mk")) + wxString(wxT(" all clean || read dummy"));
+ // execute commands..
+ cout << "Executing stitching command: " << command.mb_str() << endl;
+ wxExecute(command);
+ wxFileName::SetCwd(oldCWD);
+#elif defined __WXMAC__
+ wxString filename = MainFrame::Get()->getProjectName();
+ // cd to project directory
+ wxString oldCWD = wxFileName::GetCwd();
+ wxFileName::SetCwd(wxFileName(filename).GetPath());
+ wxString args = wxString(wxT("-f ")) + quoteStringWX(filename + wxT(".mk")) + wxString(wxT(" all clean || read dummy"));
+ MyExecuteCommandOnDialog(wxT("make"), args, 0);
+ wxFileName::SetCwd(oldCWD);
+#else
+ wxMessageBox(_("Makefile execution not yet implemented"));
+#endif
+
+#if 0
PanoramaOptions opt = pano.getOptions();
// select output file
// FIXME put in right output extension for selected
@@ -690,6 +606,13 @@
// TODO: add check for tiff_m output images
}
+ // TODO: save project to temp folder and run makefile (in the background)
+ wxMessageBox(_("TODO: save and execute makefile"));
+ // save project and create panorama
+ wxCommandEvent dummy;
+ MainFrame::Get()->SaveProjectAs(dummy);
+
+#if 0
if (m_Stitcher->Stitch(pano, opt)) {
int runViewer = wxConfig::Get()->Read(wxT("/Stitcher/RunEditor"), HUGIN_STITCHER_RUN_EDITOR);
if (runViewer) {
@@ -728,17 +651,40 @@
}
}
}
+#endif
}
+#endif
}
void PanoPanel::OnDoStitch ( wxCommandEvent & e )
{
- int preset = m_QuickChoice->GetSelection();
- // apply preset mode. (recalculates width etc)
- ApplyQuickMode(preset);
DoStitch();
}
+void PanoPanel::OnOutputFilesChanged(wxCommandEvent & e)
+{
+ int id = e.GetId();
+ PanoramaOptions opts = pano.getOptions();
+
+ if (id == XRCID("pano_cb_ldr_output_blended") ) {
+ opts.outputLDRBlended = e.IsChecked();
+ } else if (id == XRCID("pano_cb_ldr_output_layers") ) {
+ opts.outputLDRLayers = e.IsChecked();
+ } else if (id == XRCID("pano_cb_ldr_output_exposure_layers") ) {
+ opts.outputLDRExposureLayers = e.IsChecked();
+ } else if (id == XRCID("pano_cb_hdr_output_blended") ) {
+ opts.outputHDRBlended = e.IsChecked();
+ } else if (id == XRCID("pano_cb_hdr_output_stacks") ) {
+ opts.outputHDRStacks = e.IsChecked();
+ } else if (id == XRCID("pano_cb_hdr_output_layers") ) {
+ opts.outputHDRLayers = e.IsChecked();
+ }
+
+ GlobalCmdHist::getInstance().addCommand(
+ new PT::SetPanoOptionsCmd( pano, opts )
+ );
+}
+
// We need to override the default handling of size events because the
// sizers set the virtual size but not the actual size. We reverse
// the standard handling and fit the child to the parent rather than
Modified: hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h 2007-08-14 08:52:08 UTC (rev 2390)
@@ -100,9 +100,15 @@
void VFOVChanged(wxCommandEvent & e );
void VFOVChangedSpin(wxSpinEvent & e);
void ProjectionChanged(wxCommandEvent & e);
- void StitcherChanged(wxCommandEvent & e);
+ void OnOutputFilesChanged(wxCommandEvent & e);
+ void RemapperChanged(wxCommandEvent & e);
+ void BlenderChanged(wxCommandEvent & e);
+ // Stitcher options
+ void InterpolatorChanged(wxCommandEvent & e);
+ void OnRemapperCropped(wxCommandEvent & e);
+
void WidthChanged(wxCommandEvent & e);
void HeightChanged(wxCommandEvent & e);
@@ -132,24 +138,23 @@
bool m_keepViewOnResize;
// controls of this frame
- wxChoice * m_QuickChoice;
wxChoice * m_ProjectionChoice;
wxTextCtrl * m_HFOVText;
wxTextCtrl * m_VFOVText;
wxTextCtrl * m_WidthTxt;
wxTextCtrl * m_HeightTxt;
- wxChoice * m_StitcherChoice;
+ wxChoice * m_RemapperChoice;
+ wxChoice * m_BlenderChoice;
wxButton * m_StitchButton;
wxButton * m_CalcHFOVButton;
wxButton * m_CalcOptWidthButton;
#ifdef USE_WX253
wxScrolledWindow *m_pano_ctrls;
- wxPanel *m_pano_ctrls_fixed;
#endif
- StitcherPanel * m_Stitcher;
+ wxChoice * m_InterpolatorChoice;
DECLARE_EVENT_TABLE()
};
Modified: hugin/branches/ippei/src/hugin1/hugin/config_defaults.h
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/config_defaults.h 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/config_defaults.h 2007-08-14 08:52:08 UTC (rev 2390)
@@ -102,6 +102,8 @@
#define HUGIN_STITCHER_EDITOR ""
#define HUGIN_STITCHER_EDITOR_ARGS "%f"
+#define HUGIN_STITCHER_TERMINAL ""
+
#elif defined __WXMAC__
//#define HUGIN_PT_STITCHER_EXE "PTmender"
@@ -131,6 +133,8 @@
#define HUGIN_STITCHER_EDITOR ""
#define HUGIN_STITCHER_EDITOR_ARGS "%f"
+#define HUGIN_STITCHER_TERMINAL ""
+
#elif defined unix
#define HUGIN_PT_STITCHER_EXE "PTStitcher"
@@ -157,6 +161,8 @@
#define HUGIN_STITCHER_EDITOR "gimp-remote"
#define HUGIN_STITCHER_EDITOR_ARGS "%f"
+#define HUGIN_STITCHER_TERMINAL "xterm -e "
+
#endif
// enblend args
Modified: hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp 2007-08-14 08:52:08 UTC (rev 2390)
@@ -197,6 +197,16 @@
#else
wxString path(tpath, wxConvLocal);
#endif
+ wxFileName::SplitPath( path, &m_huginPath, NULL, NULL );
+#else
+ wxFileName::SplitPath( argv[0], &m_huginPath, NULL, NULL );
+#endif
+
+ #ifdef wxUSE_UNICODE
+ wxString path(tpath);
+ #else
+ wxString path(tpath, wxConvLocal);
+ #endif
m_huginPath = path;
#else
wxFileName huginFN(argv[0]);
@@ -245,6 +255,8 @@
#if defined __WXMSW__
locale.AddCatalogLookupPathPrefix(wxT("./locale"));
#elif defined __WXMAC__
+ // set path to include bundled executables
+ wxSetEnv(wxT("PATH"), wxString(wxGetenv(wxT("PATH")))+wxT(":")+wxFileName(MacGetPathTOBundledExecutableFile(CFSTR("enblend"))).GetPath());
wxString thePath = MacGetPathTOBundledResourceFile(CFSTR("locale"));
if(thePath != wxT(""))
locale.AddCatalogLookupPathPrefix(thePath);
@@ -362,14 +374,21 @@
m_workDir = config->Read(wxT("tempDir"),wxT(""));
// FIXME, make secure against some symlink attacks
// get a temp dir
+<<<<<<< .working
if (m_workDir == wxT("")) {
#if (defined __WXMSW__)
DEBUG_DEBUG("figuring out windows temp dir");
+=======
+>>>>>>> .merge-rechts.r2389
+
+#if (defined __WXMSW__)
+ DEBUG_DEBUG("figuring out windows temp dir");
/* added by Yili Zhao */
wxChar buffer[MAX_PATH];
GetTempPath(MAX_PATH, buffer);
m_workDir = buffer;
+<<<<<<< .working
#elif (defined __WXMAC__)
DEBUG_DEBUG("temp dir on Mac");
FSRef tempDirRef;
@@ -389,6 +408,27 @@
m_workDir = wxT("/tmp");
#else //UNIX
DEBUG_DEBUG("temp dir on unix");
+=======
+#elif (defined __WXMAC__)
+ DEBUG_DEBUG("temp dir on Mac");
+ FSRef tempDirRef;
+ OSErr err = FSFindFolder(kUserDomain, kTemporaryFolderType, kCreateFolder, &tempDirRef);
+ if (err == noErr)
+ {
+ CFURLRef tempDirURL = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &tempDirRef);
+ if (tempDirURL != NULL)
+ {
+ CFStringRef trashPath = CFURLCopyFileSystemPath(tempDirURL, kCFURLPOSIXPathStyle);
+ CFRetain(trashPath);
+ m_workDir = wxMacCFStringHolder(trashPath).AsString(wxLocale::GetSystemEncoding());
+ }
+ CFRelease(tempDirURL);
+ }
+ if(m_workDir == wxT(""))
+ m_workDir = wxT("/tmp");
+#else //UNIX
+ DEBUG_DEBUG("temp dir on unix");
+>>>>>>> .merge-rechts.r2389
// try to read environment variable
if (!wxGetEnv(wxT("TMPDIR"), &m_workDir)) {
// still no tempdir, use /tmp
Modified: hugin/branches/ippei/src/hugin1/hugin/huginApp.h
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/huginApp.h 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/huginApp.h 2007-08-14 08:52:08 UTC (rev 2390)
@@ -29,7 +29,7 @@
#include "hugin/MainFrame.h"
#ifdef __WXMAC__
-#include <CFBundle.h>
+#include <CoreFoundation/CFBundle.h>
#include "wx/mac/private.h"
#endif
Modified: hugin/branches/ippei/src/hugin1/hugin/po/ca_ES.po
===================================================================
--- hugin/branches/ippei/src/hugin1/hugin/po/ca_ES.po 2007-08-14 08:23:59 UTC (rev 2389)
+++ hugin/branches/ippei/src/hugin1/hugin/po/ca_ES.po 2007-08-14 08:52:08 UTC (rev 2390)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Hugin 0.5\n"
"Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2007-02-13 01:16+0100\n"
+"POT-Creation-Date: 2007-07-17 21:08+0200\n"
"PO-Revision-Date: 2005-11-10 18:48+0100\n"
"Last-Translator: Albert Capellades Badia <albertcba@..."
"Language-Team: Translation Project Catalan Team <albertcba@..."
@@ -19,26 +19,26 @@
"X-Poedit-Language: Catalan\n"
"X-Poedit-Country: SPAIN\n"
-#: src/hugin/AssistantPanel.cpp:225
+#: src/hugin/AssistantPanel.cpp:229
msgid "Please load images by pressing on the Load images button."
msgstr ""
-#: src/hugin/AssistantPanel.cpp:255
+#: src/hugin/AssistantPanel.cpp:259
#, c-format
msgid "%d images loaded."
msgstr ""
-#: src/hugin/AssistantPanel.cpp:289
+#: src/hugin/AssistantPanel.cpp:293
#, fuzzy, c-format
msgid "Images are connected by %d control points.\n"
msgstr "Segur que voleu suprimir %d punts de control\xA0?"
-#: src/hugin/AssistantPanel.cpp:298
+#: src/hugin/AssistantPanel.cpp:302
#, c-format
msgid "%d unconnected image groups found: "
msgstr ""
-#: src/hugin/AssistantPanel.cpp:299
+#: src/hugin/AssistantPanel.cpp:303
#, fuzzy
msgid ""
"Please use the Control Points tab to connect all images with control "
@@ -47,52 +47,62 @@
"Podeu pr\xE9mer el bot\xF3 del mig del ratol\xED per despla\xE7ar-se per les imatges en "
"la pestanya de punts de control."
-#: src/hugin/AssistantPanel.cpp:302
+#: src/hugin/AssistantPanel.cpp:306
msgid "Images or control points have changed, new alignment is needed."
msgstr ""
-#: src/hugin/AssistantPanel.cpp:313
+#: src/hugin/AssistantPanel.cpp:317
msgid "Very good fit."
msgstr ""
-#: src/hugin/AssistantPanel.cpp:315
+#: src/hugin/AssistantPanel.cpp:319
msgid "Good fit."
msgstr ""
-#: src/hugin/AssistantPanel.cpp:317
+#: src/hugin/AssistantPanel.cpp:321
msgid ""
"Bad fit, some control points might be bad, or there are parallax and "
"movement errors"
msgstr ""
-#: src/hugin/AssistantPanel.cpp:319
+#: src/hugin/AssistantPanel.cpp:323
msgid ""
"Very bad fit. Check for bad control points, lens parameters, or images with "
"parallax or movement. The optimizer might have failed. Manual intervention "
"required."
msgstr ""
-#: src/hugin/AssistantPanel.cpp:321
+#: src/hugin/AssistantPanel.cpp:325
#, c-format
msgid "Mean error after optimization: %.1f pixel, max: %.1f\n"
msgstr ""
-#: src/hugin/AssistantPanel.cpp:358
+#: src/hugin/AssistantPanel.cpp:362
msgid ""
"At least two images are required.\n"
"Please add more images."
msgstr ""
-#: src/hugin/AssistantPanel.cpp:358
+#: src/hugin/AssistantPanel.cpp:362 src/hugin/AssistantPanel.cpp:522
msgid "Error"
msgstr ""
-#: src/hugin/AssistantPanel.cpp:400
+#: src/hugin/AssistantPanel.cpp:382
+#, fuzzy
+msgid "Aligning images"
+msgstr "Escalant la imatge %s"
+
+#: src/hugin/AssistantPanel.cpp:382
+#, fuzzy
+msgid "Finding corresponding points"
+msgstr "No hi ha correspond\xE8ncia amb el punt trobat"
+
+#: src/hugin/AssistantPanel.cpp:407
#, c-format
msgid "Warning %d unconnected image groups found:"
msgstr ""
-#: src/hugin/AssistantPanel.cpp:401
+#: src/hugin/AssistantPanel.cpp:408
msgid ""
"Please create control points between unconnected images using the Control "
"Points tab.\n"
@@ -100,6 +110,11 @@
"After adding the points, press the \"Align\" button again"
msgstr ""
+#: src/hugin/AssistantPanel.cpp:522
+#, fuzzy
+msgid "Error: could not load all images"
+msgstr "Impossible d'obrir la dll"
+
#: src/hugin/AutoCtrlPointCreator.cpp:103
msgid "Autopano (version 1.03 or greater), from http://autopano.kolor.com"
msgstr ""
@@ -127,19 +142,48 @@
msgid "Would you like to use Autopano-Sift instead?"
msgstr "Voleu utilitzar Autopano-Sift en el seu lloc?"
+#: src/hugin/AutoCtrlPointCreator.cpp:157
+msgid "Select autopano program / frontend script"
+msgstr "Trieu el programa / seq\xFC\xE8ncia (script) final Autopano"
+
+#: src/hugin/AutoCtrlPointCreator.cpp:159
+#: src/hugin/AutoCtrlPointCreator.cpp:345 src/hugin/PreferencesDialog.cpp:257
+#: src/hugin/PreferencesDialog.cpp:275 src/hugin/PreferencesDialog.cpp:292
+#: src/hugin/PreferencesDialog.cpp:308 src/hugin/PTStitcherPanel.cpp:483
+msgid "Executables (*.exe)|*.exe"
+msgstr "Executables (*.exe)|*.exe"
+
+#: src/hugin/AutoCtrlPointCreator.cpp:165
+#: src/hugin/AutoCtrlPointCreator.cpp:201
+#: src/hugin/AutoCtrlPointCreator.cpp:351
+msgid "No autopano selected"
+msgstr "Autopano no seleccionat"
+
#: src/hugin/AutoCtrlPointCreator.cpp:188
+msgid "Autopano-SIFT is not installed."
+msgstr ""
+
+#: src/hugin/AutoCtrlPointCreator.cpp:193
+msgid "Select autopano frontend script"
+msgstr "Seleccioneu la seq\xFC\xE8ncia (script) final d'autopano"
+
+#: src/hugin/AutoCtrlPointCreator.cpp:195
+msgid "Shell Scripts (*.sh)|*.sh"
+msgstr "Fitxer de seq\xFC\xE8ncia (script) de l'int\xE8rpret de comandes (*.sh)|*.sh"
+
+#: src/hugin/AutoCtrlPointCreator.cpp:239
#, c-format
msgid "Please use either %namefile or %i in the autopano-sift command line."
msgstr ""
"Utilitzeu tant %namefile o %i per especificar els fitxers d'entrada "
"d'Autopano-sift"
-#: src/hugin/AutoCtrlPointCreator.cpp:189
-#: src/hugin/AutoCtrlPointCreator.cpp:194
+#: src/hugin/AutoCtrlPointCreator.cpp:240
+#: src/hugin/AutoCtrlPointCreator.cpp:245
msgid "Error in Autopano command"
msgstr "Error en la comanda Autopano"
-#: src/hugin/AutoCtrlPointCreator.cpp:193
+#: src/hugin/AutoCtrlPointCreator.cpp:244
#, c-format
msgid ""
"Please use %namefile or %i to specify the input files for autopano-sift"
@@ -147,8 +191,8 @@
"Utilitzeu %namefile o %i per especificar els fitxers d'entrada d'Autopano-"
"sift"
-#: src/hugin/AutoCtrlPointCreator.cpp:232
-#: src/hugin/AutoCtrlPointCreator.cpp:323
+#: src/hugin/AutoCtrlPointCreator.cpp:283
+#: src/hugin/AutoCtrlPointCreator.cpp:389
msgid ""
"autopano command line too long.\n"
"This is a windows limitation\n"
@@ -160,33 +204,33 @@
"Seleccioneu menys imatges o poseu les imatges\n"
"dins una carpeta amb una ruta m\xE9s curta."
-#: src/hugin/AutoCtrlPointCreator.cpp:233
-#: src/hugin/AutoCtrlPointCreator.cpp:324 src/hugin/NonaStitcherPanel.cpp:398
+#: src/hugin/AutoCtrlPointCreator.cpp:284
+#: src/hugin/AutoCtrlPointCreator.cpp:390 src/hugin/NonaStitcherPanel.cpp:434
msgid "Too many images selected"
msgstr "Masses imatges seleccionades"
-#: src/hugin/AutoCtrlPointCreator.cpp:248
-#: src/hugin/AutoCtrlPointCreator.cpp:336
+#: src/hugin/AutoCtrlPointCreator.cpp:299
+#: src/hugin/AutoCtrlPointCreator.cpp:402
#: src/hugin/MyExternalCmdExecDialog.cpp:62
#: src/hugin/MyExternalCmdExecDialog.cpp:100
-#: src/hugin/NonaStitcherPanel.cpp:410 src/hugin/PanoPanel.cpp:723
+#: src/hugin/NonaStitcherPanel.cpp:446 src/hugin/PanoPanel.cpp:724
msgid "Could not execute command: "
msgstr "Impossible d'executar la comanda\xA0: "
-#: src/hugin/AutoCtrlPointCreator.cpp:248
-#: src/hugin/AutoCtrlPointCreator.cpp:253
-#: src/hugin/AutoCtrlPointCreator.cpp:336
-#: src/hugin/AutoCtrlPointCreator.cpp:342 src/hugin/NonaStitcherPanel.cpp:410
+#: src/hugin/AutoCtrlPointCreator.cpp:299
+#: src/hugin/AutoCtrlPointCreator.cpp:304
+#: src/hugin/AutoCtrlPointCreator.cpp:402
+#: src/hugin/AutoCtrlPointCreator.cpp:408 src/hugin/NonaStitcherPanel.cpp:446
msgid "wxExecute Error"
msgstr "Error wxExecute"
-#: src/hugin/AutoCtrlPointCreator.cpp:251
-#: src/hugin/AutoCtrlPointCreator.cpp:340 src/hugin/NonaStitcherPanel.cpp:413
+#: src/hugin/AutoCtrlPointCreator.cpp:302
+#: src/hugin/AutoCtrlPointCreator.cpp:406 src/hugin/NonaStitcherPanel.cpp:449
msgid "command: "
msgstr "comanda: "
-#: src/hugin/AutoCtrlPointCreator.cpp:252
-#: src/hugin/AutoCtrlPointCreator.cpp:341 src/hugin/NonaStitcherPanel.cpp:414
+#: src/hugin/AutoCtrlPointCreator.cpp:303
+#: src/hugin/AutoCtrlPointCreator.cpp:407 src/hugin/NonaStitcherPanel.cpp:450
msgid ""
"\n"
"failed with error code: "
@@ -194,13 +238,13 @@
"\n"
"fallada amb el codi d'error\xA0: "
-#: src/hugin/AutoCtrlPointCreator.cpp:259
-#: src/hugin/AutoCtrlPointCreator.cpp:349
+#: src/hugin/AutoCtrlPointCreator.cpp:310
+#: src/hugin/AutoCtrlPointCreator.cpp:415
msgid "Could not open "
msgstr "Impossible d'obrir"
-#: src/hugin/AutoCtrlPointCreator.cpp:259
-#: src/hugin/AutoCtrlPointCreator.cpp:349
+#: src/hugin/AutoCtrlPointCreator.cpp:310
+#: src/hugin/AutoCtrlPointCreator.cpp:415
msgid ""
" for reading\n"
"This is an indicator that the autopano call failed,\n"
@@ -214,12 +258,17 @@
"\n"
"Comanda Autopano: "
-#: src/hugin/AutoCtrlPointCreator.cpp:260
-#: src/hugin/AutoCtrlPointCreator.cpp:352
+#: src/hugin/AutoCtrlPointCreator.cpp:311
+#: src/hugin/AutoCtrlPointCreator.cpp:418
msgid "autopano failure"
msgstr "Fallada d'Autopano"
-#: src/hugin/AutoCtrlPointCreator.cpp:350
+#: src/hugin/AutoCtrlPointCreator.cpp:343
+#, fuzzy
+msgid "Select autopano program"
+msgstr "Seleccioneu el tipus d'Autopano"
+
+#: src/hugin/AutoCtrlPointCreator.cpp:416
msgid ""
"\n"
" current directory:"
@@ -274,16 +323,16 @@
msgid "new control point added"
msgstr "un nou punt de control \xE9s afegit"
-#: src/hugin/CPEditorPanel.cpp:749 src/hugin/CPEditorPanel.cpp:973
+#: src/hugin/CPEditorPanel.cpp:751 src/hugin/CPEditorPanel.cpp:975
msgid "searching similar point..."
msgstr "Cercant un punt de control similar..."
-#: src/hugin/CPEditorPanel.cpp:768 src/hugin/CPEditorPanel.cpp:891
+#: src/hugin/CPEditorPanel.cpp:770 src/hugin/CPEditorPanel.cpp:893
msgid "Error during Fine-tune"
msgstr "Error durant el c\xE0lcul de precisi\xF3"
-#: src/hugin/CPEditorPanel.cpp:782 src/hugin/CPEditorPanel.cpp:911
-#: src/hugin/CPEditorPanel.cpp:1026
+#: src/hugin/CPEditorPanel.cpp:784 src/hugin/CPEditorPanel.cpp:913
+#: src/hugin/CPEditorPanel.cpp:1049
#, c-format
msgid ""
"Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: "
@@ -292,17 +341,17 @@
"Punt calculat amb precisi\xF3 , angle\xA0: %.0f graus, coeficient de correlaci\xF3\xA0: %"
"0.3f, curvatura %0.3f %0.3f"
-#: src/hugin/CPEditorPanel.cpp:785 src/hugin/CPEditorPanel.cpp:914
+#: src/hugin/CPEditorPanel.cpp:787 src/hugin/CPEditorPanel.cpp:916
msgid "change points, or press right mouse button to add the pair"
msgstr ""
"modifiqueu els punts, o premeu el bot\xF3 dret del ratol\xED per afegir un parell "
"de punts"
-#: src/hugin/CPEditorPanel.cpp:805
+#: src/hugin/CPEditorPanel.cpp:807
msgid "Estimated point outside image"
msgstr "El punt calculat \xE9s fora de la imatge"
-#: src/hugin/CPEditorPanel.cpp:1032
+#: src/hugin/CPEditorPanel.cpp:1055
#, c-format
msgid ""
"No similar point found.\n"
@@ -313,72 +362,71 @@
"coeficient de correlaci\xF3 \xA0: %.3f, (hauria de ser > % .3f)\n"
"curvatura de pic\xA0: (%.3f, %.3f), (hauria de ser > %.3f)"
-#: src/hugin/CPEditorPanel.cpp:1034
+#: src/hugin/CPEditorPanel.cpp:1057
msgid "No similar point found"
msgstr "No \xE9s trobat cap punt similar"
-#: src/hugin/CPEditorPanel.cpp:1186 src/hugin/CPEditorPanel.cpp:1197
+#: src/hugin/CPEditorPanel.cpp:1209 src/hugin/CPEditorPanel.cpp:1220
#, fuzzy
msgid "Add new Line"
msgstr "afegir un nou punt"
-#: src/hugin/CPEditorPanel.cpp:1192 src/hugin/CPEditorPanel.cpp:1195
-#: src/hugin/CPEditorPanel.cpp:1472 src/hugin/CPListFrame.cpp:406
+#: 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 ""
-#: src/hugin/CPEditorPanel.cpp:1463 src/hugin/CPListFrame.cpp:397
-#: src/hugin/PreviewFrame.cpp:230 src/hugin/xrc/cp_editor_panel.xrs:8
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:8
+#: src/hugin/CPEditorPanel.cpp:1487 src/hugin/CPListFrame.cpp:397
+#: src/hugin/PreviewFrame.cpp:240 src/hugin/xrc/cp_editor_panel.xrs:8
msgid "normal"
msgstr "normal"
-#: src/hugin/CPEditorPanel.cpp:1466 src/hugin/CPListFrame.cpp:400
+#: src/hugin/CPEditorPanel.cpp:1490 src/hugin/CPListFrame.cpp:400
msgid "vert. Line"
msgstr "l\xEDnia vertical"
-#: src/hugin/CPEditorPanel.cpp:1469 src/hugin/CPListFrame.cpp:403
+#: src/hugin/CPEditorPanel.cpp:1493 src/hugin/CPListFrame.cpp:403
msgid "horiz. Line"
msgstr "l\xEDnia horitzontal"
-#: src/hugin/CPEditorPanel.cpp:1767
+#: src/hugin/CPEditorPanel.cpp:1795
msgid "Cannot estimate image position without control points"
msgstr "No es pot calcular la posici\xF3 de la imatge sense punts de control"
-#: src/hugin/CPEditorPanel.cpp:1788
+#: src/hugin/CPEditorPanel.cpp:1816
msgid ""
"Create control points.\n"
"To create less points,\n"
"enter a higher number."
msgstr ""
-#: src/hugin/CPEditorPanel.cpp:1788
+#: src/hugin/CPEditorPanel.cpp:1816
#, fuzzy
msgid "Corner Detection threshold"
msgstr "Llindar de correlaci\xF3\xA0:"
-#: src/hugin/CPEditorPanel.cpp:1788 src/hugin/CPEditorPanel.cpp:1792
-#: src/hugin/xrc/images_panel-2.5.xrs:23
+#: src/hugin/CPEditorPanel.cpp:1816 src/hugin/CPEditorPanel.cpp:1820
+#: src/hugin/xrc/images_panel.xrs:23
#, fuzzy
msgid "Create control points"
msgstr "Creu els punts de control"
-#: src/hugin/CPEditorPanel.cpp:1792
+#: src/hugin/CPEditorPanel.cpp:1820
#, fuzzy
msgid "Corner Detection scale"
msgstr "Col\xB7lecci\xF3 d'imatges"
-#: src/hugin/CPEditorPanel.cpp:1804
+#: src/hugin/CPEditorPanel.cpp:1832
#, fuzzy
msgid "Error during control point creation:\n"
msgstr "Error durant l'assemblatge"
-#: src/hugin/CPEditorPanel.cpp:1935
+#: src/hugin/CPEditorPanel.cpp:1963
msgid "Select Point in right image"
msgstr "Seleccioneu un punt en la imatge de la dreta"
-#: src/hugin/CPEditorPanel.cpp:1947
+#: src/hugin/CPEditorPanel.cpp:1975
msgid "Select Point in left image"
msgstr "Seleccioneu un punt en la imatge de la esquerra"
@@ -386,7 +434,12 @@
msgid "Control point finetune"
msgstr "Ajustament prec\xEDs dels punts de control"
-#: src/hugin/CPImageCtrl.cpp:833
+#: src/hugin/CPImageCtrl.cpp:332
+#, fuzzy
+msgid "new"
+msgstr "Nou"
+
+#: src/hugin/CPImageCtrl.cpp:1143
msgid "Could not process event!"
msgstr "No es pot processar l'esdeveniment\xA0!"
@@ -430,169 +483,139 @@
#: 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:672
+#: src/hugin/PreviewFrame.cpp:748 src/hugin/PreviewFrame.cpp:764
msgid "Value must be numeric."
msgstr "El valor ha de ser num\xE8ric."
-#: src/hugin/huginApp.cpp:208
-msgid "Autopano-SIFT is not installed."
-msgstr ""
-
-#: src/hugin/huginApp.cpp:213
-msgid "Select autopano frontend script"
-msgstr "Seleccioneu la seq\xFC\xE8ncia (script) final d'autopano"
-
-#: src/hugin/huginApp.cpp:215
-msgid "Shell Scripts (*.sh)|*.sh"
-msgstr "Fitxer de seq\xFC\xE8ncia (script) de l'int\xE8rpret de comandes (*.sh)|*.sh"
-
-#: src/hugin/huginApp.cpp:222
-msgid "No autopano selected"
-msgstr "Autopano no seleccionat"
-
-#: src/hugin/huginApp.cpp:272
+#: src/hugin/ImageCache.cpp:535
#, c-format
-msgid "%s not found, please configure it in the preferences"
-msgstr ""
-
-#: src/hugin/huginApp.cpp:322
-msgid "Could not locate the hugin directory / bundle, exiting"
-msgstr ""
-
-#: src/hugin/ImageCache.cpp:618
-#, c-format
msgid "Loading image %s"
msgstr "Carregant la imatge %s"
-#: src/hugin/ImageCache.cpp:737
+#: src/hugin/ImageCache.cpp:679
#, fuzzy, c-format
msgid "Error during image reading: %s"
msgstr "Error durant l'assemblatge"
-#: src/hugin/ImageCache.cpp:745
+#: src/hugin/ImageCache.cpp:687
msgid "Cannot load image: "
msgstr "Impossible de carregar la imatge\xA0: "
-#: src/hugin/ImageCache.cpp:775
+#: src/hugin/ImageCache.cpp:715
#, c-format
msgid "Scaling image %s"
msgstr "Escalant la imatge %s"
-#: src/hugin/ImageCache.cpp:833
+#: src/hugin/ImageCache.cpp:816
#, c-format
msgid "Creating grayscale %s"
msgstr "Creant en escala de grisos %s"
-#: src/hugin/ImageCache.cpp:851
+#: src/hugin/ImageCache.cpp:834
#, c-format
msgid "Creating pyramid image for %s, level %d"
msgstr "Creaci\xF3 de la imatge pir\xE0mide %s, nivell %d"
-#: src/hugin/ImagesList.cpp:306 src/hugin/ImagesList.cpp:365
+#: src/hugin/ImagesList.cpp:307 src/hugin/ImagesList.cpp:366
msgid "Filename"
msgstr "Nom de fitxer"
-#: src/hugin/ImagesList.cpp:307
+#: src/hugin/ImagesList.cpp:308
msgid "width"
msgstr "amplada"
-#: src/hugin/ImagesList.cpp:308
+#: src/hugin/ImagesList.cpp:309
msgid "height"
msgstr "al\xE7ada"
-#: src/hugin/ImagesList.cpp:309
+#: src/hugin/ImagesList.cpp:310
msgid "yaw (y)"
msgstr "guinyada (y)"
-#: src/hugin/ImagesList.cpp:310
+#: src/hugin/ImagesList.cpp:311
msgid "pitch (p)"
msgstr "caboteig (p)"
-#: src/hugin/ImagesList.cpp:311
+#: src/hugin/ImagesList.cpp:312
msgid "roll (r)"
msgstr "balanceig (r)"
-#: src/hugin/ImagesList.cpp:312
+#: src/hugin/ImagesList.cpp:313
msgid "Anchor"
msgstr "\xC0ncora"
-#: src/hugin/ImagesList.cpp:313
+#: src/hugin/ImagesList.cpp:314
msgid "# Ctrl Pnts"
msgstr "# Pts Ctrl"
-#: src/hugin/ImagesList.cpp:366
+#: src/hugin/ImagesList.cpp:367
msgid "Lens no."
msgstr "Lent no."
-#: src/hugin/ImagesList.cpp:367
+#: src/hugin/ImagesList.cpp:368
msgid "Lens type (f)"
msgstr "Tipus de lent (f)"
-#: src/hugin/ImagesList.cpp:368
+#: src/hugin/ImagesList.cpp:369
msgid "hfov (v)"
msgstr "angle de camp horitzontal hfov (v)"
-#: src/hugin/ImagesList.cpp:369
+#: src/hugin/ImagesList.cpp:370
msgid "a"
msgstr "a"
-#: src/hugin/ImagesList.cpp:370
+#: src/hugin/ImagesList.cpp:371
msgid "b"
msgstr "b"
-#: src/hugin/ImagesList.cpp:371
+#: src/hugin/ImagesList.cpp:372
msgid "c"
msgstr "c"
-#: src/hugin/ImagesList.cpp:372
+#: src/hugin/ImagesList.cpp:373
msgid "d"
msgstr "d"
-#: src/hugin/ImagesList.cpp:373
+#: src/hugin/ImagesList.cpp:374
msgid "e"
msgstr "e"
-#: src/hugin/ImagesList.cpp:374
+#: src/hugin/ImagesList.cpp:375
msgid "g"
msgstr "g"
-#: src/hugin/ImagesList.cpp:375
+#: src/hugin/ImagesList.cpp:376
msgid "t"
msgstr "t"
-#: src/hugin/ImagesList.cpp:398 src/hugin/xrc/assistant_panel.xrs:6
-#: src/hugin/xrc/assistant_panel.xrs:25 src/hugin/xrc/lens_panel.xrs:2
-#: src/hugin/xrc/lens_panel-2.5.xrs:13
+#: 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 "Normal (rectilini)"
-#: src/hugin/ImagesList.cpp:399 src/hugin/xrc/assistant_panel.xrs:7
-#: src/hugin/xrc/assistant_panel.xrs:26 src/hugin/xrc/lens_panel.xrs:3
-#: src/hugin/xrc/lens_panel-2.5.xrs:14
+#: 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
msgid "Panoramic (cylindrical)"
msgstr "Panor\xE0mica (cil\xEDndric)"
-#: src/hugin/ImagesList.cpp:400 src/hugin/xrc/assistant_panel.xrs:8
-#: src/hugin/xrc/assistant_panel.xrs:27 src/hugin/xrc/lens_panel.xrs:4
-#: src/hugin/xrc/lens_panel-2.5.xrs:15
+#: 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 "Gran angular circular"
-#: src/hugin/ImagesList.cpp:401 src/hugin/xrc/assistant_panel.xrs:9
-#: src/hugin/xrc/assistant_panel.xrs:28 src/hugin/xrc/lens_panel.xrs:5
-#: src/hugin/xrc/lens_panel-2.5.xrs:16 src/hugin/xrc/pano_panel.xrs:6
+#: 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 "Gran angular d'abast total"
-#: src/hugin/ImagesList.cpp:402 src/hugin/PreviewFrame.cpp:537
+#: src/hugin/ImagesList.cpp:403 src/hugin/PreviewFrame.cpp:616
#: src/hugin/xrc/assistant_panel.xrs:10 src/hugin/xrc/assistant_panel.xrs:29
-#: src/hugin/xrc/lens_panel.xrs:6 src/hugin/xrc/lens_panel-2.5.xrs:17
-#: src/hugin/xrc/pano_panel.xrs:5
+#: src/hugin/xrc/lens_panel.xrs:18
msgid "Equirectangular"
msgstr "Equirectangular"
-#: src/hugin/ImagesList.cpp:420 src/hugin/xrc/images_panel.xrs:10
-#: src/hugin/xrc/images_panel-2.5.xrs:31 src/hugin/xrc/lens_panel.xrs:34
+#: src/hugin/ImagesList.cpp:421 src/hugin/xrc/images_panel.xrs:31
+#: src/hugin/xrc/main_frame.xrs:5
msgid "Crop"
msgstr "Escap\xE7ar"
@@ -605,65 +628,65 @@
msgid "Autopano result"
msgstr "Resultat d'Autopano"
-#: src/hugin/ImagesPanel.cpp:687
+#: src/hugin/ImagesPanel.cpp:684
#, c-format
msgid "Really Delete %d control points?"
msgstr "Segur que voleu suprimir %d punts de control\xA0?"
-#: src/hugin/ImagesPanel.cpp:689
+#: src/hugin/ImagesPanel.cpp:686
msgid "Delete Control Points"
msgstr "Suprimeix punts de control"
-#: src/hugin/LensPanel.cpp:717
+#: src/hugin/LensPanel.cpp:827
msgid "Not a jpeg file:"
msgstr "No \xE9s un fitxer jpeg\xA0:"
-#: src/hugin/LensPanel.cpp:721 src/hugin/LensPanel.cpp:824
-#: src/hugin/LensPanel.cpp:857 src/hugin/LensPanel.cpp:971
-#: src/hugin/LensPanel.cpp:989
+#: 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 "Seleccioneu una imatge i proveu un altre cop"
-#: src/hugin/LensPanel.cpp:739
+#: src/hugin/LensPanel.cpp:849
msgid "Save lens parameters file"
msgstr "Desa el fitxer dels par\xE0metres de la lent"
-#: src/hugin/LensPanel.cpp:741
+#: src/hugin/LensPanel.cpp:851
msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
msgstr "Fitxer Projecte de lents (*.ini)|*.ini|tots els fitxers (*)|*"
-#: src/hugin/LensPanel.cpp:866
+#: src/hugin/LensPanel.cpp:977
msgid "Load lens parameters"
msgstr "Obrir el fitxer dels par\xE0metres de l'objectiu"
-#: src/hugin/LensPanel.cpp:868
+#: src/hugin/LensPanel.cpp:979
msgid "Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"
msgstr "Fitxer Projecte de lents (*.ini)|*.ini|tots els fitxers (*.*)|*.*"
-#: src/hugin/LensPanel.cpp:885
+#: src/hugin/LensPanel.cpp:997
msgid ""
"Incompatible lens parameter file, image sizes do not match\n"
"Apply settings anyway?"
msgstr ""
-#: src/hugin/LensPanel.cpp:885
+#: src/hugin/LensPanel.cpp:997
#, fuzzy
msgid "Error loading lens parameters"
msgstr "Obrir el fitxer dels par\xE0metres de l'objectiu"
-#: src/hugin/LensPanel.cpp:979
+#: src/hugin/LensPanel.cpp:1091
msgid "Enter new lens number"
msgstr "Introdu\xEFu el nou n\xFAmero de la lent"
-#: src/hugin/LensPanel.cpp:979
+#: src/hugin/LensPanel.cpp:1091
msgid "Lens number"
msgstr "Lent n\xFAmero"
-#: src/hugin/LensPanel.cpp:980
+#: src/hugin/LensPanel.cpp:1092
msgid "Change lens number"
msgstr "Canvieu el n\xFAmero de la lent"
-#: src/hugin/MainFrame.cpp:221
+#: src/hugin/MainFrame.cpp:225
msgid ""
"Fatal installation error\n"
"The xrc directory was not found.\n"
@@ -673,16 +696,16 @@
"No es troba el directori xrc.\n"
"Us heu d'assegurar que es troba en el mateix directori que hugin.exe"
-#: src/hugin/MainFrame.cpp:241 src/hugin/xrc/main_menubar.xrs:4
+#: 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 "&Ajuda"
-#: src/hugin/MainFrame.cpp:337
+#: src/hugin/MainFrame.cpp:347
msgid "Started"
msgstr "Iniciat"
-#: src/hugin/MainFrame.cpp:463
+#: src/hugin/MainFrame.cpp:473
msgid ""
"The panorama has been changed\n"
"Save changes?"
@@ -690,52 +713,52 @@
"El panorama ha estat modificat\n"
"Voleu desar les modificacions ?"
-#: src/hugin/MainFrame.cpp:463
+#: src/hugin/MainFrame.cpp:473
msgid "Save Panorama?"
msgstr "Desar el panorama\xA0?"
-#: src/hugin/MainFrame.cpp:496
+#: src/hugin/MainFrame.cpp:506
msgid "forced close"
msgstr "Tancament obligat"
-#: src/hugin/MainFrame.cpp:549
+#: src/hugin/MainFrame.cpp:559
#, c-format
msgid "saved project %s"
msgstr "projecte %s desat"
-#: src/hugin/MainFrame.cpp:562
+#: src/hugin/MainFrame.cpp:572
msgid "Save project file"
msgstr "Desar el fitxer de projecte"
-#: src/hugin/MainFrame.cpp:564
+#: src/hugin/MainFrame.cpp:574
msgid "Project files (*.pto)|*.pto|All files (*)|*"
msgstr "Fitxer de projecte (*.pto)|*.pto|Tots els fitxers (*)|*"
-#: src/hugin/MainFrame.cpp:584
+#: src/hugin/MainFrame.cpp:595
msgid "Save PTStitcher script file"
msgstr "Desar el fitxer de seq\xFC\xE8ncia PTStitcher"
-#: src/hugin/MainFrame.cpp:586
+#: src/hugin/MainFrame.cpp:597
msgid "PTStitcher files (*.txt)|*.txt"
msgstr "Fitxer PTStitcher (*.txt)|*.txt"
-#: src/hugin/MainFrame.cpp:614
+#: src/hugin/MainFrame.cpp:626
msgid "Open project: "
msgstr "Obrir el projecte\xA0: "
-#: src/hugin/MainFrame.cpp:626
+#: src/hugin/MainFrame.cpp:638
msgid "Project opened"
msgstr "Projecte obert"
-#: src/hugin/MainFrame.cpp:636
+#: src/hugin/MainFrame.cpp:648
msgid "Error opening project: "
msgstr "Error durant la obertura del projecte: "
-#: src/hugin/MainFrame.cpp:667
+#: src/hugin/MainFrame.cpp:680
msgid "Open project file"
msgstr "Obrir el fitxer de projecte"
-#: src/hugin/MainFrame.cpp:669 src/hugin/MainFrame.cpp:1112
+#: src/hugin/MainFrame.cpp:682 src/hugin/MainFrame.cpp:1127
msgid ""
"Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files "
"(*)|*"
@@ -743,12 +766,12 @@
"Fitxer de projecte (*.pto,*.ptp,*.pts,*oto)|*.pto;*ptp;*.pts;*.oto;|Tots els "
"fitxers (*)|*"
-#: src/hugin/MainFrame.cpp:682
+#: src/hugin/MainFrame.cpp:696
msgid "Open project: cancel"
msgstr "Obrir el projecte\xA0: cancel\xB7lar"
-#: src/hugin/MainFrame.cpp:708 src/hugin/VigCorrDialog.cpp:171
-#: src/hugin/wxPanoCommand.cpp:278
+#: src/hugin/MainFrame.cpp:722 src/hugin/VigCorrDialog.cpp:173
+#: src/hugin/wxPanoCommand.cpp:303
#, fuzzy
msgid ""
"All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*."
@@ -759,28 +782,28 @@
"*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff|fitxers JPEG\xB7(*.jpg)|*.jpg;"
"*.JPG|Tots els fitxers (*)|*"
-#: src/hugin/MainFrame.cpp:711 src/hugin/wxPanoCommand.cpp:279
-#: src/hugin/wxPanoCommand.cpp:343
+#: src/hugin/MainFrame.cpp:725 src/hugin/wxPanoCommand.cpp:304
+#: src/hugin/wxPanoCommand.cpp:370
msgid "Add images"
msgstr "Afegir imatges"
-#: src/hugin/MainFrame.cpp:763
+#: src/hugin/MainFrame.cpp:778
msgid "Add Image: cancel"
msgstr "Afegir imatges\xA0: cancel\xB7lar"
-#: src/hugin/MainFrame.cpp:1110
+#: src/hugin/MainFrame.cpp:1125
msgid "Choose template project"
msgstr ""
-#: src/hugin/MainFrame.cpp:1161
+#: src/hugin/MainFrame.cpp:1177
msgid "Fine-tuning all points"
msgstr "Ajustament prec\xEDs en tots els punts"
-#: src/hugin/MainFrame.cpp:1163
+#: src/hugin/MainFrame.cpp:1179
msgid "Finetuning"
msgstr "Ajustament prec\xEDs"
-#: src/hugin/MainFrame.cpp:1254
+#: src/hugin/MainFrame.cpp:1267
#, fuzzy, c-format
msgid ""
"%d points fine-tuned, %d points not updated due to low correlation\n"
@@ -809,11 +832,11 @@
"Utilitzeu la llista de punts de control (F3) per veure tots els punts del "
"projecte actual.\n"
-#: src/hugin/MainFrame.cpp:1256
+#: src/hugin/MainFrame.cpp:1269
msgid "Fine-tune result"
msgstr "Resultat de l'ajustament prec\xEDs"
-#: src/hugin/MyExternalCmdExecDialog.cpp:62 src/hugin/PanoPanel.cpp:723
+#: src/hugin/MyExternalCmdExecDialog.cpp:62 src/hugin/PanoPanel.cpp:724
msgid "ShellExecuteEx failed"
msgstr "Fallada de ShellExecuteEx"
@@ -849,11 +872,11 @@
msgid "Elapsed time : "
msgstr "Temps utilitzat\xA0: "
-#: src/hugin/NonaStitcherPanel.cpp:301
+#: src/hugin/NonaStitcherPanel.cpp:307
msgid "Stitching Panorama"
msgstr "Assemblatge del Panorama"
-#: src/hugin/NonaStitcherPanel.cpp:338
+#: src/hugin/NonaStitcherPanel.cpp:344
msgid ""
"Out of memory.\n"
"Try again with a smaller panorama image size\n"
@@ -861,11 +884,27 @@
"Mem\xF2ria insuficient.\n"
"Proveu un altre cop amb una imatge panor\xE0mica m\xE9s petita.\n"
-#: src/hugin/NonaStitcherPanel.cpp:339 src/hugin/NonaStitcherPanel.cpp:344
+#: src/hugin/NonaStitcherPanel.cpp:345 src/hugin/NonaStitcherPanel.cpp:350
msgid "Error during stitching"
msgstr "Error durant l'assemblatge"
-#: src/hugin/NonaStitcherPanel.cpp:397
+#: src/hugin/NonaStitcherPanel.cpp:365
+msgid "Select enblend.exe"
+msgstr "Seleccioneu enblend.exe"
+
+#: src/hugin/NonaStitcherPanel.cpp:373
+msgid "No enblend.exe selected"
+msgstr "No heu seleccionat enblend.exe"
+
+#: src/hugin/NonaStitcherPanel.cpp:384
+msgid "Select enblend commandline tool"
+msgstr "Seleccioneu l'eina de l\xEDnia de comanda Enblend"
+
+#: src/hugin/NonaStitcherPanel.cpp:392
+msgid "No enblend commandline tool selected"
+msgstr "No heu seleccionat l'eina de l\xEDnia de comanda Enblend"
+
+#: src/hugin/NonaStitcherPanel.cpp:433
#, fuzzy
msgid ""
"Can not call enblend with a command line > 32766 characters.\n"
@@ -879,25 +918,15 @@
"Utilitzeu menys imatges o situeu les imatges dins una carpeta\n"
"amb una ruta m\xE9s curta."
-#: src/hugin/NonaStitcherPanel.cpp:415
+#: src/hugin/NonaStitcherPanel.cpp:451
msgid "enblend error"
msgstr "Error d'Enblend"
-#: src/hugin/NonaStitcherPanel.cpp:489 src/hugin/PTStitcherPanel.cpp:310
+#: src/hugin/NonaStitcherPanel.cpp:525 src/hugin/PTStitcherPanel.cpp:310
msgid "gamma must be a number"
msgstr "la gamma ha de ser un nombre"
-#: src/hugin/OptimizePanel.cpp:445
-msgid ""
-"Cannot optimize this projection.\n"
-"Only rectilinear, cylindrical and equirectangular panoramas can be "
-"optimized\n"
-"\n"
-"Please optimize using one of these projections and selected the desired "
-"output projection afterwards."
-msgstr ""
-
-#: src/hugin/OptimizePanel.cpp:551
+#: src/hugin/OptimizePanel.cpp:553
#, fuzzy
msgid ""
"Optimizer run finished.\n"
@@ -921,7 +950,7 @@
"El Camp de Visi\xF3 (v) pot ser a vegades optimitzat per a panorames parcials\n"
"quan les imatges estan ben alienades."
-#: src/hugin/OptimizePanel.cpp:554
+#: src/hugin/OptimizePanel.cpp:556
#, c-format
msgid ""
"Optimizer run finished.\n"
@@ -939,7 +968,7 @@
"Apply the changes anyway?"
msgstr ""
-#: src/hugin/OptimizePanel.cpp:558
+#: src/hugin/OptimizePanel.cpp:560
#, c-format
msgid ""
"Optimizer run finished.\n"
@@ -958,7 +987,7 @@
"\n"
"Voleu aplicar les\xA0modificacions?"
-#: src/hugin/OptimizePanel.cpp:563
+#: src/hugin/OptimizePanel.cpp:565
msgid "Optimisation result"
msgstr ""
@@ -1181,7 +1210,7 @@
msgid "Create panorama image"
msgstr "Crea una imatge panor\xE0mica"
-#: src/hugin/PanoPanel.cpp:680
+#: src/hugin/PanoPanel.cpp:681
#, c-format
msgid ""
"File %s already exists\n"
@@ -1189,7 +1218,7 @@
"Overwrite?"
msgstr ""
-#: src/hugin/PanoPanel.cpp:681
+#: src/hugin/PanoPanel.cpp:682
msgid "Overwrite file?"
msgstr ""
@@ -1266,142 +1295,155 @@
msgid "Ukrainian"
msgstr ""
-#: src/hugin/PreferencesDialog.cpp:272
+#: src/hugin/PreferencesDialog.cpp:253
msgid "Select PTStitcher"
msgstr "Seleccioneu PTStitcher"
-#: src/hugin/PreferencesDialog.cpp:276 src/hugin/PreferencesDialog.cpp:294
-#: src/hugin/PreferencesDialog.cpp:311 src/hugin/PreferencesDialog.cpp:327
-#: src/hugin/PTStitcherPanel.cpp:483
-msgid "Executables (*.exe)|*.exe"
-msgstr "Executables (*.exe)|*.exe"
-
-#: src/hugin/PreferencesDialog.cpp:291
+#: src/hugin/PreferencesDialog.cpp:272
#, fuzzy
msgid "Select image editor"
msgstr "parella d'imatge seg\xFCent"
-#: src/hugin/PreferencesDialog.cpp:308
+#: src/hugin/PreferencesDialog.cpp:289
msgid "Select Enblend"
msgstr "Seleccioneu Enblend"
-#: src/hugin/PreferencesDialog.cpp:324 src/hugin/PreferencesDialog.cpp:340
-#: src/hugin/xrc/pref_dialog.xrs:71
+#: src/hugin/PreferencesDialog.cpp:305 src/hugin/xrc/pref_dialog.xrs:71
msgid "Select Autopano"
msgstr "Seleccioneu Autopano"
-#: src/hugin/PreferencesDialog.cpp:343
+#: src/hugin/PreferencesDialog.cpp:321
+#, fuzzy
+msgid "Select Autopano-SIFT"
+msgstr "Seleccioneu Autopano"
+
+#: src/hugin/PreferencesDialog.cpp:324
msgid "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
msgstr "Executables (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd"
-#: src/hugin/PreferencesDialog.cpp:382
+#: src/hugin/PreferencesDialog.cpp:363
msgid "Panotools details"
msgstr "Detalls de Panotools"
-#: src/hugin/PreferencesDialog.cpp:765
+#: src/hugin/PreferencesDialog.cpp:745
msgid "Unknown Version"
msgstr "Versi\xF3 desconeguda"
-#: src/hugin/PreferencesDialog.cpp:775
+#: src/hugin/PreferencesDialog.cpp:755
msgid "Really reset displayed preferences to default values?"
msgstr ""
"Voleu realment substituir les prefer\xE8ncies mostrades pels valors per "
"defecte\xA0?"
-#: src/hugin/PreferencesDialog.cpp:775 src/hugin/xrc/pref_dialog.xrs:95
+#: src/hugin/PreferencesDialog.cpp:755 src/hugin/xrc/pref_dialog.xrs:95
msgid "Load Defaults"
msgstr "Carregant els valors per defecte"
-#: src/hugin/PreviewFrame.cpp:101
+#: src/hugin/PreviewFrame.cpp:110
msgid "Panorama preview"
msgstr "Vista pr\xE8via del panorama"
-#: src/hugin/PreviewFrame.cpp:116
+#: src/hugin/PreviewFrame.cpp:125
msgid "displayed images"
msgstr "imatges mostrades"
-#: src/hugin/PreviewFrame.cpp:151
+#: src/hugin/PreviewFrame.cpp:160
msgid "VFOV"
msgstr "VFOV"
-#: src/hugin/PreviewFrame.cpp:155
+#: src/hugin/PreviewFrame.cpp:164
msgid "drag to change the vertical field of view"
msgstr "arrossegar per canviar el camp de visi\xF3 vertical"
-#: src/hugin/PreviewFrame.cpp:164
+#: src/hugin/PreviewFrame.cpp:173
msgid "HFOV"
msgstr "HFOV"
-#: src/hugin/PreviewFrame.cpp:169
+#: src/hugin/PreviewFrame.cpp:178
msgid "drag to change the horizontal field of view"
msgstr "arrossegar per canviar el camp de visi\xF3 horitzontal"
-#: src/hugin/PreviewFrame.cpp:180
+#: src/hugin/PreviewFrame.cpp:189
msgid "Preview Options"
msgstr "Opcions de la vista pr\xE8via"
-#: src/hugin/PreviewFrame.cpp:183 src/hugin/xrc/pano_panel.xrs:2
-#: src/hugin/xrc/pano_panel-2.5.xrs:2
+#: src/hugin/PreviewFrame.cpp:192 src/hugin/xrc/pano_panel.xrs:2
msgid "projection (f):"
msgstr "projecci\xF3 (f)\xA0:"
-#: src/hugin/PreviewFrame.cpp:225
+#: src/hugin/PreviewFrame.cpp:235
msgid "Blend mode:"
msgstr "Mode de barreja\xA0:"
-#: src/hugin/PreviewFrame.cpp:231
+#: src/hugin/PreviewFrame.cpp:241
msgid "difference"
msgstr "difer\xE8ncia"
-#: src/hugin/PreviewFrame.cpp:249
+#: src/hugin/PreviewFrame.cpp:257
+msgid "Output:"
+msgstr ""
+
+#: src/hugin/PreviewFrame.cpp:262
+msgid "LDR"
+msgstr ""
+
+#: src/hugin/PreviewFrame.cpp:263 src/hugin/xrc/nona_panel.xrs:20
+msgid "HDR"
+msgstr ""
+
+#: src/hugin/PreviewFrame.cpp:275
+msgid "EV:"
+msgstr ""
+
+#: src/hugin/PreviewFrame.cpp:288 src/hugin/PreviewFrame.cpp:322
+msgid "0"
+msgstr "0"
+
+#: src/hugin/PreviewFrame.cpp:308
#, fuzzy
msgid "Projection Parameters"
msgstr "Par\xE0metres de correcci\xF3 de la lent"
-#: src/hugin/PreviewFrame.cpp:258
+#: src/hugin/PreviewFrame.cpp:317
msgid "param:"
msgstr ""
-#: src/hugin/PreviewFrame.cpp:263 src/hugin/xrc/pano_panel.xrs:28
-msgid "0"
-msgstr "0"
-
-#: src/hugin/PreviewFrame.cpp:290 src/hugin/PreviewPanel.cpp:517
+#: 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 ""
-#: src/hugin/PreviewFrame.cpp:325 src/hugin/PreviewFrame.cpp:422
+#: src/hugin/PreviewFrame.cpp:384 src/hugin/PreviewFrame.cpp:499
#, fuzzy
msgid "Center panorama with left mouse button, set horizon with right button"
msgstr ""
"Fixeu la Guinyada i el Caboteig amb el bot\xF3 esquerre del ratol\xED. Utilitzeu "
"el bot\xF3 dret del ratol\xED per fixar el Balanceig."
-#: src/hugin/PreviewFrame.cpp:535 src/hugin/xrc/pano_panel.xrs:3
+#: src/hugin/PreviewFrame.cpp:614
msgid "Rectilinear"
msgstr "Rectilini"
-#: src/hugin/PreviewFrame.cpp:536 src/hugin/xrc/pano_panel.xrs:4
+#: src/hugin/PreviewFrame.cpp:615
msgid "Cylindrical"
msgstr "Cil\xEDndric"
-#: src/hugin/PreviewFrame.cpp:634
+#: src/hugin/PreviewFrame.cpp:713
#, fuzzy
msgid "Yaw value must be numeric."
msgstr "El valor ha de ser num\xE8ric."
-#: src/hugin/PreviewFrame.cpp:640
+#: src/hugin/PreviewFrame.cpp:719
#, fuzzy
msgid "Pitch value must be numeric."
msgstr "El valor ha de ser num\xE8ric."
-#: src/hugin/PreviewFrame.cpp:646
+#: src/hugin/PreviewFrame.cpp:725
#, fuzzy
msgid "Roll value must be numeric."
msgstr "El valor ha de ser num\xE8ric."
-#: src/hugin/PreviewPanel.cpp:322
+#: src/hugin/PreviewPanel.cpp:467
msgid "Error during Stitching"
msgstr "Error durant l'assemblatge"
@@ -1528,116 +1570,37 @@
msgid "Tips not available, sorry!"
msgstr "Els consells no estan disponibles\xA0!"
-#: src/hugin/VigCorrDialog.cpp:172
+#: src/hugin/VigCorrDialog.cpp:174
#, fuzzy
msgid "Select flatfield image"
msgstr "Seleccioneu un punt en la imatge de la esquerra"
-#: src/hugin/VigCorrDialog.cpp:252 src/hugin/VigCorrDialog.cpp:636
-msgid ""
-"The vignetting curve is determined by using gray values in the overlaping "
-"areas.\n"
-"To speed up the computation, only a random subset of points is used."
+#: src/hugin/VigCorrDialog.cpp:267
+msgid "Error: could not find flatfile image file."
msgstr ""
-#: src/hugin/VigCorrDialog.cpp:253 src/hugin/VigCorrDialog.cpp:636
+#: src/hugin/VigCorrDialog.cpp:267
#, fuzzy
-msgid "Number of points per overlap"
-msgstr "nombre de punts creats en cada encavalcament"
+msgid "File not found"
+msgstr "Fitxer d'imatge no trobat"
-#: src/hugin/VigCorrDialog.cpp:254 src/hugin/VigCorrDialog.cpp:259
-#: src/hugin/VigCorrDialog.cpp:636 src/hugin/VigCorrDialog.cpp:638
-msgid "Estimate vignetting curve"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:259 src/hugin/VigCorrDialog.cpp:638
+#: src/hugin/wxPanoCommand.cpp:188
+#, fuzzy, c-format
msgid ""
-"Ransac tolerance parameter.\n"
-"Should be around 0.1.\n"
-" Smaller numbers might lead to better results, if the images are registered "
-"very well,\n"
-" and the same camera settings (exposure, white balance) were used."
-msgstr ""
+"Could not decode image:\n"
+"%s\n"
+"Abort"
+msgstr "No es pot llegir la mida de la imatge"
-#: src/hugin/VigCorrDialog.cpp:289
-msgid ""
-"Vignetting correction currently does not work with nonlinear mapped 16 bit "
-"and HDR images.\n"
-"Please enable linear mapping\n"
-"Continue anyway?"
+#: src/hugin/wxPanoCommand.cpp:188
+msgid "Unsupported image file format"
msgstr ""
-#: src/hugin/VigCorrDialog.cpp:289 src/hugin/VigCorrDialog.cpp:505
-msgid "Warning"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:308 src/hugin/VigCorrDialog.cpp:580
-msgid "Vignetting function estimation"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:372
-msgid ""
-"Not enought images selected. Please ensure that more than two images are "
-"associated with the current lens."
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:372
-msgid "Cannot estimate vignetting"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:503
-#, c-format
-msgid ""
-"Vignetting curve estimation results:\n"
-"\n"
-"WARNING: %.1f%% of all points were inconsistent.\n"
-"\n"
-"Please check if the images fit well and the same exposure and white balance "
-"settings have been used for all images.\n"
-"\n"
-"The recovered vignetting curve might be inaccurate."
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:507
-#, c-format
-msgid ""
-"Vignetting curve estimation results:\n"
-"%.1f%% inconsistent point pairs found, used %.1f%% of %d pairs during final "
-"estimation.\n"
-"Brightness error: %.2f (gray value RMSE)"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:512 src/hugin/VigCorrDialog.cpp:683
-msgid "Vignetting curve estimation"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:638
-msgid "0.1"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:679
-#, c-format
-msgid ""
-"Vignetting curve estimation results:\n"
-" %d good Points, %d bad points, used %.1f%% of good points during final "
-"estimation.\n"
-" Residual after estimation: %.5f"
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:705
-msgid "Error: could not find flatfile image file."
-msgstr ""
-
-#: src/hugin/VigCorrDialog.cpp:705
-#, fuzzy
-msgid "File not found"
-msgstr "Fitxer d'imatge no trobat"
-
-#: src/hugin/wxPanoCommand.cpp:206
+#: src/hugin/wxPanoCommand.cpp:224
msgid "Could not read image size"
msgstr "No es pot llegir la mida de la imatge"
-#: src/hugin/wxPanoCommand.cpp:272
+#: src/hugin/wxPanoCommand.cpp:297
#, c-format
msgid ""
"Image file not found:\n"
@@ -1648,11 +1611,11 @@
"%s\n"
"Seleccioneu la imatge correcte"
-#: src/hugin/wxPanoCommand.cpp:272
+#: src/hugin/wxPanoCommand.cpp:297
msgid "Image file not found"
msgstr "Fitxer d'imatge no trobat"
-#: src/hugin/wxPanoCommand.cpp:340
+#: src/hugin/wxPanoCommand.cpp:367
#, fuzzy
msgid ""
"All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*."
@@ -1663,24 +1626,24 @@
"*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff|fitxers JPEG\xB7(*.jpg)|*.jpg;"
"*.JPG|Tots els fitxers (*)|*"
-#: src/hugin/wxPanoCommand.cpp:400
+#: src/hugin/wxPanoCommand.cpp:428
#, c-format
msgid ""
"Error, template expects %d images,\n"
"current project contains %d images\n"
msgstr ""
-#: src/hugin/wxPanoCommand.cpp:401 src/hugin/wxPanoCommand.cpp:427
+#: src/hugin/wxPanoCommand.cpp:429 src/hugin/wxPanoCommand.cpp:455
#, fuzzy
msgid "Could not apply template"
msgstr "No es pot llegir el nombre"
-#: src/hugin/wxPanoCommand.cpp:427
+#: src/hugin/wxPanoCommand.cpp:455
#, fuzzy
msgid "Error loading project file"
msgstr "Error durant la obertura del projecte: "
-#: src/include/hugin/MyProgressDialog.h:71
+#: src/include/hugin/MyProgressDialog.h:98
msgid "Optimizing Panorama"
msgstr "Optimitzaci\xF3 del Panorama"
@@ -1702,7 +1665,6 @@
msgstr ""
#: src/hugin/xrc/assistant_panel.xrs:5 src/hugin/xrc/assistant_panel.xrs:24
-#: src/hugin/xrc/lens_panel.xrs:1 src/hugin/xrc/lens_panel-2.5.xrs:12
msgid "Lens type:"
msgstr "Tipus de lent\xA0:"
@@ -1720,11 +1682,11 @@
msgid "Focal length multiplier:"
msgstr "dist\xE0ncia focal\xA0:"
-#: src/hugin/xrc/assistant_panel.xrs:15 src/hugin/xrc/lens_panel-2.5.xrs:1
+#: src/hugin/xrc/assistant_panel.xrs:15 src/hugin/xrc/lens_panel.xrs:1
msgid "Load lens..."
msgstr ""
-#: src/hugin/xrc/assistant_panel.xrs:16 src/hugin/xrc/main_frame.xrs:3
+#: src/hugin/xrc/assistant_panel.xrs:16 src/hugin/xrc/main_frame.xrs:4
msgid "Camera and Lens"
msgstr "Camera i lents"
@@ -1810,126 +1772,94 @@
msgid "Set Anchor Image Orientation"
msgstr "Indicar l'orientaci\xF3 de l'\xE0ncora de la imatge"
-#: src/hugin/xrc/cp_editor_panel.xrs:1 src/hugin/xrc/cp_editor_panel-2.5.xrs:1
+#: src/hugin/xrc/cp_editor_panel.xrs:1
msgid "previous image pair"
msgstr "parella d'imatge pr\xE8via"
-#: src/hugin/xrc/cp_editor_panel.xrs:2 src/hugin/xrc/cp_editor_panel-2.5.xrs:2
+#: src/hugin/xrc/cp_editor_panel.xrs:2
msgid "next image pair"
msgstr "parella d'imatge seg\xFCent"
#: src/hugin/xrc/cp_editor_panel.xrs:3 src/hugin/xrc/cp_editor_panel.xrs:5
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:3
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:5
+#: src/hugin/xrc/lens_panel.xrs:57
msgid "x:"
msgstr "x\xA0:"
#: src/hugin/xrc/cp_editor_panel.xrs:4 src/hugin/xrc/cp_editor_panel.xrs:6
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:4
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:6 src/hugin/xrc/vig_corr_dlg.xrs:17
+#: src/hugin/xrc/lens_panel.xrs:58 src/hugin/xrc/lens_panel.xrs:82
+#: src/hugin/xrc/vig_corr_dlg.xrs:17
msgid "y:"
msgstr "y\xA0:"
-#: src/hugin/xrc/cp_editor_panel.xrs:7 src/hugin/xrc/cp_editor_panel-2.5.xrs:7
+#: src/hugin/xrc/cp_editor_panel.xrs:7
msgid "mode:"
msgstr "mode\xA0:"
-#: src/hugin/xrc/cp_editor_panel.xrs:9 src/hugin/xrc/cp_editor_panel-2.5.xrs:9
+#: src/hugin/xrc/cp_editor_panel.xrs:9
msgid "vertical line"
msgstr "l\xEDnia vertical"
#: src/hugin/xrc/cp_editor_panel.xrs:10
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:10
msgid "horizontal line"
msgstr "l\xEDnia horitzontal"
#: src/hugin/xrc/cp_editor_panel.xrs:11
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:11
msgid "Zoom:"
msgstr "Zoom\xA0:"
#: src/hugin/xrc/cp_editor_panel.xrs:12
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:12
msgid "100%"
msgstr "100%"
#: src/hugin/xrc/cp_editor_panel.xrs:13
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:13
msgid "fit to window"
msgstr "ajustar a la finestra"
#: src/hugin/xrc/cp_editor_panel.xrs:14
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:14
msgid "200%"
msgstr "200%"
#: src/hugin/xrc/cp_editor_panel.xrs:15
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:15
msgid "150%"
msgstr "150%"
#: src/hugin/xrc/cp_editor_panel.xrs:16
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:16
msgid "75%"
msgstr "75%"
#: src/hugin/xrc/cp_editor_panel.xrs:17
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:17
msgid "50%"
msgstr "50%"
#: src/hugin/xrc/cp_editor_panel.xrs:18
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:18
msgid "25%"
msgstr "25%"
#: src/hugin/xrc/cp_editor_panel.xrs:19
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:27
-msgid "&Add"
-msgstr "&Afegir"
-
-#: src/hugin/xrc/cp_editor_panel.xrs:20
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:28
-msgid "add a new Point"
-msgstr "afegir un nou punt"
-
-#: src/hugin/xrc/cp_editor_panel.xrs:21
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:26 src/hugin/xrc/cp_list_frame.xrs:2
-msgid "Delete"
-msgstr "Suprimir"
-
-#: src/hugin/xrc/cp_editor_panel.xrs:22
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:19
msgid "Fine-tune"
msgstr "Ajustament prec\xEDs"
-#: src/hugin/xrc/cp_editor_panel.xrs:23
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:20
+#: src/hugin/xrc/cp_editor_panel.xrs:20
msgid "tries to optimize the currently active point."
msgstr "intenta optimitzar el punt actiu."
-#: src/hugin/xrc/cp_editor_panel.xrs:24
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:21
+#: src/hugin/xrc/cp_editor_panel.xrs:21
msgid "auto fine-&tune"
msgstr "ajus&tament prec\xEDs autom\xE0tic"
-#: src/hugin/xrc/cp_editor_panel.xrs:25
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:22
+#: src/hugin/xrc/cp_editor_panel.xrs:22
msgid "auto add"
msgstr "afegir autom\xE0ticament"
-#: src/hugin/xrc/cp_editor_panel.xrs:26
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:23
+#: src/hugin/xrc/cp_editor_panel.xrs:23
msgid "immediately add control point when selecting a second point"
msgstr "immediatament afegir punt de control quan seleccioneu un segon punt"
-#: src/hugin/xrc/cp_editor_panel.xrs:27
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:24
+#: src/hugin/xrc/cp_editor_panel.xrs:24
msgid "auto estimate"
msgstr "Avaluaci\xF3 autom\xE0tica"
-#: src/hugin/xrc/cp_editor_panel.xrs:28
-#: src/hugin/xrc/cp_editor_panel-2.5.xrs:25
+#: src/hugin/xrc/cp_editor_panel.xrs:25
msgid ""
"tries to estimate shift between the images and use it while placing control "
"points"
@@ -1937,7 +1867,19 @@
"intenteu d'avaluar el despla\xE7ament entre les imatges i utilitzeu aquest "
"valor per situar els punts de control"
-#: src/hugin/xrc/cp_list_frame.xrs:1 src/hugin/xrc/main_frame.xrs:4
+#: src/hugin/xrc/cp_editor_panel.xrs:26 src/hugin/xrc/cp_list_frame.xrs:2
+msgid "Delete"
+msgstr "Suprimir"
+
+#: src/hugin/xrc/cp_editor_panel.xrs:27
+msgid "&Add"
+msgstr "&Afegir"
+
+#: src/hugin/xrc/cp_editor_panel.xrs:28
+msgid "add a new Point"
+msgstr "afegir un nou punt"
+
+#: src/hugin/xrc/cp_list_frame.xrs:1 src/hugin/xrc/main_frame.xrs:6
msgid "Control Points"
msgstr "Punts de Control"
@@ -1946,13 +1888,13 @@
msgstr "Seleccioneu per la Dist\xE0ncia"
#: src/hugin/xrc/crop_panel.xrs:1
-msgid "Left:"
-msgstr "Esquerra\xA0:"
-
-#: src/hugin/xrc/crop_panel.xrs:2
msgid "Top:"
msgstr "Superior\xA0:"
+#: src/hugin/xrc/crop_panel.xrs:2
+msgid "Left:"
+msgstr "Esquerra\xA0:"
+
#: src/hugin/xrc/crop_panel.xrs:3
msgid "Right:"
msgstr "Dreta\xA0:"
@@ -1965,8 +1907,7 @@
msgid "Always center Crop on d,e"
msgstr "Sempre centrar la imatge escap\xE7ada sobre d, e"
-#: src/hugin/xrc/crop_panel.xrs:6 src/hugin/xrc/images_panel.xrs:33
-#: src/hugin/xrc/images_panel-2.5.xrs:18
+#: src/hugin/xrc/crop_panel.xrs:6 src/hugin/xrc/images_panel.xrs:18
msgid "Reset"
msgstr "Reiniciar"
@@ -2013,357 +1954,427 @@
msgstr "Tancar"
#: src/hugin/xrc/images_panel.xrs:1
-msgid "Image Collection"
-msgstr "Col\xB7lecci\xF3 d'imatges"
-
-#: src/hugin/xrc/images_panel.xrs:2 src/hugin/xrc/images_panel-2.5.xrs:1
msgid "Add individual images..."
msgstr "Afegir imatges individuals..."
-#: src/hugin/xrc/images_panel.xrs:3 src/hugin/xrc/images_panel-2.5.xrs:2
+#: src/hugin/xrc/images_panel.xrs:2
msgid "load one or more photos for this project"
msgstr "obrir una o m\xE9s fotos per aquest projecte"
-#: src/hugin/xrc/images_panel.xrs:4 src/hugin/xrc/images_panel-2.5.xrs:3
+#: src/hugin/xrc/images_panel.xrs:3
msgid "Add time-series of images..."
msgstr "Afegir imatges de s\xE8ries temporals..."
-#: src/hugin/xrc/images_panel.xrs:5 src/hugin/xrc/images_panel-2.5.xrs:4
+#: src/hugin/xrc/images_panel.xrs:4
msgid "load a set of photos taken at the same time"
msgstr "obrir un grup de fotos agafades al mateix instant"
-#: src/hugin/xrc/images_panel.xrs:6 src/hugin/xrc/images_panel-2.5.xrs:7
-msgid "Remove this image"
-msgstr "Suprimir aquesta imatge"
-
-#: src/hugin/xrc/images_panel.xrs:7 src/hugin/xrc/images_panel-2.5.xrs:8
-msgid "dismiss the current photo from this project"
-msgstr "suprimir aquesta imatge del projecte"
-
-#: src/hugin/xrc/images_panel.xrs:8 src/hugin/xrc/images_panel-2.5.xrs:5
+#: src/hugin/xrc/images_panel.xrs:5
msgid "Move up"
msgstr "Pujar"
-#: src/hugin/xrc/images_panel.xrs:9 src/hugin/xrc/images_panel-2.5.xrs:6
+#: src/hugin/xrc/images_panel.xrs:6
msgid "Move down"
msgstr "Baixar"
-#: src/hugin/xrc/images_panel.xrs:11 src/hugin/xrc/images_panel-2.5.xrs:33
-msgid "Open a dialog to select the image area to be used while stitching"
-msgstr ""
+#: src/hugin/xrc/images_panel.xrs:7
+msgid "Remove this image"
+msgstr "Suprimir aquesta imatge"
-#: src/hugin/xrc/images_panel.xrs:12 src/hugin/xrc/images_panel-2.5.xrs:25
-msgid "Reference Image"
-msgstr "Imatge de refer\xE8ncia"
+#: src/hugin/xrc/images_panel.xrs:8
+msgid "dismiss the current photo from this project"
+msgstr "suprimir aquesta imatge del projecte"
-#: src/hugin/xrc/images_panel.xrs:13 src/hugin/xrc/images_panel-2.5.xrs:26
-msgid "Anchor this image for position"
-msgstr "Ancorar aquesta imatge per la posici\xF3"
-
-#: src/hugin/xrc/images_panel.xrs:14 src/hugin/xrc/images_panel-2.5.xrs:27
-msgid ""
-"use currently selected image as anchor image. That is, do not optimize the "
-"(complete) position of this image."
-msgstr ""
-"utilitzar la actual imatge seleccionada com a imatge \xE0ncora. De fet, no "
-"optimitzar (completament) la posici\xF3 d'aquesta imatge"
-
-#: src/hugin/xrc/images_panel.xrs:15
-msgid "Adjust the anchor spot..."
-msgstr "Ajusteu el punt d'ancoratge..."
-
-#: src/hugin/xrc/images_panel.xrs:16
-msgid "opens a window to select the anchor orientation graphically"
-msgstr "obre una finestra per seleccionar gr\xE0ficament l'orientaci\xF3 de l'\xE0ncora"
-
-#: src/hugin/xrc/images_panel.xrs:17 src/hugin/xrc/images_panel-2.5.xrs:28
-msgid "Anchor this image for exposure"
-msgstr "Ancorar aquesta imatge per l'exposici\xF3"
-
-#: src/hugin/xrc/images_panel.xrs:18 src/hugin/xrc/images_panel-2.5.xrs:29
-msgid "use the currently selected images as color correction anchor image"
-msgstr ""
-"utilitzeu les imatges seleccionades com a imatge de refer\xE8ncia per la "
-"correcci\xF3 de color"
-
-#: src/hugin/xrc/images_panel.xrs:19 src/hugin/xrc/images_panel-2.5.xrs:20
-msgid "Feature Matching (Autopano)"
-msgstr "Correspond\xE8ncia d'elements (Autopano)"
-
-#: src/hugin/xrc/images_panel.xrs:20 src/hugin/xrc/images_panel-2.5.xrs:21
-msgid "Points per Overlap:"
-msgstr ""
-"Nombre de punts de control\n"
-"per una \xE0rea de encavalcament \xA0:"
-
-#: src/hugin/xrc/images_panel.xrs:21 src/hugin/xrc/images_panel-2.5.xrs:22
-msgid "number of points created at each overlap"
-msgstr "nombre de punts creats en cada encavalcament"
-
-#: src/hugin/xrc/images_panel.xrs:22
-msgid "Create Ctrl Points"
-msgstr "Creu els punts de control"
-
-#: src/hugin/xrc/images_panel.xrs:23 src/hugin/xrc/images_panel-2.5.xrs:24
-msgid "Run external autopano program on the selected images"
-msgstr "Executeu el programa extern autopano per les imatges seleccionades"
-
-#: src/hugin/xrc/images_panel.xrs:24
-msgid "Remove Points"
+#: src/hugin/xrc/images_panel.xrs:9
+#, fuzzy
+msgid "Remove points"
msgstr "Suprimiu els punts"
-#: src/hugin/xrc/images_panel.xrs:25 src/hugin/xrc/images_panel-2.5.xrs:10
+#: src/hugin/xrc/images_panel.xrs:10
msgid "Remove control points connecting the selected images"
msgstr "Esborrar els punts de control connectant les imatges seleccionades"
-#: src/hugin/xrc/images_panel.xrs:26 src/hugin/xrc/images_panel-2.5.xrs:11
-#: src/hugin/xrc/optimize_panel.xrs:13
+#: src/hugin/xrc/images_panel.xrs:11 src/hugin/xrc/optimize_panel.xrs:13
msgid "Image Orientation"
msgstr "Orientaci\xF3 de la imatge"
-#: src/hugin/xrc/images_panel.xrs:27 src/hugin/xrc/images_panel-2.5.xrs:12
+#: src/hugin/xrc/images_panel.xrs:12
msgid "yaw:"
msgstr "guinyada\xA0:"
-#: src/hugin/xrc/images_panel.xrs:28 src/hugin/xrc/images_panel-2.5.xrs:13
+#: src/hugin/xrc/images_panel.xrs:13
msgid "set yaw for selected image(s)"
msgstr "Fixar la guinyada per la/es imatge/s seleccionada/es"
-#: src/hugin/xrc/images_panel.xrs:29 src/hugin/xrc/images_panel-2.5.xrs:14
+#: src/hugin/xrc/images_panel.xrs:14
msgid "pitch:"
msgstr "caboteig\xA0:"
-#: src/hugin/xrc/images_panel.xrs:30 src/hugin/xrc/images_panel-2.5.xrs:15
+#: src/hugin/xrc/images_panel.xrs:15
msgid "set pitch for selected image(s)"
msgstr "Fixar el caboteig per la/es imatge/s seleccionada/es"
-#: src/hugin/xrc/images_panel.xrs:31 src/hugin/xrc/images_panel-2.5.xrs:16
+#: src/hugin/xrc/images_panel.xrs:16
msgid "roll:"
msgstr "balanceig\xA0:"
-#: src/hugin/xrc/images_panel.xrs:32 src/hugin/xrc/images_panel-2.5.xrs:17
+#: src/hugin/xrc/images_panel.xrs:17
msgid "set roll for selected image(s)"
msgstr "Fixar el balanceig per la/es imatge/s seleccionada/es"
-#: src/hugin/xrc/images_panel.xrs:34 src/hugin/xrc/images_panel-2.5.xrs:19
+#: src/hugin/xrc/images_panel.xrs:19
msgid "Reset position of selected image(s)"
msgstr "Posar a zero la posici\xF3 de la/es imatge/s seleccionada/es"
-#: src/hugin/xrc/images_panel.xrs:35 src/hugin/xrc/images_panel-2.5.xrs:30
+#: src/hugin/xrc/images_panel.xrs:20
+msgid "Feature Matching (Autopano)"
+msgstr "Correspond\xE8ncia d'elements (Autopano)"
+
+#: src/hugin/xrc/images_panel.xrs:21
+msgid "Points per Overlap:"
+msgstr ""
+"Nombre de punts de control\n"
+"per una \xE0rea de encavalcament \xA0:"
+
+#: src/hugin/xrc/images_panel.xrs:22
+msgid "number of points created at each overlap"
+msgstr "nombre de punts creats en cada encavalcament"
+
+#: src/hugin/xrc/images_panel.xrs:24
+msgid "Run external autopano program on the selected images"
+msgstr "Executeu el programa extern autopano per les imatges seleccionades"
+
+#: src/hugin/xrc/images_panel.xrs:25
+msgid "Reference Image"
+msgstr "Imatge de refer\xE8ncia"
+
+#: src/hugin/xrc/images_panel.xrs:26
+msgid "Anchor this image for position"
+msgstr "Ancorar aquesta imatge per la posici\xF3"
+
+#: 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 ""
+"utilitzar la actual imatge seleccionada com a imatge \xE0ncora. De fet, no "
+"optimitzar (completament) la posici\xF3 d'aquesta imatge"
+
+#: src/hugin/xrc/images_panel.xrs:28
+msgid "Anchor this image for exposure"
+msgstr "Ancorar aquesta imatge per l'exposici\xF3"
+
+#: src/hugin/xrc/images_panel.xrs:29
+msgid "use the currently selected images as color correction anchor image"
+msgstr ""
+"utilitzeu les imatges seleccionades com a imatge de refer\xE8ncia per la "
+"correcci\xF3 de color"
+
+#: src/hugin/xrc/images_panel.xrs:30
msgid "This Image"
msgstr "Aquesta imatge"
-#: src/hugin/xrc/images_panel-2.5.xrs:9
+#: src/hugin/xrc/images_panel.xrs:32
#, fuzzy
-msgid "Remove points"
-msgstr "Suprimiu els punts"
-
-#: src/hugin/xrc/images_panel-2.5.xrs:32
-#, fuzzy
msgid "Crop..."
msgstr "Escap\xE7ar"
+#: src/hugin/xrc/images_panel.xrs:33
+msgid "Open a dialog to select the image area to be used while stitching"
+msgstr ""
+
#: src/hugin/xrc/keyboard_help.xrs:1
msgid "Keyboard Shortcuts"
msgstr "Dreceres del teclat"
-#: src/hugin/xrc/lens_panel.xrs:7 src/hugin/xrc/lens_panel-2.5.xrs:11
-msgid "Design Parameters"
-msgstr "Par\xE0metres de Disseny"
+#: src/hugin/xrc/lens_panel.xrs:2
+msgid "Load lens parameters from a file"
+msgstr "Carregar els par\xE0metres de la lent des d'un fitxer"
-#: src/hugin/xrc/lens_panel.xrs:8 src/hugin/xrc/lens_panel-2.5.xrs:18
+#: src/hugin/xrc/lens_panel.xrs:3
+#, fuzzy
+msgid "Save lens..."
+msgstr "Guardar com"
+
+#: src/hugin/xrc/lens_panel.xrs:4
+msgid "Save lens parameters to an file"
+msgstr "Guardar els par\xE0metres de la lent des d'un fitxer"
+
+#: src/hugin/xrc/lens_panel.xrs:5
+msgid "Load EXIF"
+msgstr "Carregar els EXIF"
+
+#: src/hugin/xrc/lens_panel.xrs:6
+msgid "Try to read HFOV from the EXIF data"
+msgstr ""
+"Provar de llegir l'angle de camp de visi\xF3 horitzontal (HFOV) des de les "
+"dades EXIF"
+
+#: src/hugin/xrc/lens_panel.xrs:7
+msgid "New Lens"
+msgstr "Nova lent"
+
+#: src/hugin/xrc/lens_panel.xrs:8
+msgid "Create a new lens and assign it to selected images"
+msgstr "Crear una nova lent i assignar-li les imatges seleccionades"
+
+#: src/hugin/xrc/lens_panel.xrs:9
+#, fuzzy
+msgid "Change lens..."
+msgstr "Canviar la lent"
+
+#: src/hugin/xrc/lens_panel.xrs:10
+msgid "change lens of selected images"
+msgstr "Canviar la lent de les imatges seleccionades"
+
+#: src/hugin/xrc/lens_panel.xrs:11
+msgid "Geometric"
+msgstr ""
+
+#: src/hugin/xrc/lens_panel.xrs:12
+#, fuzzy
+msgid "Lens"
+msgstr "Lent no."
+
+#: src/hugin/xrc/lens_panel.xrs:13 src/hugin/xrc/lens_panel.xrs:61
+#, fuzzy
+msgid "Type:"
+msgstr "Superior\xA0:"
+
+#: src/hugin/xrc/lens_panel.xrs:19
msgid "degrees of view (v):"
msgstr "Angle de camp de visi\xF3 (v)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:9 src/hugin/xrc/lens_panel-2.5.xrs:19
+#: src/hugin/xrc/lens_panel.xrs:20
msgid "Horizontal Field of View"
msgstr "Angle de camp de visi\xF3 horitzontal"
-#: src/hugin/xrc/lens_panel.xrs:10 src/hugin/xrc/lens_panel.xrs:17
-#: src/hugin/xrc/lens_panel.xrs:19 src/hugin/xrc/lens_panel.xrs:21
-#: src/hugin/xrc/lens_panel.xrs:24 src/hugin/xrc/lens_panel.xrs:26
-#: src/hugin/xrc/lens_panel.xrs:29 src/hugin/xrc/lens_panel.xrs:31
-#: src/hugin/xrc/lens_panel-2.5.xrs:20 src/hugin/xrc/lens_panel-2.5.xrs:29
-#: src/hugin/xrc/lens_panel-2.5.xrs:31 src/hugin/xrc/lens_panel-2.5.xrs:33
-#: src/hugin/xrc/lens_panel-2.5.xrs:36 src/hugin/xrc/lens_panel-2.5.xrs:38
-#: src/hugin/xrc/lens_panel-2.5.xrs:41 src/hugin/xrc/lens_panel-2.5.xrs:43
-#: src/hugin/xrc/lens_panel-2.5.xrs:48 src/hugin/xrc/lens_panel-2.5.xrs:50
-#: src/hugin/xrc/lens_panel-2.5.xrs:52
-msgid "Inherit"
-msgstr "Inherent"
+#: 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
+#: src/hugin/xrc/lens_panel.xrs:35 src/hugin/xrc/lens_panel.xrs:37
+#: src/hugin/xrc/lens_panel.xrs:40 src/hugin/xrc/lens_panel.xrs:42
+#: src/hugin/xrc/lens_panel.xrs:46 src/hugin/xrc/lens_panel.xrs:48
+#: 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 ""
-#: src/hugin/xrc/lens_panel.xrs:11 src/hugin/xrc/lens_panel-2.5.xrs:21
+#: src/hugin/xrc/lens_panel.xrs:22
msgid "focal length:"
msgstr "dist\xE0ncia focal\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:12 src/hugin/xrc/lens_panel-2.5.xrs:22
+#: src/hugin/xrc/lens_panel.xrs:23
msgid "true focal length in mm"
msgstr "dist\xE0ncia focal real en mm"
-#: src/hugin/xrc/lens_panel.xrs:13 src/hugin/xrc/lens_panel-2.5.xrs:23
+#: src/hugin/xrc/lens_panel.xrs:24
msgid "crop factor:"
msgstr "factor d'escap\xE7ament\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:14 src/hugin/xrc/lens_panel-2.5.xrs:24
+#: src/hugin/xrc/lens_panel.xrs:25
msgid "35mm film diameter / ccd diameter"
msgstr "Di\xE0metre de la pel\xB7l\xEDcula de 35mm / di\xE0metre del sensor ccd"
-#: src/hugin/xrc/lens_panel.xrs:15
-msgid "Lens Correction Parameters"
-msgstr "Par\xE0metres de correcci\xF3 de la lent"
+#: src/hugin/xrc/lens_panel.xrs:26
+#, fuzzy
+msgid "Radial Distortion"
+msgstr "distorsi\xF3 (a)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:16 src/hugin/xrc/lens_panel-2.5.xrs:28
-#: src/hugin/xrc/optimize_panel.xrs:25
+#: src/hugin/xrc/lens_panel.xrs:27 src/hugin/xrc/optimize_panel.xrs:25
msgid "distortion (a):"
msgstr "distorsi\xF3 (a)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:18 src/hugin/xrc/lens_panel-2.5.xrs:30
-#: src/hugin/xrc/optimize_panel.xrs:26
+#: src/hugin/xrc/lens_panel.xrs:29 src/hugin/xrc/optimize_panel.xrs:26
msgid "barrel (b):"
msgstr "barrilet (b)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:20 src/hugin/xrc/lens_panel-2.5.xrs:32
-#: src/hugin/xrc/optimize_panel.xrs:27
+#: src/hugin/xrc/lens_panel.xrs:31 src/hugin/xrc/optimize_panel.xrs:27
msgid "distortion (c):"
msgstr "distorsi\xF3 (c)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:22 src/hugin/xrc/lens_panel-2.5.xrs:34
+#: src/hugin/xrc/lens_panel.xrs:33
msgid "Image Center Shift"
msgstr "Despla\xE7ament del centre de la imatge"
-#: src/hugin/xrc/lens_panel.xrs:23 src/hugin/xrc/lens_panel-2.5.xrs:35
+#: src/hugin/xrc/lens_panel.xrs:34
msgid "horizontal (d):"
msgstr "horitzontal (d)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:25 src/hugin/xrc/lens_panel-2.5.xrs:37
+#: src/hugin/xrc/lens_panel.xrs:36
msgid "vertical (e):"
msgstr "vertical (e)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:27 src/hugin/xrc/lens_panel-2.5.xrs:39
+#: src/hugin/xrc/lens_panel.xrs:38
msgid "Image Shearing"
msgstr "Cisallament de la imatge"
-#: src/hugin/xrc/lens_panel.xrs:28 src/hugin/xrc/lens_panel-2.5.xrs:40
+#: src/hugin/xrc/lens_panel.xrs:39
msgid "horizontal (g):"
msgstr "horitzontal (g)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:30 src/hugin/xrc/lens_panel-2.5.xrs:42
+#: src/hugin/xrc/lens_panel.xrs:41
msgid "vertical (t):"
msgstr "vertical (t)\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:32 src/hugin/xrc/lens_panel-2.5.xrs:25
+#: src/hugin/xrc/lens_panel.xrs:43
+msgid "Photometric"
+msgstr ""
+
+#: src/hugin/xrc/lens_panel.xrs:44
#, fuzzy
-msgid "Vignetting"
-msgstr "Ajustament prec\xEDs"
+msgid "Exposure and Color"
+msgstr "\xE0ncora per la exposici\xF3\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:33 src/hugin/xrc/lens_panel.xrs:35
-msgid "Set crop and image center"
-msgstr "Definir l'escap\xE7ament i el centre de la imatge"
+#: src/hugin/xrc/lens_panel.xrs:45
+#, fuzzy
+msgid "Exposure (EV)"
+msgstr "\xE0ncora per la exposici\xF3\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:36
-msgid "Lens management"
-msgstr "Gesti\xF3 de la lent"
+#: src/hugin/xrc/lens_panel.xrs:47
+#, fuzzy
+msgid "Red multiplier:"
+msgstr "dist\xE0ncia focal\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:37
-msgid "Load"
-msgstr "Carregar"
+#: src/hugin/xrc/lens_panel.xrs:49
+#, fuzzy
+msgid "Blue multiplier:"
+msgstr "dist\xE0ncia focal\xA0:"
-#: src/hugin/xrc/lens_panel.xrs:38 src/hugin/xrc/lens_panel-2.5.xrs:2
-msgid "Load lens parameters from a file"
-msgstr "Carregar els par\xE0metres de la lent des d'un fitxer"
+#: src/hugin/xrc/lens_panel.xrs:51
+#, fuzzy
+msgid "Vignetting"
+msgstr "Ajustament prec\xEDs"
-#: src/hugin/xrc/lens_panel.xrs:39 src/hugin/xrc/main_tool.xrs:8
-msgid "Save"
-msgstr "Guardar"
+#: src/hugin/xrc/lens_panel.xrs:52
+msgid "* r^2"
+msgstr ""
-#: src/hugin/xrc/lens_panel.xrs:40 src/hugin/xrc/lens_panel-2.5.xrs:4
-msgid "Save lens parameters to an file"
-msgstr "Guardar els par\xE0metres de la lent des d'un fitxer"
+#: src/hugin/xrc/lens_panel.xrs:53
+msgid "* r^4"
+msgstr ""
-#: src/hugin/xrc/lens_panel.xrs:41 src/hugin/xrc/lens_panel-2.5.xrs:5
-msgid "Load EXIF"
-msgstr "Carregar els EXIF"
+#: src/hugin/xrc/lens_panel.xrs:54
+msgid "* r^6"
+msgstr ""
-#: src/hugin/xrc/lens_panel.xrs:42 src/hugin/xrc/lens_panel-2.5.xrs:6
-msgid "Try to read HFOV from the EXIF data"
+#: src/hugin/xrc/lens_panel.xrs:56
+#, fuzzy
+msgid "Vignetting Center Shift"
+msgstr "Despla\xE7ament del centre de la imatge"
+
+#: src/hugin/xrc/lens_panel.xrs:60
+#, fuzzy
+msgid "Camera Response"
+msgstr "Camera i lents"
+
+#: src/hugin/xrc/lens_panel.xrs:62
+msgid "custom (EMoR)"
msgstr ""
-"Provar de llegir l'angle de camp de visi\xF3 horitzontal (HFOV) des de les "
-"dades EXIF"
-#: src/hugin/xrc/lens_panel.xrs:43 src/hugin/xrc/lens_panel-2.5.xrs:7
-msgid "New Lens"
-msgstr "Nova lent"
+#: src/hugin/xrc/lens_panel.xrs:63
+#, fuzzy
+msgid "Linear"
+msgstr "Bilinear"
-#: src/hugin/xrc/lens_panel.xrs:44 src/hugin/xrc/lens_panel-2.5.xrs:8
-msgid "Create a new lens and assign it to selected images"
-msgstr "Crear una nova lent i assignar-li les imatges seleccionades"
+#: src/hugin/xrc/lens_panel.xrs:65
+#, fuzzy
+msgid "Parameters:"
+msgstr "Par\xE0metres de la lent"
-#: src/hugin/xrc/lens_panel.xrs:45
-msgid "Change lens"
-msgstr "Canviar la lent"
+#: src/hugin/xrc/lens_panel.xrs:66 src/hugin/xrc/vig_corr_dlg.xrs:1
+msgid "Vignetting correction"
+msgstr ""
-#: src/hugin/xrc/lens_panel.xrs:46 src/hugin/xrc/lens_panel-2.5.xrs:10
-msgid "change lens of selected images"
-msgstr "Canviar la lent de les imatges seleccionades"
+#: src/hugin/xrc/lens_panel.xrs:67 src/hugin/xrc/vig_corr_dlg.xrs:2
+#, fuzzy
+msgid "Type of Correction"
+msgstr "Correcci\xF3 d'exposici\xF3\xA0:"
-#: src/hugin/xrc/lens_panel-2.5.xrs:3
+#: src/hugin/xrc/lens_panel.xrs:68 src/hugin/xrc/vig_corr_dlg.xrs:3
#, fuzzy
-msgid "Save lens..."
-msgstr "Guardar com"
+msgid "No correction"
+msgstr "Correcci\xF3 d'exposici\xF3\xA0:"
-#: src/hugin/xrc/lens_panel-2.5.xrs:9
+#: src/hugin/xrc/lens_panel.xrs:69 src/hugin/xrc/vig_corr_dlg.xrs:4
#, fuzzy
-msgid "Change lens..."
-msgstr "Canviar la lent"
+msgid "Addition ( I=I+c )"
+msgstr "distorsi\xF3 (c)\xA0:"
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|