From: <da...@us...> - 2008-01-05 17:44:59
|
Revision: 2614 http://hugin.svn.sourceforge.net/hugin/?rev=2614&view=rev Author: dangelo Date: 2008-01-05 09:44:49 -0800 (Sat, 05 Jan 2008) Log Message: ----------- Changed handling of bundled programs: OSX maybe bundled, Windows always bundled, unix never bundled Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp Modified: hugin/trunk/src/hugin1/base_wx/huginConfig.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-01-05 15:29:30 UTC (rev 2613) +++ hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-01-05 17:44:49 UTC (rev 2614) @@ -54,14 +54,15 @@ if(fn == wxT("")) { - wxMessageBox(wxString::Format(_("External program %s not found in the bundle, reverting to system path"), file.c_str()), _("Error")); + // dangelo: this is not an error for a non-bundled hugin app installed via fink or MacPorts + // wxMessageBox(wxString::Format(_("External program %s not found in the bundle, reverting to system path"), file.c_str()), _("Error")); pname = file.mb_str(); } else { pname = fn.mb_str(); } return pname; -#else +#elif defined __WXMSW__ if (config->Read(name + wxT("/Custom"), 0l)) { wxString fn = config->Read(name + wxT("/Exe"),wxT("")); if (wxFileName::FileExists(fn)) { @@ -71,6 +72,15 @@ pname = (bindir + file).mb_str(); } } else { + pname = (bindir + file).mb_str(); + } + return pname; +#else + // unix, never bundled + if (config->Read(name + wxT("/Custom"), 0l)) { + wxString fn = config->Read(name + wxT("/Exe"),wxT("")); + pname = fn.mb_str(); + } else { pname = file.mb_str(); } return pname; @@ -89,8 +99,6 @@ wxFileName bindirFN = wxFileName::DirName(bundledBinDir); bindir = bindirFN.GetPath(); #endif - // on unix, custom tools don't make any sense, since on unix, hugin is never - // bundled. Just just the executables in the path progs.PTmender = getProgram(config,bindir, wxT("PTmender"), wxT("PTmender")); progs.PTblender= getProgram(config,bindir, wxT("PTblender"), wxT("PTblender")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-01-08 21:18:38
|
Revision: 2616 http://hugin.svn.sourceforge.net/hugin/?rev=2616&view=rev Author: dangelo Date: 2008-01-08 13:18:34 -0800 (Tue, 08 Jan 2008) Log Message: ----------- added missing \ to makefiles on windows Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp Modified: hugin/trunk/src/hugin1/base_wx/huginConfig.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-01-07 22:52:54 UTC (rev 2615) +++ hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-01-08 21:18:34 UTC (rev 2616) @@ -69,10 +69,10 @@ pname = fn.mb_str(); } else { wxMessageBox(wxString::Format(_("External program %s not found, reverting to bundled version"), file.c_str()), _("Error")); - pname = (bindir + file).mb_str(); + pname = (bindir + wxT("\\") + file).mb_str(); } } else { - pname = (bindir + file).mb_str(); + pname = (bindir + wxT("\\") + file).mb_str(); } return pname; #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-02-03 20:28:57
|
Revision: 2778 http://hugin.svn.sourceforge.net/hugin/?rev=2778&view=rev Author: dangelo Date: 2008-02-03 12:28:53 -0800 (Sun, 03 Feb 2008) Log Message: ----------- search for nona and hdrmerge like the other tools Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp Modified: hugin/trunk/src/hugin1/base_wx/huginConfig.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-02-03 18:51:21 UTC (rev 2777) +++ hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-02-03 20:28:53 UTC (rev 2778) @@ -46,7 +46,7 @@ wxMessageBox(wxString::Format(_("External program %s not found as specified in preferences, reverting to bundled version"), file.c_str()), _("Error")); } } - + if(name == wxT("Exiftool")) { wxString exiftoolDirPath = MacGetPathToBundledResourceFile(CFSTR("ExifTool")); if(exiftoolDirPath != wxT("")) @@ -111,7 +111,6 @@ { PTPrograms progs; - wxString bindir; #ifndef __WXGTK__ // add trailing directory separator, if needed @@ -119,6 +118,9 @@ bindir = bindirFN.GetPath(); #endif + progs.nona = getProgram(config,bindir, wxT("nona"), wxT("nona")); + progs.hdrmerge= getProgram(config,bindir, wxT("hugin_hdrmerge"), wxT("hugin_hdrmerge")); + progs.PTmender = getProgram(config,bindir, wxT("PTmender"), wxT("PTmender")); progs.PTblender= getProgram(config,bindir, wxT("PTblender"), wxT("PTblender")); progs.PTmasker= getProgram(config,bindir, wxT("PTmasker"), wxT("PTmasker")); @@ -140,7 +142,7 @@ progs.exiftool = "perl"; } #endif - + // smartblend (never bundled) progs.smartblend = config->Read(wxT("/Smartblend/SmartblendExe"),wxT("smartblend.exe")).mb_str(); progs.smartblend_opts = config->Read(wxT("/Smartblend/SmartblendArgs"),wxT(HUGIN_SMARTBLEND_ARGS)).mb_str(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-02-08 22:48:16
|
Revision: 2816 http://hugin.svn.sourceforge.net/hugin/?rev=2816&view=rev Author: dangelo Date: 2008-02-08 14:48:14 -0800 (Fri, 08 Feb 2008) Log Message: ----------- Earlier 0.7 betas might have written invalid downscale settings to the preferences. Fix this when loading prefs from an older version. Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp Modified: hugin/trunk/src/hugin1/base_wx/huginConfig.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-02-08 22:31:03 UTC (rev 2815) +++ hugin/trunk/src/hugin1/base_wx/huginConfig.cpp 2008-02-08 22:48:14 UTC (rev 2816) @@ -173,6 +173,7 @@ long revision = config->Read(wxT("HuginRevision"), 0l); if (revision <= 2797) { config->DeleteEntry(wxT("/Exiftool/CopyArgs")); + config->DeleteEntry(wxT("/Assistant/panoDownsizeFactor")); } // set new config config->Write(wxT("HuginRevision"), HUGIN_WC_REVISION); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |