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

Fix for usability of highlight threshold slider and shadow compression in batch mode

Browse Source
This commit is contained in:
Thanatomanic 2018-09-02 20:40:11 +02:00
parent 30b36e6371
commit 7b0a9c01c5
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rtgui/tonecurve.cc
View File

@ -229,11 +229,11 @@ void ToneCurve::read (const ProcParams* pp, const ParamsEdited* pedited)
hlcomprthresh->setValue (pp->toneCurve.hlcomprthresh); hlcomprthresh->setValue (pp->toneCurve.hlcomprthresh);
shcompr->setValue (pp->toneCurve.shcompr); shcompr->setValue (pp->toneCurve.shcompr);
if (!black->getAddMode()) { if (!black->getAddMode() && !batchMode) {
shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect
} }
if (!hlcompr->getAddMode()) { if (!hlcompr->getAddMode() && !batchMode) {
hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect
} }
@ -615,7 +615,7 @@ void ToneCurve::adjusterChanged (Adjuster* a, double newval)
} else if (a == black) { } else if (a == black) {
listener->panelChanged (EvBlack, costr); listener->panelChanged (EvBlack, costr);
if (!black->getAddMode()) { if (!black->getAddMode() && !batchMode) {
shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect
} }
} else if (a == contrast) { } else if (a == contrast) {
@ -625,7 +625,7 @@ void ToneCurve::adjusterChanged (Adjuster* a, double newval)
} else if (a == hlcompr) { } else if (a == hlcompr) {
listener->panelChanged (EvHLCompr, costr); listener->panelChanged (EvHLCompr, costr);
if (!hlcompr->getAddMode()) { if (!hlcompr->getAddMode() && !batchMode) {
hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect
} }
} else if (a == hlcomprthresh) { } else if (a == hlcomprthresh) {
@ -668,11 +668,11 @@ void ToneCurve::neutral_pressed ()
hlrbox->hide(); hlrbox->hide();
} }
if (!black->getAddMode()) { if (!black->getAddMode() && !batchMode) {
shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect
} }
if (!hlcompr->getAddMode()) { if (!hlcompr->getAddMode() && !batchMode) {
hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect
} }
@ -745,6 +745,11 @@ void ToneCurve::autolevels_toggled ()
if (!black->getAddMode()) { if (!black->getAddMode()) {
shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect
} }
if (!hlcompr->getAddMode() && !batchMode) {
hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect
}
} else { } else {
listener->panelChanged (EvFixedExp, M("GENERAL_DISABLED")); listener->panelChanged (EvFixedExp, M("GENERAL_DISABLED"));
} }
@ -859,10 +864,14 @@ bool ToneCurve::autoExpComputed_ ()
hlrbox->hide(); hlrbox->hide();
} }
if (!black->getAddMode()) { if (!black->getAddMode() && !batchMode) {
shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect shcompr->set_sensitive(!((int)black->getValue () == 0)); //at black=0 shcompr value has no effect
} }
if (!hlcompr->getAddMode() && !batchMode) {
hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect
}
enableListener (); enableListener ();
return false; return false;
@ -983,10 +992,14 @@ bool ToneCurve::histmatchingComputed()
contrast->setValue(0); contrast->setValue(0);
black->setValue(0); black->setValue(0);
if (!black->getAddMode()) { if (!black->getAddMode() && !batchMode) {
shcompr->set_sensitive(!((int)black->getValue() == 0)); shcompr->set_sensitive(!((int)black->getValue() == 0));
} }
if (!hlcompr->getAddMode() && !batchMode) {
hlcomprthresh->set_sensitive(!((int)hlcompr->getValue () == 0)); //at hlcompr=0 hlcomprthresh value has no effect
}
if (autolevels->get_active() ) { if (autolevels->get_active() ) {
expcomp->setValue(0); expcomp->setValue(0);
autoconn.block(true); autoconn.block(true);