From: <hug...@li...> - 2012-05-13 09:54:51
|
branch: gui_overhaul details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/7cbc93e3da16 changeset: 5792:7cbc93e3da16 user: tmodes date: Sun May 13 11:33:48 2012 +0200 description: Merged |
From: <hug...@li...> - 2012-05-13 09:54:52
|
branch: gui_overhaul details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/ba1b0a73f139 changeset: 5793:ba1b0a73f139 user: tmodes date: Sun May 13 11:34:54 2012 +0200 description: Merged |
From: <hug...@li...> - 2012-06-18 16:58:19
|
branch: gui_overhaul details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/0a74ac7a2b92 changeset: 5860:0a74ac7a2b92 user: tmodes date: Mon Jun 18 18:50:31 2012 +0200 description: Merged diffstat: mac/Hugin.xcodeproj/project.pbxproj | 12 --------- src/hugin1/base_wx/platform.cpp | 46 ++++++++++++++++++++++++++++++------ src/hugin1/base_wx/platform.h | 10 +++++-- src/hugin1/hugin/GLPreviewFrame.cpp | 18 ++++++++++++- src/hugin1/hugin/MainFrame.cpp | 1 + src/hugin1/hugin/MaskImageCtrl.cpp | 1 + src/hugin1/hugin/PreviewFrame.cpp | 12 ++++++++- src/hugin1/hugin/treelistctrl.cpp | 12 +++++++-- 8 files changed, 83 insertions(+), 29 deletions(-) diffs (335 lines): diff -r bcfd32ae5e1d -r 0a74ac7a2b92 mac/Hugin.xcodeproj/project.pbxproj --- a/mac/Hugin.xcodeproj/project.pbxproj Mon Jun 18 18:43:32 2012 +0200 +++ b/mac/Hugin.xcodeproj/project.pbxproj Mon Jun 18 18:50:31 2012 +0200 @@ -349,7 +349,6 @@ 574092C10C3943D000D16607 /* Stitcher3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4A0C391053005818A4 /* Stitcher3.cpp */; }; 574092C20C3943D000D16607 /* Stitcher4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4B0C391053005818A4 /* Stitcher4.cpp */; }; 57525A390C54BCCB00BF8096 /* nona_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E330BF0C4A87F2006AA781 /* nona_gui.cpp */; }; - 57525A3C0C54BCEA00BF8096 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; 57525A410C54BCEA00BF8096 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 57525A420C54BCEA00BF8096 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 57525A430C54BCEA00BF8096 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; @@ -754,7 +753,6 @@ 57D3832B0E236B1D00445A37 /* libhugin_levmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* libhugin_levmar.a */; }; 57D3832C0E236B1D00445A37 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 57D3832D0E236B1D00445A37 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; - 57D50A390F595A6300CCDCB5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; 57D50A3B0F595A6300CCDCB5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 57D50A3C0F595A6300CCDCB5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 57D50A3D0F595A6300CCDCB5 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; @@ -1212,7 +1210,6 @@ 737D5ED5139BA43800829EED /* PTBatcherGui.icns in Resources */ = {isa = PBXBuildFile; fileRef = 731DBF1A129D846500793A38 /* PTBatcherGui.icns */; }; 737E1C190EC9EC0300BA4D9B /* hugin_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 737E1C180EC9EC0300BA4D9B /* hugin_config.h */; }; 737E48B411D3F8C6002BA8AE /* hugin_stitch_project.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 575670980D089B1F00344F55 /* hugin_stitch_project.cpp */; }; - 737E48B611D3F8C6002BA8AE /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; 737E48B811D3F8C6002BA8AE /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 737E48B911D3F8C6002BA8AE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 737E48BA11D3F8C6002BA8AE /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; @@ -1283,7 +1280,6 @@ 737E495B11D3FD74002BA8AE /* MaskEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A773A112B4507004E3612 /* MaskEditorPanel.cpp */; }; 737E495C11D3FD74002BA8AE /* MaskImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 738A773C112B4507004E3612 /* MaskImageCtrl.cpp */; }; 737E495D11D3FD74002BA8AE /* MaskLoadDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 730B1AE91139B2B20014462B /* MaskLoadDialog.cpp */; }; - 737E495F11D3FD74002BA8AE /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; 737E496111D3FD74002BA8AE /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 737E496211D3FD74002BA8AE /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; 737E496311D3FD74002BA8AE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; @@ -1589,7 +1585,6 @@ 739286A014225FDB0051CAEC /* HtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 733AC12E131AFE1600D276B9 /* HtmlWindow.cpp */; }; 739286A114225FDB0051CAEC /* PluginItems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73A8A3BB13F58BDF00BB58F2 /* PluginItems.cpp */; }; 739286A414225FDB0051CAEC /* hugin_python_interface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B1AD0613A6A0B0006A3C54 /* hugin_python_interface.framework */; }; - 739286A514225FDB0051CAEC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; 739286A614225FDB0051CAEC /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 739286A714225FDB0051CAEC /* libintl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7368E40A1083930D00519ED0 /* libintl.dylib */; }; 739286A814225FDB0051CAEC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; @@ -1901,7 +1896,6 @@ 73DFBC98139B516C00558A2D /* FindN8Lines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73DFBC93139B516C00558A2D /* FindN8Lines.cpp */; }; 73DFBC99139B516C00558A2D /* FindLines.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DFBC94139B516C00558A2D /* FindLines.h */; }; 73DFBC9A139B516C00558A2D /* FindLines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73DFBC95139B516C00558A2D /* FindLines.cpp */; }; - 73DFBD7B139B69E900558A2D /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; 73DFBD7C139B69E900558A2D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; 73DFBD7D139B69E900558A2D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; 73DFBD7E139B69E900558A2D /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; @@ -5519,7 +5513,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 57525A3C0C54BCEA00BF8096 /* Carbon.framework in Frameworks */, 57525A410C54BCEA00BF8096 /* libiconv.dylib in Frameworks */, 57525A420C54BCEA00BF8096 /* libz.dylib in Frameworks */, 57525A430C54BCEA00BF8096 /* libmx.dylib in Frameworks */, @@ -5820,7 +5813,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 57D50A390F595A6300CCDCB5 /* Carbon.framework in Frameworks */, 57D50A3B0F595A6300CCDCB5 /* libiconv.dylib in Frameworks */, 73406703125BB8FA00FC4790 /* libexiv2.dylib in Frameworks */, 57D50A3C0F595A6300CCDCB5 /* libz.dylib in Frameworks */, @@ -6180,7 +6172,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 737E48B611D3F8C6002BA8AE /* Carbon.framework in Frameworks */, 737E48B811D3F8C6002BA8AE /* libiconv.dylib in Frameworks */, 737E48B911D3F8C6002BA8AE /* libz.dylib in Frameworks */, 737E48BA11D3F8C6002BA8AE /* libmx.dylib in Frameworks */, @@ -6213,7 +6204,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 737E495F11D3FD74002BA8AE /* Carbon.framework in Frameworks */, 737E496111D3FD74002BA8AE /* libiconv.dylib in Frameworks */, 737E496211D3FD74002BA8AE /* libintl.dylib in Frameworks */, 737E496311D3FD74002BA8AE /* libz.dylib in Frameworks */, @@ -6305,7 +6295,6 @@ buildActionMask = 2147483647; files = ( 739286A414225FDB0051CAEC /* hugin_python_interface.framework in Frameworks */, - 739286A514225FDB0051CAEC /* Carbon.framework in Frameworks */, 739286A614225FDB0051CAEC /* libiconv.dylib in Frameworks */, 739286A714225FDB0051CAEC /* libintl.dylib in Frameworks */, 739286A814225FDB0051CAEC /* libz.dylib in Frameworks */, @@ -6640,7 +6629,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 73DFBD7B139B69E900558A2D /* Carbon.framework in Frameworks */, 73DFBD7C139B69E900558A2D /* libiconv.dylib in Frameworks */, 73DFBD7D139B69E900558A2D /* libz.dylib in Frameworks */, 73DFBD7E139B69E900558A2D /* libmx.dylib in Frameworks */, diff -r bcfd32ae5e1d -r 0a74ac7a2b92 src/hugin1/base_wx/platform.cpp --- a/src/hugin1/base_wx/platform.cpp Mon Jun 18 18:43:32 2012 +0200 +++ b/src/hugin1/base_wx/platform.cpp Mon Jun 18 18:50:31 2012 +0200 @@ -31,7 +31,9 @@ #if defined __WXMAC__ || defined __WXOSX_COCOA__ #include <CoreFoundation/CFBundle.h> -#include "wx/osx/core/cfstring.h" +#if wxCHECK_VERSION(2,9,0) + #include "wx/osx/core/cfstring.h" +#endif #include <iostream> #include <stdio.h> #include "wx/utils.h" @@ -93,7 +95,11 @@ else { CFRetain( pathInCFString ); - theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #if wxCHECK_VERSION(2,9,0) + theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #else + theResult = wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #endif DEBUG_INFO("Mac: the executable's full path in the application bundle: " << theResult.mb_str(wxConvLocal)); } } @@ -164,7 +170,11 @@ else { CFRetain( pathInCFString ); - theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #if wxCHECK_VERSION(2,9,0) + theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #else + theResult = wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #endif DEBUG_INFO("Mac: the executable's full path in the application bundle: " << theResult.mb_str(wxConvLocal)); } } @@ -229,7 +239,11 @@ else { CFRetain( pathInCFString ); - theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #if wxCHECK_VERSION(2,9,0) + theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #else + theResult = wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #endif DEBUG_INFO("Mac: the executable's full path in the application bundle: " << theResult.mb_str(wxConvLocal)); } } @@ -267,7 +281,11 @@ else { CFRetain( pathInCFString ); - theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #if wxCHECK_VERSION(2,9,0) + theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #else + theResult = wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #endif DEBUG_INFO("Mac: the resource file's path in the application bundle: " << theResult.mb_str(wxConvLocal)); } } @@ -309,7 +327,11 @@ else { CFRetain( pathInCFString ); - theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #if wxCHECK_VERSION(2,9,0) + theResult = wxCFStringRef(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #else + theResult = wxMacCFStringHolder(pathInCFString).AsString(wxLocale::GetSystemEncoding()); + #endif DEBUG_INFO("Mac: executable's full path in the application bundle: " << theResult.mb_str(wxConvLocal)); } } @@ -332,7 +354,11 @@ { CFStringRef tmpPath = CFURLCopyFileSystemPath(tempDirURL, kCFURLPOSIXPathStyle); CFRetain(tmpPath); - tmpDirPath = wxCFStringRef(tmpPath).AsString(wxLocale::GetSystemEncoding()); + #if wxCHECK_VERSION(2,9,0) + tmpDirPath = wxCFStringRef(tmpPath).AsString(wxLocale::GetSystemEncoding()); + #else + tmpDirPath = wxMacCFStringHolder(tmpPath).AsString(wxLocale::GetSystemEncoding()); + #endif CFRelease(tempDirURL); } @@ -354,7 +380,11 @@ CFURLRef autopanoURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,appSupportHugin,CFSTR("Autopano"),true); CFStringRef tmpPath = CFURLCopyFileSystemPath(autopanoURL, kCFURLPOSIXPathStyle); CFRetain(tmpPath); - appSupportAutoPanoFolder = wxCFStringRef(tmpPath).AsString(wxLocale::GetSystemEncoding()); + #if wxCHECK_VERSION(2,9,0) + appSupportAutoPanoFolder = wxCFStringRef(tmpPath).AsString(wxLocale::GetSystemEncoding()); + #else + appSupportAutoPanoFolder = wxMacCFStringHolder(tmpPath).AsString(wxLocale::GetSystemEncoding()); + #endif CFRelease(autopanoURL); } diff -r bcfd32ae5e1d -r 0a74ac7a2b92 src/hugin1/base_wx/platform.h --- a/src/hugin1/base_wx/platform.h Mon Jun 18 18:43:32 2012 +0200 +++ b/src/hugin1/base_wx/platform.h Mon Jun 18 18:50:31 2012 +0200 @@ -41,9 +41,13 @@ #if defined __WXMAC__ || defined __WXOSX_COCOA__ -//#include <CoreFoundation/CFString.h> -#include "wx/osx/core/cfstring.h" -#include <wx/osx/private.h> +#if wxCHECK_VERSION(2,9,0) + #include "wx/osx/core/cfstring.h" + #include <wx/osx/private.h> +#else + #include <CoreFoundation/CFString.h> + #include <wx/mac/private.h> +#endif CFStringRef MacCreateCFStringWithWxString(const wxString& string); diff -r bcfd32ae5e1d -r 0a74ac7a2b92 src/hugin1/hugin/GLPreviewFrame.cpp --- a/src/hugin1/hugin/GLPreviewFrame.cpp Mon Jun 18 18:43:32 2012 +0200 +++ b/src/hugin1/hugin/GLPreviewFrame.cpp Mon Jun 18 18:50:31 2012 +0200 @@ -183,10 +183,24 @@ EVT_CHOICE(XRCID("preview_guide_choice_proj"), GLPreviewFrame::OnGuideChanged) EVT_MENU(XRCID("action_show_overview"), GLPreviewFrame::OnOverviewToggle) EVT_CHECKBOX(XRCID("preview_show_grid"), GLPreviewFrame::OnSwitchPreviewGrid) - EVT_COMMAND_SCROLL(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) +#ifndef __WXMAC__ + EVT_COMMAND_SCROLL(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) EVT_SCROLL_CHANGED(GLPreviewFrame::OnChangeFOV) EVT_COMMAND_SCROLL_CHANGED(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) - EVT_SCROLL_THUMBTRACK(GLPreviewFrame::OnTrackChangeFOV) +#else + #if wxCHECK_VERSION(2,9,0) + EVT_COMMAND_SCROLL(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) + EVT_SCROLL_CHANGED(GLPreviewFrame::OnChangeFOV) + EVT_COMMAND_SCROLL_CHANGED(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) + #else + EVT_SCROLL_THUMBRELEASE(GLPreviewFrame::OnChangeFOV) + EVT_SCROLL_ENDSCROLL(GLPreviewFrame::OnChangeFOV) + EVT_COMMAND_SCROLL_THUMBRELEASE(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) + EVT_COMMAND_SCROLL_ENDSCROLL(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) + EVT_COMMAND_SCROLL_THUMBTRACK(XRCID("layout_scale_slider"), GLPreviewFrame::OnLayoutScaleChange) + #endif +#endif + EVT_SCROLL_THUMBTRACK(GLPreviewFrame::OnTrackChangeFOV) EVT_TEXT_ENTER(XRCID("pano_text_hfov"), GLPreviewFrame::OnHFOVChanged ) EVT_TEXT_ENTER(XRCID("pano_text_vfov"), GLPreviewFrame::OnVFOVChanged ) EVT_TEXT_ENTER(XRCID("pano_val_roi_left"), GLPreviewFrame::OnROIChanged) diff -r bcfd32ae5e1d -r 0a74ac7a2b92 src/hugin1/hugin/MainFrame.cpp --- a/src/hugin1/hugin/MainFrame.cpp Mon Jun 18 18:43:32 2012 +0200 +++ b/src/hugin1/hugin/MainFrame.cpp Mon Jun 18 18:50:31 2012 +0200 @@ -120,6 +120,7 @@ bool PanoDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) { DEBUG_TRACE("OnDropFiles"); + wxMessageBox(filenames[0]); MainFrame * mf = MainFrame::Get(); if (!mf) return false; diff -r bcfd32ae5e1d -r 0a74ac7a2b92 src/hugin1/hugin/MaskImageCtrl.cpp --- a/src/hugin1/hugin/MaskImageCtrl.cpp Mon Jun 18 18:43:32 2012 +0200 +++ b/src/hugin1/hugin/MaskImageCtrl.cpp Mon Jun 18 18:50:31 2012 +0200 @@ -1056,6 +1056,7 @@ // draw all areas without fillings dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetLogicalFunction (wxINVERT); + dc.SetPen(*wxBLACK_PEN); wxPoint middle=transform(applyRot((m_cropRect.lowerRight()+m_cropRect.upperLeft())/2)); int c = 8; // size of midpoint cross diff -r bcfd32ae5e1d -r 0a74ac7a2b92 src/hugin1/hugin/PreviewFrame.cpp --- a/src/hugin1/hugin/PreviewFrame.cpp Mon Jun 18 18:43:32 2012 +0200 +++ b/src/hugin1/hugin/PreviewFrame.cpp Mon Jun 18 18:50:31 2012 +0200 @@ -96,8 +96,18 @@ #else EVT_CHECKBOX(-1, PreviewFrame::OnChangeDisplayedImgs) #endif +#ifndef __WXMAC__ EVT_SCROLL_CHANGED(PreviewFrame::OnChangeFOV) - EVT_TOOL(ID_FULL_SCREEN, PreviewFrame::OnFullScreen) +#else + #if wxCHECK_VERSION(2,9,0) + EVT_SCROLL_CHANGED(PreviewFrame::OnChangeFOV) + #else + EVT_SCROLL_THUMBRELEASE(PreviewFrame::OnChangeFOV) + EVT_SCROLL_ENDSCROLL(PreviewFrame::OnChangeFOV) + EVT_SCROLL_THUMBTRACK(PreviewFrame::OnChangeFOV) + #endif +#endif + EVT_TOOL(ID_FULL_SCREEN, PreviewFrame::OnFullScreen) EVT_TOOL(ID_UNDO, PreviewFrame::OnUndo) EVT_TOOL(ID_REDO, PreviewFrame::OnRedo) EVT_BUTTON(PROJ_PARAM_RESET_ID, PreviewFrame::OnProjParameterReset) diff -r bcfd32ae5e1d -r 0a74ac7a2b92 src/hugin1/hugin/treelistctrl.cpp --- a/src/hugin1/hugin/treelistctrl.cpp Mon Jun 18 18:43:32 2012 +0200 +++ b/src/hugin1/hugin/treelistctrl.cpp Mon Jun 18 18:50:31 2012 +0200 @@ -49,7 +49,11 @@ #include <wx/hashmap.h> #ifdef __WXMAC__ -#include "wx/osx/private.h" +#if wxCHECK_VERSION(2,9,0) + #include "wx/osx/private.h" +#else + #include "wx/mac/private.h" +#endif #endif #include "treelistctrl.h" @@ -2018,7 +2022,8 @@ const wxValidator &validator, const wxString& name) { -/*#ifdef __WXMAC__ +#ifdef __WXMAC__ + #if !wxCHECK_VERSION(2,9,0) if (style & wxTR_HAS_BUTTONS) style |= wxTR_MAC_BUTTONS; if (style & wxTR_HAS_BUTTONS) style &= ~wxTR_HAS_BUTTONS; style &= ~wxTR_LINES_AT_ROOT; @@ -2027,7 +2032,8 @@ int major,minor; wxGetOsVersion( &major, &minor ); if (major < 10) style |= wxTR_ROW_LINES; -#endif */ + #endif +#endif wxScrolledWindow::Create (parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name); |
From: <hug...@li...> - 2012-11-09 19:20:39
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/0ff6c4db1342 changeset: 6019:0ff6c4db1342 user: tmodes date: Fri Nov 09 20:20:17 2012 +0100 description: Merged diffstat: mac/ExternalPrograms/scripts/SetEnv-panther.txt | 40 -- mac/ExternalPrograms/scripts/SetEnv-universal.txt | 52 --- mac/ExternalPrograms/scripts/SetEnv-universal.txt.org | 53 --- mac/ExternalPrograms/scripts/SetEnv-x86_64.txt.org | 46 ++ mac/ExternalPrograms/scripts/static/boost.sh | 143 -------- mac/ExternalPrograms/scripts/static/dmalloc.sh | 130 ------- mac/ExternalPrograms/scripts/static/ilmbase.sh | 160 --------- mac/ExternalPrograms/scripts/static/lcms.sh | 124 ------- mac/ExternalPrograms/scripts/static/libexiv2.sh | 145 -------- mac/ExternalPrograms/scripts/static/libexpat.sh | 121 ------- mac/ExternalPrograms/scripts/static/libglew.sh | 155 --------- mac/ExternalPrograms/scripts/static/libjpeg.sh | 162 --------- mac/ExternalPrograms/scripts/static/libpng.sh | 149 -------- mac/ExternalPrograms/scripts/static/libtiff.sh | 186 ----------- mac/ExternalPrograms/scripts/static/libxmi.sh | 135 -------- mac/ExternalPrograms/scripts/static/openexr16.sh | 167 --------- mac/ExternalPrograms/scripts/static/pano12.sh | 146 -------- mac/ExternalPrograms/scripts/static/pano13.sh | 148 -------- mac/ExternalPrograms/scripts/static/wxmac28.sh | 244 -------------- mac/ExternalPrograms/scripts/wxMac-2.8.10.patch | 15 - mac/ExternalPrograms/scripts/wxmac28-debug.sh | 281 ---------------- mac/ExternalPrograms/scripts/wxmac28.sh | 302 ------------------ 22 files changed, 46 insertions(+), 3058 deletions(-) diffs (truncated from 3193 to 500 lines): diff -r 511d26502cc8 -r 0ff6c4db1342 mac/ExternalPrograms/scripts/SetEnv-panther.txt --- a/mac/ExternalPrograms/scripts/SetEnv-panther.txt Fri Nov 09 20:19:03 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -# Configuration for G3 and Panther build -# Copyright (c) 2007-2008, Ippei Ukai - - -# has to be the absolute path from / -myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; - -# number of jobs that make can use, probably same as the number of CPUs. -#PROCESSNUM=2 -PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); - - - -mkdir -p $myREPOSITORYDIR; - -export \ - REPOSITORYDIR="$myREPOSITORYDIR" \ - ARCHS="ppc" \ - \ - ppcTARGET="powerpc-apple-darwin7" \ - ppcOSVERSION="10.3" \ - ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ - ppcOPTIMIZE="-mcpu=G3 -mtune=G3" \ - \ - OTHERARGs="" \ - OTHERMAKEARGs="--jobs=$PROCESSNUM"; - - -# Deprecated: -export \ - ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ - - -# cmake settings -export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" -export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" - - - -# $Id: SetEnv-universal.txt 1902 2007-02-04 22:27:47Z ippei $ diff -r 511d26502cc8 -r 0ff6c4db1342 mac/ExternalPrograms/scripts/SetEnv-universal.txt --- a/mac/ExternalPrograms/scripts/SetEnv-universal.txt Fri Nov 09 20:19:03 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -# Configuration for 4 part universal build, only possible from Leopard and up -# Copyright (c) 2008, Ippei Ukai -# Somewhere end of 2010 removed the 64bit ppc stuf as Apple doesn;t support it anymore -# April 2012: Remove support for PPC and Tiger. - -# has to be the absolute path from / -myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; - - -# number of jobs that make can use, probably same as the number of CPUs. -#PROCESSNUM=2 -if [ $(uname -p) = i386 ] ; then - PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); -else - PROCESSNUM="1" -fi - -mkdir -p $myREPOSITORYDIR; - -export \ - REPOSITORYDIR="$myREPOSITORYDIR" \ - ARCHS="i386 x86_64" \ - \ - i386TARGET="i386-apple-darwin9" \ - i386OSVERSION="10.5" \ - i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize -fopenmp" \ - i386CC="gcc-4.2" \ - i386CXX="g++-4.2" \ - \ - x64TARGET="x86_64-apple-darwin9" \ - x64OSVERSION="10.5" \ - x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize -fopenmp" \ - x64CC="gcc-4.6" \ - x64CXX="g++-4.6" \ - \ - OTHERARGs="" \ - OTHERMAKEARGs="--jobs=$PROCESSNUM"; - - -# Deprecated: -export \ - i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ - x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; - - -# cmake settings -export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" -export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" - -# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ diff -r 511d26502cc8 -r 0ff6c4db1342 mac/ExternalPrograms/scripts/SetEnv-universal.txt.org --- a/mac/ExternalPrograms/scripts/SetEnv-universal.txt.org Fri Nov 09 20:19:03 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -# Configuration for 2 part universal build -# Copyright (c) 2007-2008, Ippei Ukai - - -# has to be the absolute path from / -myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; - -# number of jobs that make can use, probably same as the number of CPUs. -#PROCESSNUM=2 -if [ $(uname -p) = i386 ] ; then - PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); -else - PROCESSNUM="1" -fi - -mkdir -p $myREPOSITORYDIR; - -export \ - REPOSITORYDIR="$myREPOSITORYDIR" \ - ARCHS="ppc i386" \ - \ - ppcTARGET="powerpc-apple-darwin8" \ - ppcOSVERSION="10.4" \ - ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ - ppcCC="gcc-4.0" \ - ppcCXX="g++-4.0" \ - \ - i386TARGET="i386-apple-darwin8" \ - i386OSVERSION="10.4" \ - i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ - i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ - i386CC="gcc-4.0" \ - i386CXX="g++-4.0" \ - \ - OTHERARGs="" \ - OTHERMAKEARGs="--jobs=$PROCESSNUM"; - - -# Deprecated: -export \ - ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ - i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION"; - - - -# cmake settings -export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" -export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" - - - -# $Id: SetEnv-universal.txt 1902 2007-02-04 22:27:47Z ippei $ diff -r 511d26502cc8 -r 0ff6c4db1342 mac/ExternalPrograms/scripts/SetEnv-x86_64.txt.org --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mac/ExternalPrograms/scripts/SetEnv-x86_64.txt.org Fri Nov 09 20:20:17 2012 +0100 @@ -0,0 +1,46 @@ +# Configuration for 64-bit build, only possible from Leopard and up +# Copyright (c) 2008, Ippei Ukai +# Somewhere end of 2010 removed the 64bit ppc stuf as Apple doesn;t support it anymore +# April 2012: Remove support for PPC and Tiger. +# November 2012: tune for only 64-bit + +# has to be the absolute path from / +myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; + + +# number of jobs that make can use, probably same as the number of CPUs. +#PROCESSNUM=2 +if [ $(uname -p) = i386 ] | [ $(uname -p) = x86_64 ] ; then + PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +else + PROCESSNUM="1" +fi + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="x86_64" \ + \ + x64TARGET="x86_64-apple-darwin9" \ + x64OSVERSION="10.5" \ + x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize -fopenmp" \ + x64CC="gcc-4.6" \ + x64CXX="g++-4.6" \ + \ + OTHERARGs="" \ + OTHERMAKEARGs="--jobs=$PROCESSNUM"; + + +# Deprecated: +export \ + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ + x64ONLYARG="$x64OPTIMIZE -mmacosx-version-min=$x64OSVERSION"; + + +# cmake settings +export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" +export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" + +# $Id: SetEnv-universal.txt 2238 2007-07-08 11:19:04Z ippei $ diff -r 511d26502cc8 -r 0ff6c4db1342 mac/ExternalPrograms/scripts/static/boost.sh --- a/mac/ExternalPrograms/scripts/static/boost.sh Fri Nov 09 20:19:03 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,143 +0,0 @@ -# ------------------ -# boost -# ------------------ -# $Id: boost.sh 1902 2007-02-04 22:27:47Z ippei $ -# Copyright (c) 2007-2008, Ippei Ukai - -# prepare - -# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ -# ARCHS="ppc i386" \ -# ppcTARGET="powerpc-apple-darwin8" \ -# ppcOSVERSION="10.4" \ -# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ -# ppcOPTIMIZE="-mcpu=G3 -mtune=G4" \ -# i386TARGET="i386-apple-darwin8" \ -# i386OSVERSION="10.4" \ -# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ -# i386OPTIMIZE ="-march=prescott -mtune=pentium-m -ftree-vectorize" \ -# OTHERARGs=""; - -# ------------------------------- -# 20091206.0 sg Script NOT tested but uses std boilerplate -# ------------------------------- - -BOOST_VER="1_40" -BOOST_THREAD_LIB="libboost_thread" - -# install headers - -mkdir -p "$REPOSITORYDIR/include" -rm -rf "$REPOSITORYDIR/include/boost"; -cp -R "./boost" "$REPOSITORYDIR/include/"; - - -# compile bjab - -cd "./tools/jam/src"; -sh "build.sh"; -cd "../../../"; -BJAM=$(ls ./tools/jam/src/bin.mac*/bjam) - - -# init - -let NUMARCH="0" - -for i in $ARCHS -do - NUMARCH=$(($NUMARCH + 1)) -done - -mkdir -p "$REPOSITORYDIR/lib"; - - -# compile boost_thread - -for ARCH in $ARCHS -do - - mkdir -p "stage-$ARCH"; - - if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then - MACSDKDIR=$i386MACSDKDIR - OSVERSION=$i386OSVERSION - OPTIMIZE=$i386OPTIMIZE - boostARCHITECTURE="x86" - boostADDRESSMODEL="32" - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then - MACSDKDIR=$ppcMACSDKDIR - OSVERSION=$ppcOSVERSION - OPTIMIZE=$ppcOPTIMIZE - boostARCHITECTURE="power" - boostADDRESSMODEL="32" - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then - MACSDKDIR=$ppc64MACSDKDIR - OSVERSION=$ppc64OSVERSION - OPTIMIZE=$ppc64OPTIMIZE - boostARCHITECTURE="power" - boostADDRESSMODEL="64" - elif [ $ARCH = "x86_64" ] ; then - MACSDKDIR=$x64MACSDKDIR - OSVERSION=$x64OSVERSION - OPTIMIZE=$x64OPTIMIZE - boostARCHITECTURE="x86" - boostADDRESSMODEL="64" - fi - - SDKVRSION=$(echo $MACSDKDIR | sed 's/^[^1]*\([[:digit:]]*\.[[:digit:]]*\).*/\1/') - - - # hack that sends extra arguments to g++ - $BJAM -a --stagedir="stage-$ARCH" --prefix=$REPOSITORYDIR --toolset="darwin" -n stage \ - --with-thread \ - variant=release link=static \ - architecture="$boostARCHITECTURE" address-model="$boostADDRESSMODEL" \ - macosx-version="$SDKVRSION" macosx-version-min="$OSVERSION" \ - | grep "^ " | sed 's/"//g' | sed s/g++/g++\ "$OPTIMIZE"/ | sed 's/-O3/-O2/g' \ - | while read COMMAND - do - echo "running command: $COMMAND" - $COMMAND - done -done - - -# merge libboost_thread - -for libname in "$BOOST_THREAD_LIB-$BOOST_VER" -do - - liba="$libname.a" - if [ $NUMARCH -eq 1 ] ; then - if [ -f stage-$ARCHS/$liba ] ; then - echo "Moving stage-$ARCHS/$liba to $liba" - mv "stage-$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue - else - echo "Program arch/$ARCHS/$liba not found. Aborting build"; - exit 1; - fi - fi - - LIPOARGs="" - for ARCH in $ARCHS - do - if [ -f stage-$ARCH/$liba ] ; then - echo "Adding stage-$ARCH/$liba to bundle" - LIPOARGs="$LIPOARGs stage-$ARCH/$liba" - else - echo "File stage-$ARCH/$liba was not found. Aborting build"; - exit 1; - fi - done - - lipo $LIPOARGs -create -output "$REPOSITORYDIR/lib/$libname.a"; - ranlib "$REPOSITORYDIR/lib/$libname.a"; -done - -if [ -f "$REPOSITORYDIR/lib/$BOOST_THREAD_LIB-$BOOST_VER.a" ] ; then - ln -sfn $BOOST_THREAD_LIB-$BOOST_VER.a $REPOSITORYDIR/lib/libboost_thread.a; -fi diff -r 511d26502cc8 -r 0ff6c4db1342 mac/ExternalPrograms/scripts/static/dmalloc.sh --- a/mac/ExternalPrograms/scripts/static/dmalloc.sh Fri Nov 09 20:19:03 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -# ------------------ -# dmalloc -# ------------------ -# $Id: dmalloc.sh 1902 2009-05-07 Harry $ -# Copyright (c) 2007, Ippei Ukai -# script skeleton Copyright (c) 2007, Ippei Ukai -# dmalloc specifics 2009, Harry van der Wolf - - -# prepare - -# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ -# ARCHS="ppc i386" \ -# ppcTARGET="powerpc-apple-darwin8" \ -# i386TARGET="i386-apple-darwin8" \ -# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ -# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ -# ppcONLYARG="-mcpu=G3 -mtune=G4" \ -# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ -# OTHERARGs=""; - -# ------------------------------- -# 20091206.0 sg Script NOT tested but uses std boilerplate -# Needs defensive code to check if libraries were built -# ------------------------------- - -# init - -let NUMARCH="0" - -for i in $ARCHS -do - NUMARCH=$(($NUMARCH + 1)) -done - -mkdir -p "$REPOSITORYDIR/bin"; -mkdir -p "$REPOSITORYDIR/lib"; -mkdir -p "$REPOSITORYDIR/include"; - - -# compile - -for ARCH in $ARCHS -do - - mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; - mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; - mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; - - ARCHARGs="" - MACSDKDIR="" - - if [ $ARCH = "i386" -o $ARCH = "i686" ] ; then - TARGET=$i386TARGET - MACSDKDIR=$i386MACSDKDIR - ARCHARGs="$i386ONLYARG" - OSVERSION="$i386OSVERSION" - CC=$i386CC - CXX=$i386CXX - elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] ; then - TARGET=$ppcTARGET - MACSDKDIR=$ppcMACSDKDIR - ARCHARGs="$ppcONLYARG" - OSVERSION="$ppcOSVERSION" - CC=$ppcCC - CXX=$ppcCXX - elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] ; then - TARGET=$ppc64TARGET - MACSDKDIR=$ppc64MACSDKDIR - ARCHARGs="$ppc64ONLYARG" - OSVERSION="$ppc64OSVERSION" - CC=$ppc64CC - CXX=$ppc64CXX - elif [ $ARCH = "x86_64" ] ; then - TARGET=$x64TARGET - MACSDKDIR=$x64MACSDKDIR - ARCHARGs="$x64ONLYARG" - OSVERSION="$x64OSVERSION" - CC=$x64CC - CXX=$x64CXX - fi - - env \ - CC=$CC CXX=$CXX \ - CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ - CPPFLAGS="-I$REPOSITORYDIR/include" \ - LDFLAGS="-L$REPOSITORYDIR/lib -mmacosx-version-min=$OSVERSION -dead_strip" \ - NEXT_ROOT="$MACSDKDIR" \ - ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ - --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - ; - - make clean - make $OTHERMAKEARGs install - -done - - -# merge dmalloc libs - -for liba in lib/libdmalloc.a -do - - if [ $NUMARCH -eq 1 ] - then - mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - continue - fi - - LIPOARGs="" - - for ARCH in $ARCHS - do - LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" - done - - lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; - #Power programming: if filename ends in "a" then ... - [ ${liba##*.} = a ] && ranlib "$REPOSITORYDIR/$liba"; - -done - - -#if [ -f "$REPOSITORYDIR/lib/libdmalloc.dylib" ] -#then -# install_name_tool -id "$REPOSITORYDIR/lib/libdmalloc.dylib" "$REPOSITORYDIR/lib/libdmalloc.dylib" -#fi diff -r 511d26502cc8 -r 0ff6c4db1342 mac/ExternalPrograms/scripts/static/ilmbase.sh --- a/mac/ExternalPrograms/scripts/static/ilmbase.sh Fri Nov 09 20:19:03 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ -# ------------------ -# openexr -# ------------------ -# $Id: openexr.sh 2004 2007-05-11 00:17:50Z ippei $ -# Copyright (c) 2007, Ippei Ukai - - -# prepare |
From: <hug...@li...> - 2012-12-08 15:57:59
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/11ef124d657b changeset: 6046:11ef124d657b user: tmodes date: Sat Dec 08 16:57:59 2012 +0100 description: Merged diffstat: src/translations/cs_CZ.po | 2144 +++++++++++++++++++++++--------------------- 1 files changed, 1112 insertions(+), 1032 deletions(-) diffs (truncated from 4702 to 500 lines): diff -r 51b9ef97f075 -r 11ef124d657b src/translations/cs_CZ.po --- a/src/translations/cs_CZ.po Sat Dec 08 16:57:31 2012 +0100 +++ b/src/translations/cs_CZ.po Sat Dec 08 16:57:59 2012 +0100 @@ -28,8 +28,8 @@ msgstr "" "Project-Id-Version: cs_CZ\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2012-11-15 18:41+0100\n" -"PO-Revision-Date: 2012-08-09 19:34+0100\n" +"POT-Creation-Date: 2012-12-08 12:17+0100\n" +"PO-Revision-Date: 2012-12-08 12:16+0100\n" "Last-Translator: Václav Äerný <va...@se...>\n" "Language-Team: ÄeÅ¡tina\n" "Language: \n" @@ -59,12 +59,14 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:101 #: hugin1/calibrate_lens/LensCalFrame.cpp:402 #: hugin1/calibrate_lens/LensCalFrame.cpp:471 -#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLPreviewFrame.cpp:3107 -#: hugin1/hugin/GLPreviewFrame.cpp:3179 hugin1/hugin/GLViewer.cpp:287 -#: hugin1/hugin/GLViewer.cpp:297 hugin1/hugin/MainFrame.cpp:192 -#: hugin1/hugin/MainFrame.cpp:835 hugin1/hugin/MainFrame.cpp:1083 -#: hugin1/hugin/MainFrame.cpp:1460 hugin1/hugin/MainFrame.cpp:1508 -#: hugin1/hugin/MainFrame.cpp:1998 +#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:287 +#: hugin1/hugin/GLViewer.cpp:297 hugin1/hugin/MainFrame.cpp:195 +#: hugin1/hugin/MainFrame.cpp:841 hugin1/hugin/MainFrame.cpp:1089 +#: hugin1/hugin/MainFrame.cpp:1466 hugin1/hugin/MainFrame.cpp:1514 +#: hugin1/hugin/MainFrame.cpp:2004 hugin1/hugin/MainFrame.cpp:2193 +#: hugin1/hugin/MainFrame.cpp:2265 hugin1/hugin/MainFrame.cpp:2303 +#: hugin1/hugin/MainFrame.cpp:2315 hugin1/hugin/MainFrame.cpp:2330 +#: hugin1/hugin/MainFrame.cpp:2338 #: hugin1/hugin/OptimizePhotometricPanel.cpp:277 #: hugin1/hugin/OptimizePhotometricPanel.cpp:306 #: hugin1/hugin/PanoOperation.cpp:150 hugin1/hugin/PanoOperation.cpp:527 @@ -79,7 +81,8 @@ #: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69 #: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 -#: hugin1/hugin/MainFrame.cpp:1508 hugin1/hugin/PanoPanel.cpp:1212 +#: hugin1/hugin/MainFrame.cpp:1514 hugin1/hugin/MainFrame.cpp:2303 +#: hugin1/hugin/PanoPanel.cpp:1212 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "Externà program %s nenalezen v balÃku, vracÃm se k systémové cestÄ" @@ -112,11 +115,11 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:773 #: hugin1/calibrate_lens/LensCalFrame.cpp:799 #: hugin1/calibrate_lens/LensCalFrame.cpp:871 -#: hugin1/hugin/CPDetectorDialog.cpp:121 hugin1/hugin/GLPreviewFrame.cpp:1607 -#: hugin1/hugin/GLPreviewFrame.cpp:1614 hugin1/hugin/GLPreviewFrame.cpp:1621 -#: hugin1/hugin/GLPreviewFrame.cpp:1635 hugin1/hugin/GLPreviewFrame.cpp:1642 -#: hugin1/hugin/GLPreviewFrame.cpp:1649 hugin1/hugin/GLPreviewFrame.cpp:3183 -#: hugin1/hugin/MainFrame.cpp:831 hugin1/hugin/MainFrame.cpp:1709 +#: hugin1/hugin/CPDetectorDialog.cpp:121 hugin1/hugin/GLPreviewFrame.cpp:1578 +#: hugin1/hugin/GLPreviewFrame.cpp:1585 hugin1/hugin/GLPreviewFrame.cpp:1592 +#: hugin1/hugin/GLPreviewFrame.cpp:1606 hugin1/hugin/GLPreviewFrame.cpp:1613 +#: hugin1/hugin/GLPreviewFrame.cpp:1620 hugin1/hugin/MainFrame.cpp:837 +#: hugin1/hugin/MainFrame.cpp:1715 hugin1/hugin/MainFrame.cpp:2269 #: hugin1/hugin/MaskEditorPanel.cpp:532 hugin1/hugin/PreferencesDialog.cpp:977 #: hugin1/ptbatcher/FindPanoDialog.cpp:250 #: hugin1/ptbatcher/FindPanoDialog.cpp:271 @@ -124,35 +127,30 @@ msgstr "VarovánÃ" #: hugin1/base_wx/huginConfig.cpp:288 -#, fuzzy msgid "first image" -msgstr "Upravit oÅez dle obrázků" +msgstr "prvnà obrázek" #: hugin1/base_wx/huginConfig.cpp:289 -#, fuzzy msgid "last image" -msgstr "PÅidat obrázek" +msgstr "poslednà obrázek" #: hugin1/base_wx/huginConfig.cpp:291 -#, fuzzy msgid "directory" -msgstr "AdresáÅ:" +msgstr "adresáÅ" #: hugin1/base_wx/huginConfig.cpp:292 hugin1/base_wx/LensTools.cpp:41 -#: hugin1/hugin/GLPreviewFrame.cpp:1510 hugin1/hugin/ImagesTree.cpp:370 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/ImagesTree.cpp:370 #: hugin1/hugin/PreviewFrame.cpp:630 msgid "Equirectangular" msgstr "Equirectangular" -#: hugin1/base_wx/huginConfig.cpp:297 -#, fuzzy +#: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 msgid "Camera maker" -msgstr "Výrobce fotoaparátu:" - -#: hugin1/base_wx/huginConfig.cpp:298 -#, fuzzy +msgstr "Výrobce fotoaparátu" + +#: hugin1/base_wx/huginConfig.cpp:298 hugin1/hugin/ImagesTree.cpp:150 msgid "Camera model" -msgstr "Model fotoaparátu:" +msgstr "Model fotoaparátu" #: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:633 #: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 @@ -162,9 +160,8 @@ msgstr "Objektiv" #: hugin1/base_wx/huginConfig.cpp:335 -#, fuzzy msgid "unknown projection" -msgstr "Neznámá verze" +msgstr "neznámá projekce" #: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:366 msgid "Normal (rectilinear)" @@ -252,12 +249,12 @@ #: hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:147 #: translations/xrc.cpp:210 translations/xrc.cpp:246 translations/xrc.cpp:295 -#: translations/xrc.cpp:311 translations/xrc.cpp:318 translations/xrc.cpp:496 -#: translations/xrc.cpp:529 translations/xrc.cpp:533 translations/xrc.cpp:537 -#: translations/xrc.cpp:631 translations/xrc.cpp:780 translations/xrc.cpp:812 -#: translations/xrc.cpp:1035 xrc.cpp:147 xrc.cpp:210 xrc.cpp:246 xrc.cpp:295 -#: xrc.cpp:311 xrc.cpp:318 xrc.cpp:496 xrc.cpp:529 xrc.cpp:533 xrc.cpp:537 -#: xrc.cpp:631 xrc.cpp:780 xrc.cpp:812 xrc.cpp:1035 +#: translations/xrc.cpp:311 translations/xrc.cpp:318 translations/xrc.cpp:498 +#: translations/xrc.cpp:531 translations/xrc.cpp:535 translations/xrc.cpp:539 +#: translations/xrc.cpp:633 translations/xrc.cpp:782 translations/xrc.cpp:814 +#: translations/xrc.cpp:1041 xrc.cpp:147 xrc.cpp:210 xrc.cpp:246 xrc.cpp:295 +#: xrc.cpp:311 xrc.cpp:318 xrc.cpp:498 xrc.cpp:531 xrc.cpp:535 xrc.cpp:539 +#: xrc.cpp:633 xrc.cpp:782 xrc.cpp:814 xrc.cpp:1041 msgid "Cancel" msgstr "ZruÅ¡it" @@ -288,7 +285,7 @@ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|VÅ¡echny soubory (*)|*" #: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 -#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:782 xrc.cpp:782 +#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:784 xrc.cpp:784 msgid "Panorama Tools" msgstr "Panorama Tools" @@ -435,7 +432,7 @@ msgid "Save camera into database file" msgstr "Uložit fotoaparát do databáze" -#: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:167 +#: hugin1/calibrate_lens/LensCalApp.cpp:66 hugin1/hugin/huginApp.cpp:192 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80 msgid "xrc directory not found in bundle" msgstr "AdresáŠxrc nebyl v balÃÄku nalezen." @@ -443,27 +440,27 @@ #: hugin1/calibrate_lens/LensCalApp.cpp:66 #: hugin1/calibrate_lens/LensCalApp.cpp:74 #: hugin1/calibrate_lens/LensCalApp.cpp:80 -#: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:167 -#: hugin1/hugin/huginApp.cpp:179 hugin1/hugin/huginApp.cpp:188 -#: hugin1/hugin/huginApp.cpp:202 hugin1/hugin/MainFrame.cpp:1993 +#: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:192 +#: hugin1/hugin/huginApp.cpp:204 hugin1/hugin/huginApp.cpp:213 +#: hugin1/hugin/huginApp.cpp:227 hugin1/hugin/MainFrame.cpp:1999 #: hugin1/ptbatcher/PTBatcherGUI.cpp:80 hugin1/ptbatcher/PTBatcherGUI.cpp:91 #: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 #: hugin1/stitch_project/hugin_stitch_project.cpp:306 msgid "Fatal Error" msgstr "Kritická chyba" -#: hugin1/calibrate_lens/LensCalApp.cpp:74 hugin1/hugin/huginApp.cpp:179 +#: hugin1/calibrate_lens/LensCalApp.cpp:74 hugin1/hugin/huginApp.cpp:204 #: hugin1/ptbatcher/PTBatcherGUI.cpp:91 #: hugin1/stitch_project/hugin_stitch_project.cpp:306 msgid "Translations not found in bundle" msgstr "PÅeklad nebyl nalezen." -#: hugin1/calibrate_lens/LensCalApp.cpp:79 hugin1/hugin/huginApp.cpp:187 +#: hugin1/calibrate_lens/LensCalApp.cpp:79 hugin1/hugin/huginApp.cpp:212 #: hugin1/ptbatcher/PTBatcherGUI.cpp:96 msgid "lensfun directory not found in bundle" msgstr "AdresáŠlensfun nebyl v balÃÄku nalezen." -#: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:202 +#: hugin1/calibrate_lens/LensCalApp.cpp:92 hugin1/hugin/huginApp.cpp:227 #: hugin1/ptbatcher/PTBatcherGUI.cpp:119 msgid "" "xrc directory not found, hugin needs to be properly installed\n" @@ -473,8 +470,8 @@ "VyzkouÅ¡ený adresáÅ:" #: hugin1/calibrate_lens/LensCalFrame.cpp:100 -#: hugin1/calibrate_lens/LensCalFrame.cpp:470 hugin1/hugin/MainFrame.cpp:191 -#: hugin1/hugin/MainFrame.cpp:1082 hugin1/hugin/PanoOperation.cpp:149 +#: hugin1/calibrate_lens/LensCalFrame.cpp:470 hugin1/hugin/MainFrame.cpp:194 +#: hugin1/hugin/MainFrame.cpp:1088 hugin1/hugin/PanoOperation.cpp:149 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -514,7 +511,7 @@ msgid "Add images" msgstr "PÅidat obrázky" -#: hugin1/calibrate_lens/LensCalFrame.cpp:493 hugin1/hugin/MainFrame.cpp:1069 +#: hugin1/calibrate_lens/LensCalFrame.cpp:493 hugin1/hugin/MainFrame.cpp:1075 msgid "Add Image: cancel" msgstr "PÅidat obrázek: zruÅ¡it" @@ -564,15 +561,15 @@ msgstr "Optimalizuji parametry zkreslenà objektivu..." #: hugin1/calibrate_lens/LensCalFrame.cpp:749 -#: hugin1/calibrate_lens/LensCalFrame.cpp:814 hugin1/hugin/MainFrame.cpp:866 +#: hugin1/calibrate_lens/LensCalFrame.cpp:814 hugin1/hugin/MainFrame.cpp:872 #: hugin1/hugin/MaskEditorPanel.cpp:443 #, c-format msgid "File %s exists. Overwrite?" msgstr "Soubor %s existuje. Mám ho pÅepsat?" #: hugin1/calibrate_lens/LensCalFrame.cpp:750 -#: hugin1/calibrate_lens/LensCalFrame.cpp:815 hugin1/hugin/MainFrame.cpp:867 -#: translations/xrc.cpp:425 xrc.cpp:425 +#: hugin1/calibrate_lens/LensCalFrame.cpp:815 hugin1/hugin/MainFrame.cpp:873 +#: translations/xrc.cpp:427 xrc.cpp:427 msgid "Save project" msgstr "Uložit projekt" @@ -604,11 +601,11 @@ msgid "Save lens" msgstr "Uložit objektiv" -#: hugin1/calibrate_lens/LensCalFrame.cpp:803 hugin1/hugin/MainFrame.cpp:854 +#: hugin1/calibrate_lens/LensCalFrame.cpp:803 hugin1/hugin/MainFrame.cpp:860 msgid "Save project file" msgstr "Uložit projekt" -#: hugin1/calibrate_lens/LensCalFrame.cpp:804 hugin1/hugin/MainFrame.cpp:856 +#: hugin1/calibrate_lens/LensCalFrame.cpp:804 hugin1/hugin/MainFrame.cpp:862 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Soubory projektu (*.pto)|*.pto|VÅ¡echny soubory (*)|*" @@ -770,9 +767,9 @@ msgstr "Nenalezen podobný bod." #: hugin1/hugin/CPEditorPanel.cpp:974 hugin1/hugin/CPEditorPanel.cpp:987 -#: hugin1/hugin/GLPreviewFrame.cpp:2937 hugin1/hugin/ImagesPanel.cpp:578 -#: hugin1/hugin/ImagesPanel.cpp:608 hugin1/hugin/MainFrame.cpp:690 -#: hugin1/hugin/MainFrame.cpp:1003 hugin1/hugin/OptimizePanel.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 hugin1/hugin/ImagesPanel.cpp:578 +#: hugin1/hugin/ImagesPanel.cpp:608 hugin1/hugin/MainFrame.cpp:696 +#: hugin1/hugin/MainFrame.cpp:1009 hugin1/hugin/OptimizePanel.cpp:171 #: hugin1/hugin/OptimizePhotometricPanel.cpp:153 #: hugin1/hugin/PanoOperation.cpp:368 hugin1/hugin/PanoPanel.cpp:1419 #: hugin1/hugin/PanoPanel.cpp:1447 translations/xrc.cpp:333 xrc.cpp:333 @@ -810,7 +807,7 @@ msgstr "PÅÃmka %d" #: hugin1/hugin/CPEditorPanel.cpp:1258 hugin1/hugin/CPListFrame.cpp:427 -#: hugin1/hugin/GLPreviewFrame.cpp:660 hugin1/hugin/GLPreviewFrame.cpp:2994 +#: hugin1/hugin/GLPreviewFrame.cpp:631 hugin1/hugin/GLPreviewFrame.cpp:2965 #: hugin1/hugin/PreviewFrame.cpp:234 translations/xrc.cpp:152 xrc.cpp:152 msgid "normal" msgstr "normálnà " @@ -885,7 +882,7 @@ msgid "Loading model file" msgstr "Nahrávám soubor modelu" -#: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/MainFrame.cpp:1670 +#: hugin1/hugin/CPEditorPanel.cpp:1837 hugin1/hugin/MainFrame.cpp:1676 #, c-format msgid "Removed %d control points" msgstr "Odebráno %d kontrolnÃch bodů" @@ -939,7 +936,6 @@ msgstr "Vyberte kontrolnà body" #: hugin1/hugin/DragTool.cpp:78 -#, fuzzy msgid "" "Drag to move images (optionally use shift to constrain), or roll with right-" "drag or Ctrl-drag." @@ -985,141 +981,140 @@ "PÅetáhnÄte pro pÅesun obrázků( pÅÃpadnÄ pomocà shiftu pro pÅesun jen po " "jedné ose) , nebo otáÄejte pomocà taženà pravým tlaÄÃtkem (Äi taženà s Ctrl)" -#: hugin1/hugin/GLPreviewFrame.cpp:333 hugin1/hugin/GLPreviewFrame.cpp:3053 +#: hugin1/hugin/GLPreviewFrame.cpp:304 hugin1/hugin/GLPreviewFrame.cpp:3024 msgid "Fast Panorama preview" msgstr "Rychlý náhled panoramatu" -#: hugin1/hugin/GLPreviewFrame.cpp:385 translations/xrc.cpp:791 -#: translations/xrc.cpp:939 xrc.cpp:791 xrc.cpp:939 +#: hugin1/hugin/GLPreviewFrame.cpp:356 translations/xrc.cpp:793 +#: translations/xrc.cpp:941 xrc.cpp:793 xrc.cpp:941 msgid "Center" msgstr "VystÅedit" -#: hugin1/hugin/GLPreviewFrame.cpp:386 hugin1/hugin/GLPreviewFrame.cpp:388 -#: translations/xrc.cpp:794 translations/xrc.cpp:927 translations/xrc.cpp:941 -#: xrc.cpp:794 xrc.cpp:927 xrc.cpp:941 +#: hugin1/hugin/GLPreviewFrame.cpp:357 hugin1/hugin/GLPreviewFrame.cpp:359 +#: translations/xrc.cpp:796 translations/xrc.cpp:929 translations/xrc.cpp:943 +#: xrc.cpp:796 xrc.cpp:929 xrc.cpp:943 msgid "Fit" msgstr "PÅizpůsobit" -#: hugin1/hugin/GLPreviewFrame.cpp:387 translations/xrc.cpp:796 -#: translations/xrc.cpp:943 xrc.cpp:796 xrc.cpp:943 +#: hugin1/hugin/GLPreviewFrame.cpp:358 translations/xrc.cpp:798 +#: translations/xrc.cpp:945 xrc.cpp:798 xrc.cpp:945 msgid "Straighten" msgstr "Narovnat" -#: hugin1/hugin/GLPreviewFrame.cpp:389 hugin1/hugin/GLPreviewFrame.cpp:2541 -#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/PanoPanel.cpp:975 -#: translations/xrc.cpp:963 xrc.cpp:963 +#: hugin1/hugin/GLPreviewFrame.cpp:360 hugin1/hugin/GLPreviewFrame.cpp:2512 +#: hugin1/hugin/GLPreviewFrame.cpp:2544 hugin1/hugin/PanoPanel.cpp:975 +#: translations/xrc.cpp:965 xrc.cpp:965 msgid "Autocrop" msgstr "AutooÅez" -#: hugin1/hugin/GLPreviewFrame.cpp:390 translations/xrc.cpp:965 xrc.cpp:965 +#: hugin1/hugin/GLPreviewFrame.cpp:361 translations/xrc.cpp:967 xrc.cpp:967 msgid "HDR Autocrop" msgstr "HDR AutooÅez" -#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/GLPreviewFrame.cpp:3040 -#: hugin1/hugin/MainFrame.cpp:360 hugin1/hugin/MainFrame.cpp:2087 -#: hugin1/hugin/MainFrame.cpp:2104 translations/xrc.cpp:63 -#: translations/xrc.cpp:280 translations/xrc.cpp:408 translations/xrc.cpp:418 -#: translations/xrc.cpp:1023 xrc.cpp:63 xrc.cpp:280 xrc.cpp:408 xrc.cpp:418 -#: xrc.cpp:1023 +#: hugin1/hugin/GLPreviewFrame.cpp:374 hugin1/hugin/GLPreviewFrame.cpp:3011 +#: hugin1/hugin/MainFrame.cpp:365 hugin1/hugin/MainFrame.cpp:2090 +#: hugin1/hugin/MainFrame.cpp:2107 translations/xrc.cpp:63 +#: translations/xrc.cpp:280 translations/xrc.cpp:410 translations/xrc.cpp:420 +#: translations/xrc.cpp:1029 xrc.cpp:63 xrc.cpp:280 xrc.cpp:410 xrc.cpp:420 +#: xrc.cpp:1029 msgid "&File" msgstr "&Soubor" -#: hugin1/hugin/GLPreviewFrame.cpp:422 hugin1/hugin/PreviewFrame.cpp:135 +#: hugin1/hugin/GLPreviewFrame.cpp:393 hugin1/hugin/PreviewFrame.cpp:135 msgid "displayed images" msgstr "zobrazené obrázky" -#: hugin1/hugin/GLPreviewFrame.cpp:439 hugin1/hugin/GLPreviewFrame.cpp:452 -#: translations/xrc.cpp:804 xrc.cpp:804 +#: hugin1/hugin/GLPreviewFrame.cpp:410 hugin1/hugin/GLPreviewFrame.cpp:423 +#: translations/xrc.cpp:806 xrc.cpp:806 msgid "All" msgstr "VÅ¡echny" -#: hugin1/hugin/GLPreviewFrame.cpp:447 hugin1/hugin/GLPreviewFrame.cpp:453 -#: hugin1/hugin/ImagesPanel.cpp:630 translations/xrc.cpp:568 -#: translations/xrc.cpp:573 translations/xrc.cpp:717 translations/xrc.cpp:806 -#: translations/xrc.cpp:849 translations/xrc.cpp:861 translations/xrc.cpp:880 -#: translations/xrc.cpp:932 translations/xrc.cpp:947 translations/xrc.cpp:968 -#: xrc.cpp:568 xrc.cpp:573 xrc.cpp:717 xrc.cpp:806 xrc.cpp:849 xrc.cpp:861 -#: xrc.cpp:880 xrc.cpp:932 xrc.cpp:947 xrc.cpp:968 +#: hugin1/hugin/GLPreviewFrame.cpp:418 hugin1/hugin/GLPreviewFrame.cpp:424 +#: hugin1/hugin/ImagesPanel.cpp:630 translations/xrc.cpp:570 +#: translations/xrc.cpp:575 translations/xrc.cpp:719 translations/xrc.cpp:808 +#: translations/xrc.cpp:851 translations/xrc.cpp:863 translations/xrc.cpp:882 +#: translations/xrc.cpp:934 translations/xrc.cpp:949 translations/xrc.cpp:970 +#: xrc.cpp:570 xrc.cpp:575 xrc.cpp:719 xrc.cpp:808 xrc.cpp:851 xrc.cpp:863 +#: xrc.cpp:882 xrc.cpp:934 xrc.cpp:949 xrc.cpp:970 msgid "None" msgstr "žádná" -#: hugin1/hugin/GLPreviewFrame.cpp:468 +#: hugin1/hugin/GLPreviewFrame.cpp:439 msgid "Hide" msgstr "Skrýt" -#: hugin1/hugin/GLPreviewFrame.cpp:516 hugin1/hugin/PreviewFrame.cpp:172 +#: hugin1/hugin/GLPreviewFrame.cpp:487 hugin1/hugin/PreviewFrame.cpp:172 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:520 hugin1/hugin/PreviewFrame.cpp:176 +#: hugin1/hugin/GLPreviewFrame.cpp:491 hugin1/hugin/PreviewFrame.cpp:176 msgid "drag to change the vertical field of view" msgstr "táhnÄte myÅ¡Ã pro zmÄnu svislého zorného pole" -#: hugin1/hugin/GLPreviewFrame.cpp:529 hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/GLPreviewFrame.cpp:500 hugin1/hugin/PreviewFrame.cpp:185 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:534 hugin1/hugin/PreviewFrame.cpp:190 +#: hugin1/hugin/GLPreviewFrame.cpp:505 hugin1/hugin/PreviewFrame.cpp:190 msgid "drag to change the horizontal field of view" msgstr "táhnÄte myÅ¡Ã pro zmÄnu horizontálnÃho zorného pole" -#: hugin1/hugin/GLPreviewFrame.cpp:589 translations/xrc.cpp:276 -#: translations/xrc.cpp:447 translations/xrc.cpp:840 translations/xrc.cpp:922 -#: xrc.cpp:276 xrc.cpp:447 xrc.cpp:840 xrc.cpp:922 +#: hugin1/hugin/GLPreviewFrame.cpp:560 translations/xrc.cpp:276 +#: translations/xrc.cpp:449 translations/xrc.cpp:842 translations/xrc.cpp:924 +#: xrc.cpp:276 xrc.cpp:449 xrc.cpp:842 xrc.cpp:924 msgid "Preview" msgstr "Náhled" -#: hugin1/hugin/GLPreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:573 msgid "Overview" msgstr "PÅehled" -#: hugin1/hugin/GLPreviewFrame.cpp:713 hugin1/hugin/PreviewFrame.cpp:304 +#: hugin1/hugin/GLPreviewFrame.cpp:684 hugin1/hugin/PreviewFrame.cpp:304 msgid "Resets the projection's parameters to their default values." msgstr "Obnovà parametry projekcà na výchozà hodnoty." -#: hugin1/hugin/GLPreviewFrame.cpp:722 hugin1/hugin/PreviewFrame.cpp:313 +#: hugin1/hugin/GLPreviewFrame.cpp:693 hugin1/hugin/PreviewFrame.cpp:313 msgid "param:" msgstr "parametr:" -#: hugin1/hugin/GLPreviewFrame.cpp:995 -#, fuzzy +#: hugin1/hugin/GLPreviewFrame.cpp:966 msgid "No images loaded." -msgstr "Nejsou nahrány obrázky" - -#: hugin1/hugin/GLPreviewFrame.cpp:1030 +msgstr "Nejsou nahrány obrázky." + +#: hugin1/hugin/GLPreviewFrame.cpp:1001 #, c-format msgid "%lu images loaded." msgstr "Nahráno %lu obrázků." -#: hugin1/hugin/GLPreviewFrame.cpp:1046 +#: hugin1/hugin/GLPreviewFrame.cpp:1017 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Obrázky propojuje %lu kontrolnÃch bodů.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1057 +#: hugin1/hugin/GLPreviewFrame.cpp:1028 #, c-format msgid "%d unconnected image groups found: " msgstr "Nalezeno %d nepropojených skupin obrázků: " -#: hugin1/hugin/GLPreviewFrame.cpp:1058 +#: hugin1/hugin/GLPreviewFrame.cpp:1029 msgid "" "Please use the Control Points tab to connect all images with control " "points.\n" msgstr "Využijte záložku s kontrolnÃmi body pro propojenà vÅ¡ech obrázků.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1064 +#: hugin1/hugin/GLPreviewFrame.cpp:1035 msgid "Images or control points have changed, new alignment is needed." msgstr "Obrázky Äi kontrolnà body se zmÄnily. Je nutné nové zarovnánÃ." -#: hugin1/hugin/GLPreviewFrame.cpp:1078 +#: hugin1/hugin/GLPreviewFrame.cpp:1049 msgid "Very good fit." msgstr "Velmi dobré spasovánÃ." -#: hugin1/hugin/GLPreviewFrame.cpp:1080 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 msgid "Good fit." msgstr "Dobré spasovánÃ." -#: hugin1/hugin/GLPreviewFrame.cpp:1082 +#: hugin1/hugin/GLPreviewFrame.cpp:1053 msgid "" "Bad fit, some control points might be bad, or there are parallax and " "movement errors" @@ -1127,7 +1122,7 @@ "Å patné spasovánÃ. NÄkteré kontrolnà body mohou být chybné, nebo se " "fotografovaná scéna Äi umÃstÄnà fotoaparátu mezi fotografiemi pÅÃliÅ¡ mÄnilo" -#: hugin1/hugin/GLPreviewFrame.cpp:1084 +#: hugin1/hugin/GLPreviewFrame.cpp:1055 msgid "" "Very bad fit. Check for bad control points, lens parameters, or images with " "parallax or movement. The optimizer might have failed. Manual intervention " @@ -1137,74 +1132,71 @@ "nebo obrázky focené z jiného mÃsta. Možná také selhala optimalizace. " "Manuálnà zásah nutný." -#: hugin1/hugin/GLPreviewFrame.cpp:1086 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f\n" msgstr "StÅednà chyba po optimalizaci: %.1f pixelů, maximálnÃ: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1096 -#, fuzzy +#: hugin1/hugin/GLPreviewFrame.cpp:1067 msgid "" "Note: automatic alignment uses default settings from the preferences. If you " "want to use customized settings, run the CP detection, the geometrical " "optimization and the photometric optimization from the Photos tab in the " "panorama editor." |
From: <hug...@li...> - 2012-12-27 13:43:54
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/d224d46048f4 changeset: 6078:d224d46048f4 user: tmodes date: Thu Dec 27 14:44:07 2012 +0100 description: Merged diffstat: src/translations/cs_CZ.po | 4724 +++++++++++++++++++++++++++----------------- 1 files changed, 2879 insertions(+), 1845 deletions(-) diffs (truncated from 8007 to 500 lines): diff -r 72217abf14ec -r d224d46048f4 src/translations/cs_CZ.po --- a/src/translations/cs_CZ.po Thu Dec 27 14:40:12 2012 +0100 +++ b/src/translations/cs_CZ.po Thu Dec 27 14:44:07 2012 +0100 @@ -28,8 +28,8 @@ msgstr "" "Project-Id-Version: cs_CZ\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2012-12-18 21:59+0100\n" -"PO-Revision-Date: 2012-12-08 12:16+0100\n" +"POT-Creation-Date: 2012-12-27 09:56+0100\n" +"PO-Revision-Date: 2012-12-27 10:00+0100\n" "Last-Translator: Václav Äerný <va...@se...>\n" "Language-Team: ÄeÅ¡tina\n" "Language: \n" @@ -41,72 +41,101 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 +#: hugin1/base_wx/huginConfig.cpp:47 +#: hugin1/base_wx/huginConfig.cpp:82 #, c-format -msgid "" -"External program %s not found as specified in preferences, reverting to " -"bundled version" -msgstr "" -"Externà program %s nenalezen (tak jak byl uložen v nastavenÃ) , vracÃm se k " -"pÅibalené verzi" - -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57 -#: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82 -#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 -#: hugin1/base_wx/wxLensDB.cpp:749 hugin1/base_wx/wxLensDB.cpp:762 -#: hugin1/base_wx/wxLensDB.cpp:808 hugin1/base_wx/wxLensDB.cpp:815 -#: hugin1/base_wx/wxLensDB.cpp:820 hugin1/base_wx/wxLensDB.cpp:967 +msgid "External program %s not found as specified in preferences, reverting to bundled version" +msgstr "Externà program %s nenalezen (tak jak byl uložen v nastavenÃ) , vracÃm se k pÅibalené verzi" + +#: hugin1/base_wx/huginConfig.cpp:47 +#: hugin1/base_wx/huginConfig.cpp:57 +#: hugin1/base_wx/huginConfig.cpp:69 +#: hugin1/base_wx/huginConfig.cpp:82 +#: hugin1/base_wx/platform.cpp:131 +#: hugin1/base_wx/RunStitchPanel.cpp:111 +#: hugin1/base_wx/wxLensDB.cpp:751 +#: hugin1/base_wx/wxLensDB.cpp:764 +#: hugin1/base_wx/wxLensDB.cpp:810 +#: hugin1/base_wx/wxLensDB.cpp:817 +#: hugin1/base_wx/wxLensDB.cpp:822 +#: hugin1/base_wx/wxLensDB.cpp:969 #: hugin1/calibrate_lens/LensCalFrame.cpp:101 #: hugin1/calibrate_lens/LensCalFrame.cpp:402 #: hugin1/calibrate_lens/LensCalFrame.cpp:471 -#: hugin1/hugin/CPEditorPanel.cpp:1783 hugin1/hugin/GLViewer.cpp:287 -#: hugin1/hugin/GLViewer.cpp:297 hugin1/hugin/MainFrame.cpp:195 -#: hugin1/hugin/MainFrame.cpp:842 hugin1/hugin/MainFrame.cpp:1090 -#: hugin1/hugin/MainFrame.cpp:1467 hugin1/hugin/MainFrame.cpp:1515 -#: hugin1/hugin/MainFrame.cpp:2005 hugin1/hugin/MainFrame.cpp:2194 -#: hugin1/hugin/MainFrame.cpp:2266 hugin1/hugin/MainFrame.cpp:2304 -#: hugin1/hugin/MainFrame.cpp:2316 hugin1/hugin/MainFrame.cpp:2331 +#: hugin1/hugin/CPEditorPanel.cpp:1783 +#: hugin1/hugin/GLViewer.cpp:287 +#: hugin1/hugin/GLViewer.cpp:297 +#: hugin1/hugin/MainFrame.cpp:195 +#: hugin1/hugin/MainFrame.cpp:842 +#: hugin1/hugin/MainFrame.cpp:1090 +#: hugin1/hugin/MainFrame.cpp:1467 +#: hugin1/hugin/MainFrame.cpp:1515 +#: hugin1/hugin/MainFrame.cpp:2005 +#: hugin1/hugin/MainFrame.cpp:2194 +#: hugin1/hugin/MainFrame.cpp:2266 +#: hugin1/hugin/MainFrame.cpp:2304 +#: hugin1/hugin/MainFrame.cpp:2316 +#: hugin1/hugin/MainFrame.cpp:2331 #: hugin1/hugin/MainFrame.cpp:2339 #: hugin1/hugin/OptimizePhotometricPanel.cpp:277 #: hugin1/hugin/OptimizePhotometricPanel.cpp:306 -#: hugin1/hugin/PanoOperation.cpp:150 hugin1/hugin/PanoOperation.cpp:527 -#: hugin1/hugin/PanoPanel.cpp:1015 hugin1/hugin/PanoPanel.cpp:1070 -#: hugin1/hugin/PanoPanel.cpp:1194 hugin1/hugin/PanoPanel.cpp:1212 +#: hugin1/hugin/PanoOperation.cpp:150 +#: hugin1/hugin/PanoOperation.cpp:527 +#: hugin1/hugin/PanoPanel.cpp:1015 +#: hugin1/hugin/PanoPanel.cpp:1070 +#: hugin1/hugin/PanoPanel.cpp:1153 +#: hugin1/hugin/PanoPanel.cpp:1171 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:246 -#: hugin1/ptbatcher/BatchFrame.cpp:499 hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/BatchFrame.cpp:499 +#: hugin1/ptbatcher/FindPanoDialog.cpp:293 #: hugin1/ptbatcher/ProjectListBox.cpp:184 #: hugin1/stitch_project/hugin_stitch_project.cpp:411 msgid "Error" msgstr "Chyba" -#: hugin1/base_wx/huginConfig.cpp:57 hugin1/base_wx/huginConfig.cpp:69 -#: hugin1/base_wx/platform.cpp:131 hugin1/base_wx/RunStitchPanel.cpp:111 -#: hugin1/hugin/MainFrame.cpp:1515 hugin1/hugin/MainFrame.cpp:2304 -#: hugin1/hugin/PanoPanel.cpp:1212 +#: hugin1/base_wx/huginConfig.cpp:57 +#: hugin1/base_wx/huginConfig.cpp:69 +#: hugin1/base_wx/platform.cpp:131 +#: hugin1/base_wx/RunStitchPanel.cpp:111 +#: hugin1/hugin/MainFrame.cpp:1515 +#: hugin1/hugin/MainFrame.cpp:2304 +#: hugin1/hugin/PanoPanel.cpp:1171 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "Externà program %s nenalezen v balÃku, vracÃm se k systémové cestÄ" -#: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109 +#: hugin1/base_wx/huginConfig.cpp:95 +#: hugin1/base_wx/huginConfig.cpp:109 #, c-format msgid "Program %s not found in preferences, reverting to default value" -msgstr "" -"Externà program %s nenalezen (tak jak byl uložen v nastavenÃ) , vracÃm se k " -"původnÃmu nastavenÃ" - -#: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134 -#: hugin1/base_wx/huginConfig.cpp:140 hugin1/base_wx/huginConfig.cpp:145 -#: hugin1/base_wx/huginConfig.cpp:150 hugin1/base_wx/huginConfig.cpp:155 -#: hugin1/base_wx/huginConfig.cpp:161 hugin1/base_wx/huginConfig.cpp:166 -#: hugin1/base_wx/huginConfig.cpp:171 hugin1/base_wx/huginConfig.cpp:176 -#: hugin1/base_wx/huginConfig.cpp:182 hugin1/base_wx/huginConfig.cpp:187 -#: hugin1/base_wx/huginConfig.cpp:194 hugin1/base_wx/huginConfig.cpp:199 -#: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224 -#: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235 -#: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245 -#: hugin1/base_wx/huginConfig.cpp:253 hugin1/base_wx/wxLensDB.cpp:232 -#: hugin1/base_wx/wxLensDB.cpp:607 hugin1/base_wx/wxLensDB.cpp:659 -#: hugin1/base_wx/wxLensDB.cpp:918 hugin1/base_wx/wxLensDB.cpp:923 +msgstr "Externà program %s nenalezen (tak jak byl uložen v nastavenÃ) , vracÃm se k původnÃmu nastavenÃ" + +#: hugin1/base_wx/huginConfig.cpp:129 +#: hugin1/base_wx/huginConfig.cpp:134 +#: hugin1/base_wx/huginConfig.cpp:140 +#: hugin1/base_wx/huginConfig.cpp:145 +#: hugin1/base_wx/huginConfig.cpp:150 +#: hugin1/base_wx/huginConfig.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:161 +#: hugin1/base_wx/huginConfig.cpp:166 +#: hugin1/base_wx/huginConfig.cpp:171 +#: hugin1/base_wx/huginConfig.cpp:176 +#: hugin1/base_wx/huginConfig.cpp:182 +#: hugin1/base_wx/huginConfig.cpp:187 +#: hugin1/base_wx/huginConfig.cpp:194 +#: hugin1/base_wx/huginConfig.cpp:199 +#: hugin1/base_wx/huginConfig.cpp:219 +#: hugin1/base_wx/huginConfig.cpp:224 +#: hugin1/base_wx/huginConfig.cpp:230 +#: hugin1/base_wx/huginConfig.cpp:235 +#: hugin1/base_wx/huginConfig.cpp:240 +#: hugin1/base_wx/huginConfig.cpp:245 +#: hugin1/base_wx/huginConfig.cpp:253 +#: hugin1/base_wx/wxLensDB.cpp:233 +#: hugin1/base_wx/wxLensDB.cpp:609 +#: hugin1/base_wx/wxLensDB.cpp:661 +#: hugin1/base_wx/wxLensDB.cpp:920 +#: hugin1/base_wx/wxLensDB.cpp:925 #: hugin1/calibrate_lens/LensCalFrame.cpp:415 #: hugin1/calibrate_lens/LensCalFrame.cpp:599 #: hugin1/calibrate_lens/LensCalFrame.cpp:622 @@ -115,12 +144,18 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:773 #: hugin1/calibrate_lens/LensCalFrame.cpp:799 #: hugin1/calibrate_lens/LensCalFrame.cpp:871 -#: hugin1/hugin/CPDetectorDialog.cpp:121 hugin1/hugin/GLPreviewFrame.cpp:1578 -#: hugin1/hugin/GLPreviewFrame.cpp:1585 hugin1/hugin/GLPreviewFrame.cpp:1592 -#: hugin1/hugin/GLPreviewFrame.cpp:1606 hugin1/hugin/GLPreviewFrame.cpp:1613 -#: hugin1/hugin/GLPreviewFrame.cpp:1620 hugin1/hugin/MainFrame.cpp:838 -#: hugin1/hugin/MainFrame.cpp:1716 hugin1/hugin/MainFrame.cpp:2270 -#: hugin1/hugin/MaskEditorPanel.cpp:532 hugin1/hugin/PreferencesDialog.cpp:983 +#: hugin1/hugin/CPDetectorDialog.cpp:121 +#: hugin1/hugin/GLPreviewFrame.cpp:1578 +#: hugin1/hugin/GLPreviewFrame.cpp:1585 +#: hugin1/hugin/GLPreviewFrame.cpp:1592 +#: hugin1/hugin/GLPreviewFrame.cpp:1606 +#: hugin1/hugin/GLPreviewFrame.cpp:1613 +#: hugin1/hugin/GLPreviewFrame.cpp:1620 +#: hugin1/hugin/MainFrame.cpp:838 +#: hugin1/hugin/MainFrame.cpp:1716 +#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MaskEditorPanel.cpp:532 +#: hugin1/hugin/PreferencesDialog.cpp:876 #: hugin1/ptbatcher/FindPanoDialog.cpp:250 #: hugin1/ptbatcher/FindPanoDialog.cpp:271 msgid "Warning" @@ -138,24 +173,36 @@ msgid "directory" msgstr "adresáÅ" -#: hugin1/base_wx/huginConfig.cpp:292 hugin1/base_wx/LensTools.cpp:41 -#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/ImagesTree.cpp:370 +#: hugin1/base_wx/huginConfig.cpp:292 +#: hugin1/base_wx/LensTools.cpp:41 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 +#: hugin1/hugin/ImagesTree.cpp:370 #: hugin1/hugin/PreviewFrame.cpp:630 msgid "Equirectangular" msgstr "Equirectangular" -#: hugin1/base_wx/huginConfig.cpp:297 hugin1/hugin/ImagesTree.cpp:149 +#: hugin1/base_wx/huginConfig.cpp:297 +#: hugin1/hugin/ImagesTree.cpp:149 msgid "Camera maker" msgstr "Výrobce fotoaparátu" -#: hugin1/base_wx/huginConfig.cpp:298 hugin1/hugin/ImagesTree.cpp:150 +#: hugin1/base_wx/huginConfig.cpp:298 +#: hugin1/hugin/ImagesTree.cpp:150 msgid "Camera model" msgstr "Model fotoaparátu" -#: hugin1/base_wx/huginConfig.cpp:299 hugin1/hugin/ImagesPanel.cpp:633 -#: hugin1/hugin/ImagesTree.cpp:151 hugin1/hugin/ImagesTree.cpp:1161 -#: translations/xrc.cpp:220 translations/xrc.cpp:233 translations/xrc.cpp:297 -#: translations/xrc.cpp:313 xrc.cpp:220 xrc.cpp:233 xrc.cpp:297 xrc.cpp:313 +#: hugin1/base_wx/huginConfig.cpp:299 +#: hugin1/hugin/ImagesPanel.cpp:633 +#: hugin1/hugin/ImagesTree.cpp:151 +#: hugin1/hugin/ImagesTree.cpp:1161 +#: translations/xrc.cpp:220 +#: translations/xrc.cpp:233 +#: translations/xrc.cpp:297 +#: translations/xrc.cpp:313 +#: xrc.cpp:220 +#: xrc.cpp:233 +#: xrc.cpp:297 +#: xrc.cpp:313 msgid "Lens" msgstr "Objektiv" @@ -163,38 +210,46 @@ msgid "unknown projection" msgstr "neznámá projekce" -#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesTree.cpp:366 +#: hugin1/base_wx/LensTools.cpp:37 +#: hugin1/hugin/ImagesTree.cpp:366 msgid "Normal (rectilinear)" msgstr "ObyÄejný (rectilineárnÃ)" -#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesTree.cpp:367 +#: hugin1/base_wx/LensTools.cpp:38 +#: hugin1/hugin/ImagesTree.cpp:367 msgid "Panoramic (cylindrical)" msgstr "Panoramatický (cylindrický)" -#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesTree.cpp:368 +#: hugin1/base_wx/LensTools.cpp:39 +#: hugin1/hugin/ImagesTree.cpp:368 msgid "Circular fisheye" msgstr "Kruhové rybà oko" -#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/ImagesTree.cpp:369 +#: hugin1/base_wx/LensTools.cpp:40 +#: hugin1/hugin/ImagesTree.cpp:369 msgid "Full frame fisheye" msgstr "PlnosnÃmkové rybà oko" -#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesTree.cpp:371 +#: hugin1/base_wx/LensTools.cpp:42 +#: hugin1/hugin/ImagesTree.cpp:371 #: hugin1/hugin/PanoPanel.cpp:153 msgid "Orthographic" msgstr "Ortografické" -#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesTree.cpp:372 +#: hugin1/base_wx/LensTools.cpp:43 +#: hugin1/hugin/ImagesTree.cpp:372 #: hugin1/hugin/PanoPanel.cpp:143 msgid "Stereographic" msgstr "Stereografické" -#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesTree.cpp:373 +#: hugin1/base_wx/LensTools.cpp:44 +#: hugin1/hugin/ImagesTree.cpp:373 #: hugin1/hugin/PanoPanel.cpp:154 msgid "Equisolid" msgstr "Equisolid" -#: hugin1/base_wx/LensTools.cpp:45 hugin1/hugin/ImagesTree.cpp:374 +#: hugin1/base_wx/LensTools.cpp:45 +#: hugin1/hugin/ImagesTree.cpp:374 msgid "Fisheye Thoby" msgstr "Rybà oko Thoby" @@ -218,11 +273,13 @@ msgid "Error loading lens parameters" msgstr "Chyba pÅi nahrávánà parametrů objektivu." -#: hugin1/base_wx/LensTools.cpp:345 hugin1/calibrate_lens/LensCalFrame.cpp:736 +#: hugin1/base_wx/LensTools.cpp:345 +#: hugin1/calibrate_lens/LensCalFrame.cpp:736 msgid "Save lens parameters file" msgstr "Uložit soubor s parametry objektivu" -#: hugin1/base_wx/LensTools.cpp:347 hugin1/calibrate_lens/LensCalFrame.cpp:738 +#: hugin1/base_wx/LensTools.cpp:347 +#: hugin1/calibrate_lens/LensCalFrame.cpp:738 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Soubory s vlastnostmi objektivu (*.ini)|*.ini|VÅ¡echny soubory (*)|*" @@ -247,14 +304,35 @@ #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:612 #: hugin1/ptbatcher/RunStitchFrame.cpp:43 -#: hugin1/stitch_project/hugin_stitch_project.cpp:126 translations/xrc.cpp:147 -#: translations/xrc.cpp:210 translations/xrc.cpp:249 translations/xrc.cpp:299 -#: translations/xrc.cpp:315 translations/xrc.cpp:322 translations/xrc.cpp:502 -#: translations/xrc.cpp:535 translations/xrc.cpp:539 translations/xrc.cpp:543 -#: translations/xrc.cpp:637 translations/xrc.cpp:785 translations/xrc.cpp:818 -#: translations/xrc.cpp:1045 xrc.cpp:147 xrc.cpp:210 xrc.cpp:249 xrc.cpp:299 -#: xrc.cpp:315 xrc.cpp:322 xrc.cpp:502 xrc.cpp:535 xrc.cpp:539 xrc.cpp:543 -#: xrc.cpp:637 xrc.cpp:785 xrc.cpp:818 xrc.cpp:1045 +#: hugin1/stitch_project/hugin_stitch_project.cpp:126 +#: translations/xrc.cpp:147 +#: translations/xrc.cpp:210 +#: translations/xrc.cpp:249 +#: translations/xrc.cpp:299 +#: translations/xrc.cpp:315 +#: translations/xrc.cpp:322 +#: translations/xrc.cpp:502 +#: translations/xrc.cpp:535 +#: translations/xrc.cpp:539 +#: translations/xrc.cpp:543 +#: translations/xrc.cpp:626 +#: translations/xrc.cpp:765 +#: translations/xrc.cpp:790 +#: translations/xrc.cpp:1017 +#: xrc.cpp:147 +#: xrc.cpp:210 +#: xrc.cpp:249 +#: xrc.cpp:299 +#: xrc.cpp:315 +#: xrc.cpp:322 +#: xrc.cpp:502 +#: xrc.cpp:535 +#: xrc.cpp:539 +#: xrc.cpp:543 +#: xrc.cpp:626 +#: xrc.cpp:765 +#: xrc.cpp:790 +#: xrc.cpp:1017 msgid "Cancel" msgstr "ZruÅ¡it" @@ -271,41 +349,38 @@ msgstr "Optimalizuji panorama" #: hugin1/base_wx/platform.h:40 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"vÅ¡echny obrázky|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPG obrázky (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF obrázky (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG obrázky (*.png)|*.png;*.PNG|HDR obrázky " -"(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|VÅ¡echny soubory (*)|*" - -#: hugin1/base_wx/PTWXDlg.cpp:49 hugin1/base_wx/PTWXDlg.cpp:68 -#: hugin1/base_wx/PTWXDlg.cpp:122 translations/xrc.cpp:788 xrc.cpp:788 +msgid "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +msgstr "vÅ¡echny obrázky|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPG obrázky (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF obrázky (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG obrázky (*.png)|*.png;*.PNG|HDR obrázky (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|VÅ¡echny soubory (*)|*" + +#: hugin1/base_wx/PTWXDlg.cpp:49 +#: hugin1/base_wx/PTWXDlg.cpp:68 +#: hugin1/base_wx/PTWXDlg.cpp:122 msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:135 hugin1/base_wx/RunStitchPanel.cpp:304 +#: hugin1/base_wx/RunStitchPanel.cpp:135 +#: hugin1/base_wx/RunStitchPanel.cpp:304 msgid "Could not open project file:" msgstr "Nelze otevÅÃt projektový soubor:" -#: hugin1/base_wx/RunStitchPanel.cpp:145 hugin1/base_wx/RunStitchPanel.cpp:312 -#: hugin1/nona_gui/nona_gui.cpp:243 hugin1/ptbatcher/ProjectArray.cpp:91 +#: hugin1/base_wx/RunStitchPanel.cpp:145 +#: hugin1/base_wx/RunStitchPanel.cpp:312 +#: hugin1/nona_gui/nona_gui.cpp:243 +#: hugin1/ptbatcher/ProjectArray.cpp:91 #, c-format msgid "could not open script : %s" msgstr "nelze otevÅÃt skript: %s" -#: hugin1/base_wx/RunStitchPanel.cpp:166 hugin1/base_wx/RunStitchPanel.cpp:320 -#: hugin1/nona_gui/nona_gui.cpp:250 hugin1/ptbatcher/ProjectArray.cpp:128 +#: hugin1/base_wx/RunStitchPanel.cpp:166 +#: hugin1/base_wx/RunStitchPanel.cpp:320 +#: hugin1/nona_gui/nona_gui.cpp:250 +#: hugin1/ptbatcher/ProjectArray.cpp:128 #, c-format msgid "error while parsing panotools script: %s" msgstr "chyba pÅi parsovánà panotools skriptu: %s" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:227 +#: hugin1/base_wx/RunStitchPanel.cpp:210 +#: hugin1/base_wx/RunStitchPanel.cpp:227 #: hugin1/base_wx/RunStitchPanel.cpp:346 msgid "Could not create temporary file" msgstr "Nelze vytvoÅit doÄasný soubor" @@ -336,7 +411,8 @@ "Chyba pÅi slepovánà projektu\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:287 hugin1/base_wx/RunStitchPanel.cpp:293 +#: hugin1/base_wx/RunStitchPanel.cpp:287 +#: hugin1/base_wx/RunStitchPanel.cpp:293 #: hugin1/stitch_project/hugin_stitch_project.cpp:177 msgid "Error during stitching" msgstr "Chyba bÄhem slepovánÃ" @@ -350,69 +426,80 @@ "Chyba pÅi bÄhu pomocnÃka\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:366 hugin1/base_wx/RunStitchPanel.cpp:374 +#: hugin1/base_wx/RunStitchPanel.cpp:366 +#: hugin1/base_wx/RunStitchPanel.cpp:374 msgid "Error during running assistant" msgstr "Chyba pÅi bÄhu pomocnÃka" -#: hugin1/base_wx/wxLensDB.cpp:232 +#: hugin1/base_wx/wxLensDB.cpp:233 #, c-format msgid "The input \"%s\" is not a valid number." msgstr "Vstup \"%s\" nenà platné ÄÃslo." -#: hugin1/base_wx/wxLensDB.cpp:296 +#: hugin1/base_wx/wxLensDB.cpp:294 +#: translations/xrc.cpp:191 +#: translations/xrc.cpp:208 +#: translations/xrc.cpp:256 +#: translations/xrc.cpp:796 +#: translations/xrc.cpp:879 +#: xrc.cpp:191 +#: xrc.cpp:208 +#: xrc.cpp:256 +#: xrc.cpp:796 +#: xrc.cpp:879 +msgid "Focal length multiplier:" +msgstr "Násobitel ohniskové vzdálenosti:" + +#: hugin1/base_wx/wxLensDB.cpp:299 #, c-format msgid "%d lenses found." msgstr "%d objektivy nalezeny." -#: hugin1/base_wx/wxLensDB.cpp:300 +#: hugin1/base_wx/wxLensDB.cpp:303 msgid "No lens found." msgstr "Nebylo nalezeno žádné objektivy." -#: hugin1/base_wx/wxLensDB.cpp:607 -msgid "" -"There is too little information for saving data into database. Please check " -"your input!" -msgstr "" -"Je zde pÅÃliÅ¡ málo informacà pro uloženà do databáze. Zkontrolujte vaÅ¡e " -"zadánÃ!" - -#: hugin1/base_wx/wxLensDB.cpp:658 +#: hugin1/base_wx/wxLensDB.cpp:609 +msgid "There is too little information for saving data into database. Please check your input!" +msgstr "Je zde pÅÃliÅ¡ málo informacà pro uloženà do databáze. Zkontrolujte vaÅ¡e zadánÃ!" + +#: hugin1/base_wx/wxLensDB.cpp:660 #, c-format msgid "" "You selected the folder \"%s\" to save your database file.\n" -"This is not the default folder. You won't be able to automatically load this " -"information back into Hugin.\n" +"This is not the default folder. You won't be able to automatically load this information back into Hugin.\n" "The default folder for the database files is \"%s\".\n" "Do you want to proceed anyway?" msgstr "" "Máte vybranou složku \"%s\" pro uloženà databáze.\n" -"Toto nenà výchozà složka, data se z nà nebudou do Huginu naÄÃtat " -"automaticky..\n" +"Toto nenà výchozà složka, data se z nà nebudou do Huginu naÄÃtat automaticky..\n" "Výchozà složka je \"%s\".\n" "Chcete pÅesto pokraÄovat?" -#: hugin1/base_wx/wxLensDB.cpp:706 +#: hugin1/base_wx/wxLensDB.cpp:708 msgid "Save lens into database file" msgstr "Uložit objektiv do databáze" -#: hugin1/base_wx/wxLensDB.cpp:708 hugin1/base_wx/wxLensDB.cpp:946 +#: hugin1/base_wx/wxLensDB.cpp:710 +#: hugin1/base_wx/wxLensDB.cpp:948 msgid "Lensfun database files (*.xml)|*.xml" msgstr "Lensfun databáze (*.xml)|*.xml" |
From: <hug...@li...> - 2013-01-30 17:33:03
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/670f6e5d6432 changeset: 6129:670f6e5d6432 user: tmodes date: Wed Jan 30 18:32:54 2013 +0100 description: Merged diffstat: src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html | 16 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html | 22 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html | 2 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html | 14 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html | 134 +++------ src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html | 2 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html | 2 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html | 70 ++-- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html | 98 +++--- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Photos_tab.html | 75 +---- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html | 14 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_tab.html | 32 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html | 2 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Projection_tab.html | 6 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_move_drag_tab.html | 24 +- src/hugin1/hugin/xrc/data/help_en_EN/Panorama_Editor_window.html | 98 +++--- src/hugin1/hugin/xrc/data/help_en_EN/pages.txt | 2 +- 17 files changed, 271 insertions(+), 342 deletions(-) diffs (truncated from 1187 to 500 lines): diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html Wed Jan 30 18:32:54 2013 +0100 @@ -73,11 +73,11 @@ <h2> <span class="mw-headline" id="User_interface"> User interface </span></h2> <p>The Hugin version as of version 2013.0.0 (to be released early 2013) consists of three User interfaces: <b>Simple</b>, <b>Advanced</b> and <b>Expert</b>. </p> -<ul><li> <b>Simple</b>, this User interface consists of all basic functionality to create a panorama and will suffice in 90% of all cases. -</li><li> <b>Advanced</b>, this user interface will start hugin in the Panorama Editor screen. The simple interface is available in the background. -</li><li> <b>Expert</b>, this user interface also start hugin in the Panorama Editor screen and will unleash all the power and options of hugin. +<ul><li> <b>Simple</b>: This user interface consists of all basic functionality to create a panorama and will suffice in 90% of all cases. +</li><li> <b>Advanced</b>: This user interface will start Hugin in the Panorama Editor screen; the simple interface is available in the background. +</li><li> <b>Expert</b>: This user interface also starts Hugin in the Panorama Editor screen and will unleash all the power and options of Hugin. </li></ul> -<p><i>(Go to Version 2012 and older Gui<a class="external" href="http://wiki.panotools.org/Hugin_Main_window_old_gui">[*]</a> to read about the "old" gui which is being used in the current stable release. Note that all Hugin 2012 and older versions come with the help screens installed. You can read the same texts as in this wiki by simply opening <b>Hugin</b> and clicking the 'Help' option from the 'Help' menu)</i> +<p><i>(Go to Version 2012 and older Gui<a class="external" href="http://wiki.panotools.org/Hugin_Main_window_old_gui">[*]</a> to read about the "old" gui which is being used in the current stable release. Note that all Hugin 2012 and older versions come with the help screens installed. You can read the same texts as in this wiki by simply opening <b>Hugin</b> and clicking the "Help" option from the "Help" menu)</i> </p><p><br /> </p> <h3> <span class="mw-headline" id="Simple_User_Interface"> Simple User Interface </span></h3> @@ -94,14 +94,16 @@ <ul><li> <a href="Hugin_Photos_tab.html" title="Hugin Photos tab">Photos tab</a> </li><li> <a href="Hugin_Mask_tab.html" title="Hugin Mask tab">Masks tab</a> </li><li> <a href="Hugin_Control_Points_tab.html" title="Hugin Control Points tab">Control Points tab</a> +</li><li> <a href="Hugin_Optimiser_tab.html" title="Hugin Optimiser tab">Optimiser tab</a> (only available when selecting <b>Geometric</b> Custom parameters on the <a href="Hugin_Photos_tab.html" title="Hugin Photos tab">Photos tab</a> +</li><li> <a href="Hugin_Exposure_tab.html" title="Hugin Exposure tab">Exposure tab</a> (only available when selecting <b>Photometric</b> Custom parameters on the <a href="Hugin_Photos_tab.html" title="Hugin Photos tab">Photos tab</a> </li><li> <a href="Hugin_Stitcher_tab.html" title="Hugin Stitcher tab">Stitcher tab</a> </li></ul> </li></ul> -<p>The Panorama Editor window "takes" the foreground but you can still switch to the Simple User interface +<p>The Panorama Editor window "takes" the foreground, but you can still switch to the Simple User interface which is started as a "background" screen of the <a href="Hugin_Panorama_Editor_window.html" title="Hugin Panorama Editor window">Panorama Editor</a>. </p> <h3> <span class="mw-headline" id="Expert_User_Interface"> Expert User Interface </span></h3> -<p>This one is identical to the Advanced User interface including the Simple User interface screen in the background. It will give you even more options in the form of context-menus (right-click menus) in some parts of the screens. +<p>This one is identical to the Advanced User interface, including the Simple User interface screen in the background. It will give you even more options in the form of context-menus (right-click menus) in some parts of the screens. </p> <h2> <span class="mw-headline" id="Hugin_components"> Hugin components </span></h2> <p>The following tools are part of the Hugin suite: @@ -168,7 +170,7 @@ </div> <!-- /bodycontent --> <!-- printfooter --> <div class="printfooter"> - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin&oldid=14902<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin&oldid=14902">[*]</a>" </div> + Retrieved from "http://wiki.panotools.org/index.php?title=Hugin&oldid=14974<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin&oldid=14974">[*]</a>" </div> <!-- /printfooter --> <!-- catlinks --> </div></div></body></html> \ No newline at end of file diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html Wed Jan 30 18:32:54 2013 +0100 @@ -45,20 +45,20 @@ <!-- /jumpto --> <!-- bodycontent --> - <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"><p>The <a href="Hugin.html" title="Hugin">hugin</a> assistant automates nearly everything needed to create -a panorama, just follow the three steps below the partial screen capture of the top half of the screen: + <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"><p>The <a href="Hugin.html" title="Hugin">Hugin</a> assistant automates nearly everything needed to create +a panorama; just follow the three steps described below the partial screen capture of the top half of the screen: </p><p><img alt="Hugin2013 assistant tab tophalf.png" src="Hugin2013_assistant_tab_tophalf.png" width="820" height="123" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_assistant_tab_tophalf.png">[*]</a> <br style="clear:both;" /> </p> <h1> <span class="mw-headline" id="1._Load_images..."> 1. Load images... </span></h1> <p>Click on the <b>Load images...</b> button to select the photos you want to use in your panorama. </p><p>This tries to identify the field of view<a class="external" href="http://wiki.panotools.org/Field_of_view">[*]</a> of your photos by looking at (EXIF) information stored by -the camera itself. If this fails you need to enter the <b>field of view</b> manually, or let <a href="Hugin.html" title="Hugin">hugin</a> calculate it from the <a href="Focal_Length.html" title="Focal Length">Focal Length</a> and <a href="Crop_factor.html" title="Crop factor">Focal length multiplier</a>. -</p><p>Also select a <a href="Hugin_Photos_tab.html#Lens_type" title="Hugin Photos tab">matching <i>Lens type</i></a> from the drop-down list. If you are unsure try the default <b>Normal (rectilinear)</b>. +the camera itself. If this fails, you need to enter the <b>field of view</b> manually, or let <a href="Hugin.html" title="Hugin">Hugin</a> calculate it from the <a href="Focal_Length.html" title="Focal Length">Focal Length</a> and <a href="Crop_factor.html" title="Crop factor">Focal length multiplier</a>. +</p><p>Also select a <a href="Hugin_Photos_tab.html#Lens_type" title="Hugin Photos tab">matching <i>Lens type</i></a> from the drop-down list. If you are unsure, try the default <b>Normal (rectilinear)</b>. </p> <h1> <span class="mw-headline" id="2._Align..."> 2. Align... </span></h1> -<p>Click on <b>Align...</b> will use an automatic tool (the one set as <i>Default</i> in the <a href="Hugin_Preferences.html#Control_Point_Detectors" title="Hugin Preferences">Control Point Detectors tab</a> of the Preferences) to match images, then use the internal <a href="Hugin.html" title="Hugin">hugin</a> optimiser to align them, correct exposure and white balance. -</p><p>A preview of the result will be displayed in the bottom half of this screen. If this preview looks good proceed with the third step (the <b>Create panorama...</b> button), otherwise you will need to make some changes to the images and optimisations of the project in the other tabs. +<p>Clicking on <b>Align...</b> will use an automatic tool (the one set as <i>Default</i> in the <a href="Hugin_Preferences.html#Control_Point_Detectors" title="Hugin Preferences">Control Point Detectors tab</a> of the Preferences) to match images, then use the internal <a href="Hugin.html" title="Hugin">Hugin</a> optimiser to align them, correct exposure and white balance. +</p><p>A preview of the result will be displayed in the bottom half of this screen. If this preview looks good, proceed with the third step (the <b>Create panorama...</b> button), otherwise you will need to make some changes to the images and optimisations of the project in the other tabs. </p> <h1> <span class="mw-headline" id="3._Create_panorama..."> 3. Create panorama... </span></h1> <p>Finally, use <b>Create panorama...</b> to stitch the panorama to an image file with standard @@ -68,16 +68,16 @@ <p>A tab in the <i>Preferences</i> dialog (available from the menu) allows you to customise some <a href="Hugin_Preferences.html#Assistant" title="Hugin Preferences">settings</a> of the assistant. </p> <h1> <span class="mw-headline" id="Overview_and_Preview"> Overview and Preview </span></h1> -<p>Both the Overview and the Preview canvas will be displayed on all tabs of the Simple Interface being this <i>Hugin Assistant tab</i>, the <a href="Hugin_Preview_tab.html" title="Hugin Preview tab">Hugin Preview tab</a>, +<p>Both the Overview and the Preview canvas will be displayed on all tabs of the Simple Interface, being this <i>Hugin Assistant tab</i>, the <a href="Hugin_Preview_tab.html" title="Hugin Preview tab">Hugin Preview tab</a>, the <a href="Hugin_Main_window.html#Layout" title="Hugin Main window">Hugin Layout tab</a>, the <a href="Hugin_Projection_tab.html" title="Hugin Projection tab">Hugin Projection tab</a>, the <a href="Hugin_move_drag_tab.html" title="Hugin move drag tab">Hugin move drag tab</a> and the <a href="Hugin_Crop_tab.html" title="Hugin Crop tab">Hugin Crop tab</a>. </p><p><br /> </p> <h2> <span class="mw-headline" id="Overview"> Overview </span></h2> <div class="thumb tleft"><div class="thumbinner" style="width:202px;"><img alt="" src="200px-Hugin2013_overview.png" width="200" height="297" class="thumbimage" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_overview.png">[*]</a> <div class="thumbcaption"><div class="magnify"><img src="magnify-clip.png" width="15" height="11" alt="" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_overview.png">[*]</a></div>Screenshot of Overview in Panosphere mode</div></div></div> <p>The <b>Overview</b> represents an interactive preview of the panorama. -</p><p>To Show or Hide the docked Overview window check or uncheck the 'Overview' checkbox option from the 'View' menu. Zoom it by dragging the handle located at the center of the border to the preview canvas. -</p><p>To hide or show the grid in both the overview and the preview canvas, check or uncheck the 'Grid' checkbox option from the 'View' menu. -</p><p>Clicking the small pin icon in the header of the docked Overview area (or dragging the Overview title bar) will switch to a floating window instead. To put that floating window back in a docked position just drag it in either the top, bottom, left or right boundary of the preview's actual image area. +</p><p>To show or hide the docked Overview window, check or uncheck the "Overview" checkbox option from the "View" menu. Zoom it by dragging the handle located at the center of the border to the preview canvas. +</p><p>To hide or show the grid in both the overview and the preview canvas, check or uncheck the "Grid" checkbox option from the "View" menu. +</p><p>Clicking the small pin icon in the header of the docked Overview area (or dragging the Overview title bar) will switch to a floating window instead. To put that floating window back in a docked position, just drag it in either the top, bottom, left or right boundary of the preview's actual image area. </p><p>The default mode is a Panosphere to display typical panoramas and can be used to e.g. easily check for errors in the nadir or zenith regions. <br style="clear:both;" /> </p> @@ -90,7 +90,7 @@ </div> <!-- /bodycontent --> <!-- printfooter --> <div class="printfooter"> - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Assistant_tab&oldid=14911<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Assistant_tab&oldid=14911">[*]</a>" </div> + Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Assistant_tab&oldid=14938<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Assistant_tab&oldid=14938">[*]</a>" </div> <!-- /printfooter --> <!-- catlinks --> </div></div></body></html> \ No newline at end of file diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html Wed Jan 30 18:32:54 2013 +0100 @@ -48,7 +48,7 @@ <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"> <h2> <span class="mw-headline" id="About_Control_points"> About Control points </span></h2> <p><a href="Control_points.html" title="Control points">Control points</a> are central to Panorama Tools<a class="external" href="http://wiki.panotools.org/Panorama_Tools">[*]</a> and <a href="Hugin.html" title="Hugin">hugin</a>, because they are used to estimate the position of image position and lens parameters described above. -A control point specifies a corresponding point between two images. Using these corresponding points, the <a href="Hugin_Optimizer_tab.html" title="Hugin Optimizer tab">hugin Optimizer tab</a> can estimate the image position and lens parameters. +A control point specifies a corresponding point between two images. Using these corresponding points, the hugin Optimizer tab<a class="external" href="http://wiki.panotools.org/Hugin_Optimizer_tab">[*]</a> can estimate the image position and lens parameters. It is therefore important that the control points are accurate and usually at least 3 well distributed control points should be used to estimate the image position (<a href="Yaw.html" title="Yaw">yaw</a>, <a href="Roll.html" title="Roll">roll</a> and <a href="Pitch.html" title="Pitch">pitch</a>) and maybe the <a href="Field_of_View.html" title="Field of View">HFOV</a>. For accurate estimation of the a,b,c distortion parameters, many well distributed control points, and a large overlap (up to 50%) are required. </p> diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html Wed Jan 30 18:32:54 2013 +0100 @@ -45,15 +45,15 @@ <!-- /jumpto --> <!-- bodycontent --> - <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"><p>Use the <b>Crop</b> tab to indicate the area of the panorama that should be used as output. This crop tab doesn't work on the individual images, but on the entire panorama. + <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"><p>Use the <b>Crop</b> tab to indicate the area of the panorama that should be used as output. This crop tab doesn't work on the individual images but on the entire panorama. </p> <div class="thumb tleft"><div class="thumbinner" style="width:602px;"><img alt="" src="600px-Hugin2013_crop_tab.png" width="600" height="88" class="thumbimage" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_crop_tab.png">[*]</a> <div class="thumbcaption"><div class="magnify"><img src="magnify-clip.png" width="15" height="11" alt="" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_crop_tab.png">[*]</a></div>Screenshot of the Crop tab; click for larger image</div></div></div> <p><br style="clear:both;" /> -</p><p>The "Autocrop" and "HDR Autocrop" buttons will adjust the crop rectangle so that it is entirely within the image area, i.e. there will be no 'black' borders in the final stitched image (In other words: it determines the maximum number of pixels having no empty, black space). It does this by maximising the area of the rectangle rather than the width or height. This is automatically done when running the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a>. -</p><p>To change the cropping at each edge, move the mouse towards that edge until a semi-transparant white box appears along it, then drag with the left mouse button until the edge is where you want it. The area outside the dragging rectangle represents the areas that will be cropped off the panorama. You can move two edges at once by moving the mouse towards the corner shared by the edges until both white boxes appear. If you wish to move the whole region at once, move the mouse into the middle so that all four edges have boxes along them and drag. -</p><p>This <strong class="selflink">Hugin Crop tab</strong> also has the option to display guides in the preview to help you crop the panorama until the composition applies to for example the "rule of thirds". -</p><p>Note: <b>cropping the panorama</b> shouldn't be confused with a camera's <a href="Crop_factor.html" title="Crop factor">Crop factor</a>, which is something else entirely. -</p><p>Note 2: This <strong class="selflink">Hugin Crop tab</strong> is neither to crop individual images, like you would do for e.g. <a href="Fisheye_Projection.html" title="Fisheye Projection">fisheye Projection</a> images having a circular area in the middle with a useless black area outside, or scanned images that might have edges that need to +</p><p>The "Autocrop" and "HDR Autocrop" buttons will adjust the crop rectangle so that it is entirely within the image area, i.e. there will be no "black" borders in the final stitched image (In other words: it determines the maximum number of pixels having no empty, black space). It does this by maximising the area of the rectangle rather than the width or height. This is automatically done when running the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a>. +</p><p>To change the cropping at each edge, move the mouse towards that edge until a semi-transparant white box appears along it; then drag with the left mouse button until the edge is where you want it. The area outside the dragging rectangle represents the areas that will be cropped off the panorama. You can move two edges at once by moving the mouse towards the corner shared by the edges until both white boxes appear. If you wish to move the whole region at once, move the mouse into the middle so that all four edges have boxes along them and drag. +</p><p>This <strong class="selflink">Hugin Crop tab</strong> also has the option to display guides in the preview to help you crop the panorama until the composition applies to for example the "rule of thirds." +</p><p>Note: <b>Cropping the panorama</b> shouldn't be confused with a camera's <a href="Crop_factor.html" title="Crop factor">Crop factor</a>, which is something else entirely. +</p><p>Note 2: This <strong class="selflink">Hugin Crop tab</strong> is not for cropping individual images, like you would do for e.g. <a href="Fisheye_Projection.html" title="Fisheye Projection">fisheye Projection</a> images having a circular area in the middle with a useless black area outside or scanned images that might have edges that need to be <i>cropped</i> away. </p> @@ -62,7 +62,7 @@ </div> <!-- /bodycontent --> <!-- printfooter --> <div class="printfooter"> - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Crop_tab&oldid=14796<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Crop_tab&oldid=14796">[*]</a>" </div> + Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Crop_tab&oldid=14943<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Crop_tab&oldid=14943">[*]</a>" </div> <!-- /printfooter --> <!-- catlinks --> </div></div></body></html> \ No newline at end of file diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html Wed Jan 30 18:32:54 2013 +0100 @@ -45,106 +45,58 @@ <!-- /jumpto --> <!-- bodycontent --> - <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"><p><a href="Hugin.html" title="Hugin">hugin</a> has a brightness and colour correction system which is completely -independent of the old <a href="PTStitcher.html" title="PTStitcher">PTStitcher</a> tool. This improved system is only -available with the default <a href="Nona.html" title="Nona">nona</a> stitching tool in the <a href="Hugin_Stitcher_tab.html" title="Hugin Stitcher tab">hugin Stitcher tab</a>. -</p><p>The <b>hugin</b> system works by sampling a spread of points for each pair of -overlapping images. The optimiser then tries to model a system of <a href="Camera_response_curve.html" title="Camera response curve">camera response curve</a>, -<b>exposure</b>, <b>white balance</b> and <a href="Vignetting.html" title="Vignetting">vignetting</a> that fits the values of these points. -</p><p>So for this to work, the photos in the project have to be already aligned. Align -photos by managing control points in the <a href="Hugin_Control_Points_tab.html" title="Hugin Control Points tab">hugin Control Points tab</a> and optimising -geometric image parameters in the <a href="Hugin_Optimizer_tab.html" title="Hugin Optimizer tab">hugin Optimizer tab</a>. -</p><p><b>Only use images selected in preview.</b> allows you to work with just a few -of the images in the current project rather than all of them. Use the buttons along the top of the -<a href="Hugin_Preview_window.html" title="Hugin Preview window">Hugin Preview window</a> to enable and disable source photos. When optimising, all the hidden images will be ignored. + <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"><p>As explained on the <a href="Hugin_Photos_tab.html#Photometric_.28Simple_User_interface.29" title="Hugin Photos tab">Hugin Photos tab</a>, hugin has a brightness and colour correction system using the default nona stitching tool. +</p><p>Hugin comes with an extended set of predefined settings for photometric optimisation. If these predefined options do not give the desired results you can define your custom parameters in this <b>Hugin Exposure tab</b>. </p> -<h2> <span class="mw-headline" id="Optimize_Preset"> Optimize Preset </span></h2> -<p>Use the <b>Optimize Preset</b> combo box to pick one of several pre-set photometric -optimisation schemes, then click the <b>Optimize now!</b> button to calculate the -best available brightness and colour adjustments. -</p> -<h3> <span class="mw-headline" id="Low_dynamic_range"> Low dynamic range </span></h3> -<p>This will optimise <a href="Vignetting.html" title="Vignetting">vignetting</a>, the <a href="Camera_response_curve.html" title="Camera response curve">camera response curve</a> and <b>exposure</b> (EV) -for all the photos in your project. -</p><p>The exposures for all images (except for the anchor image determined by selecting -<b>Anchor this image for exposure</b> in the hugin Images tab<a class="external" href="http://wiki.panotools.org/Hugin_Images_tab">[*]</a>) are optimised. -</p> -<h3> <span class="mw-headline" id="Low_dynamic_range.2C_variable_white_balance"> Low dynamic range, variable white balance </span></h3> -<p>This will optimise <a href="Vignetting.html" title="Vignetting">vignetting</a>, the <a href="Camera_response_curve.html" title="Camera response curve">camera response curve</a>, <b>exposure</b> (EV) and -<b>white balance</b> for all the photos in your project. -</p><p>Similarly to above, the exposures and white balance is optimised for all images except the -<i>anchor</i>. -</p> -<h3> <span class="mw-headline" id="High_dynamic_range.2C_fixed_exposure"> High dynamic range, fixed exposure </span></h3> -<p>This will optimise <a href="Vignetting.html" title="Vignetting">vignetting</a> and <a href="Camera_response_curve.html" title="Camera response curve">camera response curve</a> for all photos. -</p> -<h3> <span class="mw-headline" id="High_dynamic_range.2C_variable_white_balance.2C_fixed_exposure"> High dynamic range, variable white balance, fixed exposure </span></h3> -<p>This will optimise <a href="Vignetting.html" title="Vignetting">vignetting</a>, the <a href="Camera_response_curve.html" title="Camera response curve">camera response curve</a> and <b>white balance</b> -for all the photos in your project. -</p> -<h3> <span class="mw-headline" id="Custom_parameters_below"> Custom parameters below </span></h3> -<p>The pre-set options are good for most situations, but often it is necessary to switch to -<b>Custom parameters</b>. For example, none of the pre-sets will optimise the -<b>Vignetting Centre</b>, so use custom parameters if your vignetting is off-centre. -</p> -<h2> <span class="mw-headline" id="Image_Variables"> Image Variables </span></h2> -<p>Image variables are quite likely to vary between photos, perhaps because of minor -variations in shutter speed, changes in natural light or because of 'auto' settings -in the camera itself. -</p> -<h3> <span class="mw-headline" id="Exposure"> Exposure </span></h3> -<p>The <b>Exposure</b> section shows the photo number and exposure values for all input -photos (in parenthesis), the check mark indicates parameters that will be optimised. -</p><p>When a value is set to <i>0</i> (zero) this results in <a href="Hugin.html" title="Hugin">hugin</a> applying no exposure -change to the photo. <i>EV</i> is a standard photographic scale, each increase or -decrease by one unit will change the exposure by the equivalent of one <i>f-stop</i> -(ie. halving or doubling the exposure). -</p> -<h3> <span class="mw-headline" id="White_balance"> White balance </span></h3> -<p>Also known as <i>colour balance</i> or <i>colour temperature</i>. -</p><p>The <b>White balance</b> section shows the photo number and <i>red</i> and <i>blue</i> -multiplier values (in parenthesis), the check mark indicates photos that -will be optimised. If the values are set to <i>(1,1)</i>, this will result in no -<b>white balance</b> change (the numbers are relative to the green channel which -stays unaltered). + +<h1> <span class="mw-headline" id="Photometric_Optimisation"> Photometric Optimisation </span></h1> +<h2> <span class="mw-headline" id="Image_variables"> Image variables </span></h2> +<p>In the <b>Image variables</b> part of the screen you can modify the exposure EV, the <i>red multiplier</i> <b>Er</b> and the <i>blue multiplier</i> <b>Eb</b>. +</p><p>The <b>Red multiplier</b> and <b>Blue multiplier</b> settings are used to account for changes +in <b>white balance</b> (also known as <i>colour balance</i> or <i>colour temperature</i>) between +photos. Setting them both to <i>1</i> will result in no <i>white balance</i> change (the numbers +are relative to the green channel which stays unaltered). +</p><p>As with exposure, different photos in the same project are quite likely to require different +<i>white balance</i>. Typically this will be caused by variations in lighting conditions between +shots - For example a cloudy scene will contain considerably less <i>red</i> light than the same scene +under direct sunlight. </p> <h2> <span class="mw-headline" id="Camera_and_Lens_variables"> Camera and Lens variables </span></h2> -<p>The <b>Camera and Lens variables</b> are the <i>photometric</i> analog of the <i>geometric</i> <a href="Lens_correction_model.html" title="Lens correction model">lens correction model</a>, <a href="Hugin.html" title="Hugin">hugin</a> -assumes that all input photos with the same <b>lens number</b> have identical values unless they are <b>unlinked</b> in the -hugin Camera and Lens tab<a class="external" href="http://wiki.panotools.org/Hugin_Camera_and_Lens_tab">[*]</a>. +<p>The values that you can change in the <b>Camera and Lens variables</b> table is again dependent on the <b>Simple</b>, <b>Advanced</b> or <b>Expert</b> User interface. </p> -<h3> <span class="mw-headline" id="Vignettting"> Vignettting </span></h3> -<p><a href="Vignetting.html" title="Vignetting">Vignetting</a> is dependent mainly on your lens and the <i>aperture</i>. Usually the centre of the image is -brighter with a falloff towards the edges, <a href="Hugin.html" title="Hugin">hugin</a> can calculate this falloff curve as part of the -<i>photometric optimisation</i> process or you can enter it manually in the hugin Camera and Lens tab<a class="external" href="http://wiki.panotools.org/Hugin_Camera_and_Lens_tab">[*]</a> -as the three numbers shown here. +<h3> <span class="mw-headline" id="Vignetting"> Vignetting </span></h3> +<p><a href="Vignetting.html" title="Vignetting">Vignetting</a> is dependent mainly on your lens and the <i>aperture</i>. Usually the +centre of the image is brighter with a falloff towards the edges. The three +numbers here represent a polynomial curve used by <a href="Hugin.html" title="Hugin">hugin</a> to correct vignetting. +</p><p>You are not expected to guess these values, they are generally loaded with a lens +profile or calculated from two or more overlapping photos. +</p><p>Set the values to <i>0,0,0</i> for no vignetting correction. +</p><p>Usually all photos taken with the same <i>lens</i> will have the same vignetting, keep +<b>Link</b> checked to ensure <b>hugin</b> applies the same vignetting correction to all +photos with the selected lens number. </p> -<h3> <span class="mw-headline" id="Vignetting_Centre"> Vignetting Centre </span></h3> -<p>The centre of <a href="Vignetting.html" title="Vignetting">vignetting</a> is rarely the exact centre of the photo, -<a href="Hugin.html" title="Hugin">hugin</a> can optimise this position or you can enter it manually in the -hugin Camera and Lens tab<a class="external" href="http://wiki.panotools.org/Hugin_Camera_and_Lens_tab">[*]</a>. The scale is in <i>pixels</i>, with <i>0,0</i> -indicating the centre of the photo. The values are independent of the -d & e parameters, that specify the origin for projection and distortion -values. +<h3> <span class="mw-headline" id="Vignetting_Center_Shift"> Vignetting Center Shift </span></h3> +<p>The centre of <a href="Vignetting.html" title="Vignetting">vignetting</a> is rarely the exact centre of the photo. The two numbers +here indicate the position of the vignetting centre. The scale is in pixels, with +<i>0,0</i> indicating the centre of the photo. The values are independent of the <b>d</b> +& <b>e</b> parameters which specify the origin for projection and geometric distortion. +</p><p><br /> </p> <h3> <span class="mw-headline" id="Camera_Response"> Camera Response </span></h3> -<p><a href="Hugin.html" title="Hugin">hugin</a> can optimise the <a href="Camera_response_curve.html" title="Camera response curve">camera response curve</a> by comparing differences -between overlapping images. To do this your photos need to either have -significant <a href="Vignetting.html" title="Vignetting">vignetting</a> or have variable exposure. If your photos have -perfectly even exposure and zero vignetting, then you would have to -calibrate the camera response separately and then enter it manually in the -hugin Camera and Lens tab<a class="external" href="http://wiki.panotools.org/Hugin_Camera_and_Lens_tab">[*]</a>. -</p><p>The <b>camera response curve</b> is used both for mapping the images to a linear +<p>The <a href="Camera_response_curve.html" title="Camera response curve">camera response curve</a> is used both for mapping the images to a linear colourspace when creating <a href="HDR.html" title="HDR">HDR</a> output, and for normalising the colourspace for internal vignetting, brightness and colour corrections when creating -'normal' <b>LDR</b> output. If your pictures don't require such corrections -then you don't really need a calibrated response curve. -</p><p>Hugin uses the <a rel="nofollow" class="external text" href="http://www1.cs.columbia.edu/CAVE/projects/rad_cal/rad_cal.php">EMoR response model</a> +'normal' <b>LDR</b> output. +</p><p><a href="Hugin.html" title="Hugin">hugin</a> uses the <a rel="nofollow" class="external text" href="http://www1.cs.columbia.edu/CAVE/projects/rad_cal/rad_cal.php">EMoR response model</a> from the Computer Vision Lab at Columbia University which simplifies the full -response curve to five empirical coefficient numbers. -</p><p>If your brightness variations are caused by lens flare then you may be better not optimising -<b>Exposure</b> or <b>white balance</b>, instead uncheck <b>Link</b> for <b>Camera Response</b> -in the hugin Camera and Lens tab<a class="external" href="http://wiki.panotools.org/Hugin_Camera_and_Lens_tab">[*]</a> to optimise a different response curve for each photo. +response curve to these five empirical coefficient numbers. You are +not expected to guess these values, they are generally loaded with a lens +profile or calculated from two or more overlapping photos. +</p><p>Set the five numbers to <i>0,0,0,0,0</i> to use a generic response curve or change the <b>Type</b> +to <b>Linear</b> to indicate that your input photos have a <i>scene-referred</i> or <a href="HDR.html" title="HDR">HDR</a> +response. +</p><p>Keep <b>Link</b> checked to ensure <b>hugin</b> applies the same +response curve to all photos with the selected lens number. </p> @@ -152,7 +104,7 @@ </div> <!-- /bodycontent --> <!-- printfooter --> <div class="printfooter"> - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Exposure_tab&oldid=10229<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Exposure_tab&oldid=10229">[*]</a>" </div> + Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Exposure_tab&oldid=14962<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Exposure_tab&oldid=14962">[*]</a>" </div> <!-- /printfooter --> <!-- catlinks --> </div></div></body></html> \ No newline at end of file diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html Wed Jan 30 18:32:54 2013 +0100 @@ -71,7 +71,7 @@ </p> <h2> <span class="mw-headline" id="Displayed_images"> Displayed images </span></h2> <p>Every input image in the preview has <i>toggle</i> button where display can be disabled or enabled. -</p><p>In addition, this display also controls the behaviour of the <a href="Hugin_Optimizer_tab.html" title="Hugin Optimizer tab">hugin Optimizer tab</a> and the <a href="Hugin_Stitcher_tab.html" title="Hugin Stitcher tab">hugin Stitcher tab</a> - Any photos disabled here are not used in optimisation or stitching. +</p><p>In addition, this display also controls the behaviour of the hugin Optimizer tab<a class="external" href="http://wiki.panotools.org/Hugin_Optimizer_tab">[*]</a> and the <a href="Hugin_Stitcher_tab.html" title="Hugin Stitcher tab">hugin Stitcher tab</a> - Any photos disabled here are not used in optimisation or stitching. </p> <h3> <span class="mw-headline" id="All"> <img alt="Hugin preview show all.png" src="Hugin_preview_show_all.png" width="22" height="22" /><a class="external" href="http://wiki.panotools.org/File:Hugin_preview_show_all.png">[*]</a> All </span></h3> <p>By default all input images are shown in the preview, however individual images can be enabled and disabled in the diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html Wed Jan 30 18:32:54 2013 +0100 @@ -54,7 +54,7 @@ </li><li> <b>Ctrl-Q</b>, quit hugin. </li><li> <b>Ctrl-Z</b>, undoes the most recent change to the current project. </li><li> <b>Ctrl-R</b>, redoes an undo. -</li><li> <b>Ctrl-T</b>, re-optimises the current project. This has exactly the same effect as clicking <b>Optimize Now!</b> in the <a href="Hugin_Optimizer_tab.html" title="Hugin Optimizer tab">Optimizer tab</a>. +</li><li> <b>Ctrl-T</b>, re-optimises the current project. This has exactly the same effect as clicking <b>Optimize Now!</b> in the Optimizer tab<a class="external" href="http://wiki.panotools.org/Hugin_Optimizer_tab">[*]</a>. </li><li> <b>Ctrl-P</b>, shows the <a href="Hugin_Preview_window.html" title="Hugin Preview window">Preview window</a>. </li><li> <b>Ctrl-A</b>, selects all photos in the <a href="Hugin_Photos_tab.html" title="Hugin Photos tab">Photos tab</a>, selects all points in the <a href="Hugin_Control_Points_table.html" title="Hugin Control Points table">Control Points table</a>. </li><li> <b>Delete</b> and <b>Insert</b> in the <a href="Hugin_Photos_tab.html" title="Hugin Photos tab">Photos tab</a> removes and adds photos to the project. diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html Wed Jan 30 18:32:54 2013 +0100 @@ -54,29 +54,29 @@ </th></tr></table> <h1> <span class="mw-headline" id="Tabs"> Tabs </span></h1> -<p>Although there are many other uses, <a href="Hugin.html" title="Hugin">hugin</a> is primarily a -tool for assembling multiple photos and creating a 'seamless' panorama. -</p><p>Hugin is a program that is 'tab' based. Below you see a partial example screen of Hugin showing the tabs. -<img alt="Hugin2013 tabs.png" src="Hugin2013_tabs.png" width="511" height="66" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_tabs.png">[*]</a> -</p><p>This process of assembling multiple photos and creating a 'seamless' panorama is completely automatic -if you use the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">hugin Assistant tab</a>, which is the default tab, -but <b>hugin</b> also allows full manual control of every stage. For this <b>hugin</b> provides three user interface options: Simple, Advanced and Expert. -The <b>hugin</b> simple mode consists of the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">hugin Assistant tab</a> and a few other tabs (as displayed above) that give you simple but effective control on what you are doing. +<p>Although there are many other uses, <a href="Hugin.html" title="Hugin">Hugin</a> is primarily a +tool for assembling multiple photos and creating a "seamless" panorama. +</p><p>Hugin is a program that is "tab" based. Below you see a partial example screen of Hugin showing the tabs. +</p><p><img alt="Hugin2013 tabs.png" src="Hugin2013_tabs.png" width="511" height="66" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_tabs.png">[*]</a> +</p><p>This process of assembling multiple photos and creating a "seamless" panorama is completely automatic +if you use the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a>, which is the default tab, +but <b>Hugin</b> also allows full manual control of every stage. For this, <b>Hugin</b> provides three user interface options: Simple, Advanced and Expert. +The <b>Hugin</b> simple mode consists of the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a> and a few other tabs (as displayed above) that give you simple but effective control on what you are doing. </p><p>This is a quick overview of this <i>tab</i> system for the <i>Simple</i> interface. It isn't a step by step tutorial. -You can find these tutorials on the <a rel="nofollow" class="external text" href="http://hugin.sourceforge.net/tutorials/">hugin website</a>. -</p><p>For this same overview regarding the "old" user interface (but still the user interface of the current stable release) you can start with Hugin Main window old gui<a class="external" href="http://wiki.panotools.org/Hugin_Main_window_old_gui">[*]</a>. +You can find these tutorials on the <a rel="nofollow" class="external text" href="http://hugin.sourceforge.net/tutorials/">Hugin website</a>. +</p><p>For this same overview regarding the "old" user interface (but still the user interface of the current stable release), you can start with Hugin Main window old gui<a class="external" href="http://wiki.panotools.org/Hugin_Main_window_old_gui">[*]</a>. </p> <h2> <span class="mw-headline" id="Assistant"> Assistant </span></h2> -<p>The <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">hugin Assistant tab</a> is the fully automatic part of <a href="Hugin.html" title="Hugin">hugin</a>, here you can +<p>The <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a> is the fully automatic part of <a href="Hugin.html" title="Hugin">Hugin</a>; here you can load images, align them and <i>stitch</i> them into a panorama without having to use any of the other tabs. -The <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">hugin Assistant tab</a> also consists of a panoramic overview and a preview. This overview and preview are visible on the other tabs as well be it with different functionality and sometimes slightly modified layout. +The <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a> also consists of a panoramic overview and a preview. This overview and preview are visible on the other tabs as well, be it with different functionality and sometimes slightly modified layout. </p><p>Alternatively, you can use this <b>Assistant</b> as the first step in creating a project that can involve the use of some or all of the other tabs. You can also switch to one of the other -user interface modes Advanced and Expert if you want or need to. +user interface modes, Advanced and Expert, if you want or need to. </p> <h2> <span class="mw-headline" id="Preview"> Preview </span></h2> -<p>In the <a href="Hugin_Preview_tab.html" title="Hugin Preview tab">hugin Preview tab</a> you have options to check your images and positions, the white balance, control points (equal points in two overlapping images), etcetera. Changes will immediately be displayed in this preview. This <a href="Hugin_Preview_tab.html" title="Hugin Preview tab">hugin Preview tab</a> is the same preview as displayed in the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a> and all other tabs in the Simple User Interface. +<p>In the <a href="Hugin_Preview_tab.html" title="Hugin Preview tab">Hugin Preview tab</a>, you have options to check your images and positions, the white balance, control points (equal points in two overlapping images), <i>etcetera</i>. Changes will immediately be displayed in this preview. This <a href="Hugin_Preview_tab.html" title="Hugin Preview tab">Hugin Preview tab</a> is the same preview as displayed in the <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab">Hugin Assistant tab</a> and all other tabs in the Simple User Interface. </p><p><br /> </p> <h2> <span class="mw-headline" id="Layout"> Layout </span></h2> @@ -84,52 +84,52 @@ </p> <div class="thumb tleft"><div class="thumbinner" style="width:302px;"><img alt="" src="300px-Hugin2013_layout_tab.png" width="300" height="172" class="thumbimage" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_layout_tab.png">[*]</a> <div class="thumbcaption"><div class="magnify"><img src="magnify-clip.png" width="15" height="11" alt="" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_layout_tab.png">[*]</a></div>Screenshot of Layout tab; click for larger versions</div></div></div> <p><br style="clear:both;" /> -</p><p>Green lines connecting images show the control points have a small error, red lines show a large error. Grey lines show no control points connecting the images. +</p><p>Green lines connecting images show the control points have a small error; red lines show a large error. Grey lines show no control points connecting the images. </p><p>You can see where the project is OK and where there are problems if it isn't quite right. Just click on any connection and Hugin jumps to the Control Points tab to edit that pair of photos. -</p><p>Use the <b>Scale</b> slider to change the size of the photo thumbnails. This only effects the Layout display and won't change the final panorama. +</p><p>Use the <b>Scale</b> slider to change the size of the photo thumbnails. This only affects the Layout display and won't change the final panorama. </p> <h2> <span class="mw-headline" id="Projection"> Projection </span></h2> -<p>The <a href="Hugin_Projection_tab.html" title="Hugin Projection tab">Hugin Projection tab</a> is for adjusting the <a href="Projections.html" title="Projections">projection</a> of the panorama, some projections have adjustable parameters which will appear when selected. +<p>The <a href="Hugin_Projection_tab.html" title="Hugin Projection tab">Hugin Projection tab</a> is for adjusting the <a href="Projections.html" title="Projections">projection</a> of the panorama; some projections have adjustable parameters that will appear when selected. </p> <h2> <span class="mw-headline" id="Move.2FDrag"> Move/Drag </span></h2> <p>The <a href="Hugin_move_drag_tab.html" title="Hugin move drag tab">Hugin Move/Drag tab</a> is used to recentre the panorama interactively (or place it for whatever reason off centre). </p> <h2> <span class="mw-headline" id="Crop"> Crop </span></h2> -<p>The <a href="Hugin_Crop_tab.html" title="Hugin Crop tab">hugin Crop tab</a> displays a rectangle over your preview. By dragging the edges of this rectangle you can adjust the output area of the panorama. +<p>The <a href="Hugin_Crop_tab.html" title="Hugin Crop tab">Hugin Crop tab</a> displays a rectangle over your preview. By dragging the edges of this rectangle, you can adjust the output area of the panorama. </p> <h1> <span class="mw-headline" id="Menus"> Menus </span></h1> <h2> <span class="mw-headline" id="File"> File </span></h2> -<ul><li> <b>New</b>, discard the current project and start a new empty project. -</li><li> <b>Open</b> an existing <a href="Hugin.html" title="Hugin">hugin</a>, PTGUI<a class="external" href="http://wiki.panotools.org/PTGUI">[*]</a>, PTAssembler<a class="external" href="http://wiki.panotools.org/PTAssembler">[*]</a>, <a href="Autopano.html" title="Autopano">autopano</a> or <a href="Autopano-sift.html" title="Autopano-sift">autopano-sift</a> project file. -</li><li> <b>Save</b> the current project as a hugin <i>pto</i> file. +<ul><li> <b>New</b>: Discard the current project and start a new empty project. +</li><li> <b>Open</b> an existing <a href="Hugin.html" title="Hugin">Hugin</a>, PTGUI<a class="external" href="http://wiki.panotools.org/PTGUI">[*]</a>, PTAssembler<a class="external" href="http://wiki.panotools.org/PTAssembler">[*]</a>, <a href="Autopano.html" title="Autopano">autopano</a> or <a href="Autopano-sift.html" title="Autopano-sift">autopano-sift</a> project file. +</li><li> <b>Save</b> the current project as a Hugin <i>pto</i> file. </li><li> <b>Save as</b> a <i>pto</i> file with a different name. -</li><li> <b>Most recently used projects</b>, shows a list of recent Hugin projects. -</li><li> <b>Run Batch Processor</b>, launches the <a href="Hugin_Batch_Processor.html" title="Hugin Batch Processor">Hugin Batch Processor</a> GUI queue manager, note that the queue won't be processed unless this queue manager is running. -</li><li> <b>Preferences</b> opens the <a href="Hugin_Preferences.html" title="Hugin Preferences">hugin Preferences</a> window. -</li><li> <b>Quit</b> hugin. +</li><li> <b>Most recently used projects</b> shows a list of recent Hugin projects. +</li><li> <b>Run Batch Processor</b> launches the <a href="Hugin_Batch_Processor.html" title="Hugin Batch Processor">Hugin Batch Processor</a> GUI queue manager; note that the queue won't be processed unless this queue manager is running. +</li><li> <b>Preferences</b> opens the <a href="Hugin_Preferences.html" title="Hugin Preferences">Hugin Preferences</a> window. +</li><li> <b>Quit</b> Hugin. </li></ul> <h2> <span class="mw-headline" id="Edit"> Edit </span></h2> -<ul><li> <b>Undo</b>, undoes the most recent change to the current project. -</li><li> <b>Redo</b>, redoes an undo. +<ul><li> <b>Undo</b> undoes the most recent change to the current project. +</li><li> <b>Redo</b> redoes an undo. </li></ul> <h2> <span class="mw-headline" id="View"> View </span></h2> <ul><li> <b>Panorama Editor</b> opens the <a href="Hugin_Panorama_Editor_window.html" title="Hugin Panorama Editor window">Editor window</a> where you have control over the various states a workflow is going through from a set of source images to the panorama. </li><li> <b>Full Screen</b> shows this <b>Hugin Main window</b> using as much screen space as possible without any window decorations. Note that the <a href="Hugin_Fast_Preview_window.html" title="Hugin Fast Preview window">Hugin Fast Preview window</a> can also be set as full screen. </li><li> <b>Overview</b> checkbox: Shows or hides the (docked) overview in the screen. -</li><li> <b>Grid</b> checkbox: Shows or hides the grid in the overview and preview canvas. (see <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab"> Hugin Assistant tab</a>). +</li><li> <b>Grid</b> checkbox: Shows or hides the grid in the overview and preview canvas (see <a href="Hugin_Assistant_tab.html" title="Hugin Assistant tab"> Hugin Assistant tab</a>). </li></ul> <h2> <span class="mw-headline" id="Interface"> Interface </span></h2> -<ul><li> <b>Simple</b>, this is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases. -</li><li> <b>Advanced</b>, this user interface that starts hugin in the Panorama Editor screen. The simple interface is available in the background. -</li><li> <b>Expert</b>, this user interface also start hugin in the Panorama Editor screen and unleashes all the power and options of hugin. +<ul><li> <b>Simple</b>: This is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases. +</li><li> <b>Advanced</b>: This user interface starts Hugin in the Panorama Editor screen. The Simple interface is available in the background. +</li><li> <b>Expert</b>: This user interface also starts Hugin in the Panorama Editor screen and unleashes all the power and options of Hugin. </li></ul> <h2> <span class="mw-headline" id="Help"> Help </span></h2> -<ul><li> <b>Help</b> opens the <a href="Hugin.html" title="Hugin">hugin</a> manual. +<ul><li> <b>Help</b> opens the <a href="Hugin.html" title="Hugin">Hugin</a> manual. </li><li> <b>Tip of the day</b> </li><li> <b>Keyboard Shortcuts</b> -</li><li> <b>FAQ</b>, hugin <a href="Hugin_FAQ.html" title="Hugin FAQ">Frequently asked questions</a>. +</li><li> <b>FAQ</b>: Hugin <a href="Hugin_FAQ.html" title="Hugin FAQ">Frequently asked questions</a> </li><li> <b>About</b> shows the Hugin About window<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_About_window&action=edit&redlink=1">[*]</a>. -</li><li> <b>Donate</b> opens the Hugin donation page, there is no obligation to donate. Any donations are used for travel and promotion costs related to Hugin development. +</li><li> <b>Donate</b> opens the Hugin donation page; there is no obligation to donate. Any donations are used for travel and promotion costs related to Hugin development. </li></ul> @@ -138,7 +138,7 @@ </div> <!-- /bodycontent --> <!-- printfooter --> <div class="printfooter"> - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Main_window&oldid=14904<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Main_window&oldid=14904">[*]</a>" </div> + Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Main_window&oldid=14937<a class="external" href="http://wiki.panotools.org/index.php?title=Hugin_Main_window&oldid=14937">[*]</a>" </div> <!-- /printfooter --> <!-- catlinks --> </div></div></body></html> \ No newline at end of file diff -r 498618f28b36 -r 670f6e5d6432 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html --- a/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html Wed Jan 30 18:14:41 2013 +0100 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html Wed Jan 30 18:32:54 2013 +0100 @@ -47,70 +47,76 @@ <!-- bodycontent --> <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"> <h1> <span class="mw-headline" id="Tabs"> Tabs </span></h1> -<p>The <a href="Panorama_Editor_window.html" title="Panorama Editor window" class="mw-redirect">Panorama Editor window</a> is also 'tab' based. Below you see a partial example screen of the <a href="Panorama_Editor_window.html" title="Panorama Editor window" class="mw-redirect">Panorama Editor window</a> showing the tabs with above it the button bar. +<p>The <a href="Panorama_Editor_window.html" title="Panorama Editor window" class="mw-redirect">Panorama Editor window</a> is also "tab" based. Below you see a partial example screen of the <a href="Panorama_Editor_window.html" title="Panorama Editor window" class="mw-redirect">Panorama Editor window</a> showing the tabs with the button bar above them. </p><p><img alt="Hugin2013 panorama editor menu.png" src="Hugin2013_panorama_editor_menu.png" width="447" height="97" /><a class="external" href="http://wiki.panotools.org/File:Hugin2013_panorama_editor_menu.png">[*]</a> <br style="clear:both;" /> </p> <h2> <span class="mw-headline" id="Photos"> Photos </span></h2> <p>The <a href="Hugin_Photos_tab.html" title="Hugin Photos tab">Photos tab</a> is used to: </p> -<ul><li> Manage the images in a hugin project. -</li><li> Edit the positions of the images in the final panorama. -</li><li> Edit the lens settings. -</li><li> Edit photometrics settings. -</li><li> Edit/Create stacks. +<ul><li> Manage the images in a Hugin project +</li><li> Edit the positions of the images in the final panorama +</li><li> Edit the lens settings +</li><li> Edit photometrics settings +</li><li> Edit/Create stacks </li></ul> <h2> <span class="mw-headline" id="Masks"> Masks </span></h2> -<p>Often photos contain parts which should not be used in the final panorama (e.g. moving objects), |