diff --git a/rtdata/profiles/crisp.pp3 b/rtdata/profiles/crisp.pp3 index 1c50c7bdf..a6ffd6fdb 100644 --- a/rtdata/profiles/crisp.pp3 +++ b/rtdata/profiles/crisp.pp3 @@ -173,6 +173,8 @@ CA=false HotDeadPixels=false LineDenoise=0 GreenEqThreshold=0 +PreExposure=1 +PrePreserv=0 CcSteps=1 Method=amaze DCBIterations=2 diff --git a/rtdata/profiles/default.pp3 b/rtdata/profiles/default.pp3 index 49b3a6680..30f2d7fd7 100644 --- a/rtdata/profiles/default.pp3 +++ b/rtdata/profiles/default.pp3 @@ -173,6 +173,8 @@ CA=false HotDeadPixels=false LineDenoise=0 GreenEqThreshold=0 +PreExposure=1 +PrePreserv=0 CcSteps=1 Method=amaze DCBIterations=2 diff --git a/rtdata/profiles/neutral.pp3 b/rtdata/profiles/neutral.pp3 index fdecac574..aa550bf00 100644 --- a/rtdata/profiles/neutral.pp3 +++ b/rtdata/profiles/neutral.pp3 @@ -172,6 +172,8 @@ CA=false HotDeadPixels=false LineDenoise=0 GreenEqThreshold=0 +PreExposure=1 +PrePreserv=0 CcSteps=1 Method=amaze DCBIterations=2 diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index c0122bd93..7ea5ed1be 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -441,8 +441,7 @@ int ProcParams::save (Glib::ustring fname) const { keyFile.set_string ("RAW", "Method", raw.dmethod ); keyFile.set_integer ("RAW", "DCBIterations", raw.dcb_iterations ); keyFile.set_boolean ("RAW", "DCBEnhance", raw.dcb_enhance ); - //exposition -// keyFile.set_boolean ("RAW", "PreExpo", raw.expos_correc ); + //exposure keyFile.set_double ("RAW", "PreExposure", raw.expos ); keyFile.set_double ("RAW", "PrePreserv", raw.preser ); @@ -765,7 +764,6 @@ if (keyFile.has_group ("RAW")) { if (keyFile.has_key ("RAW", "Method")) raw.dmethod = keyFile.get_string ("RAW", "Method"); if (keyFile.has_key ("RAW", "DCBIterations")) raw.dcb_iterations = keyFile.get_integer("RAW", "DCBIterations"); if (keyFile.has_key ("RAW", "DCBEnhance")) raw.dcb_enhance =keyFile.get_boolean("RAW", "DCBEnhance"); -// if (keyFile.has_key ("RAW", "PreExpo")) raw.expos_correc =keyFile.get_boolean("RAW", "PreExpo");//exposi if (keyFile.has_key ("RAW", "PreExposure")) raw.expos =keyFile.get_double("RAW", "PreExposure"); if (keyFile.has_key ("RAW", "PrePreserv")) raw.preser =keyFile.get_double("RAW", "PrePreserv"); diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 20f8174fe..d5b405148 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -396,7 +396,6 @@ class RAWParams { bool ca_autocorrect; double cared; double cablue; - // bool expos_correc; double expos; double preser; // expos bool hotdeadpix_filt; diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 5a2fffbb1..1899180da 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -290,7 +290,6 @@ void ParamsEdited::initFrom (const std::vector 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.exCorrection = raw.exCorrection && p.raw.expos_correc == other.raw.expos_correc; 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; diff --git a/rtgui/preprocess.cc b/rtgui/preprocess.cc index bac00850e..8d8f73edf 100644 --- a/rtgui/preprocess.cc +++ b/rtgui/preprocess.cc @@ -44,12 +44,18 @@ PreProcess::PreProcess () caBlue->setAdjusterListener (this); caBlue->show(); //exposi - exPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1)); + /*exPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1)); exPos->setAdjusterListener (this); exPos->show(); exPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0)); exPreser->setAdjusterListener (this); - exPreser->show(); + exPreser->show();*/ + PexPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1)); + PexPos->setAdjusterListener (this); + PexPos->show(); + PexPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0)); + PexPreser->setAdjusterListener (this); + PexPreser->show(); hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_HOTDEADPIXFILT")))); @@ -70,8 +76,8 @@ PreProcess::PreProcess () pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4); pack_start( *caRed, Gtk::PACK_SHRINK, 4); pack_start( *caBlue, Gtk::PACK_SHRINK, 4); - pack_start( *exPos, Gtk::PACK_SHRINK, 4);//exposi - pack_start( *exPreser, Gtk::PACK_SHRINK, 4); + pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi + pack_start( *PexPreser, Gtk::PACK_SHRINK, 4); pack_start( *Gtk::manage (new Gtk::HSeparator())); pack_start( *lineDenoise, Gtk::PACK_SHRINK, 4); @@ -98,9 +104,10 @@ void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd caAutocorrect->set_inconsistent(!pedited->raw.caCorrection); caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited ); caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited ); - exPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited ); - exPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited ); - //exposi + PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited ); + PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited ); + + //exposure hotDeadPixel->set_inconsistent (!pedited->raw.hotDeadPixel); lineDenoise->setEditedState( pedited->raw.linenoise ? Edited : UnEdited ); greenEqThreshold->setEditedState( pedited->raw.greenEq ? Edited : UnEdited ); @@ -119,8 +126,9 @@ void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd caAutocorrect->set_active(pp->raw.ca_autocorrect); caRed->setValue (pp->raw.cared); caBlue->setValue (pp->raw.cablue); - exPos->setValue (pp->raw.expos); - exPreser->setValue (pp->raw.preser);//exposi + PexPos->setValue (pp->raw.expos); + PexPreser->setValue (pp->raw.preser);//exposi + hotDeadPixel->set_active (pp->raw.hotdeadpix_filt); lineDenoise->setValue (pp->raw.linenoise); greenEqThreshold->setValue (pp->raw.greenthresh); @@ -142,8 +150,8 @@ void PreProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi pp->raw.ca_autocorrect = caAutocorrect->get_active(); pp->raw.cared = (double)caRed->getValue(); pp->raw.cablue = (double)caBlue->getValue(); - pp->raw.expos = (double)exPos->getValue(); - pp->raw.preser = (double)exPreser->getValue();//exposi + pp->raw.expos = (double)PexPos->getValue(); + pp->raw.preser = (double)PexPreser->getValue();//exposi pp->raw.hotdeadpix_filt = hotDeadPixel->get_active(); pp->raw.linenoise = (int)lineDenoise->getValue(); @@ -157,9 +165,8 @@ void PreProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi pedited->raw.caCorrection = !caAutocorrect->get_inconsistent(); pedited->raw.caRed = caRed->getEditedState (); pedited->raw.caBlue = caBlue->getEditedState (); - //pedited->raw.exCorrection = !caAutocorrect->get_inconsistent(); - pedited->raw.exPos = exPos->getEditedState (); - pedited->raw.exPreser = exPreser->getEditedState ();//exposi + pedited->raw.exPos = PexPos->getEditedState (); + pedited->raw.exPreser = PexPreser->getEditedState ();//exposi pedited->raw.hotDeadPixel = !hotDeadPixel->get_inconsistent(); } @@ -176,8 +183,9 @@ void PreProcess::setBatchMode(bool batchMode) ToolPanel::setBatchMode (batchMode); caRed->showEditedCB (); caBlue->showEditedCB (); - exPos->showEditedCB (); - exPreser->showEditedCB ();//exposi + PexPos->showEditedCB (); + PexPreser->showEditedCB ();//exposi + lineDenoise->showEditedCB (); greenEqThreshold->showEditedCB (); } @@ -187,24 +195,24 @@ void PreProcess::setDefaults(const rtengine::procparams::ProcParams* defParams, lineDenoise->setDefault( defParams->raw.linenoise); caRed->setDefault( defParams->raw.cared); caBlue->setDefault( defParams->raw.cablue); - exPos->setDefault( defParams->raw.expos); - exPreser->setDefault( defParams->raw.preser); + PexPos->setDefault( defParams->raw.expos); + PexPreser->setDefault( defParams->raw.preser); greenEqThreshold->setDefault (defParams->raw.greenthresh); if (pedited) { lineDenoise->setDefaultEditedState( pedited->raw.linenoise ? Edited : UnEdited); caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited); caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited); - exPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited); - exPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited); + PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited); + PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited); greenEqThreshold->setDefaultEditedState(pedited->raw.greenEq ? Edited : UnEdited); }else{ lineDenoise->setDefaultEditedState( Irrelevant ); caRed->setDefaultEditedState( Irrelevant ); caBlue->setDefaultEditedState( Irrelevant ); - exPos->setDefaultEditedState( Irrelevant ); - exPreser->setDefaultEditedState( Irrelevant ); + PexPos->setDefaultEditedState( Irrelevant ); + PexPreser->setDefaultEditedState( Irrelevant ); greenEqThreshold->setDefaultEditedState(Irrelevant ); } diff --git a/rtgui/preprocess.h b/rtgui/preprocess.h index af8a76244..c411cb07e 100644 --- a/rtgui/preprocess.h +++ b/rtgui/preprocess.h @@ -37,8 +37,9 @@ class PreProcess : public Gtk::VBox, public AdjusterListener, public ToolPanel{ Adjuster* caRed; Adjuster* caBlue; - Adjuster* exPos; - Adjuster* exPreser; + Adjuster* PexPos; + Adjuster* PexPreser; + Adjuster* lineDenoise; Adjuster* greenEqThreshold; Gtk::CheckButton* caAutocorrect;