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

merge master into retinexgain

Browse Source
This commit is contained in:
Desmis
2016-05-01 08:53:52 +02:00
parent 67a19d0cc9 c8db56643a
commit a742e3a7ba
221 changed files with 7954 additions and 6498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
rtengine/procparams.cc
View File

@@ -16,11 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
//#include <glib/gstdio.h>
#include <glib/gstdio.h>
#include "procparams.h"
#include "rt_math.h"
#include "safegtk.h"
#include "safekeyfile.h"
#include "dcp.h"
#include "../rtgui/multilangmgr.h"
#include "../rtgui/version.h"
@@ -910,6 +908,7 @@ void RAWParams::setDefaults()
ff_clipControl = 0;
cared = 0;
cablue = 0;
caautostrength = 2;
ca_autocorrect = false;
hotPixelFilter = false;
deadPixelFilter = false;
@@ -1239,6 +1238,8 @@ void ProcParams::setDefaults ()
dirpyrequalizer.enabled = false;
dirpyrequalizer.gamutlab = false;
dirpyrequalizer.cbdlMethod = "bef";
for(int i = 0; i < 6; i ++) {
dirpyrequalizer.mult[i] = 1.0;
@@ -1323,11 +1324,15 @@ static Glib::ustring relativePathIfInside(Glib::ustring procparams_fname, bool f
int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, bool fnameAbsolute, ParamsEdited* pedited)
{
if (!fname.length() && !fname2.length()) {
if (fname.empty () && fname2.empty ()) {
return 0;
}
SafeKeyFile keyFile;
Glib::ustring sPParams;
try {
Glib::KeyFile keyFile;
keyFile.set_string ("Version", "AppVersion", APPVERSION);
keyFile.set_integer ("Version", "Version", PPVERSION);
@@ -3053,6 +3058,10 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, bool fnameAbsol
keyFile.set_boolean ("Directional Pyramid Equalizer", "Gamutlab", dirpyrequalizer.gamutlab);
}
if (!pedited || pedited->dirpyrequalizer.cbdlMethod) {
keyFile.set_string ("Directional Pyramid Equalizer", "cbdlMethod", dirpyrequalizer.cbdlMethod);
}
for(int i = 0; i < 6; i++) {
std::stringstream ss;
ss << "Mult" << i;
@@ -3273,6 +3282,10 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, bool fnameAbsol
keyFile.set_boolean ("RAW", "CA", raw.ca_autocorrect );
}
if (!pedited || pedited->raw.caAutoStrength) {
keyFile.set_double ("RAW", "CAAutoStrength", raw.caautostrength );
}
if (!pedited || pedited->raw.caRed) {
keyFile.set_double ("RAW", "CARed", raw.cared );
}
@@ -3388,12 +3401,18 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, bool fnameAbsol
}
}
Glib::ustring sPParams = keyFile.to_data();
sPParams = keyFile.to_data();
} catch(Glib::KeyFileError&) {}
if (sPParams.empty ()) {
return 1;
}
int error1, error2;
error1 = write (fname , sPParams);
error1 = write (fname, sPParams);
if (fname2.length()) {
if (!fname2.empty ()) {
error2 = write (fname2, sPParams);
// If at least one file has been saved, it's a success
@@ -3410,7 +3429,7 @@ int ProcParams::write (Glib::ustring &fname, Glib::ustring &content) const
if (fname.length()) {
FILE *f;
f = safe_g_fopen (fname, "wt");
f = g_fopen (fname.c_str (), "wt");
if (f == NULL) {
error = 1;
@@ -3431,15 +3450,15 @@ int ProcParams::load (Glib::ustring fname, ParamsEdited* pedited)
return 1;
}
SafeKeyFile keyFile;
Glib::KeyFile keyFile;
try {
//setDefaults ();
if (pedited) {
pedited->set(false);
}
FILE* f = safe_g_fopen (fname, "rt");
FILE* f = g_fopen (fname.c_str (), "rt");
if (!f) {
return 1;
@@ -3475,8 +3494,6 @@ int ProcParams::load (Glib::ustring fname, ParamsEdited* pedited)
}
}
//printf("ProcParams::load called ppVersion=%i\n",ppVersion);
if (keyFile.has_group ("General")) {
if (keyFile.has_key ("General", "Rank")) {
rank = keyFile.get_integer ("General", "Rank");
@@ -6645,6 +6662,16 @@ int ProcParams::load (Glib::ustring fname, ParamsEdited* pedited)
}
}
if (keyFile.has_key ("Directional Pyramid Equalizer", "cbdlMethod")) {
dirpyrequalizer.cbdlMethod = keyFile.get_string ("Directional Pyramid Equalizer", "cbdlMethod");
if (pedited) {
pedited->dirpyrequalizer.cbdlMethod = true;
}
}
// if (keyFile.has_key ("Directional Pyramid Equalizer", "Algorithm")) { dirpyrequalizer.algo = keyFile.get_string ("Directional Pyramid Equalizer", "Algorithm"); if (pedited) pedited->dirpyrequalizer.algo = true; }
if (keyFile.has_key ("Directional Pyramid Equalizer", "Hueskin")) {
Glib::ArrayHandle<int> thresh = keyFile.get_integer_list ("Directional Pyramid Equalizer", "Hueskin");
@@ -7093,6 +7120,14 @@ int ProcParams::load (Glib::ustring fname, ParamsEdited* pedited)
}
}
if (keyFile.has_key ("RAW", "CAAutoStrength")) {
raw.caautostrength = keyFile.get_double ("RAW", "CAAutoStrength" );
if (pedited) {
pedited->raw.caAutoStrength = true;
}
}
if (keyFile.has_key ("RAW", "CARed")) {
raw.cared = keyFile.get_double ("RAW", "CARed" );
@@ -7462,9 +7497,11 @@ int ProcParams::load (Glib::ustring fname, ParamsEdited* pedited)
return 0;
} catch (const Glib::Error& e) {
printf ("-->%s\n", e.what().c_str());
setDefaults ();
return 1;
} catch (...) {
printf ("-->unknown exception!\n");
setDefaults ();
return 1;
}
@@ -7813,6 +7850,7 @@ bool ProcParams::operator== (const ProcParams& other)
&& raw.expos == other.raw.expos
&& raw.preser == other.raw.preser
&& raw.ca_autocorrect == other.raw.ca_autocorrect
&& raw.caautostrength == other.raw.caautostrength
&& raw.cared == other.raw.cared
&& raw.cablue == other.raw.cablue
&& raw.hotPixelFilter == other.raw.hotPixelFilter
@@ -7916,6 +7954,7 @@ bool ProcParams::operator== (const ProcParams& other)
// && dirpyrequalizer.algo == other.dirpyrequalizer.algo
&& dirpyrequalizer.hueskin == other.dirpyrequalizer.hueskin
&& dirpyrequalizer.threshold == other.dirpyrequalizer.threshold
&& dirpyrequalizer.cbdlMethod == other.dirpyrequalizer.cbdlMethod
&& dirpyrequalizer.skinprotect == other.dirpyrequalizer.skinprotect
&& hsvequalizer.hcurve == other.hsvequalizer.hcurve
&& hsvequalizer.scurve == other.hsvequalizer.scurve