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-22 12:58:28 +01:00
parent cef451807d dbe3d55e33
commit 9f0b5dc844
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/ipwavelet.cc
View File

@@ -1877,8 +1877,6 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
//one can also chnage in calckoe //one can also chnage in calckoe
float edd = settings->ed_detec; float edd = settings->ed_detec;
float eddlow = settings->ed_low; //5 to 40 float eddlow = settings->ed_low; //5 to 40
// float eddlipinfl=settings->ed_lipinfl;
// float eddlipampl=settings->ed_lipampl;
float eddlipinfl = 0.005f * cp.edgsens + 0.4f; float eddlipinfl = 0.005f * cp.edgsens + 0.4f;
float eddlipampl = 1.f + cp.edgampl / 50.f; float eddlipampl = 1.f + cp.edgampl / 50.f;
// float eddlow=5.f + cp.edgampl/2.f;//settings->ed_low;//5 to 40 // float eddlow=5.f + cp.edgampl/2.f;//settings->ed_low;//5 to 40

2
rtengine/settings.h
View File

@@ -90,8 +90,6 @@ public:
double ed_detec; double ed_detec;
double ed_detecStr; double ed_detecStr;
double ed_low; double ed_low;
double ed_lipinfl;
double ed_lipampl;
int nspot; int nspot;
bool locdelay; bool locdelay;

14
rtgui/options.cc
View File

@@ -575,8 +575,6 @@ void Options::setDefaults ()
rtSettings.ed_detec = 3; //between 2 and 10 rtSettings.ed_detec = 3; //between 2 and 10
rtSettings.ed_detecStr = 1.3; //not use rtSettings.ed_detecStr = 1.3; //not use
rtSettings.ed_low = 15.; //between 5 to 40 rtSettings.ed_low = 15.; //between 5 to 40
rtSettings.ed_lipinfl = 0.8; //between 0.5 to 0.9
rtSettings.ed_lipampl = 1.1; //between 1 and 2
//locallab //locallab
rtSettings.nspot = 8;//between 1 and ?? rtSettings.nspot = 8;//between 1 and ??
@@ -785,15 +783,6 @@ void Options::readFromFile (Glib::ustring fname)
rtSettings.ed_low = keyFile.get_double ("General", "EDLow"); rtSettings.ed_low = keyFile.get_double ("General", "EDLow");
} }
if (keyFile.has_key ("General", "EDLipinfl")) {
rtSettings.ed_lipinfl = keyFile.get_double ("General", "EDLipinfl");
}
if (keyFile.has_key ("General", "EDLipampl")) {
rtSettings.ed_lipampl = keyFile.get_double ("General", "EDLipampl");
}
} }
if (keyFile.has_group ("External Editor")) { if (keyFile.has_group ("External Editor")) {
@@ -1899,9 +1888,6 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_double ("General", "EDdetec", rtSettings.ed_detec); keyFile.set_double ("General", "EDdetec", rtSettings.ed_detec);
keyFile.set_double ("General", "EDdetecStr", rtSettings.ed_detecStr); keyFile.set_double ("General", "EDdetecStr", rtSettings.ed_detecStr);
keyFile.set_double ("General", "EDLow", rtSettings.ed_low); keyFile.set_double ("General", "EDLow", rtSettings.ed_low);
keyFile.set_double ("General", "EDLipinfl", rtSettings.ed_lipinfl);
keyFile.set_double ("General", "EDLipampl", rtSettings.ed_lipampl);
keyFile.set_integer ("General", "Nspot", rtSettings.nspot); keyFile.set_integer ("General", "Nspot", rtSettings.nspot);
keyFile.set_boolean ("General", "Locdelay", rtSettings.locdelay); keyFile.set_boolean ("General", "Locdelay", rtSettings.locdelay);
keyFile.set_integer ("General", "Cropsleep", rtSettings.cropsleep); keyFile.set_integer ("General", "Cropsleep", rtSettings.cropsleep);