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

Unfix fixed white level, #5187

Browse Source
This commit is contained in:
heckflosse
2019-02-23 14:00:45 +01:00
parent 04f8fc6cc8
commit 46aabd2003
17 changed files with 29 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtgui/rawexposure.cc
View File

@@ -33,19 +33,7 @@ RAWExposure::RAWExposure () : FoldableToolPanel(this, "rawexposure", M("TP_EXPOS
}
PexPos->show();
PexPreser = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_PRESER"), 0, 2.5, 0.1, 0));
PexPreser->setAdjusterListener (this);
if (PexPreser->delay < options.adjusterMaxDelay) {
PexPreser->delay = options.adjusterMaxDelay;
}
PexPreser->show();
pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi
// raw highlight exposure setting is obsolete, removing from GUI
//pack_start( *PexPreser, Gtk::PACK_SHRINK, 4);
PexPos->setLogScale(100, 0);
}
@@ -55,11 +43,9 @@ void RAWExposure::read(const rtengine::procparams::ProcParams* pp, const ParamsE
if(pedited ) {
PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited );
PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited );
}
PexPos->setValue (pp->raw.expos);
PexPreser->setValue (pp->raw.preser);//exposi
enableListener ();
}
@@ -67,11 +53,9 @@ void RAWExposure::read(const rtengine::procparams::ProcParams* pp, const ParamsE
void RAWExposure::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
pp->raw.expos = PexPos->getValue();
pp->raw.preser = PexPreser->getValue();//exposi
if (pedited) {
pedited->raw.exPos = PexPos->getEditedState ();
pedited->raw.exPreser = PexPreser->getEditedState ();//exposi
}
}
@@ -83,8 +67,6 @@ void RAWExposure::adjusterChanged(Adjuster* a, double newval)
if (a == PexPos ) {
listener->panelChanged (EvPreProcessExpCorrLinear, value );
} else if (a == PexPreser && ABS(PexPos->getValue() - 1.0) > 0.0001) { // update takes long, only do it if it would have an effect
listener->panelChanged (EvPreProcessExpCorrPH, value );
}
}
}
@@ -97,33 +79,27 @@ void RAWExposure::setBatchMode(bool batchMode)
{
ToolPanel::setBatchMode (batchMode);
PexPos->showEditedCB ();
PexPreser->showEditedCB ();//exposure
}
void RAWExposure::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
{
PexPos->setDefault( defParams->raw.expos);
PexPreser->setDefault( defParams->raw.preser);
if (pedited) {
PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited);
PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited);
} else {
PexPos->setDefaultEditedState( Irrelevant );
PexPreser->setDefaultEditedState( Irrelevant );
}
}
void RAWExposure::setAdjusterBehavior (bool pexposadd, bool pexpreseradd)
void RAWExposure::setAdjusterBehavior (bool pexposadd)
{
PexPos->setAddMode(pexposadd);
PexPreser->setAddMode(pexpreseradd);
}
void RAWExposure::trimValues (rtengine::procparams::ProcParams* pp)
{
PexPos->trimValue(pp->raw.expos);
PexPreser->trimValue(pp->raw.preser);
}