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

merge with Dev

Browse Source
This commit is contained in:
Desmis
2018-01-23 17:52:31 +01:00
parent 9f0b5dc844 4046a3c9b9
commit 62d9825bce
15 changed files with 39 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
rtgui/options.cc
View File

@@ -568,14 +568,6 @@ void Options::setDefaults ()
rtSettings.artifact_cbdl = 4.;
rtSettings.level0_cbdl = 0;
rtSettings.level123_cbdl = 30;
rtSettings.bot_left = 0;
rtSettings.top_left = 10;
rtSettings.top_right = 40;
rtSettings.bot_right = 75;
rtSettings.ed_detec = 3; //between 2 and 10
rtSettings.ed_detecStr = 1.3; //not use
rtSettings.ed_low = 15.; //between 5 to 40
//locallab
rtSettings.nspot = 8;//between 1 and ??
rtSettings.locdelay = false;//true enabled delay 200 for selection spot
@@ -733,23 +725,6 @@ void Options::readFromFile (Glib::ustring fname)
if ( keyFile.has_key ("General", "Verbose")) {
rtSettings.verbose = keyFile.get_boolean ( "General", "Verbose");
}
if (keyFile.has_key ("General", "BotLeft")) {
rtSettings.bot_left = keyFile.get_double ("General", "BotLeft");
}
if (keyFile.has_key ("General", "TopLeft")) {
rtSettings.top_left = keyFile.get_double ("General", "TopLeft");
}
if (keyFile.has_key ("General", "TopRight")) {
rtSettings.top_right = keyFile.get_double ("General", "TopRight");
}
if (keyFile.has_key ("General", "BotRight")) {
rtSettings.bot_right = keyFile.get_double ("General", "BotRight");
}
if (keyFile.has_key ("General", "Nspot")) {
rtSettings.nspot = keyFile.get_integer ("General", "Nspot");
}
@@ -771,18 +746,6 @@ void Options::readFromFile (Glib::ustring fname)
rtSettings.locdelay = keyFile.get_boolean ("General", "Locdelay");
}
if (keyFile.has_key ("General", "EDdetec")) {
rtSettings.ed_detec = keyFile.get_double ("General", "EDdetec");
}
if (keyFile.has_key ("General", "EDdetecStr")) {
rtSettings.ed_detecStr = keyFile.get_double ("General", "EDdetecStr");
}
if (keyFile.has_key ("General", "EDLow")) {
rtSettings.ed_low = keyFile.get_double ("General", "EDLow");
}
}
if (keyFile.has_group ("External Editor")) {
@@ -1881,20 +1844,12 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("General", "DarkFramesPath", rtSettings.darkFramesPath);
keyFile.set_string ("General", "FlatFieldsPath", rtSettings.flatFieldsPath);
keyFile.set_boolean ("General", "Verbose", rtSettings.verbose);
keyFile.set_double ("General", "BotLeft", rtSettings.bot_left);
keyFile.set_double ("General", "TopLeft", rtSettings.top_left);
keyFile.set_double ("General", "TopRight", rtSettings.top_right);
keyFile.set_double ("General", "BotRight", rtSettings.bot_right);
keyFile.set_double ("General", "EDdetec", rtSettings.ed_detec);
keyFile.set_double ("General", "EDdetecStr", rtSettings.ed_detecStr);
keyFile.set_double ("General", "EDLow", rtSettings.ed_low);
keyFile.set_integer ("General", "Nspot", rtSettings.nspot);
keyFile.set_boolean ("General", "Locdelay", rtSettings.locdelay);
keyFile.set_integer ("General", "Cropsleep", rtSettings.cropsleep);
keyFile.set_double ("General", "Reduchigh", rtSettings.reduchigh);
keyFile.set_double ("General", "Reduclow", rtSettings.reduclow);
keyFile.set_integer ("External Editor", "EditorKind", editorToSendTo);
keyFile.set_string ("External Editor", "GimpDir", gimpDir);
keyFile.set_string ("External Editor", "PhotoshopDir", psDir);