From: <hug...@li...> - 2010-08-28 20:08:08
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/aef3f8fcc1b8 changeset: 4254:aef3f8fcc1b8 user: Masahiro Kitagawa <arc...@gm...> date: Sat Aug 28 14:49:49 2010 +0900 description: updated Japanese translation details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/ef60981f8611 changeset: 4255:ef60981f8611 user: Bruno Postle <br...@po...> date: Sat Aug 28 12:36:30 2010 +0100 description: Remove some \n from Japanese translation that caused fatal error diffstat: src/translations/ja.po | 1069 ++++++++++++++++++++--------------------------- 1 files changed, 449 insertions(+), 620 deletions(-) diffs (truncated from 3050 to 500 lines): diff -r c4ded35d3f73 -r ef60981f8611 src/translations/ja.po --- a/src/translations/ja.po Wed Aug 25 20:49:46 2010 +0200 +++ b/src/translations/ja.po Sat Aug 28 12:36:30 2010 +0100 @@ -1,20 +1,23 @@ # This file is distributed under the same license as the hugin. -# Copyleft: Ippei UKAI <ippei_ukai (at mac.com>, 2005 # +# Copyleft: Ippei UKAI <ippei_ukai (at mac.com>, 2005. +# KITAGAWA, Masahiro <arc...@gm...>, 2010. msgid "" msgstr "" "Project-Id-Version: Hugin 0.8.0\n" -"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?" -"group_id=77506&atid=550441\n" +"Report-Msgid-Bugs-To: http://sourceforge." +"net/tracker/?group_id=77506&atid=550441\n" "POT-Creation-Date: 2010-06-03 18:09+0200\n" -"PO-Revision-Date: 2009-03-30 00:05+0900\n" -"Last-Translator: Ippei UKAI <ippei (at users.sourceforge.net>\n" -"Language-Team: N/A\n" +"PO-Revision-Date: 2010-08-28 14:47+0900\n" +"Last-Translator: KITAGAWA, Masahiro <arc...@gm...>\n" +"Language-Team: æ¥æ¬èª <kde...@kd...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Japanese\n" "X-Poedit-Basepath: ../\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:82 #, c-format @@ -51,10 +54,10 @@ "ãã" #: hugin1/base_wx/huginConfig.cpp:95 hugin1/base_wx/huginConfig.cpp:109 -#, fuzzy, c-format +#, c-format msgid "Program %s not found in preferences, reverting to default value" msgstr "" -"å¤é¨å®è¡ãã¡ã¤ã«ã%sããåæè¨å®ã«æå®ãããå ´æã«è¦ã¤ããã¾ããã§ãããä»å±" +"ããã°ã©ã ã%sããç°å¢è¨å®ã§æå®ãããå ´æã«è¦ã¤ããã¾ããã§ãããããã©ã«ã" "ã®ãã®ã使ç¨ãã¾ãã" #: hugin1/base_wx/huginConfig.cpp:129 hugin1/base_wx/huginConfig.cpp:134 @@ -105,14 +108,14 @@ msgstr "ããã»ã¹ %ld ãå¼·å¶çµäºã§ãã¾ããã§ãããã¨ã©ã¼ %dï¼%s" #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:179 -#, fuzzy, c-format +#, c-format msgid "Error pausing process %ld, code 1" -msgstr "ããã¸ã§ã¯ãã®èªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼" +msgstr "ããã»ã¹ %ld ãåæ¢ãã¨ã©ã¼ã³ã¼ã 1." #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:196 -#, fuzzy, c-format +#, c-format msgid "Error pausing process %ld, code 2" -msgstr "ããã¸ã§ã¯ãã®èªã¿è¾¼ã¿ä¸ã«ã¨ã©ã¼" +msgstr "ããã»ã¹ %ld ãåæ¢ãã¨ã©ã¼ã³ã¼ã 2." #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:602 #: hugin1/ptbatcher/RunStitchFrame.cpp:43 @@ -138,7 +141,6 @@ msgstr "ããã©ããæé©åä¸" #: hugin1/base_wx/platform.h:40 -#, fuzzy 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|" @@ -147,8 +149,10 @@ "hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" msgstr "" "å ¨ã¦ã®ç»åãã¡ã¤ã«|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEGãã¡ã¤ã« (*." -"jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|ãã¹ã¦ (*)|*" +"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" +"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF ãã¡ã¤ã« (*.tif,*." +"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." +"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|ãã¹ã¦ (*)|*" #: hugin1/base_wx/PTWXDlg.cpp:48 hugin1/base_wx/PTWXDlg.cpp:66 #: hugin1/base_wx/PTWXDlg.cpp:118 translations/xrc.cpp:677 xrc.cpp:677 @@ -236,8 +240,7 @@ #: hugin1/hugin/AssistantPanel.cpp:315 msgid "Images or control points have changed, new alignment is needed." -msgstr "" -"ç»åãã³ã³ããã¼ã«ãã¤ã³ãã«å¤æ´ãããã¾ãããé ç½®ãæ´æ°ããå¿ è¦ãããã¾ãã" +msgstr "ç»åãã³ã³ããã¼ã«ãã¤ã³ãã«å¤æ´ãããã¾ãããé ç½®ãæ´æ°ããå¿ è¦ãããã¾ãã" #: hugin1/hugin/AssistantPanel.cpp:326 msgid "Very good fit." @@ -261,7 +264,7 @@ "parallax or movement. The optimizer might have failed. Manual intervention " "required." msgstr "" -"å ¨ç¶ãã¾ãåããããªãã£ãæ§ã§ããã³ã³ããã¼ã«ãã¤ã³ããæ£ããããã¬ã³ãºã®è¨" +"å ¨ç¶ãã¾ãåããããªãã£ãããã§ããã³ã³ããã¼ã«ãã¤ã³ããæ£ããããã¬ã³ãºã®è¨" "å®ãééã£ã¦ããªãããå¤ä½ãè¦å·®ã®å½±é¿ããªããããã§ãã¯ãã¦ã¿ã¦ä¸ãããé ç½®" "ã®æé©åå¦çã«å¤±æããããç¥ãã¾ãããæåã§èª¿æ´ããå¿ è¦ãããã¾ãã" @@ -278,6 +281,8 @@ "geometrical optimization from the the Optimizer tab and the photometric " "optimization from the Exposure tab." msgstr "" +"註ï¼èªåé ç½®ã¯ç°å¢è¨å®ã§ã®ããã©ã«ãå¤ã使ç¨ãã¾ããããä¸ç´ã¿ãã§è¨å®ãã«ã¹ã¿ãã¤ãºãã¦ä½¿ãããå ´åãç»åã¿ãã§ã³ã³ããã¼ã«ãã¤ã³ãæ¤åºããæé©åã¿ãã§å¹¾" +"ä½å¦çæé©åããé²åºã¿ãã§æ¸¬å å¦çæé©åãå®è¡ãã¦ãã ããã" #: hugin1/hugin/AssistantPanel.cpp:376 msgid "" @@ -304,9 +309,8 @@ #: hugin1/hugin/AssistantPanel.cpp:482 hugin1/hugin/CPEditorPanel.cpp:2164 #: hugin1/hugin/ImagesPanel.cpp:1078 -#, fuzzy msgid "searching for cloud-like control points..." -msgstr "åããããªå ´æãæ¢ãã¦ãã¾ãâ¦" +msgstr "ã³ã³ããã¼ã«ãã¤ã³ãã®å¡ãæ¢ãã¦ãã¾ãâ¦" #: hugin1/hugin/AssistantPanel.cpp:510 msgid "Celeste model file not found, Hugin needs to be properly installed." @@ -324,9 +328,8 @@ msgstr "è´å½çã¨ã©ã¼" #: hugin1/hugin/AssistantPanel.cpp:518 -#, fuzzy msgid "Checking for outlying control points" -msgstr "åããããªå ´æãæ¢ãã¦ãã¾ãâ¦" +msgstr "å¤ããã³ã³ããã¼ã«ãã¤ã³ãããã§ãã¯ãã¦ãã¾ãâ¦" #: hugin1/hugin/AssistantPanel.cpp:544 hugin1/hugin/AssistantPanel.cpp:573 #, c-format @@ -375,33 +378,32 @@ "Maybe you have not installed it properly or given a wrong path in the " "settings." msgstr "" +"\"%s\" ãè¦ã¤ãããã¾ããã§ããã\n" +"æ£ããã¤ã³ã¹ãã¼ã«ã§ãã¦ããªããããã¹ã®è¨å®ãééã£ã¦ãã¾ãã" #: hugin1/hugin/AutoCtrlPointCreator.cpp:321 -#, fuzzy, c-format +#, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for control point " "detector" -msgstr "" -"%namefile ã %i ã%s 㧠autopano-sift ã®å ¥åãã¡ã¤ã«ãæå®ãã¦ãã ããã" +msgstr "%namefile ã %i ã%s ã§å ¥åãã¡ã¤ã«ãæå®ãã¦ãã ããã" #: hugin1/hugin/AutoCtrlPointCreator.cpp:322 #: hugin1/hugin/AutoCtrlPointCreator.cpp:467 #: hugin1/hugin/AutoCtrlPointCreator.cpp:473 -#, fuzzy msgid "Error in control point detector command" -msgstr "ã³ã³ããã¼ã«ãã¤ã³ãæ¤åºä¸ã«ã¨ã©ã¼ï¼\n" +msgstr "ã³ã³ããã¼ã«ãã¤ã³ãæ¤åºä¸ã«ã¨ã©ã¼ " #: hugin1/hugin/AutoCtrlPointCreator.cpp:370 #: hugin1/hugin/AutoCtrlPointCreator.cpp:551 #: hugin1/hugin/AutoCtrlPointCreator.cpp:657 -#, fuzzy msgid "" "Command line for control point detector too long.\n" "This is a windows limitation\n" "Please select less images, or place the images in a folder with\n" "a shorter pathname" msgstr "" -"Autopanoã¸ã®ã³ãã³ããé·éãã¾ãã\n" +"ã³ã³ããã¼ã«ãã¤ã³ãæ¤åºããã°ã©ã ã¸ã®ã³ãã³ããé·éãã¾ãã\n" "ããã¯Windowsã«ããå¶ç´ã§ãã\n" "åçã®æ°ãæ¸ããããç»åãã¡ã¤ã«ããã¹ã®çããã©ã«ãã«ç§»åãã¦ã¿ã¦ãã ããã" @@ -419,6 +421,9 @@ "\n" " Could not execute command: %s" msgstr "" +"å¼æ°ï¼ç»åï¼ã®æ°ãå¤ããã¾ãããã©ã¡ã¼ã¿ %%s ã使ãããç°å¢è¨å®ãã¦ã¿ã¦ãã ããã\n" +"\n" +"ã³ãã³ã %s ãå®è¡ã§ãã¾ããã§ãã" #: hugin1/hugin/AutoCtrlPointCreator.cpp:384 #: hugin1/hugin/AutoCtrlPointCreator.cpp:395 @@ -444,26 +449,26 @@ #: hugin1/hugin/AutoCtrlPointCreator.cpp:507 #: hugin1/hugin/AutoCtrlPointCreator.cpp:580 #: hugin1/hugin/AutoCtrlPointCreator.cpp:680 -#, fuzzy, c-format +#, c-format msgid "Could not execute command: %s" -msgstr "以ä¸ã®ã³ãã³ããå®è¡ã§ãã¾ããã§ããï¼" +msgstr "以ä¸ã®ã³ãã³ããå®è¡ã§ãã¾ããã§ããï¼%s" #: hugin1/hugin/AutoCtrlPointCreator.cpp:399 #: hugin1/hugin/AutoCtrlPointCreator.cpp:514 #: hugin1/hugin/AutoCtrlPointCreator.cpp:587 #: hugin1/hugin/AutoCtrlPointCreator.cpp:684 -#, fuzzy, c-format +#, c-format msgid "" "Command: %s\n" "failed with error code: %d" msgstr "" -"\n" -"ã¨ã©ã¼ã³ã¼ãï¼" +"ã³ãã³ãï¼%s\n" +"ã¨ã©ã¼ã³ã¼ãï¼%d" #: hugin1/hugin/AutoCtrlPointCreator.cpp:405 #: hugin1/hugin/AutoCtrlPointCreator.cpp:594 #: hugin1/hugin/AutoCtrlPointCreator.cpp:692 -#, fuzzy, c-format +#, c-format msgid "" "Could not open %s for reading\n" "This is an indicator that the control point detector call failed,\n" @@ -471,36 +476,33 @@ "\n" "Executed command: %s" msgstr "" -" \n" -"ããã¯autopanoã®å®è¡ã«å¤±æãããã\n" -"ã³ãã³ãã©ã¤ã³ã®è¨å®ãééã£ã¦ããããã¨æããã¾ãã\n" +"%s ãéãã¾ããã\n" +"ããã¯ã³ã³ããã¼ã«ãã¤ã³ãæ¤åºããã°ã©ã ã®å®è¡ã«å¤±æãããã\n" +"ã³ãã³ãã©ã¤ã³ã®ãã©ã¡ã¼ã¿ãééã£ã¦ããããã¨æããã¾ãã\n" "\n" -"Autopanoã³ãã³ãï¼" +"å®è¡ãããã³ãã³ãï¼%s" #: hugin1/hugin/AutoCtrlPointCreator.cpp:406 #: hugin1/hugin/AutoCtrlPointCreator.cpp:595 #: hugin1/hugin/AutoCtrlPointCreator.cpp:693 -#, fuzzy msgid "Control point detector failure" -msgstr "ã³ã³ããã¼ã«ãã¤ã³ãã®ç·¨é" +msgstr "ã³ã³ããã¼ã«ãã¤ã³ãæ¤åºã«å¤±æ" #: hugin1/hugin/AutoCtrlPointCreator.cpp:466 -#, fuzzy msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for generate keys step" -msgstr "" -"%namefile ã %i ã%s 㧠autopano-sift ã®å ¥åãã¡ã¤ã«ãæå®ãã¦ãã ããã" +msgstr "%i ã§å ¥åãã¡ã¤ã«ãã%k ã®ãã¼ã¹ãããçæã®ããã®ãã¼ãã¤ã³ããã¡ã¤ã«ãæå®ãã¦ãã ããã" #: hugin1/hugin/AutoCtrlPointCreator.cpp:472 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" -msgstr "" +msgstr "ãããã³ã°ã¹ãããç¨ã®ãã¼ãã¤ã³ããã¡ã¤ã«ã %k ã§ãåºåããã¸ã§ã¯ããã¡ã¤ã«ã %o ã§æå®ãã¦ãã ããã" #: hugin1/hugin/AutoCtrlPointCreator.cpp:500 msgid "generating key file" -msgstr "" +msgstr "ãã¼ãã¡ã¤ã«ã®ä½æä¸" #: hugin1/hugin/AutoCtrlPointCreator.cpp:568 #, c-format @@ -510,6 +512,9 @@ "\n" " Could not execute command: %s" msgstr "" +"å¼æ°ï¼ç»åï¼ã®æ°ãå¤ããã¾ãããã©ã¡ã¼ã¿ %%s ããµãã¼ãããã³ã³ããã¼ã«ãã¤ã³ãæ¤åºããã°ã©ã ã使ãããç°å¢è¨å®ãã¦ã¿ã¦ãã ããã\n" +"\n" +"ã³ãã³ã %s ãå®è¡ã§ãã¾ããã§ãã" #: hugin1/hugin/CommandHistory.cpp:94 msgid "no command in undo history" @@ -520,43 +525,40 @@ msgstr "å±¥æ´ã«ã³ãã³ããããã¾ãã" #: hugin1/hugin/CPDetectorConfig.cpp:107 -#, fuzzy msgid "Default" -msgstr "Deflate" +msgstr "ããã©ã«ã" #: hugin1/hugin/CPDetectorConfig.cpp:278 msgid "Autopano from http://autopano.kolor.com is not available for OSX" msgstr "OSXã§ã¯ Autopano (http://autopano.kolor.com) ã使ãã¾ãã" #: hugin1/hugin/CPDetectorConfig.cpp:279 -#, fuzzy msgid "Using Autopano-Sift instead" -msgstr "代ããã«Autopano-SIFTã使ãã¾ããï¼" +msgstr "代ããã« Autopano-Sift ã使ãã¾ã" #: hugin1/hugin/CPDetectorConfig.cpp:306 msgid "" "At least one input field is empty.\n" "Please check your inputs." msgstr "" +"å°ãªãã¨ãã²ã¨ã¤ç©ºæ¬ãããã¾ãã\n" +"è¨å ¥ã確èªãã¦ãã ããã" #: hugin1/hugin/CPDetectorConfig.cpp:385 msgid "Try to connect all overlapping images." -msgstr "" +msgstr "éãªãåã£ãç»åãã¹ã¦ãç¹ããã¨ãã¦ãã¾ãâ¦" #: hugin1/hugin/CPDetectorConfig.cpp:391 -#, fuzzy msgid "Only work on image pairs without control points." -msgstr "ã³ã³ããã¼ã«ãã¤ã³ããç¡ãã¨ç»åã®ä½ç½®ãæ¨å®ã§ãã¾ãã" +msgstr "ã³ã³ããã¼ã«ãã¤ã³ããç¡ãç»åãã¢ã«ã®ã¿æå¹ã§ã" #: hugin1/hugin/CPDetectorConfig.cpp:413 -#, fuzzy msgid "Select control point detector program" -msgstr "ã³ã³ããã¼ã«ãã¤ã³ãã®ç·¨é" +msgstr "ã³ã³ããã¼ã«ãã¤ã³ãæ¤åºããã°ã©ã ã®é¸æ" #: hugin1/hugin/CPDetectorConfig.cpp:421 -#, fuzzy msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -msgstr "å®è¡ãã¡ã¤ã« (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd" +msgstr "å®è¡ãã¡ã¤ã« (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd;*.bat" #: hugin1/hugin/CPEditorPanel.cpp:223 hugin1/hugin/CPListFrame.cpp:283 #: hugin1/hugin/ImagesList.cpp:71 hugin1/hugin/MaskEditorPanel.cpp:100 @@ -611,8 +613,7 @@ msgid "" "Point finetuned, angle: %.0f deg, correlation coefficient: %0.3f, curvature: " "%0.3f %0.3f " -msgstr "" -"ãã¤ã³ãã微調æ´ãã¾ãããè§åº¦ï¼%.0f° / ç¸é¢ä¿æ°ï¼%0.3f / æ²çï¼%0.3f, %0.3f" +msgstr "ãã¤ã³ãã微調æ´ãã¾ãããè§åº¦ï¼%.0f° / ç¸é¢ä¿æ°ï¼%0.3f / æ²çï¼%0.3f, %0.3f" #: hugin1/hugin/CPEditorPanel.cpp:799 hugin1/hugin/CPEditorPanel.cpp:929 msgid "change points, or press right mouse button to add the pair" @@ -630,7 +631,7 @@ "preferences." msgstr "" "åããããªå ´æãè¦ã¤ããã¾ããã§ãããç¸ä¼¼æ§ããã§ãã¯ãã¦ä¸ããã\n" -"ç¸é¢ä¿æ°ã %.3f ã§ãåæè¨å®ã§æå®ããããããå¤ããä½ãã§ãã" +"ç¸é¢ä¿æ°ã %.3f ã§ãç°å¢è¨å®ã§æå®ããããããå¤ããä½ãã§ãã" #: hugin1/hugin/CPEditorPanel.cpp:1070 msgid "No similar point found" @@ -703,25 +704,23 @@ msgid "" "Cannot run celeste without at least one control point connecting the two " "images" -msgstr "" -"ç»åãã¤ãªãã§ããã³ã³ããã¼ã«ãã¤ã³ãããªãã¨Celesteãå®è¡åºæ¥ã¾ããã" +msgstr "ç»åãã¤ãªãã§ããã³ã³ããã¼ã«ãã¤ã³ãããªãã¨Celesteãå®è¡åºæ¥ã¾ããã" #: hugin1/hugin/CPEditorPanel.cpp:2202 hugin1/hugin/ImagesPanel.cpp:1013 msgid "Celeste model expected in " msgstr "" #: hugin1/hugin/CPEditorPanel.cpp:2202 hugin1/hugin/ImagesPanel.cpp:1013 -#, fuzzy msgid " not found, Hugin needs to be properly installed." msgstr "" -"Celesteã®ã¢ãã«ãã¡ã¤ã«ãè¦ã¤ããã¾ãããHuginãæ£ããã¤ã³ã¹ãã¼ã«ããã¦ããª" -"ãå¯è½æ§ãããã¾ãã" +"è¦ã¤ããã¾ãããHuginãæ£ããã¤ã³ã¹ãã¼ã«ããã¦ããª" +"ãå¯è½æ§ãããã¾ãããããã¾ãã" #: hugin1/hugin/CPEditorPanel.cpp:2248 hugin1/hugin/ImagesPanel.cpp:379 #: hugin1/hugin/ImagesPanel.cpp:1114 hugin1/hugin/MainFrame.cpp:1555 -#, fuzzy, c-format +#, c-format msgid "Removed %d control points" -msgstr "æ¤åº" +msgstr "%d åã®ã³ã³ããã¼ã«ãã¤ã³ããåé¤ãã¾ãã" #: hugin1/hugin/CPEditorPanel.cpp:2248 hugin1/hugin/ImagesPanel.cpp:1114 msgid "Celeste result" @@ -781,9 +780,8 @@ msgstr "æå¹ãªå¤ãå ¥åãã¦ãã ãã" #: hugin1/hugin/GLPreviewFrame.cpp:203 -#, fuzzy msgid "Fast Panorama preview" -msgstr "ãã¬ãã¥ã¼ã»ã¦ã£ã¸ããæå¹" +msgstr "ãã¡ã¹ãããã©ããã¬ãã¥ã¼" #: hugin1/hugin/GLPreviewFrame.cpp:228 translations/xrc.cpp:686 #: translations/xrc.cpp:693 xrc.cpp:686 xrc.cpp:693 @@ -801,9 +799,8 @@ #: hugin1/hugin/GLPreviewFrame.cpp:232 hugin1/hugin/GLPreviewFrame.cpp:1381 #: hugin1/hugin/PanoPanel.cpp:929 translations/xrc.cpp:491 xrc.cpp:491 -#, fuzzy msgid "Autocrop" -msgstr "èªåæ´æ°" +msgstr "èªåã§åãæã" #: hugin1/hugin/GLPreviewFrame.cpp:237 hugin1/hugin/PreviewFrame.cpp:128 msgid "displayed images" @@ -837,16 +834,15 @@ #: hugin1/hugin/GLPreviewFrame.cpp:363 msgid "mosaic" -msgstr "" +msgstr "ã¢ã¶ã¤ã¯" #: hugin1/hugin/GLPreviewFrame.cpp:401 hugin1/hugin/PreviewFrame.cpp:297 msgid "Resets the projections parameters to their default values." -msgstr "" +msgstr "æå½±æ³ã®ãã©ã¡ã¼ã¿ãããã©ã«ãå¤ã«ãªã»ãã" #: hugin1/hugin/GLPreviewFrame.cpp:410 hugin1/hugin/PreviewFrame.cpp:306 -#, fuzzy msgid "param:" -msgstr "param:" +msgstr "ãã©ã¡ã¼ã¿ï¼" #: hugin1/hugin/GLPreviewFrame.cpp:415 hugin1/hugin/PreviewFrame.cpp:275 msgid "0" @@ -893,9 +889,8 @@ msgstr "å·®åï¼éãï¼" #: hugin1/hugin/GLPreviewFrame.cpp:1381 hugin1/hugin/PanoPanel.cpp:929 -#, fuzzy msgid "Calculating optimal crop" -msgstr "æé©ãªãµã¤ãºãè¨ç®" +msgstr "æé©ãªåãæããµã¤ãºãè¨ç®" #: hugin1/hugin/GLPreviewFrame.cpp:1504 hugin1/hugin/PanoPanel.cpp:685 msgid "Top needs to be an integer bigger than 0" @@ -915,11 +910,11 @@ #: hugin1/hugin/GLPreviewFrame.cpp:1521 hugin1/hugin/PanoPanel.cpp:702 msgid "left boundary must be smaller than right" -msgstr "" +msgstr "å·¦ã®å¢çã¯å³ã®å¢çããå°ããå¿ è¦ãããã¾ãã" #: hugin1/hugin/GLPreviewFrame.cpp:1527 hugin1/hugin/PanoPanel.cpp:708 msgid "top boundary must be smaller than bottom" -msgstr "" +msgstr "ä¸ã®å¢çã¯ä¸ã®å¢çããå°ããå¿ è¦ãããã¾ãã" #: hugin1/hugin/GLPreviewFrame.cpp:1558 hugin1/hugin/PanoPanel.cpp:581 #, c-format @@ -936,6 +931,8 @@ "Error initialising GLEW\n" "Fast preview window can not be opened." msgstr "" +"GLEW ã®åæåã¨ã©ã¼\n" +"ãã¡ã¹ããã¬ãã¥ã¼ã¦ã£ã³ãã¦ãéãã¾ããã" #: hugin1/hugin/GLViewer.cpp:138 msgid "" @@ -943,29 +940,31 @@ "version 1.1 with the GL_ARB_multitexture extension.\n" "The fast preview cannot be opened." msgstr "" +"æ®å¿µãªããããã¡ã¹ããã¬ãã¥ã¼ã¦ã£ã³ãã¦ã使ãã«ã¯ GL_ARB_multitexture ã¨ã¯ã¹ãã³ã·ã§ã³ä»ãã® OpenGL " +"version 1.1 ã«å¯¾å¿ããã·ã¹ãã ãå¿ è¦ã§ãã\n" +"ãã¡ã¹ããã¬ãã¥ã¼ã¦ã£ã³ãã¦ãéãã¾ããã" #: hugin1/hugin/HDRMergeOptionDialog.cpp:147 msgid "Invalid input\n" -msgstr "" +msgstr "ç¡å¹ãªå ¥å\n" #: hugin1/hugin/HDRMergeOptionDialog.cpp:167 #: hugin1/hugin/HDRMergeOptionDialog.cpp:184 #, c-format msgid "Input \"%s\" for %s is not a valid number\n" -msgstr "" +msgstr "å ¥åããã \"%s\" 㯠%s ã«å¯¾ãã¦ç¡å¹ãªæ°å¤ã§ã\n" #: hugin1/hugin/HDRMergeOptionDialog.cpp:168 -#, fuzzy msgid "Iteration" -msgstr "Italianoï¼ã¤ã¿ãªã¢èªï¼" +msgstr "ç¹°ãè¿ãã¤ã¿ãªã¢èªï¼" #: hugin1/hugin/HDRMergeOptionDialog.cpp:185 msgid "Sigma" -msgstr "" +msgstr "ã·ã°ã" #: hugin1/hugin/HDRMergeOptionDialog.cpp:201 msgid "Wrong input" -msgstr "" +msgstr "ééã£ãå ¥å" #: hugin1/hugin/HFOVDialog.cpp:55 hugin1/hugin/ImagesList.cpp:520 msgid "Normal (rectilinear)" @@ -986,7 +985,7 @@ #: hugin1/hugin/HFOVDialog.cpp:60 hugin1/hugin/ImagesList.cpp:525 #: hugin1/hugin/PanoPanel.cpp:157 msgid "Orthographic" -msgstr "" +msgstr "æ£å°æ¹ä½ï¼Orthographicï¼" #: hugin1/hugin/HFOVDialog.cpp:61 hugin1/hugin/ImagesList.cpp:526 #: hugin1/hugin/PanoPanel.cpp:147 @@ -1087,7 +1086,7 @@ |
From: <hug...@li...> - 2010-08-31 14:40:35
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/2ec90ae30bc3 changeset: 4275:2ec90ae30bc3 user: dmakreshanski <dma...@us...> date: Tue Aug 31 14:39:50 2010 +0200 description: hide the floating window when the preview frame is hidden details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/4b97faffa73b changeset: 4276:4b97faffa73b user: dmakreshanski <dma...@us...> date: Tue Aug 31 16:40:20 2010 +0200 description: allow show/hide the overview diffstat: src/hugin1/hugin/GLPreviewFrame.cpp | 73 ++++++++++++++++++++++++++++++++- src/hugin1/hugin/GLPreviewFrame.h | 8 +++- src/hugin1/hugin/GLViewer.cpp | 4 + src/hugin1/hugin/xrc/preview_frame.xrc | 13 ++++++ 4 files changed, 93 insertions(+), 5 deletions(-) diffs (208 lines): diff -r 6d86c531b823 -r 4b97faffa73b src/hugin1/hugin/GLPreviewFrame.cpp --- a/src/hugin1/hugin/GLPreviewFrame.cpp Sun Aug 29 12:45:04 2010 +0200 +++ b/src/hugin1/hugin/GLPreviewFrame.cpp Tue Aug 31 16:40:20 2010 +0200 @@ -114,6 +114,7 @@ BEGIN_EVENT_TABLE(GLPreviewFrame, wxFrame) EVT_CLOSE(GLPreviewFrame::OnClose) + EVT_SHOW(GLPreviewFrame::OnShowEvent) EVT_BUTTON(XRCID("preview_center_tool"), GLPreviewFrame::OnCenterHorizontally) EVT_BUTTON(XRCID("preview_fit_pano_tool"), GLPreviewFrame::OnFitPano) EVT_BUTTON(XRCID("preview_fit_pano_tool2"), GLPreviewFrame::OnFitPano) @@ -135,6 +136,7 @@ EVT_CHOICE(XRCID("drag_mode_choice"), GLPreviewFrame::OnDragChoice) EVT_CHOICE(XRCID("projection_choice"), GLPreviewFrame::OnProjectionChoice) EVT_CHOICE(XRCID("overview_mode_choice"), GLPreviewFrame::OnOverviewModeChoice) + EVT_TOGGLEBUTTON(XRCID("overview_toggle"), GLPreviewFrame::OnOverviewToggle) #ifndef __WXMAC__ // wxMac does not process these EVT_SCROLL_CHANGED(GLPreviewFrame::OnChangeFOV) @@ -301,13 +303,29 @@ AddLabelToBitmapButton(XRCCTRL(*this,"preview_fit_pano_tool2",wxBitmapButton),_("Fit")); AddLabelToBitmapButton(XRCCTRL(*this,"preview_autocrop_tool",wxBitmapButton),_("Autocrop")); + m_topsizer = new wxBoxSizer( wxVERTICAL ); + wxPanel * toggle_panel = new wxPanel(this); + wxBoxSizer * toggle_panel_sizer = new wxBoxSizer(wxHORIZONTAL); + toggle_panel->SetSizer(toggle_panel_sizer); + + wxPanel *overview_toggle_panel = wxXmlResource::Get()->LoadPanel(toggle_panel,wxT("overview_toggle_panel")); + toggle_panel_sizer->Add(overview_toggle_panel, 0, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, 0); + + bool overview_hidden = wxConfig::Get()->Read(wxT("/GLPreviewFrame/overview_hidden"), 0l); + m_OverviewToggle = XRCCTRL(*this, "overview_toggle", wxToggleButton); + if (overview_hidden) { + m_OverviewToggle->SetValue(false); + } else { + m_OverviewToggle->SetValue(true); + } + m_ToggleButtonSizer = new wxStaticBoxSizer( - new wxStaticBox(this, -1, _("displayed images")), + new wxStaticBox(toggle_panel, -1, _("displayed images")), wxHORIZONTAL ); - m_ButtonPanel = new wxScrolledWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_ButtonPanel = new wxScrolledWindow(toggle_panel, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); // Set min height big enough to display scrollbars as well m_ButtonPanel->SetSizeHints(20, 42); //Horizontal scroll bars only @@ -316,7 +334,7 @@ m_ButtonPanel->SetAutoLayout(true); m_ButtonPanel->SetSizer(m_ButtonSizer); - wxPanel *panel = new wxPanel(this); + wxPanel *panel = new wxPanel(toggle_panel); wxBitmap bitmap; bitmap.LoadFile(huginApp::Get()->GetXRCPath()+wxT("data/preview_show_all.png"),wxBITMAP_TYPE_PNG); wxBitmapButton * select_all = new wxBitmapButton(panel,ID_SHOW_ALL,bitmap); @@ -331,8 +349,11 @@ m_ToggleButtonSizer->Add(m_ButtonPanel, 1, wxEXPAND | wxADJUST_MINSIZE | wxALIGN_CENTER_VERTICAL, 0); AddLabelToBitmapButton(select_all,_("All"),false); AddLabelToBitmapButton(select_none,_("None"), false); + + toggle_panel_sizer->Add(m_ToggleButtonSizer, wxEXPAND); + m_topsizer->Add(tool_panel, 0, wxEXPAND | wxALL, 2); - m_topsizer->Add(m_ToggleButtonSizer, 0, wxEXPAND | wxADJUST_MINSIZE | wxBOTTOM, 5); + m_topsizer->Add(toggle_panel, 0, wxEXPAND | wxADJUST_MINSIZE | wxBOTTOM, 5); //create panel that will hold gl canvases @@ -346,6 +367,7 @@ m_GLPreview = new GLPreview(preview_panel, pano, args, this); m_GLOverview = new GLOverview(overview_panel, pano, args, this, m_GLPreview->GetContext()); m_GLOverview->SetMode(GLOverview::PANOSPHERE); + m_GLOverview->SetActive(!overview_hidden); // set the AUI manager to our panel m_mgr = new GLwxAuiManager(this, m_GLPreview, m_GLOverview); @@ -455,6 +477,7 @@ ).Dockable(true ).PinButton( ).Left( + ).Show(!overview_hidden ) ); @@ -624,6 +647,7 @@ config->Write(wxT("/GLPreviewFrame/blendMode"), m_BlendModeChoice->GetSelection()); config->Write(wxT("/GLPreviewFrame/OpenGLLayout"), m_mgr->SavePerspective()); + config->Write(wxT("/GLPreviewFrame/overview_hidden"), !(m_OverviewToggle->GetValue())); // delete all of the tools. When the preview is never used we never get an // OpenGL context and therefore don't create the tools. @@ -974,6 +998,47 @@ } +void GLPreviewFrame::OnShowEvent(wxShowEvent& e) +{ + + DEBUG_TRACE("OnShow"); + bool toggle_on = m_OverviewToggle->GetValue(); + wxAuiPaneInfo &inf = m_mgr->GetPane(_("overview")); + if (inf.IsOk()) { + if (e.IsShown()) { + if (!inf.IsShown() && toggle_on ) { + inf.Show(); + m_mgr->Update(); + } + } else { + if (inf.IsFloating() && inf.IsShown()) { + DEBUG_DEBUG("hiding overview float"); + inf.Hide(); + m_mgr->Update(); + } + } + } + +} + +void GLPreviewFrame::OnOverviewToggle(wxCommandEvent& e) +{ + DEBUG_TRACE("overview toggle"); + bool toggle_on = m_OverviewToggle->GetValue(); + wxAuiPaneInfo &inf = m_mgr->GetPane(_("overview")); + if (inf.IsOk()) { + if (inf.IsShown() && !toggle_on) { + inf.Hide(); + m_GLOverview->SetActive(false); + m_mgr->Update(); + } else if (!(inf.IsShown() && toggle_on)) { + inf.Show(); + m_GLOverview->SetActive(true); + m_mgr->Update(); + } + } +} + void GLPreviewFrame::OnClose(wxCloseEvent& event) { DEBUG_TRACE("OnClose") diff -r 6d86c531b823 -r 4b97faffa73b src/hugin1/hugin/GLPreviewFrame.h --- a/src/hugin1/hugin/GLPreviewFrame.h Sun Aug 29 12:45:04 2010 +0200 +++ b/src/hugin1/hugin/GLPreviewFrame.h Tue Aug 31 16:40:20 2010 +0200 @@ -198,6 +198,9 @@ bool GLresize; void OnClose(wxCloseEvent& e); + void OnShowEvent(wxShowEvent& e); + + void OnOverviewToggle(wxCommandEvent& e); void OnCenterHorizontally(wxCommandEvent & e); void OnFitPano(wxCommandEvent& e); @@ -300,8 +303,11 @@ #endif std::vector<wxPanel *> m_ToggleButtonPanel; std::vector<ImageToogleButtonEventHandler *> toogle_button_event_handlers; + + wxToggleButton * m_OverviewToggle; + DECLARE_EVENT_TABLE() - + // tools PreviewToolHelper *preview_helper; diff -r 6d86c531b823 -r 4b97faffa73b src/hugin1/hugin/GLViewer.cpp --- a/src/hugin1/hugin/GLViewer.cpp Sun Aug 29 12:45:04 2010 +0200 +++ b/src/hugin1/hugin/GLViewer.cpp Tue Aug 31 16:40:20 2010 +0200 @@ -305,6 +305,10 @@ void GLViewer::Resized(wxSizeEvent& e) { + if (!IsActive()) { + return; + } + DEBUG_DEBUG("RESIZED_OUT"); GLPreview * test; diff -r 6d86c531b823 -r 4b97faffa73b src/hugin1/hugin/xrc/preview_frame.xrc --- a/src/hugin1/hugin/xrc/preview_frame.xrc Sun Aug 29 12:45:04 2010 +0200 +++ b/src/hugin1/hugin/xrc/preview_frame.xrc Tue Aug 31 16:40:20 2010 +0200 @@ -659,6 +659,19 @@ </object> </object> </object> + <object class="wxPanel" name="overview_toggle_panel"> + <object class="wxStaticBoxSizer" name="overview_toggle_sizer"> + <label>toggle overview</label> + <orient>wxHORIZONTAL</orient> + <object class="sizeritem"> + <object class="wxToggleButton" name="overview_toggle"> + <label>Show/Hide</label> + </object> + <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + </object> + </object> + </object> <object class="wxPanel" name="overview_command_panel"> <object class="wxBoxSizer"> <orient>wxHORIZONTAL</orient> |
From: <hug...@li...> - 2010-09-01 16:28:21
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/dd98fffc16fc changeset: 4278:dd98fffc16fc user: Masahiro Kitagawa <arc...@gm...> date: Thu Sep 02 01:12:49 2010 +0900 description: updated Japanese translation details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/2c23239b6c40 changeset: 4279:2c23239b6c40 user: Masahiro Kitagawa <arc...@gm...> date: Thu Sep 02 01:25:52 2010 +0900 description: updated Japanese translation diffstat: ChangeLog | 268 ++++++++++ doc/releases/hugin-2010.2.0_beta2.txt | 219 ++++++++ src/hugin1/hugin/GreatCircles.cpp | 4 +- src/hugin1/hugin/xrc/data/help_en_EN/197px-Field-of-view.svg.png | 0 src/hugin1/hugin/xrc/data/help_en_EN/360px-Pantheon-150x100-rect-panini.jpg | 0 src/hugin1/hugin/xrc/data/help_en_EN/Fulla.html | 15 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html | 17 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html | 3 + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html | 2 +- src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html | 4 +- src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html | 6 +- src/hugin1/hugin/xrc/data/help_en_EN/Panorama_tools.html | 15 +- src/hugin1/hugin/xrc/data/help_en_EN/Panotools.html | 15 +- src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html | 4 +- src/translations/ja.po | 179 +++--- 15 files changed, 634 insertions(+), 117 deletions(-) diffs (truncated from 1456 to 500 lines): diff -r e36f788bf17f -r 2c23239b6c40 ChangeLog --- a/ChangeLog Sat Aug 28 14:49:49 2010 +0900 +++ b/ChangeLog Thu Sep 02 01:25:52 2010 +0900 @@ -1,3 +1,271 @@ +2010-08-28 Bruno Postle <br...@po...> + + * src/translations/ja.po: + Remove some \n from Japanese translation that caused fatal error + [33c9f4471693] + +2010-08-28 Masahiro Kitagawa <arc...@gm...> + + * src/translations/ja.po: + updated Japanese translation + [e36f788bf17f] + +2010-08-25 tmodes <tmodes> + + * src/hugin1/hugin/ImagesPanel.cpp: + Ignore empty input fields in Images tab + [db6a0a66364a] + +2010-08-23 Bruno Postle <br...@po...> + + * src/translations/it.po: + Updated Italian translation (Cristian Marchi) + [3bed0a85cc33] + +2010-08-07 tmodes <tmodes> + + * src/hugin_base/algorithms/basic/CalculateOverlap.cpp, + src/hugin_base/algorithms/basic/CalculateOverlap.h, + src/hugin_base/panodata/Panorama.cpp, + src/hugin_base/panodata/SrcPanoImage.cpp, + src/hugin_base/panodata/SrcPanoImage.h: + Faster mask calculation for bigger projects + [7865fdc91695] + + * src/hugin1/hugin/MainFrame.cpp, + src/hugin_base/algorithms/control_points/CleanCP.cpp: + Fixes bug in last commit (652ab1e4d937) + [8e0fa9d64380] + +2010-08-05 tmodes <tmodes> + + * src/hugin1/hugin/MainFrame.cpp, + src/hugin_base/algorithms/control_points/CleanCP.cpp, + src/hugin_base/algorithms/control_points/CleanCP.h: + Refactored code for removing control points in masks + [652ab1e4d937] + + * src/hugin_base/panodata/ControlPoint.cpp, + src/hugin_base/panodata/ControlPoint.h, + src/hugin_base/panodata/Panorama.cpp, + src/hugin_base/panodata/Panorama.h, + src/hugin_base/panodata/PanoramaData.h: + Added code to remove duplicate control points after merging + [c6244856168f] + +2010-08-04 tmodes <tmodes> + + * src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp, + src/hugin_base/algorithms/basic/CalculateOptimalROI.h: + Several improvements for autocrop + * Better memory management + * Make autocrop aware of crops and masks + * Works now also with bigger dimensions + [090323ed8e65] + +2010-08-01 tmodes <tmodes> + + * src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp, + src/hugin_base/algorithms/basic/CalculateOptimalROI.h: + Do autocrop to active images only and not all images Clean up code + (removed unused lines) + [729147f7db0c] + + * src/hugin_base/algorithms/basic/CalculateOverlap.cpp, + src/hugin_base/algorithms/point_sampler/PointSampler.h, + src/hugin_base/nona/RemappedPanoImage.h, + src/hugin_base/panotools/PanoToolsInterface.cpp: + Check, if transformImgCoord was successfull This should fix the bug, + that the fov was calculated wrong for projects with non-zero + translations parameters. Now also the photometric optimisation + should work for these projects. + [ebece9c9319d] + +2010-07-29 harryvanderwolf <hv...@gm...> + + * CMakeLists.txt: + [OSX] typo corrected + [c5c9bb0923a3] + + * CMakeLists.txt: + [OSX] neccessary adjustment for cmake compilation + [27b53a38eb7e] + +2010-07-28 tmodes <tmodes> + + * src/hugin1/hugin/MainFrame.cpp: + Fixes possible bug in 5e631cee4cc5 (It's not sure, that the + constants ID_SHOW_PANEL_IMAGES ... ID_SHOW_PANEL_PANORAMA are + consecutive. They can have random values.) + [31fdaa8ffc2c] + +2010-07-27 Vaclav Cerny <va...@se...> + + * src/hugin1/hugin/MainFrame.cpp, src/hugin1/hugin/MainFrame.h, + src/hugin1/hugin/xrc/main_menu.xrc: + Add menuitems Show panel ... with shortcut + [5e631cee4cc5] + +2010-07-24 Andreas <Andreas Metzler> + + * CMakeLists.txt, CMakeModules/FindPANO13.cmake: + Added version checking for libpano13 (transplanted from + 6e072258d9510951f49c37962332c682cc78d9ac) + [2fc209cbb6ee] + +2010-07-23 tmodes <tmodes> + + * src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.c + pp: + Reduce resolution for overlap detection in makefile generation (This + should speed up of writing of makefile) + [8cbe07845ccf] + +2010-07-22 Bruno Postle <br...@po...> + + * src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html, + src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift-C.html, + src/hugin1/hugin/xrc/data/help_en_EN/Chromatic_aberration.html, + src/hugin1/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html, + src/hugin1/hugin/xrc/data/help_en_EN/Enfuse.html, + src/hugin1/hugin/xrc/data/help_en_EN/Field_of_View.html, + src/hugin1/hugin/xrc/data/help_en_EN/HDR_workflow_with_hugin.html, + src/hugin1/hugin/xrc/data/help_en_EN/Horizontal_control_points.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Camera_and_Lens_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html, src/h + ugin1/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_D + etectors_dialog.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html, src/hugin1/hu + gin/xrc/data/help_en_EN/Panorama_scripting_in_a_nutshell.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pitch.html, + src/hugin1/hugin/xrc/data/help_en_EN/Projections.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html, + src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html, src/hugin1/hug + in/xrc/data/help_en_EN/Straight_line_control_points.html, + src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html, src/hugin1/hugi + n/xrc/data/help_en_EN/The_General_Panini_Projection.html, + src/hugin1/hugin/xrc/data/help_en_EN/Vertical_control_points.html, + src/hugin1/hugin/xrc/data/help_en_EN/Wavy_distortion.html, + src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html: + Update manual from wiki + [f408e18d7ed7] + + * src/hugin1/hugin/xrc/data/help_en_EN/pages.txt: + New pages from wiki + [014cdfa994d2] + +2010-07-18 Bruno Postle <br...@po...> + + * doc/pano_trafo.1: + Regenerate pano_trafo man page (Andreas Metzler) + [87026235e9ca] + +2010-07-15 James Legg <jl...@us...> + + * src/hugin1/hugin/ViewState.cpp: + Fix bug where fast preview interactions could disconnect image's + lenses introduced in 66f626bf15aa. + [275fb96ee614] + +2010-07-15 tmodes <tmodes> + + * CMakeModules/win_bundle.cmake: + Added missing files to install target for windows + [690b85e84096] + +2010-07-13 tmodes <tmodes> + + * src/hugin_base/panodata/Panorama.cpp: + Fixes an issue with positive masks and fisheye images + [a7e8dc9da841] + +2010-07-07 Bruno Postle <br...@po...> + + * doc/releases/hugin-0.8.0.txt, doc/releases/hugin-0.8.0_rc1.txt, + doc/releases/hugin-0.8.0_rc2.txt, doc/releases/hugin-0.8.0_rc3.txt, + doc/releases/hugin-0.8.0_rc4.txt, doc/releases/hugin-0.8.0_rc5.txt, + doc/releases/hugin-2009.4.0.txt, doc/releases/hugin- + 2009.4.0_rc3.txt, doc/releases/hugin-2010.0.0.txt, doc/releases/ + hugin-2010.0.0_rc1.txt: + Add some historic release notes + [8cf00462e9cf] + + * admin/update_tarball.sh: + Remove ancient unused script + [c9df36df86dd] + + * doc/batch-processing/README.batch: + Outdated info is now on the wiki + [f641d81bb04e] + +2010-06-29 James Legg <jl...@us...> + + * merge + [9fb6e9f16ef8] + + * src/hugin1/hugin/ViewState.cpp, src/hugin1/hugin/wxPanoCommand.cpp, + src/hugin_base/algorithms/basic/CalculateOverlap.cpp, src/hugin_base + /algorithms/panorama_makefile/PanoramaMakefileExport.cpp: + Don't call Panorama::getSrcImage when a const reference would do, + use Panorama::getImage instead. Most performance improvements are + from CalculateImageOverlap::calculate. In my test saving a project + was three times faster. + [66f626bf15aa] + +2010-06-29 Kornel Benko <Kor...@be...> + + * CMakeLists.txt: + Enable creation of ChangeLog from build-dir + [b60ba225e103] + +2010-06-28 Bruno Postle <br...@po...> + + * merge (I'm not sure why) + [a69d9c1929c5] + +2010-06-28 harryvanderwolf <hv...@gm...> + + * mac/copyExtraTools.sh: + [OSX] correct stupid enblend enfuse copy error + [640f8f2af986] + +2010-06-28 Bruno Postle <br...@po...> + + * CMakeLists.txt: + Set minor version to 3 for unstable trunk + [f2ec72d1d228] + +2010-06-28 harryvanderwolf <hv...@gm...> + + * mac/Hugin.xcodeproj/project.pbxproj: + [OSX] Change version stamp to only hexadecimal part + [9fa03ec044ad] + +2010-06-28 Bruno Postle <br...@po...> + + * src/translations/zh_TW.po: + Updated Traditional Chinese translation (Rick Langford) + [d017edd0161f] + + * src/translations/hu.po: + Updated Hungarian translation #3021348 (Höss Lajos) + [8ce1c813f7a1] + +2010-06-28 Terry Duell <td...@us...> + + * ChangeLog, authors.txt: + Update authors.txt + [38ed0587798b] + 2010-06-27 Terry Duell <td...@us...> * CMakeLists.txt: diff -r e36f788bf17f -r 2c23239b6c40 doc/releases/hugin-2010.2.0_beta2.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/releases/hugin-2010.2.0_beta2.txt Thu Sep 02 01:25:52 2010 +0900 @@ -0,0 +1,219 @@ +Hugin is a Panorama stitcher and more. A powerful software package +for creating and processing panoramic images. + +A hugin-2010.2.0_beta2 (beta 2) tarball is available here: +https://sourceforge.net/projects/hugin/files/hugin-2010.2_beta/ + +This is a beta release for testing, i.e. The final release is likely to have +further bugfixes, help/manual and translation updates. + +More information about this release can be found in the full ChangeLog below +and the unfinished release notes: +http://hugin.sourceforge.net/releases/2010.2.0/ + +Summary of changes since 2010.2.0_beta1: + +* Updated Japanese, Italian translations. + +* Manual/help updates. + +* Fix for 'mosaic mode' angle-of-view calculation and photometric optimisation. + +* Fix for slow .pto.mk file generation with large projects. + +* Several improvements for autocrop: Better memory management, make autocrop +aware of crops and masks, works now also with bigger dimensions, do autocrop +to active images only. + +* Faster mask calculation for bigger projects + +* Ignore empty input fields in Images tab + +* Fix crash when trying to draw control points on the fast preview that are +not in the projectable region. + +libpano13-2.7.17 is required, note that this is still in beta itself. + +See README, ChangeLog and INSTALL_cmake for more information. + +SHA1SUM: +42bc884fb2ad5726fff4cc489c4076f9db2d68b0 hugin-2010.2.0_beta2.tar.gz + +This release is equivalent to hg branch 2010.2 -r 4273:3bd31edd2dca + +A detailed ChangeLog of every commit since 2010.2.0_beta1 follows: + +2010-08-30 James Legg <jl...@us...> + + * merge + [a264d29891ac] + + * src/hugin1/hugin/GreatCircles.cpp: + Fix crash when trying to draw control points on the fast preview + that are not in the projectable region. + [cc8d0c234ceb] + +2010-08-29 Bruno Postle <br...@po...> + + * src/hugin1/hugin/xrc/data/help_en_EN/Fulla.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html, + src/hugin1/hugin/xrc/data/help_en_EN/Panorama_tools.html, + src/hugin1/hugin/xrc/data/help_en_EN/Panotools.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html: + Update manual from wiki + [e9e2baafa23d] + + * ChangeLog: + Update ChangeLog for 2010.2 branch + [da9ae058ed68] + +2010-08-28 Bruno Postle <br...@po...> + + * src/translations/ja.po: + Remove some \n from Japanese translation that caused fatal error + [ef60981f8611] + +2010-08-28 Masahiro Kitagawa <arc...@gm...> + + * src/translations/ja.po: + updated Japanese translation + [aef3f8fcc1b8] + +2010-08-25 tmodes <tmodes> + + * src/hugin1/hugin/ImagesPanel.cpp: + Ignore empty input fields in Images tab + [c4ded35d3f73] + +2010-08-23 Bruno Postle <br...@po...> + + * src/translations/it.po: + Updated Italian translation (Cristian Marchi) + [6eb12d5d8e54] + +2010-08-07 tmodes <tmodes> + + * src/hugin_base/algorithms/basic/CalculateOverlap.cpp, + src/hugin_base/algorithms/basic/CalculateOverlap.h, + src/hugin_base/panodata/Panorama.cpp, + src/hugin_base/panodata/SrcPanoImage.cpp, + src/hugin_base/panodata/SrcPanoImage.h: + Faster mask calculation for bigger projects (transplanted from + 7865fdc9169504f143305883541c9516b2b0359a) + [ad5544e0c303] + +2010-08-04 tmodes <tmodes> + + * src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp, + src/hugin_base/algorithms/basic/CalculateOptimalROI.h: + Several improvements for autocrop + * Better memory management + * Make autocrop aware of crops and masks + * Works now also with bigger dimensions (transplanted from + 090323ed8e655255f2eeaa09f13ac7c98392b9e1) + [4484cb5832a4] + +2010-08-01 tmodes <tmodes> + + * src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp, + src/hugin_base/algorithms/basic/CalculateOptimalROI.h: + Do autocrop to active images only and not all images Clean up code + (removed unused lines) (transplanted from + 729147f7db0c026027c32160cbeedd709f822440) + [315e05f56567] + + * src/hugin_base/algorithms/basic/CalculateOverlap.cpp, + src/hugin_base/algorithms/point_sampler/PointSampler.h, + src/hugin_base/nona/RemappedPanoImage.h, + src/hugin_base/panotools/PanoToolsInterface.cpp: + Check, if transformImgCoord was successfull This should fix the bug, + that the fov was calculated wrong for projects with non-zero + translations parameters. Now also the photometric optimisation + should work for these projects. (transplanted from + ebece9c9319dcc9b2750c037d08352edceb3fa07) + [bdaf6c92c6a5] + +2010-07-30 harryvanderwolf <hv...@gm...> + + * CMakeLists.txt: + [OSX] correct CMakeLists.txt file. This will build correctly on OSX + [b5bddb03391a] + +2010-07-24 Andreas <Andreas Metzler> + + * CMakeLists.txt, CMakeModules/FindPANO13.cmake: + Added version checking for libpano13 + [6e072258d951] + +2010-07-23 tmodes <tmodes> + + * src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.c + pp: + Reduce resolution for overlap detection in makefile generation (This + should speed up of writing of makefile) (transplanted from + 8cbe07845ccff07982bcf5981d5a26a08e4e4999) + [3143279c500b] + +2010-07-22 Bruno Postle <br...@po...> + + * src/hugin1/hugin/xrc/data/help_en_EN/197px-Field-of-view.svg.png, + src/hugin1/hugin/xrc/data/help_en_EN/360px-Pantheon-150x100-rect- + panini.jpg, src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html, + src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift-C.html, + src/hugin1/hugin/xrc/data/help_en_EN/Chromatic_aberration.html, + src/hugin1/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html, + src/hugin1/hugin/xrc/data/help_en_EN/Enfuse.html, + src/hugin1/hugin/xrc/data/help_en_EN/Field_of_View.html, + src/hugin1/hugin/xrc/data/help_en_EN/HDR_workflow_with_hugin.html, + src/hugin1/hugin/xrc/data/help_en_EN/Horizontal_control_points.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Camera_and_Lens_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html, src/h + ugin1/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_D + etectors_dialog.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html, + src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html, src/hugin1/hu + gin/xrc/data/help_en_EN/Panorama_scripting_in_a_nutshell.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pitch.html, + src/hugin1/hugin/xrc/data/help_en_EN/Projections.html, + src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html, + src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html, src/hugin1/hug + in/xrc/data/help_en_EN/Straight_line_control_points.html, + src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html, src/hugin1/hugi + n/xrc/data/help_en_EN/The_General_Panini_Projection.html, + src/hugin1/hugin/xrc/data/help_en_EN/Vertical_control_points.html, + src/hugin1/hugin/xrc/data/help_en_EN/Wavy_distortion.html, + src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html: + Update manual from wiki + [36d225248e33] + + * src/hugin1/hugin/xrc/data/help_en_EN/pages.txt: + New pages from wiki + [ac59be554ab8] + +2010-07-18 Bruno Postle <br...@po...> + + * doc/pano_trafo.1: + Regenerate pano_trafo man page (Andreas Metzler) + [fba464a0344b] + +2010-07-16 Bruno Postle <br...@po...> + + * doc/releases/hugin-2010.2.0_beta1.txt: + finish off beta1 release notes + [90fbabef61e9] + + * ChangeLog: + Update ChangeLog file + [69545ba63586] diff -r e36f788bf17f -r 2c23239b6c40 src/hugin1/hugin/GreatCircles.cpp --- a/src/hugin1/hugin/GreatCircles.cpp Sat Aug 28 14:49:49 2010 +0900 |
From: <hug...@li...> - 2010-09-01 19:54:06
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/4330ac3ddf2a changeset: 4282:4330ac3ddf2a user: Bruno Postle <br...@po...> date: Wed Sep 01 20:50:42 2010 +0100 description: Minor manual update details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/11fe796a3e42 changeset: 4283:11fe796a3e42 user: Bruno Postle <br...@po...> date: Wed Sep 01 20:53:56 2010 +0100 description: Some images to go with manual update diffstat: src/hugin1/hugin/xrc/data/help_en_EN/22px-Preview_layout.svg.png | 0 src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html | 6 ++++++ src/hugin1/hugin/xrc/data/help_en_EN/Layout-small.png | 0 3 files changed, 6 insertions(+), 0 deletions(-) diffs (20 lines): diff -r 2c23239b6c40 -r 11fe796a3e42 src/hugin1/hugin/xrc/data/help_en_EN/22px-Preview_layout.svg.png Binary file src/hugin1/hugin/xrc/data/help_en_EN/22px-Preview_layout.svg.png has changed diff -r 2c23239b6c40 -r 11fe796a3e42 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 Thu Sep 02 01:25:52 2010 +0900 +++ b/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html Wed Sep 01 20:53:56 2010 +0100 @@ -82,6 +82,12 @@ </p><p>The average value isn't always wanted. If you see colour artefacts in bright sky areas, set this to the negative of the darkest input image - This has a side-effect of clipping brighter images. </p> +<a name="Layout_tab" id="Layout_tab"></a><h2> <span class="mw-headline"> <img alt="Image:preview_layout.svgâ" src="22px-Preview_layout.svg.png" width="22" height="22" border="0" />Layout tab </span></h2> +<p>The Layout tab shows the entire project as a diagram with colour-coded lines connecting each of the photographs. +</p><p><img alt="File:layout-small.png" src="Layout-small.png" width="200" height="145" border="0" /> +</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> <a name="Projection_tab" id="Projection_tab"></a><h2> <span class="mw-headline"> Projection tab </span></h2> <p>This tab is for adjusting <a href="Projections.html" title="Projections">projection</a> of the panorama, some projections have adjustable parameters which will appear when selected. </p> diff -r 2c23239b6c40 -r 11fe796a3e42 src/hugin1/hugin/xrc/data/help_en_EN/Layout-small.png Binary file src/hugin1/hugin/xrc/data/help_en_EN/Layout-small.png has changed |
From: <hug...@li...> - 2010-09-02 17:25:29
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b41086a6c6b0 changeset: 4287:b41086a6c6b0 user: tmodes date: Thu Sep 02 19:24:05 2010 +0200 description: Modified PTBatcherGUI menu for more clarity details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d2cef3abb956 changeset: 4288:d2cef3abb956 user: tmodes date: Thu Sep 02 19:24:54 2010 +0200 description: Removed now obsolete files diffstat: .hgignore | 3 + CMakeLists.txt | 11 +- TODO | 34 +- mac/ExternalPrograms/readme.txt | 68 +- mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt | 50 - mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt.org | 66 + mac/ExternalPrograms/scripts/SetEnv-leopard.txt | 66 - mac/ExternalPrograms/scripts/SetEnv-leopard.txt.org | 66 + mac/ExternalPrograms/scripts/SetEnv-universal.txt | 53 - mac/ExternalPrograms/scripts/SetEnv-universal.txt.org | 53 + mac/Hugin.xcodeproj/project.pbxproj | 8 +- mac/patch-xrc.sh | 15 +- src/Doxyfile | 166 +- src/hugin1/CMakeLists.txt | 1 - src/hugin1/base_wx/MyExternalCmdExecDialog.cpp | 7 +- src/hugin1/base_wx/MyExternalCmdExecDialog.h | 2 +- src/hugin1/base_wx/RunStitchPanel.cpp | 138 +- src/hugin1/base_wx/RunStitchPanel.h | 9 +- src/hugin1/base_wx/huginConfig.cpp | 45 - src/hugin1/base_wx/huginConfig.h | 7 +- src/hugin1/hugin/AssistantPanel.cpp | 467 +- src/hugin1/hugin/AssistantPanel.h | 1 - src/hugin1/hugin/AutoCtrlPointCreator.cpp | 1118 ++ src/hugin1/hugin/AutoCtrlPointCreator.h | 193 + src/hugin1/hugin/CMakeLists.txt | 12 +- src/hugin1/hugin/CPDetectorConfig.cpp | 470 + src/hugin1/hugin/CPDetectorConfig.h | 201 + src/hugin1/hugin/CPDetectorConfig_default.h | 97 + src/hugin1/hugin/CPDetectorDialog.cpp | 284 - src/hugin1/hugin/CPDetectorDialog.h | 88 - src/hugin1/hugin/ChoosyRemapper.cpp | 20 +- src/hugin1/hugin/ChoosyRemapper.h | 4 +- src/hugin1/hugin/GLPreviewFrame.cpp | 571 +- src/hugin1/hugin/GLPreviewFrame.h | 154 +- src/hugin1/hugin/GLRenderer.cpp | 399 +- src/hugin1/hugin/GLRenderer.h | 93 +- src/hugin1/hugin/GLViewer.cpp | 250 +- src/hugin1/hugin/GLViewer.h | 105 +- src/hugin1/hugin/GreatCircles.cpp | 255 +- src/hugin1/hugin/GreatCircles.h | 27 +- src/hugin1/hugin/ImagesPanel.cpp | 2 +- src/hugin1/hugin/ImagesPanel.h | 2 +- src/hugin1/hugin/LayoutRemapper.cpp | 16 +- src/hugin1/hugin/LayoutRemapper.h | 4 +- src/hugin1/hugin/LensPanel.cpp | 2 +- src/hugin1/hugin/MainFrame.cpp | 2 +- src/hugin1/hugin/MeshManager.cpp | 291 +- src/hugin1/hugin/MeshManager.h | 186 +- src/hugin1/hugin/MeshRemapper.cpp | 34 +- src/hugin1/hugin/MeshRemapper.h | 10 +- src/hugin1/hugin/OverviewCameraTool.cpp | 186 + src/hugin1/hugin/OverviewCameraTool.h | 92 + src/hugin1/hugin/OverviewDragTool.cpp | 43 + src/hugin1/hugin/OverviewDragTool.h | 28 + src/hugin1/hugin/OverviewOutlinesTool.cpp | 592 + src/hugin1/hugin/OverviewOutlinesTool.h | 149 + src/hugin1/hugin/PreferencesDialog.cpp | 1 - src/hugin1/hugin/PreferencesDialog.h | 2 +- src/hugin1/hugin/PreviewControlPointTool.cpp | 8 +- src/hugin1/hugin/PreviewControlPointTool.h | 6 +- src/hugin1/hugin/PreviewCropTool.cpp | 29 +- src/hugin1/hugin/PreviewCropTool.h | 2 +- src/hugin1/hugin/PreviewDifferenceTool.cpp | 25 +- src/hugin1/hugin/PreviewDifferenceTool.h | 7 +- src/hugin1/hugin/PreviewDragTool.cpp | 349 +- src/hugin1/hugin/PreviewDragTool.h | 31 +- src/hugin1/hugin/PreviewIdentifyTool.cpp | 264 +- src/hugin1/hugin/PreviewIdentifyTool.h | 18 +- src/hugin1/hugin/PreviewLayoutLinesTool.cpp | 57 +- src/hugin1/hugin/PreviewLayoutLinesTool.h | 10 +- src/hugin1/hugin/PreviewPanoMaskTool.h | 2 +- src/hugin1/hugin/PreviewTool.cpp | 34 - src/hugin1/hugin/PreviewTool.h | 104 - src/hugin1/hugin/PreviewToolHelper.cpp | 424 - src/hugin1/hugin/PreviewToolHelper.h | 156 - src/hugin1/hugin/ProjectionGridTool.cpp | 477 + src/hugin1/hugin/ProjectionGridTool.h | 81 + src/hugin1/hugin/TexCoordRemapper.cpp | 34 +- src/hugin1/hugin/TexCoordRemapper.h | 4 +- src/hugin1/hugin/TextureManager.cpp | 11 +- src/hugin1/hugin/TextureManager.h | 2 +- src/hugin1/hugin/Tool.cpp | 48 + src/hugin1/hugin/Tool.h | 156 + src/hugin1/hugin/ToolHelper.cpp | 794 + src/hugin1/hugin/ToolHelper.h | 249 + src/hugin1/hugin/VertexCoordRemapper.cpp | 42 +- src/hugin1/hugin/VertexCoordRemapper.h | 4 +- src/hugin1/hugin/ViewState.cpp | 469 +- src/hugin1/hugin/ViewState.h | 272 +- src/hugin1/hugin/wxPanoCommand.cpp | 4 - src/hugin1/hugin/wxPanoCommand.h | 6 +- src/hugin1/hugin/xrc/assistant_panel.xrc | 26 +- src/hugin1/hugin/xrc/batch_frame.xrc | 177 +- src/hugin1/hugin/xrc/batch_menu.xrc | 6 +- src/hugin1/hugin/xrc/preview_frame.xrc | 34 + src/hugin1/icpfind/AutoCtrlPointCreator.cpp | 1119 -- src/hugin1/icpfind/AutoCtrlPointCreator.h | 169 - src/hugin1/icpfind/CMakeLists.txt | 24 - src/hugin1/icpfind/CPDetectorConfig.cpp | 214 - src/hugin1/icpfind/CPDetectorConfig.h | 146 - src/hugin1/icpfind/CPDetectorConfig_default.h | 97 - src/hugin1/icpfind/icpfind.cpp | 145 - src/hugin1/icpfind/icpfind.h | 36 - src/hugin1/ptbatcher/Batch.cpp | 72 +- src/hugin1/ptbatcher/Batch.h | 5 +- src/hugin1/ptbatcher/BatchFrame.cpp | 99 +- src/hugin1/ptbatcher/BatchFrame.h | 3 +- src/hugin1/ptbatcher/CMakeLists.txt | 105 +- src/hugin1/ptbatcher/FindPanoDialog.cpp | 580 - src/hugin1/ptbatcher/FindPanoDialog.h | 147 - src/hugin1/ptbatcher/PTBatcherGUI.cpp | 180 +- src/hugin1/ptbatcher/PTBatcherGUI.h | 1 + src/hugin1/ptbatcher/ProjectArray.cpp | 4 +- src/hugin1/ptbatcher/ProjectArray.h | 8 +- src/hugin1/ptbatcher/ProjectListBox.cpp | 14 +- src/hugin1/ptbatcher/ProjectListBox.h | 2 - src/hugin1/ptbatcher/RunStitchFrame.cpp | 30 +- src/hugin1/ptbatcher/RunStitchFrame.h | 6 +- src/hugin1/stitch_project/hugin_stitch_project.cpp | 4 +- src/hugin_base/CMakeLists.txt | 10 +- src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp | 147 - src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.h | 138 - src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp | 982 ++ src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h | 145 + src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp | 1027 -- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h | 208 - src/hugin_base/hugin_utils/utils.h | 96 +- src/hugin_base/makefilelib/Anything.h | 66 - src/hugin_base/makefilelib/AutoVariable.cpp | 53 - src/hugin_base/makefilelib/AutoVariable.h | 63 - src/hugin_base/makefilelib/CMakeLists.txt | 49 - src/hugin_base/makefilelib/Comment.cpp | 39 - src/hugin_base/makefilelib/Comment.h | 69 - src/hugin_base/makefilelib/Conditional.cpp | 50 - src/hugin_base/makefilelib/Conditional.h | 140 - src/hugin_base/makefilelib/Doxyfile | 279 - src/hugin_base/makefilelib/Makefile.cpp | 134 - src/hugin_base/makefilelib/Makefile.h | 106 - src/hugin_base/makefilelib/Makefile.mk | 32 - src/hugin_base/makefilelib/MakefileItem.cpp | 49 - src/hugin_base/makefilelib/MakefileItem.h | 96 - src/hugin_base/makefilelib/Manageable.h | 40 - src/hugin_base/makefilelib/Manager.h | 91 - src/hugin_base/makefilelib/Newline.h | 59 - src/hugin_base/makefilelib/README.dox | 56 - src/hugin_base/makefilelib/Rule.cpp | 53 - src/hugin_base/makefilelib/Rule.h | 107 - src/hugin_base/makefilelib/StringAdapter.h | 73 - src/hugin_base/makefilelib/Variable.cpp | 104 - src/hugin_base/makefilelib/Variable.h | 138 - src/hugin_base/makefilelib/VariableDef.cpp | 38 - src/hugin_base/makefilelib/VariableDef.h | 59 - src/hugin_base/makefilelib/VariableRef.cpp | 36 - src/hugin_base/makefilelib/VariableRef.h | 61 - src/hugin_base/makefilelib/char_type.h | 83 - src/hugin_base/makefilelib/example.cpp | 114 - src/hugin_base/makefilelib/test_filenames.cpp | 220 - src/hugin_base/makefilelib/test_makefilelib.cpp | 215 - src/hugin_base/makefilelib/test_simple.cpp | 224 - src/hugin_base/makefilelib/test_util.cpp | 133 - src/hugin_base/makefilelib/test_util.h | 65 - src/hugin_base/makefilelib/test_util_win32.cpp | 164 - src/hugin_base/makefilelib/unicode.cpp | 103 - src/hugin_base/makefilelib/unicode.dox | 26 - src/hugin_base/panodata/PanoramaOptions.cpp | 4 +- src/hugin_base/panodata/SrcPanoImage.h | 6 +- src/tools/CMakeLists.txt | 5 +- src/tools/checkpto.cpp | 85 - src/tools/pano_modify.cpp | 841 +- src/tools/pto2mk.cpp | 11 +- src/translations/bg.po | 1981 ++- src/translations/ca_ES.po | 1998 ++-- src/translations/cs_CZ.po | 3553 +++---- src/translations/de.po | 4813 ++++---- src/translations/en_GB.po | 3411 +++--- src/translations/es.po | 1978 ++- src/translations/fi.po | 3913 +++---- src/translations/fr.po | 1978 ++- src/translations/hu.po | 1978 ++- src/translations/hugin.pot | 3515 +++--- src/translations/it.po | 2017 ++-- src/translations/ja.po | 1979 ++- src/translations/ko.po | 1974 ++- src/translations/nl.po | 4910 +++++---- src/translations/pl.po | 2094 ++-- src/translations/pt_BR.po | 1978 ++- src/translations/ru.po | 1979 ++- src/translations/sk.po | 2052 ++-- src/translations/sl.po | 1980 ++- src/translations/sv.po | 4258 +++---- src/translations/uk.po | 1980 ++- src/translations/zh_CN.po | 3598 ++---- src/translations/zh_TW.po | 1974 ++- 193 files changed, 40852 insertions(+), 43182 deletions(-) diffs (truncated from 151550 to 500 lines): diff -r afcb49d443f0 -r d2cef3abb956 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Thu Sep 02 19:24:54 2010 +0200 @@ -0,0 +1,3 @@ +# ignore editors backup file +glob:*~$ +glob:rev.txt diff -r afcb49d443f0 -r d2cef3abb956 CMakeLists.txt --- a/CMakeLists.txt Wed Sep 01 22:25:49 2010 +0200 +++ b/CMakeLists.txt Thu Sep 02 19:24:54 2010 +0200 @@ -137,8 +137,7 @@ ## # This must come before FINDs for tiff, jpeg, png, zlib to enable # finding the wxWidgets distributions of those packages (Win32 only). - -SET(wxWidgets_USE_LIBS base core xrc html xml adv gl net) +SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net) FIND_PACKAGE(wxWidgets REQUIRED) # hugin requires wxwidgets 2.7.0 or above @@ -232,13 +231,9 @@ set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix}) endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") ENDIF(WIN32) -FIND_PACKAGE(Boost 1.34 COMPONENTS thread regex filesystem iostreams system) +FIND_PACKAGE(Boost COMPONENTS thread) IF (NOT Boost_FOUND) - IF(WIN32) - MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") - ELSE() - MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.34") - ENDIF() + MESSAGE(FATAL_ERROR "boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") ENDIF (NOT Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) diff -r afcb49d443f0 -r d2cef3abb956 TODO --- a/TODO Wed Sep 01 22:25:49 2010 +0200 +++ b/TODO Thu Sep 02 19:24:54 2010 +0200 @@ -1,3 +1,35 @@ [TODO] -- compile a todo list \ No newline at end of file +- compile a todo list + + +Panorama Overview Related TODO list: + + - Check the system in windows and mac (I can only test in windows) + - DragTool: add lines from starting to ending point + - Improve performance of calculating panosphere meshes by using GPU + - Create realtime adjustments for the other viewer when dragging images + - Add a switch for the projection grid or make it automatic for certain tabs. + - The projection grid is not included in the mosaic plane currently because just adding it as a rectilinear projection of the current grid will be ugly and not useful. So first I need to come up with some representation of the grid on the mosaic plane which will be useful. + - The mosaic plane could use some things like: + - rendering of the hypothetical camera positions for each image + - rendering of the panosphere together with the plane to create a sense of what is going on. This also needs some thought + - Dragging in the mosaic plane should support changing of the Z parameter as well + - Test the system with masks for the issues that James pointed out + - Highlighting an image in identify mode also highlights the image in the other viewer. This currently only works when the mouse is over the image buttons + - Improve performance for great circles by using display lists and meshes also for the crosses. Also keep the old method by just using lines, which is useful for the preview + - Check the issue with double difference choices + - Add the interactive circles + - Implement the better handling of image groups + - Bug, sometimes changing the FOV sliders doesn't cause the overview to be redrawn + - Add informative status messages + - Automatic adjustment of the zoom level for the mosaic plane + - The overview window does not process the mouse wheel on windows + + +fixed: + + - Bug (at least in my computer) with wxAUI which causes the program to crash when both canvases are undocked and then docked. + - with preview fixed to the frame this is not a problem anymore + - Toggle buttons to show hide the overview and preview canvases + diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/readme.txt --- a/mac/ExternalPrograms/readme.txt Wed Sep 01 22:25:49 2010 +0200 +++ b/mac/ExternalPrograms/readme.txt Thu Sep 02 19:24:54 2010 +0200 @@ -1,1 +1,67 @@ -External Programs (This is for 10.4 or above) HOWTO: 1. Download the source package of the external programs. You typically want to place it in the "ExternalPrograms" folder. 2. Edit ExternalPrograms/scripts/SetEnv-*.txt file appropriately, especially the myREPOSITORYDIR variable. 3. Open a Terminal window (bash is preferred). 5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b') 4. Set the variables for the compilation. (eg. 'source ../scripts/SetEnv-universal.txt') 6. Using the appropriate shell script, build the source. (eg. 'sh ../scripts/libjpeg.sh') RESULT: The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw). USAGE: When compiling programs from source specifying the above directory as prefix. You probably have to specify the correct SDK (-isysroot) and MacOS target version (-mmacosx-version-min) as well. You can make multiple 'repositories' as well. For example, you can make one for statically and one for dynamically linked product, or ones with different target architecture/OS versions. PROGRAMS: The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. [Dynamic Build for distributable Hugin.app and PTBatcherGUI.app] boost (1.39) libexpat (2.0.1) libjpeg (6b) libpng (1.2.38) libtiff (3.8.2) ilmbase (1.0.1) openexr16 (1.6.1) pano13 (2.9.14) wxmac28 (2.8.10) static/libexiv2 (0.18.2) static/lcms (1.17) static/libxmi (1.2) static/libglew (1.5.1) gnumake (Darwin 9/gnumake-119/make) enblend (3.2) [Static Build for distributable command-line tools] static/boost (1.39) static/libexpat (2.0.1) static/libjpeg (6b) static/libpng (1.2.38) static/libtiff (3.8.2) static/ilmbase (1.0.1) static/openexr16 (1.6.1) static/pano13 (2.9.14) static/wxmac28 (2.8.10) static/libexiv2 (0.18.2) static/lcms (1.17) static/libxmi (1.2) static/libglew (1.5.1) gnumake (Darwin 9 source: gnumake-119/make) enblend31 (3.2) LICENSE: The scripts for compiling universal builds are originally copyrighted by Ippei Ukai (2007-2008), and distributed under the modified BSD license. $Id: howto.txt 1902 2007-02-04 22:27:47Z ippei $ \ No newline at end of file +External Programs +(This is for 10.4 or above) + + +HOWTO: +1. Download the source package of the external programs. You typically want to place it in the "ExternalPrograms" folder. +2. Edit ExternalPrograms/scripts/SetEnv-*.txt.org file appropriately, especially the myREPOSITORYDIR variable and + save it as SetEnv-*.txt. +3. Open a Terminal window (bash is preferred). +5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b') +4. Set the variables for the compilation. (eg. 'source ../scripts/SetEnv-universal.txt') +6. Using the appropriate shell script, build the source. (eg. 'sh ../scripts/libjpeg.sh') + + +RESULT: +The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw). + + +USAGE: +When compiling programs from source specifying the above directory as prefix. You probably have to specify the correct SDK (-isysroot) and MacOS target version (-mmacosx-version-min) as well. +You can make multiple 'repositories' as well. For example, you can make one for statically and one for dynamically linked product, or ones with different target architecture/OS versions. + + +PROGRAMS: +The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. + +[Dynamic Build for distributable Hugin.app and PTBatcherGUI.app] +boost (1.41) +libexpat (2.0.1) +libiconv +gettext (0.17) +libjpeg (8) +libpng (1.2.41) +libtiff (3.8.2) +ilmbase (1.0.1) +openexr16 (1.6.2) +pano13 (2.9.17) +wxmac28 (2.8.11) +libexiv2 (0.19) +lcms (1.17) +libxmi (1.2) +libglew (1.5.1) +gnumake (Darwin 9/gnumake-119/make) +enblend (4.0) + +[Static Build for distributable command-line tools] +static/boost (1.39) +static/libexpat (2.0.1) +static/libjpeg (6b) +static/libpng (1.2.38) +static/libtiff (3.8.2) +static/ilmbase (1.0.1) +static/openexr16 (1.6.1) +static/pano13 (2.9.14) +static/wxmac28 (2.8.10) +static/libexiv2 (0.18.2) +static/lcms (1.17) +static/libxmi (1.2) +static/libglew (1.5.1) +gnumake (Darwin 9 source: gnumake-119/make) +enblend31 (3.2) + +LICENSE: +The scripts for compiling universal builds are originally copyrighted by Ippei Ukai (2007-2008), and distributed under the modified BSD license. + + +$Id: howto.txt 1902 2007-02-04 22:27:47Z ippei diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt --- a/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt Wed Sep 01 22:25:49 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -# Configuration for 4 part universal build, only possible from Leopard -# Copyright (c) 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'); - - -#export \ -# CC="gcc-4.2" \ -# CXX="g++-4.2"; - -mkdir -p $myREPOSITORYDIR; - -export \ - REPOSITORYDIR="$myREPOSITORYDIR" \ - ARCHS="ppc i386" \ - \ - ppcTARGET="powerpc-apple-darwin9" \ - ppcOSVERSION="10.5" \ - ppcMACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - ppcOPTIMIZE="-mtune=G5 -ftree-vectorize" \ - ppcCC="gcc-4.2" \ - ppcCXX="g++-4.2" \ - \ - i386TARGET="i386-apple-darwin9" \ - i386OSVERSION="10.5" \ - i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ - i386CC="gcc-4.2" \ - i386CXX="g++-4.2" \ - \ - 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 2238 2007-07-08 11:19:04Z ippei $ diff -r afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt.org --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mac/ExternalPrograms/scripts/SetEnv-leopard-OpenMP.txt.org Thu Sep 02 19:24:54 2010 +0200 @@ -0,0 +1,66 @@ +# Configuration for 4 part universal build, only possible from Leopard +# Copyright (c) 2008, Ippei Ukai + + +# has to be the absolute path from / +myREPOSITORYDIR="/Users/Shared/development/hugin_related/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'); + + +#export \ +# CC="gcc-4.2" \ +# CXX="g++-4.2"; + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="ppc i386 ppc64 x86_64" \ + \ + ppcTARGET="powerpc-apple-darwin9" \ + ppcOSVERSION="10.5" \ + ppcMACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppcOPTIMIZE="-mcpu=G3 -mtune=G4 -ftree-vectorize" \ + ppcCC="gcc-4.2" \ + ppcCXX="g++-4.2" \ + \ + i386TARGET="i386-apple-darwin9" \ + i386OSVERSION="10.5" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + i386OPTIMIZE="-march=prescott -mtune=pentium-m -ftree-vectorize" \ + i386CC="gcc-4.2" \ + i386CXX="g++-4.2" \ + \ + ppc64TARGET="powerpc64-apple-darwin9" \ + ppc64OSVERSION="10.5" \ + ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppc64OPTIMIZE="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ + ppc64CC="gcc-4.2" \ + ppc64CXX="g++-4.2" \ + \ + x64TARGET="x86_64-apple-darwin9" \ + x64OSVERSION="10.5" \ + x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ + x64CC="gcc-4.2" \ + x64CXX="g++-4.2" \ + \ + OTHERARGs="" \ + OTHERMAKEARGs="--jobs=$PROCESSNUM"; + + +# Deprecated: +export \ + ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ + ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ + 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 afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard.txt --- a/mac/ExternalPrograms/scripts/SetEnv-leopard.txt Wed Sep 01 22:25:49 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -# Configuration for 4 part universal build, only possible from Leopard -# Copyright (c) 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 ppc64 x86_64" \ - \ - 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" \ - \ - ppc64TARGET="powerpc64-apple-darwin9" \ - ppc64OSVERSION="10.5" \ - ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - ppc64OPTIMIZE="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ - ppc64CC="gcc-4.2" \ - ppc64CXX="g++-4.2" \ - \ - x64TARGET="x86_64-apple-darwin9" \ - x64OSVERSION="10.5" \ - x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ - x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ - x64CC="gcc-4.2" \ - x64CXX="g++-4.2" \ - \ - OTHERARGs="" \ - OTHERMAKEARGs="--jobs=$PROCESSNUM"; - - -# Deprecated: -export \ - ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ - i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ - ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ - 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 afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-leopard.txt.org --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mac/ExternalPrograms/scripts/SetEnv-leopard.txt.org Thu Sep 02 19:24:54 2010 +0200 @@ -0,0 +1,66 @@ +# Configuration for 4 part universal build, only possible from Leopard +# Copyright (c) 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 ppc64 x86_64" \ + \ + 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" \ + \ + ppc64TARGET="powerpc64-apple-darwin9" \ + ppc64OSVERSION="10.5" \ + ppc64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + ppc64OPTIMIZE="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ + ppc64CC="gcc-4.2" \ + ppc64CXX="g++-4.2" \ + \ + x64TARGET="x86_64-apple-darwin9" \ + x64OSVERSION="10.5" \ + x64MACSDKDIR="/Developer/SDKs/MacOSX10.5.sdk" \ + x64OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ + x64CC="gcc-4.2" \ + x64CXX="g++-4.2" \ + \ + OTHERARGs="" \ + OTHERMAKEARGs="--jobs=$PROCESSNUM"; + + +# Deprecated: +export \ + ppcONLYARG="$ppcOPTIMIZE -mmacosx-version-min=$ppcOSVERSION" \ + i386ONLYARG="$i386OPTIMIZE -mmacosx-version-min=$i386OSVERSION" \ + ppc64ONLYARG="$ppc64OPTIMIZE -mmacosx-version-min=$ppc64OSVERSION" \ + 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 afcb49d443f0 -r d2cef3abb956 mac/ExternalPrograms/scripts/SetEnv-universal.txt --- a/mac/ExternalPrograms/scripts/SetEnv-universal.txt Wed Sep 01 22:25:49 2010 +0200 +++ /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" \ |
From: <hug...@li...> - 2010-09-05 06:29:23
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b43ce8722d82 changeset: 4302:b43ce8722d82 user: tmodes date: Sun Sep 05 08:25:58 2010 +0200 description: Added missing whitespace details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/fb526dd72d6e changeset: 4303:fb526dd72d6e user: tmodes date: Sun Sep 05 08:28:31 2010 +0200 description: Merge diffstat: src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp | 2 +- src/hugin_base/makefilelib/Makefile.cpp | 5 +---- src/hugin_base/makefilelib/test_filenames.cpp | 7 ------- 3 files changed, 2 insertions(+), 12 deletions(-) diffs (45 lines): diff -r b6255d61499c -r fb526dd72d6e src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp --- a/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp Sat Sep 04 14:14:29 2010 +0200 +++ b/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp Sun Sep 05 08:28:31 2010 +0200 @@ -712,7 +712,7 @@ ruleldr->addPrereq(ldr_stacks_input[i]); ruleldr->addCommand(venfuse->getRef() +" "+ venfuseopts->getRef() + " -o " + ldr_stacks_shell[i]->getRef() +" "+ ldr_stacks_input_shell[i]->getRef()); - ruleldr->addCommand("-" + vexiftool->getRef() + "-overwrite_original_in_place -TagsFromFile " + + ruleldr->addCommand("-" + vexiftool->getRef() + " -overwrite_original_in_place -TagsFromFile " + vinimage1shell->getRef() +" "+ vexiftoolcopyargs->getRef() +" "+ ldr_stacks_shell[i]->getRef()); Rule* rulehdr = mgr.own(new Rule()); rulehdr->add(); diff -r b6255d61499c -r fb526dd72d6e src/hugin_base/makefilelib/Makefile.cpp --- a/src/hugin_base/makefilelib/Makefile.cpp Sat Sep 04 14:14:29 2010 +0200 +++ b/src/hugin_base/makefilelib/Makefile.cpp Sun Sep 05 08:28:31 2010 +0200 @@ -32,11 +32,8 @@ Makefile* Makefile::instance = NULL; // static -#ifdef __APPLE__ +/// Used for numeric output to get a decimal dot anyways. const std::locale Makefile::locale(std::locale("C")); -#else -const std::locale Makefile::locale(std::locale(""), "C", std::locale::numeric); -#endif const std::locale GetMakefileLocale() { diff -r b6255d61499c -r fb526dd72d6e src/hugin_base/makefilelib/test_filenames.cpp --- a/src/hugin_base/makefilelib/test_filenames.cpp Sat Sep 04 14:14:29 2010 +0200 +++ b/src/hugin_base/makefilelib/test_filenames.cpp Sun Sep 05 08:28:31 2010 +0200 @@ -182,13 +182,6 @@ int main(int argc, char *argv[]) { - // set the environments locale. -#ifdef __APPLE__ - std::locale::global(std::locale("C")); -#else - std::locale::global(std::locale("")); -#endif - uchar_type limit; if(argc != 2) { |
From: <hug...@li...> - 2010-09-09 21:40:28
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/8f6f6692982f changeset: 4324:8f6f6692982f user: Yuval Levy <yu...@us...> date: Thu Sep 09 10:32:10 2010 -0400 description: updated authors list details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d10557ac9b2e changeset: 4325:d10557ac9b2e user: Bruno Postle <br...@po...> date: Thu Sep 09 22:39:58 2010 +0100 description: merge diffstat: authors.txt | 14 ++++++++------ src/celeste/PGMImage.cpp | 6 ++++-- src/hugin1/hugin/OptimizePanel.cpp | 7 +++++++ 3 files changed, 19 insertions(+), 8 deletions(-) diffs (97 lines): diff -r e1f91781858f -r d10557ac9b2e authors.txt --- a/authors.txt Mon Sep 06 13:45:14 2010 +0200 +++ b/authors.txt Thu Sep 09 22:39:58 2010 +0100 @@ -17,13 +17,14 @@ Alexandre Duret-Lutz code Lu Fang initial Chinese Simplified translation Skip Gaede OS X build fixes -Daniel German bug patch +Daniel German bug fixes, GSoC mentor 2010 Niels Giesen Dutch translation Jorge González González original Spanish translation Felix Hagemann bug reports and patches Ed Halley gui, documentation Robert Hart bug reports and patches Juha Helminen Code +Brian Hoffmann German translation of NSIS windows installer Ad Huikeshoven automated Windows snapshot builds Iouri Ivliev bug fixes Marek Januszewski Code, initial Polish translation @@ -37,8 +38,8 @@ Höss Lajos Hungarian translation Rick Langford Traditional Chinese original translation and updates Homin Lee initial Korean translation -James Legg GSoC 2008 OpenGL fast preview GSoC 2009 new layout -Yuval Levy Community Builder, GSoC admin 2007 and 2009, GSoC mentor 2007 and 2008, Windows build, original Windows installer, bugfixes, fixes Italian translation +James Legg GSoC 2008 OpenGL fast preview, GSoC 2009 new layout, GSoC 2010 mentor +Yuval Levy Community Builder, GSoC admin 2007 and 2009, GSoC mentor 2007 and 2008, Windows build, original Windows installer (0.7.0 and 0.8.0 InnoSetup), bugfixes, fixes Italian translation Wim Lewis Code fix Roger Luethi Code Caolán McNamara code fix @@ -46,15 +47,16 @@ Zoran Mesec GSoC 2007 feature detector, GSoC 2008 mentor, initial Slovenian translation Andreas Metzler Debian packaging Andrew Mihal original author of enblend, enfuse, nona-gpu. GSoC 2009 mentor -Thomas Modes code and bugfixes +Thomas Modes statistic CP cleaner, multi-row CP detection, masking tool, GSoC 2010 mentor, code and bugfixes Tiziano Müller code John Navas MSI installer José Alejandro Carrillo Neira Spanish translation -Tim Nugent GSoC 2008 Celeste, GSoC 2009 Lens Calibration +Tim Nugent GSoC 2008 Celeste, GSoC 2009 Lens Calibration, GSoC 2010 mentor Simon Oosthoek Dutch translation +Emanuele Panz Windows installer (2010.02 transition to Nullsoft NSIS) Gerry Patterson Code Eduardo Pérez Esteban Spanish translation -Bruno Postle initial packaging, website, documentation, initial British English translation, GSoC 2009 mentor +Bruno Postle initial packaging, website, documentation, initial British English translation, GSoC 2009 mentor, GSoC 2010 admin and mentor, release manager on many occasions including 2010.02 Alexandre Prokoudine Initial Russian translation, GSoC 2008 admin Jozef Riha original Slovak translation Marijn Ros bug reports and patches diff -r e1f91781858f -r d10557ac9b2e src/celeste/PGMImage.cpp --- a/src/celeste/PGMImage.cpp Mon Sep 06 13:45:14 2010 +0200 +++ b/src/celeste/PGMImage.cpp Thu Sep 09 22:39:58 2010 +0100 @@ -221,7 +221,8 @@ // set dimensions of pixelmap and allocate memory mWidth = width; mHeight = height; - strcpy( mMagicNumber, "P5" ); + mMagicNumber[0] = 'P'; + mMagicNumber[1] = '5'; mNumLevels = 255; Allocate( kChars ); @@ -341,7 +342,8 @@ // set dimensions of pixelmap and allocate memory mWidth = width; mHeight = height; - strcpy( mMagicNumber, "P5" ); + mMagicNumber[0] = 'P'; + mMagicNumber[1] = '5'; mNumLevels = 255; Allocate( kChars ); diff -r e1f91781858f -r d10557ac9b2e src/hugin1/hugin/OptimizePanel.cpp --- a/src/hugin1/hugin/OptimizePanel.cpp Mon Sep 06 13:45:14 2010 +0200 +++ b/src/hugin1/hugin/OptimizePanel.cpp Thu Sep 09 22:39:58 2010 +0100 @@ -1000,13 +1000,20 @@ default: break; } + bool optXYZ=m_x_list->IsChecked(0) || m_y_list->IsChecked(0) || m_z_list->IsChecked(0); // don't optimize translation of anchor image + // if translation should be optimized, then also optimise yaw and pitch of anchor for (std::vector<unsigned int>::iterator it = refImgs.begin(); it != refImgs.end(); it++) { m_x_list->Check(*it, false); m_y_list->Check(*it, false); m_z_list->Check(*it, false); + if(optXYZ) + { + m_yaw_list->Check(*it,true); + m_pitch_list->Check(*it,true); + }; } // disable all manual settings m_yaw_list->Disable(); |