liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with 6e384f1d399717d5c68fca35de1f00394a6f1d58

Browse Source
This commit is contained in:
Hombrenatureh.510
2014-03-05 21:04:53 +01:00
parent 9ab0d2b2f3
commit 518a318822
36 changed files with 1168 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/flatfield.cc
View File

@@ -84,6 +84,8 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
}
if (safe_file_test (pp->raw.ff_file, Glib::FILE_TEST_EXISTS))
flatFieldFile->set_filename (pp->raw.ff_file);
else
flatFieldFile_Reset();
hbff->set_sensitive( !pp->raw.ff_AutoSelect );
lastFFAutoSelect = pp->raw.ff_AutoSelect;
@@ -175,9 +177,13 @@ void FlatField::flatFieldFileChanged()
void FlatField::flatFieldFile_Reset()
{
ffChanged=true;
//flatFieldFile->set_current_name("");
flatFieldFile->set_filename ("");
// caution: I had to make this hack, because set_current_folder() doesn't work correctly!
// Because szeva doesn't exist since he was committed to happy hunting ground in Issue 316
// we can use him now for this hack
flatFieldFile->set_filename (options.lastFlatfieldDir + "/szeva");
// end of the hack
if (!options.lastFlatfieldDir.empty())
flatFieldFile->set_current_folder(options.lastFlatfieldDir);