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

Merge branch 'master' into pixelshift

Browse Source
This commit is contained in:
heckflosse
2017-01-21 02:49:40 +01:00
parent d9c1ba78c4 8e1392429d
commit 45f41ae62a
2 changed files with 236 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
rtgui/retinex.cc
View File

@@ -761,14 +761,16 @@ void Retinex::read (const ProcParams* pp, const ParamsEdited* pedited)
skal->setValue (pp->retinex.skal);
if(pp->retinex.iter == 1) {
grad->set_sensitive(false);
scal->set_sensitive(false);
grads->set_sensitive(false);
} else {
grad->set_sensitive(true);
scal->set_sensitive(true);
grads->set_sensitive(true);
if (!batchMode) {
if(pp->retinex.iter == 1) {
grad->set_sensitive(false);
scal->set_sensitive(false);
grads->set_sensitive(false);
} else {
grad->set_sensitive(true);
scal->set_sensitive(true);
grads->set_sensitive(true);
}
}
setEnabled (pp->retinex.enabled);
@@ -1043,38 +1045,39 @@ void Retinex::mapMethodChanged()
void Retinex::viewMethodChanged()
{
if(viewMethod->get_active_row_number() == 1 || viewMethod->get_active_row_number() == 2) {
// vart->hide();
gain->hide();
offs->hide();
limd->hide();
transmissionCurveEditorG->hide();
medianmap->hide();
iter->hide();
scal->hide();
grad->hide();
grads->hide();
curveEditorGH->hide();
} else if(viewMethod->get_active_row_number() == 3 || viewMethod->get_active_row_number() == 4) {
gain->hide();
offs->hide();
transmissionCurveEditorG->show();
// vart->hide();
curveEditorGH->hide();
} else {
vart->show();
neigh->show();
gain->show();
offs->show();
limd->show();
transmissionCurveEditorG->show();
medianmap->show();
iter->show();
scal->show();
grad->show();
grads->show();
curveEditorGH->show();
if (!batchMode) {
if(viewMethod->get_active_row_number() == 1 || viewMethod->get_active_row_number() == 2) {
//vart->hide();
gain->hide();
offs->hide();
limd->hide();
transmissionCurveEditorG->hide();
medianmap->hide();
iter->hide();
scal->hide();
grad->hide();
grads->hide();
curveEditorGH->hide();
} else if(viewMethod->get_active_row_number() == 3 || viewMethod->get_active_row_number() == 4) {
gain->hide();
offs->hide();
transmissionCurveEditorG->show();
//vart->hide();
curveEditorGH->hide();
} else {
vart->show();
neigh->show();
gain->show();
offs->show();
limd->show();
transmissionCurveEditorG->show();
medianmap->show();
iter->show();
scal->show();
grad->show();
grads->show();
curveEditorGH->show();
}
}
if (listener) {
@@ -1254,21 +1257,22 @@ void Retinex::setAdjusterBehavior (bool strAdd, bool neighAdd, bool limdAdd, boo
void Retinex::adjusterChanged (Adjuster* a, double newval)
{
if (a==iter && !batchMode) {
if(iter->getIntValue() > 1) {
scal->set_sensitive(true);
grad->set_sensitive(true);
grads->set_sensitive(true);
} else {
scal->set_sensitive(false);
grad->set_sensitive(false);
grads->set_sensitive(false);
}
}
if (!listener || !getEnabled()) {
return;
}
if(iter->getTextValue() > "1") {
scal->set_sensitive(true);
grad->set_sensitive(true);
grads->set_sensitive(true);
} else {
scal->set_sensitive(false);
grad->set_sensitive(false);
grads->set_sensitive(false);
}
if (a == neigh) {
listener->panelChanged (EvLneigh, neigh->getTextValue());
} else if (a == str) {