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

Suppress manuel settings fot local contrsat and edge detection in wavelet

Browse Source
This commit is contained in:
Desmis 2018-01-23 10:36:50 +01:00
parent e5fe9b47df
commit 9a4359995f
4 changed files with 8 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/ipwavelet.cc
View File

@ -1876,11 +1876,10 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
// I adapted the principle but have profoundly changed the algorithm
// One can 1) change all parameters and found good parameters;
//one can also chnage in calckoe
float edd = settings->ed_detec;
float eddlow = settings->ed_low; //5 to 40
float edd = 3.f;
float eddlow = 15.f;
float eddlipinfl = 0.005f * cp.edgsens + 0.4f;
float eddlipampl = 1.f + cp.edgampl / 50.f;
// float eddlow=5.f + cp.edgampl/2.f;//settings->ed_low;//5 to 40
if(cp.detectedge) { //enabled Lipschitz control...more memory..more time...
@ -2579,11 +2578,11 @@ void ImProcFunctions::ContAllL (float *koeLi[12], float *maxkoeLi, bool lipschit
scaleskip[sc] = scales[sc] / skip;
}
float t_r = settings->top_right;
float t_l = settings->top_left;
float b_r = settings->bot_right;
float edd = settings->ed_detec;
float eddstrength = settings->ed_detecStr;
float t_r = 40.f;
float t_l = 10.f;
float b_r = 75.f;
float edd = 3.f;
float eddstrength = 1.3f;
float aedstr = (eddstrength - 1.f) / 90.f;
float bedstr = 1.f - 10.f * aedstr;

8
rtengine/settings.h
View File

@ -83,14 +83,6 @@ public:
double artifact_cbdl;
double level0_cbdl;
double level123_cbdl;
double bot_left;
double top_left;
double top_right;
double bot_right;
double ed_detec;
double ed_detecStr;
double ed_low;
Glib::ustring lensfunDbDirectory; ///< The directory containing the lensfun database. If empty, the system defaults will be used (as described in http://lensfun.sourceforge.net/manual/dbsearch.html)
/** Creates a new instance of Settings.

45
rtgui/options.cc
View File

@ -560,14 +560,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
rtSettings.ciecamfloat = true;
rtSettings.protectred = 60;
@ -716,35 +708,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", "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")) {
@ -1829,14 +1792,6 @@ 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 ("External Editor", "EditorKind", editorToSendTo);
keyFile.set_string ("External Editor", "GimpDir", gimpDir);
keyFile.set_string ("External Editor", "PhotoshopDir", psDir);

2
rtgui/wavelet.cc
View File

@ -100,7 +100,7 @@ Wavelet::Wavelet() :
bllev(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LOWLIGHT"), 0., 100., 0., 2., 50., 25., 0, false))),
pastlev(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_PASTEL"), 0., 70., 0., 2., 30., 20., 0, false))),
satlev(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_SAT"), 0., 130., 30., 45., 130., 100., 0, false))),
edgcont(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_EDGCONT"), 0., 100., options.rtSettings.bot_left, options.rtSettings.top_left, options.rtSettings.bot_right, options.rtSettings.top_right, 0., false))),
edgcont(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_EDGCONT"), 0., 100., 0, 10, 75, 40, 0., false))),
level0noise(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LEVZERO"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false))),
level1noise(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LEVONE"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false))),
level2noise(Gtk::manage(new ThresholdAdjuster(M("TP_WAVELET_LEVTWO"), -30., 100., 0., M("TP_WAVELET_STREN"), 1., 0., 100., 0., M("TP_WAVELET_NOIS"), 1., nullptr, false))),