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

Change behavior exposure PDE Ipol

Browse Source
This commit is contained in:
Desmis 2020-06-05 13:28:15 +02:00
parent 8a8fba500b
commit 4ae6e01af3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/procparams.cc
View File

@ -2891,7 +2891,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
exnoiseMethod("none"), exnoiseMethod("none"),
laplacexp(0.0), laplacexp(0.0),
balanexp(1.0), balanexp(1.0),
linear(0.3), linear(0.05),
gamm(0.4), gamm(0.4),
fatamount(1.0), fatamount(1.0),
fatdetail(40.0), fatdetail(40.0),

11
rtgui/locallabtools.cc
View File

@ -2175,7 +2175,7 @@ LocallabExposure::LocallabExposure():
expMethod(Gtk::manage(new MyComboBoxText())), expMethod(Gtk::manage(new MyComboBoxText())),
pdeFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_PDEFRA")))), pdeFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_PDEFRA")))),
laplacexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACEXP"), 0.0, 100.0, 0.1, 0.))), laplacexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACEXP"), 0.0, 100.0, 0.1, 0.))),
linear(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LINEAR"), 0., 1., 0.01, 0.3))), linear(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LINEAR"), 0., 1., 0.01, 0.05))),
balanexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANEXP"), 0.5, 1.5, 0.01, 1.0))), balanexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANEXP"), 0.5, 1.5, 0.01, 1.0))),
gamm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMM"), 0.2, 1.3, 0.01, 0.4))), gamm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMM"), 0.2, 1.3, 0.01, 0.4))),
exnoiseMethod(Gtk::manage(new MyComboBoxText())), exnoiseMethod(Gtk::manage(new MyComboBoxText())),
@ -2567,6 +2567,7 @@ void LocallabExposure::read(const rtengine::procparams::ProcParams* pp, const Pa
if (spot.expMethod == "std") { if (spot.expMethod == "std") {
expMethod->set_active(0); expMethod->set_active(0);
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} else if (spot.expMethod == "pde") { } else if (spot.expMethod == "pde") {
expMethod->set_active(1); expMethod->set_active(1);
} }
@ -2650,6 +2651,7 @@ void LocallabExposure::write(rtengine::procparams::ProcParams* pp, ParamsEdited*
if (expMethod->get_active_row_number() == 0) { if (expMethod->get_active_row_number() == 0) {
spot.expMethod = "std"; spot.expMethod = "std";
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
} else if (expMethod->get_active_row_number() == 1) { } else if (expMethod->get_active_row_number() == 1) {
spot.expMethod = "pde"; spot.expMethod = "pde";
} }
@ -3029,6 +3031,10 @@ void LocallabExposure::convertParamToNormal()
slomaskexp->setValue(defSpot.slomaskexp); slomaskexp->setValue(defSpot.slomaskexp);
strmaskexp->setValue(defSpot.strmaskexp); strmaskexp->setValue(defSpot.strmaskexp);
angmaskexp->setValue(defSpot.angmaskexp); angmaskexp->setValue(defSpot.angmaskexp);
laplacexp->setValue(defSpot.laplacexp);
linear->setValue(defSpot.linear);
balanexp->setValue(defSpot.balanexp);
gamm->setValue(defSpot.gamm);
// Enable all listeners // Enable all listeners
enableListener(); enableListener();
@ -3043,6 +3049,7 @@ void LocallabExposure::updateGUIToMode(const modeType new_type)
slomaskexp->hide(); slomaskexp->hide();
gradFramemask->hide(); gradFramemask->hide();
blurexpde->hide(); blurexpde->hide();
pdeFrame->hide();
} else { } else {
// Advanced widgets are shown in Expert mode // Advanced widgets are shown in Expert mode
lapmaskexp->show(); lapmaskexp->show();
@ -3050,6 +3057,7 @@ void LocallabExposure::updateGUIToMode(const modeType new_type)
slomaskexp->show(); slomaskexp->show();
gradFramemask->show(); gradFramemask->show();
blurexpde->show(); blurexpde->show();
pdeFrame->show();
} }
} }
@ -3073,6 +3081,7 @@ void LocallabExposure::expMethodChanged()
{ {
// Update exposure GUI according to expMethod value // Update exposure GUI according to expMethod value
updateExposureGUI2(); updateExposureGUI2();
updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
if (isLocActivated && exp->getEnabled()) { if (isLocActivated && exp->getEnabled()) {
if (listener) { if (listener) {