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

Raw white point (aka Raw exposure) ported

Browse Source
This commit is contained in:
Oliver Duis
2011-04-08 19:39:35 +02:00
parent 573bae31d1
commit 9d053c18b3
11 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/paramsedited.cc
View File

@@ -308,8 +308,8 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
raw.caCorrection = raw.caCorrection && p.raw.ca_autocorrect == other.raw.ca_autocorrect;
raw.caRed = raw.caRed && p.raw.cared == other.raw.cared;
raw.caBlue = raw.caBlue && p.raw.cablue == other.raw.cablue;
//raw.exPos = raw.exPos && p.raw.expos == other.raw.expos;
//raw.exPreser = raw.exPreser && p.raw.preser == other.raw.preser; //exposi
raw.exPos = raw.exPos && p.raw.expos == other.raw.expos;
raw.exPreser = raw.exPreser && p.raw.preser == other.raw.preser; //exposi
raw.darkFrame = raw.darkFrame && p.raw.dark_frame == other.raw.dark_frame;
raw.dfAuto = raw.dfAuto && p.raw.df_autoselect == other.raw.df_autoselect;
raw.ff_file = raw.ff_file && p.raw.ff_file == other.raw.ff_file;
@@ -461,8 +461,8 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (raw.caCorrection) toEdit.raw.ca_autocorrect = mods.raw.ca_autocorrect;
if (raw.caRed) toEdit.raw.cared = mods.raw.cared;
if (raw.caBlue) toEdit.raw.cablue = mods.raw.cablue;
//if (raw.exPos) toEdit.raw.expos =mods.raw.expos;
//if (raw.exPreser) toEdit.raw.preser =mods.raw.preser;
if (raw.exPos) toEdit.raw.expos =mods.raw.expos;
if (raw.exPreser) toEdit.raw.preser =mods.raw.preser;
if (raw.greenEq) toEdit.raw.greenthresh = mods.raw.greenthresh;
if (raw.hotDeadPixel) toEdit.raw.hotdeadpix_filt= mods.raw.hotdeadpix_filt;
if (raw.linenoise) toEdit.raw.linenoise = mods.raw.linenoise;

4
rtgui/partialpastedlg.cc
View File

@@ -552,8 +552,8 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dst, const r
if (raw_ccSteps->get_active ()) dst->raw.ccSteps =src->raw.ccSteps;
if (raw_dcb_iterations->get_active ()) dst->raw.dcb_iterations =src->raw.dcb_iterations;
if (raw_dcb_enhance->get_active ()) dst->raw.dcb_enhance =src->raw.dcb_enhance;
//if (raw_expos->get_active ()) dst->raw.expos =src->raw.expos;
//if (raw_preser->get_active ()) dst->raw.preser =src->raw.preser;
if (raw_expos->get_active ()) dst->raw.expos =src->raw.expos;
if (raw_preser->get_active ()) dst->raw.preser =src->raw.preser;
if (raw_ca_autocorrect->get_active ()) dst->raw.ca_autocorrect =src->raw.ca_autocorrect;
if (raw_cared->get_active ()) dst->raw.cared =src->raw.cared;
if (raw_cablue->get_active ()) dst->raw.cablue =src->raw.cablue;

18
rtgui/rawexposure.cc
View File

@@ -48,16 +48,16 @@ void RAWExposure::read(const rtengine::procparams::ProcParams* pp, const ParamsE
PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited );
}
//PexPos->setValue (pp->raw.expos);
//PexPreser->setValue (pp->raw.preser);//exposi
PexPos->setValue (pp->raw.expos);
PexPreser->setValue (pp->raw.preser);//exposi
enableListener ();
}
void RAWExposure::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
//pp->raw.expos = PexPos->getValue();
//pp->raw.preser = PexPreser->getValue();//exposi
pp->raw.expos = PexPos->getValue();
pp->raw.preser = PexPreser->getValue();//exposi
if (pedited) {
pedited->raw.exPos = PexPos->getEditedState ();
@@ -69,13 +69,11 @@ void RAWExposure::write( rtengine::procparams::ProcParams* pp, ParamsEdited* ped
void RAWExposure::adjusterChanged (Adjuster* a, double newval)
{
if (listener) {
Glib::ustring value = a->getTextValue();
/*if (a == PexPos)
if (a == PexPos)
listener->panelChanged (EvPreProcessExpCorrLinear, value );
else if (a == PexPreser)
listener->panelChanged (EvPreProcessExpCorrPH, value );*/
listener->panelChanged (EvPreProcessExpCorrPH, value );
}
}
@@ -88,8 +86,8 @@ void RAWExposure::setBatchMode(bool batchMode)
void RAWExposure::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
{
//PexPos->setDefault( defParams->raw.expos);
//PexPreser->setDefault( defParams->raw.preser);
PexPos->setDefault( defParams->raw.expos);
PexPreser->setDefault( defParams->raw.preser);
if (pedited) {
PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited);