From: <bru...@us...> - 2010-02-28 21:44:20
|
Revision: 5034 http://hugin.svn.sourceforge.net/hugin/?rev=5034&view=rev Author: brunopostle Date: 2010-02-28 21:44:14 +0000 (Sun, 28 Feb 2010) Log Message: ----------- merge trunk -r 5027 Set blender and fusion options to default value when user entered an empty string (Thomas Modes) Modified Paths: -------------- hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp Modified: hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp =================================================================== --- hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp 2010-02-28 20:59:55 UTC (rev 5033) +++ hugin/releases/2010.0/src/hugin1/hugin/PanoPanel.cpp 2010-02-28 21:44:14 UTC (rev 5034) @@ -814,6 +814,10 @@ if (enblend_opts_text->GetValue().length() > 0) { opt.enblendOptions = enblend_opts_text->GetValue().mb_str(wxConvLocal); } + else + { + opt.enblendOptions = wxConfigBase::Get()->Read(wxT("Enblend/Args"),wxT(HUGIN_ENBLEND_ARGS)).mb_str(wxConvLocal); + }; GlobalCmdHist::getInstance().addCommand( new PT::SetPanoOptionsCmd( *pano, opt ) ); @@ -842,6 +846,10 @@ if (enfuse_opts_text->GetValue().length() > 0) { opt.enfuseOptions = enfuse_opts_text->GetValue().mb_str(wxConvLocal); } + else + { + opt.enfuseOptions = wxConfigBase::Get()->Read(wxT("Enfuse/Args"),wxT(HUGIN_ENFUSE_ARGS)).mb_str(wxConvLocal); + }; GlobalCmdHist::getInstance().addCommand( new PT::SetPanoOptionsCmd( *pano, opt ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |